[types] add ChainID to user txn

client/libra-dev/src/transaction.rs

@@ -20,6 +20,7 @@ use libra_types::{
     account_config::{
         from_currency_code_string, lbr_type_tag, type_tag_for_currency_code, LBR_NAME,
     },
+    chain_id::ChainId,
     transaction::{
         authenticator::AuthenticationKey, helpers::TransactionSigner, RawTransaction, Script,
         SignedTransaction, TransactionArgument, TransactionPayload,
@@ -40,6 +41,7 @@ pub unsafe extern "C" fn libra_SignedTransactionBytes_from(
     gas_unit_price: u64,
     gas_identifier: *const i8,
     expiration_time_secs: u64,
+    chain_id: u64,
     script_bytes: *const u8,
     script_len: usize,
     ptr_buf: *mut *mut u8,
@@ -90,6 +92,7 @@ pub unsafe extern "C" fn libra_SignedTransactionBytes_from(
             .to_string_lossy()
             .into_owned(),
         expiration_time,
+        ChainId::new(chain_id),
     );
 
     let keypair = KeyPair::from(private_key);
@@ -338,6 +341,7 @@ pub unsafe extern "C" fn libra_RawTransactionBytes_from(
     sender: *const u8,
     receiver: *const u8,
     sequence: u64,
+    chain_id: u64,
     num_coins: u64,
     max_gas_amount: u64,
     gas_unit_price: u64,
@@ -405,6 +409,7 @@ pub unsafe extern "C" fn libra_RawTransactionBytes_from(
         gas_unit_price,
         LBR_NAME.to_owned(),
         expiration_time,
+        ChainId::new(chain_id),
     );
 
     let raw_txn_bytes = match to_bytes(&raw_txn) {
@@ -709,6 +714,7 @@ mod test {
                 gas_unit_price,
                 coin_ident.as_ptr(),
                 expiration_time_secs,
+                ChainId::test().id(),
                 script_bytes.as_ptr(),
                 script_len,
                 buf_ptr,
@@ -758,6 +764,7 @@ mod test {
                 gas_unit_price,
                 coin_idnet.as_ptr(),
                 expiration_time_secs,
+                ChainId::test().id(),
                 script_bytes.as_ptr(),
                 script_len,
                 buf_ptr2,
@@ -806,6 +813,7 @@ mod test {
                 gas_unit_price,
                 coin_ident_2.as_ptr(),
                 expiration_time_secs,
+                ChainId::test().id(),
                 script_bytes.as_ptr(),
                 script_len,
                 buf_ptr,
@@ -1046,6 +1054,7 @@ mod test {
                 sender_address.as_ref().as_ptr(),
                 receiver_address.as_ref().as_ptr(),
                 sequence,
+                ChainId::test().id(),
                 amount,
                 max_gas_amount,
                 gas_unit_price,
@@ -1140,6 +1149,7 @@ mod test {
                 gas_unit_price,
                 LBR_NAME.to_owned(),
                 Duration::from_secs(expiration_time_secs),
+                ChainId::test(),
             ),
             public_key.clone(),
             signature.clone(),

client/swiss-knife/src/main.rs

@@ -7,12 +7,16 @@ use libra_crypto::{
     test_utils::KeyPair,
     Signature, SigningKey, Uniform, ValidCryptoMaterialStringExt,
 };
-use libra_types::transaction::{
-    authenticator::AuthenticationKey, RawTransaction, SignedTransaction, Transaction,
-    TransactionPayload,
+use libra_types::{
+    chain_id::ChainId,
+    transaction::{
+        authenticator::AuthenticationKey, RawTransaction, SignedTransaction, Transaction,
+        TransactionPayload,
+    },
 };
 use rand::{prelude::StdRng, SeedableRng};
 use serde::{Deserialize, Serialize};
+use std::str::FromStr;
 use structopt::StructOpt;
 use swiss_knife::helpers;
 
@@ -117,6 +121,8 @@ struct TxnParams {
     pub sender_address: String,
     // Sequence number of this transaction corresponding to sender's account.
     pub sequence_number: u64,
+    // Chain ID of the network this transaction is intended for
+    pub chain_id: String,
     // Maximal total gas specified by wallet to spend for this transaction.
     pub max_gas_amount: u64,
     // Maximal price can be paid per gas.
@@ -193,6 +199,7 @@ fn generate_raw_txn(g: GenerateRawTxnRequest) -> GenerateRawTxnResponse {
         g.txn_params.gas_unit_price,
         g.txn_params.gas_currency_code,
         std::time::Duration::new(g.txn_params.expiration_timestamp, 0),
+        ChainId::from_str(&g.txn_params.chain_id).expect("Failed to convert str to ChainId"),
     );
     GenerateRawTxnResponse {
         raw_txn: hex::encode(

config/management/src/config_builder.rs

@@ -108,6 +108,7 @@ impl<T: AsRef<Path>> ValidatorBuilder<T> {
                 validator_account,
                 validator_network_address,
                 fullnode_network_address,
+                self.template.base.chain_id,
                 &ns,
                 &ns_shared,
             )

config/management/src/lib.rs

@@ -264,7 +264,7 @@ pub mod tests {
     use super::*;
     use crate::storage_helper::StorageHelper;
     use libra_secure_storage::{CryptoStorage, KVStorage};
-    use libra_types::account_address::AccountAddress;
+    use libra_types::{account_address::AccountAddress, chain_id::ChainId};
     use std::{
         fs::File,
         io::{Read, Write},
@@ -329,6 +329,7 @@ pub mod tests {
                     AccountAddress::random(),
                     "/ip4/0.0.0.0/tcp/6180".parse().unwrap(),
                     "/ip4/0.0.0.0/tcp/6180".parse().unwrap(),
+                    ChainId::test(),
                     ns,
                     &((*ns).to_string() + shared),
                 )
@@ -394,6 +395,7 @@ pub mod tests {
                 AccountAddress::random(),
                 "/ip4/0.0.0.0/tcp/6180".parse().unwrap(),
                 "/ip4/0.0.0.0/tcp/6180".parse().unwrap(),
+                ChainId::test(),
                 local_ns,
                 remote_ns,
             )

config/management/src/storage_helper.rs

@@ -11,7 +11,10 @@ use libra_network_address::NetworkAddress;
 use libra_secure_storage::{
     CryptoStorage, KVStorage, NamespacedStorage, OnDiskStorage, Storage, Value,
 };
-use libra_types::{account_address::AccountAddress, transaction::Transaction, waypoint::Waypoint};
+use libra_types::{
+    account_address::AccountAddress, chain_id::ChainId, transaction::Transaction,
+    waypoint::Waypoint,
+};
 use std::{fs::File, path::Path};
 use structopt::StructOpt;
 
@@ -214,6 +217,7 @@ impl StorageHelper {
         owner_address: AccountAddress,
         validator_address: NetworkAddress,
         fullnode_address: NetworkAddress,
+        chain_id: ChainId,
         local_ns: &str,
         remote_ns: &str,
     ) -> Result<Transaction, Error> {
@@ -224,6 +228,7 @@ impl StorageHelper {
                 --owner-address {owner_address}
                 --validator-address {validator_address}
                 --fullnode-address {fullnode_address}
+                --chain-id {chain_id}
                 --local backend={backend};\
                     path={path};\
                     namespace={local_ns}
@@ -234,6 +239,7 @@ impl StorageHelper {
             owner_address = owner_address,
             validator_address = validator_address,
             fullnode_address = fullnode_address,
+            chain_id = chain_id.id(),
             backend = crate::secure_backend::DISK,
             path = self.path_string(),
             local_ns = local_ns,

config/management/src/validator_config.rs

@@ -22,6 +22,7 @@ use libra_secure_storage::{CryptoStorage, KVStorage, Storage, Value};
 use libra_secure_time::{RealTimeService, TimeService};
 use libra_types::{
     account_address::{self, AccountAddress},
+    chain_id::ChainId,
     transaction::{RawTransaction, SignedTransaction, Transaction},
 };
 use std::{convert::TryFrom, time::Duration};
@@ -38,6 +39,8 @@ pub struct ValidatorConfig {
     fullnode_address: NetworkAddress,
     #[structopt(flatten)]
     backends: SecureBackends,
+    #[structopt(long)]
+    chain_id: ChainId,
 }
 
 impl ValidatorConfig {
@@ -122,6 +125,7 @@ impl ValidatorConfig {
             constants::GAS_UNIT_PRICE,
             constants::GAS_CURRENCY_CODE.to_owned(),
             Duration::from_secs(expiration_time),
+            self.chain_id,
         );
         let signature = local_storage
             .sign(OPERATOR_KEY, &raw_transaction)

config/src/config/key_manager_config.rs

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::config::{Error, LoggerConfig, PersistableConfig, SecureBackend};
+use libra_types::chain_id::{self, ChainId};
 use serde::{Deserialize, Serialize};
 use std::path::{Path, PathBuf};
 
@@ -21,6 +22,8 @@ pub struct KeyManagerConfig {
     pub secure_backend: SecureBackend,
     pub sleep_period_secs: u64,
     pub txn_expiration_secs: u64,
+    #[serde(deserialize_with = "chain_id::deserialize_config_chain_id")]
+    pub chain_id: ChainId,
 }
 
 impl Default for KeyManagerConfig {
@@ -32,6 +35,7 @@ impl Default for KeyManagerConfig {
             secure_backend: SecureBackend::InMemoryStorage,
             sleep_period_secs: DEFAULT_SLEEP_PERIOD_SECS,
             txn_expiration_secs: DEFAULT_TXN_EXPIRATION_SECS,
+            chain_id: ChainId::test(),
         }
     }
 }

config/src/config/mod.rs

@@ -44,9 +44,12 @@ pub use safety_rules_config::*;
 mod upstream_config;
 pub use upstream_config::*;
 mod test_config;
-use crate::{chain_id::ChainId, network_id::NetworkId};
+use crate::network_id::NetworkId;
 use libra_secure_storage::{KVStorage, Storage};
-use libra_types::waypoint::Waypoint;
+use libra_types::{
+    chain_id::{self, ChainId},
+    waypoint::Waypoint,
+};
 pub use test_config::*;
 
 /// Config pulls in configuration information from the config file.
@@ -91,6 +94,7 @@ pub struct NodeConfig {
 #[serde(default, deny_unknown_fields)]
 pub struct BaseConfig {
     data_dir: PathBuf,
+    #[serde(deserialize_with = "chain_id::deserialize_config_chain_id")]
     pub chain_id: ChainId,
     pub role: RoleType,
     pub waypoint: WaypointConfig,
@@ -100,7 +104,7 @@ impl Default for BaseConfig {
     fn default() -> BaseConfig {
         BaseConfig {
             data_dir: PathBuf::from("/opt/libra/data/commmon"),
-            chain_id: ChainId::default(),
+            chain_id: ChainId::test(),
             role: RoleType::Validator,
             waypoint: WaypointConfig::None,
         }

config/src/config/test_data/public_full_node.yaml

@@ -1,5 +1,5 @@
 base:
-    chain_id: "some-test-id"
+    chain_id: "TESTING"
     data_dir: "/opt/libra/data/common"
     role: "full_node"
     waypoint:

config/src/config/test_data/validator.yaml

@@ -1,5 +1,5 @@
 base:
-    chain_id: "some-test-id"
+    chain_id: "TESTING"
     data_dir: "/opt/libra/data/common"
     role: "validator"
     waypoint:

config/src/config/test_data/validator_full_node.yaml

@@ -1,5 +1,5 @@
 base:
-    chain_id: "some-test-id"
+    chain_id: "TESTING"
     data_dir: "/opt/libra/data/common"
     role: "full_node"
     waypoint:

config/src/lib.rs

@@ -3,7 +3,6 @@
 
 #![forbid(unsafe_code)]
 
-pub mod chain_id;
 pub mod config;
 pub mod generator;
 pub mod keys;

execution/executor-benchmark/src/lib.rs

@@ -16,6 +16,7 @@ use libra_types::{
         coin1_tag, libra_root_address, testnet_dd_account_address, AccountResource, COIN1_NAME,
     },
     block_info::BlockInfo,
+    chain_id::ChainId,
     ledger_info::{LedgerInfo, LedgerInfoWithSignatures},
     transaction::{
         authenticator::AuthenticationKey, RawTransaction, Script, SignedTransaction, Transaction,
@@ -374,6 +375,7 @@ fn create_transaction(
         0,                     /* gas_unit_price */
         COIN1_NAME.to_owned(), /* gas_currency_code */
         expiration_time,
+        ChainId::test(),
     );
 
     let signature = private_key.sign(&raw_txn);

execution/executor/src/mock_vm/mod.rs

@@ -10,6 +10,7 @@ use libra_types::{
     access_path::AccessPath,
     account_address::AccountAddress,
     account_config::{libra_root_address, validator_set_address, LBR_NAME},
+    chain_id::ChainId,
     contract_event::ContractEvent,
     event::EventKey,
     on_chain_config::{
@@ -314,6 +315,7 @@ fn encode_transaction(sender: AccountAddress, program: Script) -> Transaction {
         0,
         LBR_NAME.to_owned(),
         std::time::Duration::from_secs(0),
+        ChainId::test(),
     );
 
     let privkey = Ed25519PrivateKey::generate_for_testing();
@@ -326,7 +328,8 @@ fn encode_transaction(sender: AccountAddress, program: Script) -> Transaction {
 }
 
 pub fn encode_reconfiguration_transaction(sender: AccountAddress) -> Transaction {
-    let raw_transaction = RawTransaction::new_write_set(sender, 0, WriteSet::default());
+    let raw_transaction =
+        RawTransaction::new_write_set(sender, 0, WriteSet::default(), ChainId::test());
 
     let privkey = Ed25519PrivateKey::generate_for_testing();
     Transaction::UserTransaction(

json-rpc/json-rpc-spec.md

@@ -1058,6 +1058,14 @@ User submitted transaction.
    <td>Sequence number of this transaction corresponding to sender's account
    </td>
   </tr>
+  <tr>
+   <td>chain_id
+   </td>
+   <td>u64
+   </td>
+   <td>Chain ID of the network this transaction is intended for
+   </td>
+  </tr>
   <tr>
    <td>max_gas_amount
    </td>

json-rpc/src/tests/unit_tests.rs

@@ -417,9 +417,11 @@ fn test_get_transactions() {
                     TransactionDataView::UserTransaction {
                         sender,
                         script_hash,
+                        chain_id,
                         ..
                     } => {
                         assert_eq!(&t.sender().to_string(), sender);
+                        assert_eq!(&t.chain_id().id(), chain_id);
                         // TODO: verify every field
                         if let TransactionPayload::Script(s) = t.payload() {
                             assert_eq!(script_hash, &HashValue::sha3_256_of(s.code()).to_hex());