Merge #1977

1977: Problem: tdbe types are not up to date with latest design (fixes #1967) r=tomtau a=tomtau Solution: updated the data types according to the latest doc https://github.com/crypto-com/chain-docs/pull/179/files - chain-abci part was moved to extras module of mls for validation (when crypto-org-chain/chain-docs#141 is done implementation could go there) - in order not to break tx format, confidential init is still takes as Vec<u8> - as tdbe workflows aren't ready yet, a temporary wrapper was put in the client Co-authored-by: Tomas Tauber <[email protected]>
crypto-com · Jul 22, 2020 · bc921a4 · bc921a4
2 parents 06a5751 + 961b12d
commit bc921a4
Show file tree

Hide file tree

Showing 31 changed files with 269 additions and 80 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/chain-abci/Cargo.toml b/chain-abci/Cargo.toml
@@ -24,10 +24,6 @@ mock-utils = { path = "../chain-tx-enclave/mock-utils" }
 mls = { path = "../chain-tx-enclave-next/mls" }
 ra-client = { path = "../chain-tx-enclave-next/enclave-ra/ra-client" }
 
-aesm-client = {version = "0.5", features = ["sgxs"], optional = true }
-enclave-runner = {version = "0.4", optional = true}
-sgxs-loaders = {version = "0.2", optional = true}
-tokio = { version = "0.2", optional = true }
 
 log = "0.4.11"
 env_logger = "0.7.1"
@@ -46,6 +42,11 @@ parity-scale-codec = { features = ["derive"], version = "1.3" }
 thiserror = "1.0"
 
 [target.'cfg(target_os = "linux")'.dependencies]
+aesm-client = {version = "0.5", features = ["sgxs"], optional = true }
+enclave-runner = {version = "0.4", optional = true}
+sgxs-loaders = {version = "0.2", optional = true}
+tokio = { version = "0.2", optional = true }
+
 enclave-u-common = { path = "../chain-tx-enclave/enclave-u-common", optional = true }
 sgx_types = { rev = "v1.1.2", git = "https://github.com/apache/teaclave-sgx-sdk.git", optional = true }
 sgx_urts = { rev = "v1.1.2", git = "https://github.com/apache/teaclave-sgx-sdk.git", optional = true }

diff --git a/chain-abci/src/app/staking_event.rs b/chain-abci/src/app/staking_event.rs
@@ -357,7 +357,7 @@ impl fmt::Display for StakingCoinChange {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use chain_core::state::account::ConfidentialInit;
+    use chain_core::state::account::{ConfidentialInit, MLSInit};
     use chain_core::state::tendermint::TendermintValidatorPubKey;
     use chain_core::tx::fee::Fee;
     use std::str::FromStr;
@@ -437,7 +437,7 @@ mod tests {
 
                 assert_eq!(
                     staking_diff.to_string(),
-                    "{\"key\":\"CouncilNode\",\"value\":{\"name\":\"Council Node\",\"security_contact\":\"[email protected]\",\"confidential_init\":{\"keypackage\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\"},\"consensus_pubkey\":{\"type\":\"tendermint/PubKeyEd25519\",\"value\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\"}}}",
+                    "{\"key\":\"CouncilNode\",\"value\":{\"name\":\"Council Node\",\"security_contact\":\"[email protected]\",\"confidential_init\":{\"init_payload\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\"},\"consensus_pubkey\":{\"type\":\"tendermint/PubKeyEd25519\",\"value\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\"}}}",
                 );
             }
 
@@ -446,7 +446,7 @@ mod tests {
                 let any_security_contact = Some(String::from("[email protected]"));
                 let any_pub_key = TendermintValidatorPubKey::Ed25519([0u8; 32]);
                 let any_cert = ConfidentialInit {
-                    keypackage: [0u8; 32].to_vec(),
+                    init_payload: MLSInit::Genesis([0u8; 32].to_vec()),
                 };
 
                 CouncilNodeMeta::new_with_details(
@@ -546,7 +546,7 @@ mod tests {
                 let any_security_contact = Some(String::from("[email protected]"));
                 let any_pub_key = TendermintValidatorPubKey::Ed25519([0u8; 32]);
                 let any_cert = ConfidentialInit {
-                    keypackage: [0u8; 32].to_vec(),
+                    init_payload: MLSInit::Genesis([0u8; 32].to_vec()),
                 };
 
                 CouncilNodeMeta::new_with_details(

diff --git a/chain-abci/src/enclave_bridge/mod.rs b/chain-abci/src/enclave_bridge/mod.rs
@@ -6,7 +6,7 @@ pub mod mock;
 #[cfg(all(not(feature = "mock-enclave"), feature = "legacy", target_os = "linux"))]
 pub mod real;
 
-#[cfg(feature = "edp")]
+#[cfg(all(not(feature = "mock-enclave"), feature = "edp", target_os = "linux"))]
 pub mod edp;
 
 /// Abstracts over communication with an external part that does enclave calls

diff --git a/chain-abci/src/staking/mod.rs b/chain-abci/src/staking/mod.rs
@@ -23,7 +23,8 @@ mod tests {
     use chain_core::tx::fee::Fee;
     use chain_storage::buffer::{Get, GetStaking, MemStore, StoreStaking};
     use test_common::chain_env::{
-        get_init_network_params, mock_council_node, mock_council_node_meta, DEFAULT_GENESIS_TIME,
+        get_init_network_params, mock_council_node_join, mock_council_node_meta,
+        DEFAULT_GENESIS_TIME,
     };
 
     use super::*;
@@ -118,7 +119,7 @@ mod tests {
             nonce,
             address: addr4,
             attributes: Default::default(),
-            node_meta: mock_council_node(val_pk4.clone()),
+            node_meta: mock_council_node_join(val_pk4.clone()),
         };
         table
             .node_join(&mut store, DEFAULT_GENESIS_TIME + 10, 0, 0, &node_join)
@@ -271,7 +272,7 @@ mod tests {
             nonce,
             address: addr1,
             attributes: Default::default(),
-            node_meta: mock_council_node(val_pk_new),
+            node_meta: mock_council_node_join(val_pk_new),
         };
         assert!(matches!(
             table.node_join(&mut store, DEFAULT_GENESIS_TIME + 3, 0, 0, &node_join),
@@ -337,7 +338,7 @@ mod tests {
             nonce: staking.nonce + 1,
             address: addr,
             attributes: Default::default(),
-            node_meta: mock_council_node(val_pk_new.clone()),
+            node_meta: mock_council_node_join(val_pk_new.clone()),
         };
         // change to new validator key
         let result = table.node_join(store, DEFAULT_GENESIS_TIME + 1, 1, 0, &node_join);
@@ -392,7 +393,7 @@ mod tests {
             nonce: 0,
             address: addr_new,
             attributes: Default::default(),
-            node_meta: mock_council_node(val_pk1),
+            node_meta: mock_council_node_join(val_pk1),
         };
         // can't join with used key
         assert!(matches!(
@@ -469,7 +470,7 @@ mod tests {
             nonce,
             address: addr1,
             attributes: Default::default(),
-            node_meta: mock_council_node(val_pk1.clone()),
+            node_meta: mock_council_node_join(val_pk1.clone()),
         };
 
         let mut init_params = get_init_network_params(Coin::zero());
@@ -795,7 +796,7 @@ mod tests {
             nonce: 1,
             address: addr2,
             attributes: Default::default(),
-            node_meta: mock_council_node(val_pk_new.clone()),
+            node_meta: mock_council_node_join(val_pk_new.clone()),
         };
         table
             .node_join(&mut store, DEFAULT_GENESIS_TIME + 2, 0, 0, &tx)

diff --git a/chain-abci/src/staking/tx.rs b/chain-abci/src/staking/tx.rs
@@ -9,8 +9,7 @@ use chain_core::state::tendermint::{BlockHeight, TendermintValidatorAddress};
 use chain_core::state::validator::NodeJoinRequestTx;
 use chain_core::tx::fee::Fee;
 use chain_storage::buffer::StoreStaking;
-use mls::{Codec, KeyPackage};
-use ra_client::ENCLAVE_CERT_VERIFIER;
+use mls::extras::check_nodejoin;
 
 use super::table::{set_staking, StakingTable};
 use crate::tx_error::{
@@ -40,13 +39,14 @@ impl StakingTable {
         let isv_svn = if cfg!(feature = "mock-enclave") {
             0
         } else {
-            let keypackage = KeyPackage::read_bytes(&tx.get_keypackage_payload())
-                .ok_or(NodeJoinError::KeyPackageDecodeError)?;
-            let info = keypackage
-                .verify(&*ENCLAVE_CERT_VERIFIER, block_time)
-                .map_err(NodeJoinError::KeyPackageVerifyError)?;
             // FIXME: more tdbe-related checks that may be observable by abci -- e.g. key not in the mls tree already
-            info.quote.report_body.isv_svn
+            let (add, commit) = tx
+                .node_meta
+                .get_node_join_mls_init()
+                .ok_or(NodeJoinError::InvalidMLSInitData)?;
+            let r = check_nodejoin(add, commit, block_time)
+                .map_err(NodeJoinError::MLSInitVerifyError)?;
+            r.info.quote.report_body.isv_svn
         };
 
         let new_isv_svn = if isv_svn > recent_isv_svn {

diff --git a/chain-abci/src/tx_error.rs b/chain-abci/src/tx_error.rs
@@ -1,5 +1,5 @@
 use chain_core::init::coin::{Coin, CoinError};
-use mls::keypackage;
+use mls::extras::{self};
 
 #[derive(thiserror::Error, Debug)]
 pub enum TxError {
@@ -53,10 +53,10 @@ pub enum NodeJoinError {
     IsJailed,
     #[error("the used_validator_addresses queue is full")]
     UsedValidatorAddrFull,
-    #[error("key package decode failed")]
-    KeyPackageDecodeError,
-    #[error("invalid key package: {0}")]
-    KeyPackageVerifyError(#[from] keypackage::Error),
+    #[error("failed to decode Add proposal and Commit message")]
+    InvalidMLSInitData,
+    #[error("invalid mls init data: {0}")]
+    MLSInitVerifyError(#[from] extras::NodeJoinError),
     #[error("FIXME: WIP -- community node not yet supported")]
     WIPNotValidator,
 }

diff --git a/chain-abci/tests/abci_app.rs b/chain-abci/tests/abci_app.rs
@@ -57,7 +57,7 @@ use std::convert::TryInto;
 use std::str::FromStr;
 use std::sync::Arc;
 use test_common::chain_env::{
-    mock_confidential_init, mock_council_node, ChainEnv, DEFAULT_GENESIS_TIME,
+    mock_confidential_init, mock_council_node_join, ChainEnv, DEFAULT_GENESIS_TIME,
 };
 
 const TEST_CHAIN_ID: &str = "test-00";
@@ -1064,7 +1064,7 @@ fn all_valid_tx_types_should_commit() {
         1,
         addr.into(),
         StakedStateOpAttributes::new(0),
-        mock_council_node(TendermintValidatorPubKey::Ed25519([2u8; 32])),
+        mock_council_node_join(TendermintValidatorPubKey::Ed25519([2u8; 32])),
     );
     let secp = Secp256k1::new();
     let witness = StakedStateOpWitness::new(get_ecdsa_witness(&secp, &tx.id(), &secret_key));

diff --git a/chain-abci/tests/tx_validation.rs b/chain-abci/tests/tx_validation.rs
@@ -53,7 +53,7 @@ use std::fmt::Debug;
 use std::mem;
 use std::sync::Arc;
 use test_common::chain_env::{
-    mock_confidential_init, mock_council_node_meta, DEFAULT_GENESIS_TIME,
+    mock_confidential_init_node_join, mock_council_node_meta, DEFAULT_GENESIS_TIME,
 };
 
 fn verify_enclave_tx<T: EnclaveProxy>(
@@ -1347,7 +1347,7 @@ fn prepare_nodejoin_transaction(
             "test".to_string(),
             None,
             TendermintValidatorPubKey::Ed25519([1u8; 32]),
-            mock_confidential_init(),
+            mock_confidential_init_node_join(),
         ),
     };
     let witness = get_account_op_witness(secp, &tx.id(), &secret_key);

diff --git a/chain-core/src/init/config.rs b/chain-core/src/init/config.rs
@@ -3,7 +3,7 @@ use crate::init::address::RedeemAddress;
 use crate::init::coin::{sum_coins, Coin, CoinError};
 pub use crate::init::params::*;
 use crate::state::account::{
-    ConfidentialInit, CouncilNodeMeta, NodeName, NodeSecurityContact, StakedState,
+    ConfidentialInit, CouncilNodeMeta, MLSInit, NodeName, NodeSecurityContact, StakedState,
     StakedStateAddress, StakedStateDestination,
 };
 use crate::state::tendermint::TendermintValidatorPubKey;
@@ -200,7 +200,10 @@ impl InitConfig {
 
         let isv_svn = validators
             .iter()
-            .map(|v| verify_keypackage(genesis_time, &v.1.node_info.confidential_init.keypackage))
+            .map(|v| match &v.1.node_info.confidential_init.init_payload {
+                MLSInit::Genesis(ref kp) => verify_keypackage(genesis_time, &kp),
+                _ => Err(DistributionError::KeyPackageDecodeError),
+            })
             .collect::<Result<Vec<_>, _>>()?
             .into_iter()
             .max()