Validator reward with runtime (#1152)

* test validator reward in runtime * proper equality for epoch info * add test for state sync. Address comments * reward test in epoch manager * reenable test_kickout
near · Aug 10, 2019 · 5863a7c · 5863a7c
1 parent 183dc13
commit 5863a7c
Show file tree

Hide file tree

Showing 18 changed files with 974 additions and 650 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/chain/chain/src/chain.rs b/chain/chain/src/chain.rs
@@ -221,6 +221,8 @@ impl Chain {
                         vec![],
                         vec![],
                         0,
+                        chain_genesis.gas_price,
+                        chain_genesis.total_supply,
                     )?;
                     store_update.save_block_header(genesis.header.clone());
                     store_update.save_block(genesis.clone());
@@ -350,6 +352,8 @@ impl Chain {
                     vec![],
                     vec![],
                     header.gas_used,
+                    header.gas_price,
+                    header.total_supply,
                 )?;
             }
         }
@@ -1248,8 +1252,6 @@ impl<'a> ChainUpdate<'a> {
                             &block.hash(),
                             &receipts,
                             &chunk.transactions,
-                            block.header.gas_price,
-                            block.header.total_supply,
                         )
                         .map_err(|e| ErrorKind::Other(e.to_string()))?;
 
@@ -1416,6 +1418,8 @@ impl<'a> ChainUpdate<'a> {
             vec![],
             vec![],
             block.header.gas_used,
+            block.header.gas_price,
+            block.header.total_supply,
         )?;
 
         // Add validated block to the db, even if it's not the selected fork.

diff --git a/chain/chain/src/test_utils.rs b/chain/chain/src/test_utils.rs
@@ -362,6 +362,8 @@ impl RuntimeAdapter for KeyValueRuntime {
         _slashed_validators: Vec<AccountId>,
         _validator_mask: Vec<bool>,
         _gas_used: GasUsage,
+        _gas_price: Balance,
+        _total_supply: Balance,
     ) -> Result<(), Error> {
         Ok(())
     }
@@ -375,8 +377,6 @@ impl RuntimeAdapter for KeyValueRuntime {
         _block_hash: &CryptoHash,
         receipts: &Vec<ReceiptTransaction>,
         transactions: &Vec<SignedTransaction>,
-        _gas_price: Balance,
-        _total_supply: Balance,
     ) -> Result<ApplyTransactionResult, Error> {
         let mut tx_results = vec![];
 

diff --git a/chain/chain/src/types.rs b/chain/chain/src/types.rs
@@ -179,6 +179,8 @@ pub trait RuntimeAdapter: Send + Sync {
         slashed_validators: Vec<AccountId>,
         validator_mask: Vec<bool>,
         gas_used: GasUsage,
+        gas_price: Balance,
+        total_supply: Balance,
     ) -> Result<(), Error>;
 
     /// Apply transactions to given state root and return store update and new state root.
@@ -192,8 +194,6 @@ pub trait RuntimeAdapter: Send + Sync {
         block_hash: &CryptoHash,
         receipts: &Vec<ReceiptTransaction>,
         transactions: &Vec<SignedTransaction>,
-        gas_price: Balance,
-        total_supply: Balance,
     ) -> Result<ApplyTransactionResult, Error>;
 
     /// Query runtime with given `path` and `data`.