transaction-builder: rename to diem-transaction-builder

client/faucet/Cargo.toml

@@ -29,7 +29,7 @@ diem-logger = { path = "../../common/logger" }
 diem-types = { path = "../../types" }
 diem-workspace-hack = { path = "../../common/workspace-hack" }
 move-core-types = { path = "../../language/move-core/types" }
-transaction-builder-generated = { path = "../transaction-builder" }
+diem-transaction-builder = { path = "../transaction-builder" }
 
 [dev-dependencies]
 serde_json = "1.0.64"

client/faucet/src/main.rs

@@ -127,6 +127,7 @@ mod tests {
     use crate::routes;
     use diem_faucet::mint;
     use diem_infallible::RwLock;
+    use diem_transaction_builder::stdlib::ScriptCall;
     use diem_types::{
         account_address::AccountAddress,
         transaction::{
@@ -135,7 +136,6 @@ mod tests {
         },
     };
     use std::{collections::HashMap, convert::TryFrom, sync::Arc};
-    use transaction_builder_generated::stdlib::ScriptCall;
     use warp::Filter;
 
     fn setup(

client/faucet/src/mint.rs

@@ -51,7 +51,7 @@ impl MintParams {
         seq: u64,
     ) -> diem_types::transaction::TransactionPayload {
         diem_types::transaction::TransactionPayload::Script(
-            transaction_builder_generated::stdlib::encode_create_parent_vasp_account_script(
+            diem_transaction_builder::stdlib::encode_create_parent_vasp_account_script(
                 self.currency_code(),
                 0, // sliding nonce
                 self.receiver(),
@@ -67,7 +67,7 @@ impl MintParams {
         seq: u64,
     ) -> diem_types::transaction::TransactionPayload {
         diem_types::transaction::TransactionPayload::Script(
-            transaction_builder_generated::stdlib::encode_create_designated_dealer_script(
+            diem_transaction_builder::stdlib::encode_create_designated_dealer_script(
                 self.currency_code(),
                 0, // sliding nonce
                 self.receiver(),
@@ -80,7 +80,7 @@ impl MintParams {
 
     fn p2p_script(&self) -> diem_types::transaction::TransactionPayload {
         diem_types::transaction::TransactionPayload::Script(
-            transaction_builder_generated::stdlib::encode_peer_to_peer_with_metadata_script(
+            diem_transaction_builder::stdlib::encode_peer_to_peer_with_metadata_script(
                 self.currency_code(),
                 self.receiver(),
                 self.amount,

client/transaction-builder/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "transaction-builder-generated"
+name = "diem-transaction-builder"
 version = "0.1.0"
 authors = ["Diem Association <[email protected]>"]
 description = "Generated transaction builders"

json-rpc/Cargo.toml

@@ -63,7 +63,7 @@ executor = { path = "../execution/executor" }
 executor-types = { path = "../execution/executor-types" }
 scratchpad = { path = "../storage/scratchpad" }
 move-vm-types = { path = "../language/move-vm/types" }
-transaction-builder-generated = { path = "../client/transaction-builder" }
+diem-transaction-builder = { path = "../client/transaction-builder" }
 diem-node = { path = "../diem-node" }
 
 [features]

json-rpc/tests/integration_test.rs

@@ -5,6 +5,7 @@ use serde_json::json;
 
 use compiled_stdlib::shim::tmp_new_transaction_script_builders;
 use diem_crypto::hash::CryptoHash;
+use diem_transaction_builder::stdlib;
 use diem_types::{
     access_path::AccessPath,
     account_address::AccountAddress,
@@ -17,7 +18,6 @@ use diem_types::{
     write_set::{WriteOp, WriteSet, WriteSetMut},
 };
 use std::{convert::TryInto, ops::Deref};
-use transaction_builder_generated::stdlib;
 
 use diem_json_rpc_types::views::EventView;
 
@@ -449,7 +449,7 @@ fn create_test_cases() -> Vec<Test> {
                     let txn1 = {
                         let account1 = env.get_account(0, 0);
                         let account2 = env.get_account(1, 0);
-                        let script = transaction_builder_generated::stdlib::encode_peer_to_peer_with_metadata_script(
+                        let script = diem_transaction_builder::stdlib::encode_peer_to_peer_with_metadata_script(
                             xus_tag(),
                             account2.address,
                             100,

json-rpc/tests/testing.rs

@@ -67,23 +67,22 @@ impl Env {
 
     pub fn create_parent_vasp(&mut self) {
         let vasp = Account::gen();
-        let script =
-            transaction_builder_generated::stdlib::encode_create_parent_vasp_account_script(
-                xus_tag(),
-                0, // sliding nonce
-                vasp.address,
-                vasp.auth_key().prefix().to_vec(),
-                format!("Novi {}", self.vasps.len()).as_bytes().to_owned(),
-                false, /* add all currencies */
-            );
+        let script = diem_transaction_builder::stdlib::encode_create_parent_vasp_account_script(
+            xus_tag(),
+            0, // sliding nonce
+            vasp.address,
+            vasp.auth_key().prefix().to_vec(),
+            format!("Novi {}", self.vasps.len()).as_bytes().to_owned(),
+            false, /* add all currencies */
+        );
         let txn = self.create_txn(&self.tc, script);
         self.submit_and_wait(txn);
         self.vasps.push(vasp);
     }
 
     pub fn create_child_vasp(&mut self, parent_vasp_index: usize, amount: u64) {
         let child = Account::gen();
-        let script = transaction_builder_generated::stdlib::encode_create_child_vasp_account_script(
+        let script = diem_transaction_builder::stdlib::encode_create_child_vasp_account_script(
             xus_tag(),
             child.address,
             child.auth_key().prefix().to_vec(),
@@ -96,14 +95,13 @@ impl Env {
     }
 
     pub fn transfer_coins_to_vasp(&mut self, index: usize, amount: u64) {
-        let script =
-            transaction_builder_generated::stdlib::encode_peer_to_peer_with_metadata_script(
-                xus_tag(),
-                self.vasps[index].address,
-                amount,
-                vec![],
-                vec![],
-            );
+        let script = diem_transaction_builder::stdlib::encode_peer_to_peer_with_metadata_script(
+            xus_tag(),
+            self.vasps[index].address,
+            amount,
+            vec![],
+            vec![],
+        );
         let txn = self.create_txn(&self.dd, script);
         self.submit_and_wait(txn);
     }
@@ -127,15 +125,14 @@ impl Env {
     ) -> SignedTransaction {
         let (rid, rcid) = receiver;
         let receiver_address = self.vasps[rid].children[rcid].address;
-        let script =
-            transaction_builder_generated::stdlib::encode_peer_to_peer_with_metadata_script(
-                xus_tag(),
-                receiver_address,
-                amount,
-                // todo: add metadata
-                vec![],
-                vec![],
-            );
+        let script = diem_transaction_builder::stdlib::encode_peer_to_peer_with_metadata_script(
+            xus_tag(),
+            receiver_address,
+            amount,
+            // todo: add metadata
+            vec![],
+            vec![],
+        );
         self.create_txn(&self.vasps[sender.0].children[sender.1], script)
     }
 

language/e2e-testsuite/Cargo.toml

@@ -21,7 +21,7 @@ move-core-types = { path = "../move-core/types" }
 move-vm-runtime = { path = "../move-vm/runtime" }
 move-vm-types = { path = "../move-vm/types" }
 transaction-builder = { path = "../transaction-builder"}
-transaction-builder-generated = { path = "../../client/transaction-builder"}
+diem-transaction-builder = { path = "../../client/transaction-builder"}
 vm = { path = "../vm" }
 diem-vm = { path = "../diem-vm" }
 proptest = "1.0.0"
@@ -31,4 +31,4 @@ diem-workspace-hack = { path = "../../common/workspace-hack" }
 diem-writeset-generator = { path = "../diem-tools/writeset-transaction-generator"}
 
 [features]
-default = ["transaction-builder-generated/fuzzing"]
+default = ["diem-transaction-builder/fuzzing"]

language/e2e-testsuite/src/tests/transaction_fuzzer.rs

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use compiled_stdlib::legacy::transaction_scripts::LegacyStdlibScript;
+use diem_transaction_builder::stdlib::ScriptCall;
 use diem_types::account_config;
 use language_e2e_tests::{
     account::{self, Account},
@@ -10,7 +11,6 @@ use language_e2e_tests::{
 use proptest::{collection::vec, prelude::*};
 use std::convert::TryFrom;
 use transaction_builder::encode_create_parent_vasp_account_script;
-use transaction_builder_generated::stdlib::ScriptCall;
 
 proptest! {
     #![proptest_config(ProptestConfig::with_cases(10))]

language/transaction-builder/Cargo.toml

@@ -13,7 +13,7 @@ edition = "2018"
 mirai-annotations = "1.10.1"
 
 diem-workspace-hack = { path = "../../common/workspace-hack" }
-transaction-builder-generated = { path = "../../client/transaction-builder" }
+diem-transaction-builder = { path = "../../client/transaction-builder" }
 
 [features]
 default = []

language/transaction-builder/src/lib.rs

@@ -4,4 +4,4 @@
 #![forbid(unsafe_code)]
 
 // TODO: remove
-pub use transaction_builder_generated::stdlib::*;
+pub use diem_transaction_builder::stdlib::*;

secure/key-manager/Cargo.toml

@@ -27,7 +27,7 @@ diem-secure-storage = { path = "../storage" }
 diem-time-service = { path = "../../common/time-service" }
 diem-types = { path = "../../types" }
 diem-workspace-hack = { path = "../../common/workspace-hack" }
-transaction-builder-generated = { path = "../../client/transaction-builder" }
+diem-transaction-builder = { path = "../../client/transaction-builder" }
 
 [dev-dependencies]
 futures = "0.3.12"

secure/key-manager/src/lib.rs

@@ -399,7 +399,7 @@ pub fn build_rotation_transaction(
     chain_id: ChainId,
 ) -> RawTransaction {
     let script =
-        transaction_builder_generated::stdlib::encode_set_validator_config_and_reconfigure_script(
+        diem_transaction_builder::stdlib::encode_set_validator_config_and_reconfigure_script(
             owner_address,
             consensus_key.to_bytes().to_vec(),
             network_addresses,

secure/key-manager/src/tests.rs

@@ -736,7 +736,7 @@ fn verify_validator_config_info_mismatch<T: DiemInterface>(mut node: Node<T>) {
     // Build a transaction updating the validator config consensus key on chain
     let mut rng = StdRng::from_seed([44u8; 32]);
     let new_consensus_key = Ed25519PrivateKey::generate(&mut rng).public_key();
-    let script = transaction_builder_generated::stdlib::encode_register_validator_config_script(
+    let script = diem_transaction_builder::stdlib::encode_register_validator_config_script(
         node.get_account_from_storage(OWNER_ACCOUNT),
         new_consensus_key.to_bytes().to_vec(),
         Vec::new(),