From f61d0091243605457f03f0120abd2e5374d2516d Mon Sep 17 00:00:00 2001 From: Manuel Bilbao Date: Thu, 2 May 2024 15:04:47 -0300 Subject: [PATCH 1/4] Remove ignore flag from extcodehash tests --- core/lib/multivm/src/versions/vm_latest/tests/evm_simulator.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/core/lib/multivm/src/versions/vm_latest/tests/evm_simulator.rs b/core/lib/multivm/src/versions/vm_latest/tests/evm_simulator.rs index 1d47c1544605..9b5d5b7c684d 100644 --- a/core/lib/multivm/src/versions/vm_latest/tests/evm_simulator.rs +++ b/core/lib/multivm/src/versions/vm_latest/tests/evm_simulator.rs @@ -4044,7 +4044,6 @@ fn test_basic_environment4_vectors() { } #[test] -#[ignore = "Ignored because the current compared values don't match"] fn test_basic_extcodehash_vectors() { // extcodehash let evm_output = test_evm_vector( From 246e96f8a186c1bd9bc013ac09795b4dc113a38c Mon Sep 17 00:00:00 2001 From: Javier Chatruc Date: Thu, 2 May 2024 16:51:36 -0300 Subject: [PATCH 2/4] Update submodule --- contracts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contracts b/contracts index 6c3602cede53..2b3e3fb80ead 160000 --- a/contracts +++ b/contracts @@ -1 +1 @@ -Subproject commit 6c3602cede531ce459cb7b525c4168b6eb5a2dcd +Subproject commit 2b3e3fb80ead04b7c69073b28e731e44e83f4bfa From ae9032856b004a03eb83a6562970abc7f3fe9ae6 Mon Sep 17 00:00:00 2001 From: Francisco Krause Arnim Date: Mon, 13 May 2024 17:44:44 -0300 Subject: [PATCH 3/4] feat: Handle tx when "to" field is "0x" --- core/lib/dal/src/models/storage_transaction.rs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/core/lib/dal/src/models/storage_transaction.rs b/core/lib/dal/src/models/storage_transaction.rs index 74ae2967bc43..9e74c212a759 100644 --- a/core/lib/dal/src/models/storage_transaction.rs +++ b/core/lib/dal/src/models/storage_transaction.rs @@ -496,6 +496,12 @@ impl StorageApiTransaction { .signature .and_then(|signature| PackedEthSignature::deserialize_packed(&signature).ok()); + let to = if let Ok(address) = serde_json::from_value(self.execute_contract_address) { + Some(address) + } else { + Some(Address::zero()) + }; + let mut tx = api::Transaction { hash: H256::from_slice(&self.tx_hash), nonce: U256::from(self.nonce.unwrap_or(0) as u64), @@ -503,7 +509,7 @@ impl StorageApiTransaction { block_number: self.block_number.map(|number| U64::from(number as u64)), transaction_index: self.index_in_block.map(|idx| U64::from(idx as u64)), from: Some(Address::from_slice(&self.initiator_address)), - to: Some(serde_json::from_value(self.execute_contract_address).unwrap()), + to, value: bigdecimal_to_u256(self.value), gas_price: Some(bigdecimal_to_u256( self.effective_gas_price From c5dc0de92cccd326ed4c68a90e2266655d1c855c Mon Sep 17 00:00:00 2001 From: Francisco Krause Arnim Date: Thu, 16 May 2024 11:24:33 -0300 Subject: [PATCH 4/4] Bump era-contracts --- contracts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contracts b/contracts index 2b3e3fb80ead..c223988e73b0 160000 --- a/contracts +++ b/contracts @@ -1 +1 @@ -Subproject commit 2b3e3fb80ead04b7c69073b28e731e44e83f4bfa +Subproject commit c223988e73b0638e3494a5572cfc14c660d7c362