Compilance fix 6 (#224)

* Compliance fix #6

* Fix order of deposit inc_nonce in transact

Author: sorpaas

.github/workflows/rust.yml

@@ -38,6 +38,7 @@ jobs:
         cargo run --release --verbose -p jsontests -- \
         jsontests/res/ethtests/GeneralStateTests/stCodeCopyTest/ \
         jsontests/res/ethtests/GeneralStateTests/stExample/ \
+        jsontests/res/ethtests/GeneralStateTests/stSelfBalance \
         jsontests/res/ethtests/GeneralStateTests/stSLoadTest/ \
         jsontests/res/ethtests/GeneralStateTests/VMTests/vmArithmeticTest/ \
         jsontests/res/ethtests/GeneralStateTests/VMTests/vmBitwiseLogicOperation/ \

jsontests/src/run.rs

@@ -81,7 +81,13 @@ pub fn run_test(_filename: &str, _test_name: &str, test: Test, debug: bool) -> R
 			state,
 			logs: Vec::new(),
 			suicides: Vec::new(),
-			hots: BTreeSet::new(),
+			hots: {
+				let mut hots = BTreeSet::new();
+				for i in 1..10 {
+					hots.insert((u256_to_h256(U256::from(i)).into(), None));
+				}
+				hots
+			},
 		}],
 	};
 	let mut step_backend = run_backend.clone();

src/backend/in_memory.rs

@@ -240,6 +240,10 @@ impl RuntimeBackend for InMemoryBackend {
 	}
 
 	fn deposit(&mut self, target: H160, value: U256) {
+		if value == U256::zero() {
+			return;
+		}
+
 		self.current_layer_mut()
 			.state
 			.entry(target)

src/standard/invoker/mod.rs

@@ -132,6 +132,8 @@ where
 		let gas_fee = args.gas_limit().saturating_mul(gas_price);
 		handler.withdrawal(caller, gas_fee)?;
 
+		handler.inc_nonce(caller)?;
+
 		let address = match &args {
 			TransactArgs::Call { address, .. } => *address,
 			TransactArgs::Create {
@@ -230,8 +232,6 @@ where
 						handler.mark_hot(address, None);
 					}
 
-					handler.inc_nonce(caller)?;
-
 					Ok((invoke, machine))
 				}
 				TransactArgs::Create {
@@ -310,19 +310,19 @@ where
 		let refunded_fee = refunded_gas.saturating_mul(invoke.gas_price);
 		let coinbase_reward = invoke.gas_fee.saturating_sub(refunded_fee);
 
-		handler.deposit(invoke.caller, refunded_fee);
-		handler.deposit(handler.block_coinbase(), coinbase_reward);
-
-		match result {
-			Ok(exit) => {
+		match &result {
+			Ok(_) => {
 				handler.pop_substate(MergeStrategy::Commit);
-				Ok(exit)
 			}
-			Err(err) => {
+			Err(_) => {
 				handler.pop_substate(MergeStrategy::Discard);
-				Err(err)
 			}
 		}
+
+		handler.deposit(invoke.caller, refunded_fee);
+		handler.deposit(handler.block_coinbase(), coinbase_reward);
+
+		result
 	}
 
 	fn enter_substack(