Merge #1668

1668: Problem (WIP #1616): keypackage not verified in nodejointx / council node data r=tomtau a=yihuang

Solution:
- record most recent isv_svn, warn when a new version appears
- add mock data and fix unit/integration tests temporarily.

TBD: generate real keypackage when construct node-join tx, or prepare genesis.

Co-authored-by: yihuang <[email protected]>

chain-abci/Cargo.toml

@@ -37,7 +37,6 @@ structopt = "0.3"
 secp256k1zkp = { git = "https://github.com/crypto-com/rust-secp256k1-zkp.git", rev = "f8759809f6e3fed793b37166f7cd91c57cdb2eab", features = ["recovery", "endomorphism"] }
 parity-scale-codec = { features = ["derive"], version = "1.3" }
 thiserror = "1.0"
-rustls = { version = "0.17", features = ["dangerous_configuration"] }
 
 [target.'cfg(target_os = "linux")'.dependencies]
 enclave-u-common = { path = "../chain-tx-enclave/enclave-u-common" }

chain-abci/src/app/app_init.rs

@@ -31,7 +31,6 @@ use chain_storage::buffer::{
 };
 use chain_storage::jellyfish::{compute_staking_root, sum_staking_coins, StakingGetter, Version};
 use chain_storage::{Storage, StoredChainState};
-use ra_client::EnclaveCertVerifier;
 
 /// ABCI app state snapshot
 #[derive(Serialize, Deserialize, Clone, Encode, Decode)]
@@ -55,6 +54,9 @@ pub struct ChainNodeState {
     pub staking_version: Version,
     /// Record the sum of all the coins in UTxO set
     pub utxo_coins: Coin,
+    /// Record the biggest enclave ISVSVN (Security Version Number of the Enclave) we've seen in
+    /// keypackage so far
+    pub enclave_isv_svn: u16,
 
     /// The parts of states which involved in computing app_hash
     pub top_level: ChainState,
@@ -98,6 +100,7 @@ impl ChainNodeState {
             max_evidence_age,
             staking_version: 0,
             utxo_coins: Coin::zero(),
+            enclave_isv_svn: 0,
             top_level: ChainState {
                 account_root,
                 rewards_pool,
@@ -137,8 +140,6 @@ pub struct ChainNodeApp<T: EnclaveProxy> {
     pub rewards_pool_updated: bool,
     /// address of tx query enclave to supply to clients (if any)
     pub tx_query_address: Option<String>,
-    /// Enclave certificate verifier
-    pub enclave_cert_verifier: EnclaveCertVerifier,
 
     /// consensus buffer of staking merkle trie storage
     pub staking_buffer: StakingBuffer,
@@ -225,14 +226,14 @@ fn get_voting_power(
 }
 
 pub fn init_app_hash(conf: &InitConfig, genesis_time: Timespec) -> H256 {
-    let (accounts, rp, _nodes) = conf
+    let state = conf
         .validate_config_get_genesis(genesis_time)
         .expect("distribution validation error");
 
     compute_app_hash(
         &MerkleTree::empty(),
-        &compute_staking_root(&accounts),
-        &rp,
+        &compute_staking_root(&state.accounts),
+        &state.rewards_pool,
         &NetworkParameters::Genesis(conf.network_params.clone()),
     )
 }
@@ -245,7 +246,6 @@ impl<T: EnclaveProxy> ChainNodeApp<T> {
         chain_id: &str,
         storage: Storage,
         tx_query_address: Option<String>,
-        enclave_cert_verifier: EnclaveCertVerifier,
     ) -> Self {
         let stored_genesis = storage.get_genesis_app_hash();
 
@@ -276,7 +276,6 @@ impl<T: EnclaveProxy> ChainNodeApp<T> {
             tx_validator,
             rewards_pool_updated: false,
             tx_query_address,
-            enclave_cert_verifier,
 
             staking_buffer: HashMap::new(),
             mempool_staking_buffer: HashMap::new(),
@@ -315,9 +314,6 @@ impl<T: EnclaveProxy> ChainNodeApp<T> {
             let _ = start_zmq(_conn_str, chain_hex_id, storage.get_read_only());
         }
 
-        let enclave_cert_verifier = EnclaveCertVerifier::new(Default::default())
-            .expect("enclave cert verifier init failed");
-
         if let Some(data) = storage.get_last_app_state() {
             info!("last app state stored");
             let mut last_state =
@@ -365,7 +361,6 @@ impl<T: EnclaveProxy> ChainNodeApp<T> {
                 chain_id,
                 storage,
                 tx_query_address,
-                enclave_cert_verifier,
             )
         } else {
             info!("no last app state stored");
@@ -390,7 +385,6 @@ impl<T: EnclaveProxy> ChainNodeApp<T> {
                 tx_validator,
                 rewards_pool_updated: false,
                 tx_query_address,
-                enclave_cert_verifier,
 
                 staking_buffer: HashMap::new(),
                 mempool_staking_buffer: HashMap::new(),
@@ -426,7 +420,7 @@ impl<T: EnclaveProxy> ChainNodeApp<T> {
             .get_seconds()
             .try_into()
             .expect("invalid genesis time");
-        let (accounts, rp, nodes) = conf
+        let state = conf
             .validate_config_get_genesis(genesis_time)
             .expect("distribution validation error");
 
@@ -440,11 +434,11 @@ impl<T: EnclaveProxy> ChainNodeApp<T> {
         }
 
         let network_params = NetworkParameters::Genesis(conf.network_params);
-        let new_account_root = self.storage.put_stakings(0, &accounts);
+        let new_account_root = self.storage.put_stakings(0, &state.accounts);
         let genesis_app_hash = compute_app_hash(
             &MerkleTree::empty(),
             &new_account_root,
-            &rp,
+            &state.rewards_pool,
             &network_params,
         );
 
@@ -454,19 +448,23 @@ impl<T: EnclaveProxy> ChainNodeApp<T> {
 
         check_and_store_consensus_params(
             req.consensus_params.as_ref(),
-            &nodes,
+            &state.validators,
             &network_params,
             &mut self.storage,
         );
 
         check_validators(
-            &nodes,
+            &state.validators,
             req.validators.clone().into_vec(),
             &conf.distribution,
         )
         .expect("validators in genesis configuration are not consistent with app_state");
 
-        let val_addresses = nodes.iter().map(|(addr, _)| *addr).collect::<Vec<_>>();
+        let val_addresses = state
+            .validators
+            .iter()
+            .map(|(addr, _)| *addr)
+            .collect::<Vec<_>>();
         let staking_table = StakingTable::from_genesis(
             &staking_getter!(self, 0),
             network_params.get_required_council_node_stake(),
@@ -479,7 +477,7 @@ impl<T: EnclaveProxy> ChainNodeApp<T> {
             genesis_time,
             max_evidence_age,
             new_account_root,
-            rp,
+            state.rewards_pool,
             network_params,
             staking_table,
         );

chain-abci/src/app/mod.rs

@@ -404,9 +404,11 @@ fn generate_tx_staking_change_event(tx_action: TxAction) -> Option<abci::Event>
                 fee,
                 ..
             } => Some(StakingEvent::Unbond(&unbond.0, unbond.1, unbonded_from, fee).into()),
-            TxPublicAction::NodeJoin(staking_address, council_node) => {
-                Some(StakingEvent::NodeJoin(&staking_address, council_node).into())
-            }
+            TxPublicAction::NodeJoin {
+                address,
+                council_node,
+                ..
+            } => Some(StakingEvent::NodeJoin(&address, council_node).into()),
             TxPublicAction::Unjail(staking_address) => {
                 Some(StakingEvent::Unjail(&staking_address).into())
             }

chain-abci/src/app/validate_tx.rs

@@ -1,6 +1,8 @@
 use super::{BufferType, ChainNodeApp, ChainNodeState};
 use crate::enclave_bridge::EnclaveProxy;
-use crate::storage::{process_public_tx, verify_enclave_tx, TxAction, TxEnclaveAction};
+use crate::storage::{
+    process_public_tx, verify_enclave_tx, TxAction, TxEnclaveAction, TxPublicAction,
+};
 use crate::tx_error::TxError;
 use abci::*;
 use chain_core::tx::data::TxId;
@@ -118,11 +120,18 @@ impl<T: EnclaveProxy> ChainNodeApp<T> {
                 let action = process_public_tx(
                     &mut staking_store!(self, state.staking_version, buffer_type),
                     &mut state.staking_table,
-                    &self.enclave_cert_verifier,
+                    state.enclave_isv_svn,
                     &extra_info,
                     &tx,
                 )?;
 
+                match action {
+                    TxPublicAction::NodeJoin { isv_svn, .. } => {
+                        state.enclave_isv_svn = isv_svn;
+                    }
+                    _ => {}
+                };
+
                 TxAction::Public(action)
             }
         };