Fix truncated hex in anvil dump_state #8216

AxelAramburu · 2024-06-20T16:52:05Z

Motivation

Fixes #8179

An issue reported is leading zeros in hex can be truncated and leading to deserialize failure with anvil_dumpState

Solution

Like @mattsse recommend in the issue post, I change the type of storage from U256 to B256.

foundry/crates/anvil/src/eth/backend/db.rs

Line 345 in f673066

pub storage: BTreeMap<U256, U256>,

The modifications don't break the actual implemented tests:

Before

...

"0x068e44eb31e111028c41598e4535be7468674d0a": { // line 32, a contract address

...

"0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc": "0x68e44eb31e111028c41598e4535be7468674d0a", // line 172, a reference to that contract
"0xb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103": "0x9e2803ad9ecc0a848c8a045329524d295f6ee44f",
"0xd30e835d3f35624761057ff5b27d558f97bd5be034621e62240e5c0b784abe68": "0x9965507d1a55bcc2695c58ba16fb37d819b0a4dc"

After

...

"0x068e44eb31e111028c41598e4535be7468674d0a": { // line 32, a contract address

...

"0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc": "0x000000000000000000000000068e44eb31e111028c41598e4535be7468674d0a", // <--- truncated zero is preserved
"0xb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103": "0x0000000000000000000000009e2803ad9ecc0a848c8a045329524d295f6ee44f",
"0xd30e835d3f35624761057ff5b27d558f97bd5be034621e62240e5c0b784abe68": "0x0000000000000000000000009965507d1a55bcc2695c58ba16fb37d819b0a4dc"

Let me know if I can improve my contribution

mattsse · 2024-06-20T17:15:09Z

crates/anvil/src/eth/backend/db.rs

@@ -348,7 +348,7 @@ pub struct SerializableAccountRecord {
    pub nonce: u64,
    pub balance: U256,
    pub code: Bytes,
-    pub storage: BTreeMap<U256, U256>,
+    pub storage: BTreeMap<U256, B256>,


this should be flipped, the key should always be b256

I change also the key type

That's good, but the value should stay U256, BTreeMap<B256, U256>

If I the value is U256 the bug is not corrected:
#8179

{ "0x0000000000000000000000000000000000000000000000000000000000000000":"0x1", "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc":"0x68e44eb31e111028c41598e4535be7468674d0a", // <--- The truncated zero "0xb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103":"0x9e2803ad9ecc0a848c8a045329524d295f6ee44f", "0xd30e835d3f35624761057ff5b27d558f97bd5be034621e62240e5c0b784abe68":"0x9965507d1a55bcc2695c58ba16fb37d819b0a4dc"}},

mattsse · 2024-06-21T20:41:45Z

crates/anvil/src/eth/backend/db.rs

@@ -348,7 +348,7 @@ pub struct SerializableAccountRecord {
    pub nonce: u64,
    pub balance: U256,
    pub code: Bytes,
-    pub storage: BTreeMap<U256, U256>,
+    pub storage: BTreeMap<B256, B256>,


this is also how the regular genesis account is formatted with hash -> hash

I see an example of genesis.json storage field:

"storage": { "0x0000000000000000000000000000000000000000000000000000000000000001": "0x02", "0x0000000000000000000000000000000000000000000000000000000000000002": "0x04", "0x29ecdbdf95c7f6ceec92d6150c697aa14abeb0f8595dd58d808842ea237d8494": "0x01", "0x6aa118c6537572d8b515a9f9154be55a3377a8de7991cd23bf6e5ceb368688e3": "0x01", ... }

The type is pub storage: BTreeMap<B256, U256>, but it doesnt resolve the issue:
#8179

mattsse · 2024-06-21T20:42:09Z

crates/anvil/src/eth/backend/mem/in_memory_db.rs

please cargo +nightly fmt

mattsse · 2024-06-21T20:42:55Z

crates/anvil/src/eth/backend/mem/mod.rs

@@ -564,7 +564,7 @@ impl Backend {
        slot: U256,
        val: B256,
    ) -> DatabaseResult<()> {
-        self.db.write().await.set_storage_at(address, slot, U256::from_be_bytes(val.0))
+        self.db.write().await.set_storage_at(address, B256::from(slot), B256::from(val.0))


B256::from(val.0) is not needed here?

I fixed it thanks

mattsse · 2024-06-23T19:03:06Z

crates/anvil/src/eth/backend/mem/in_memory_db.rs

something went wrong here, why are all lines changed?
line endings?

zerosnacks · 2024-07-16T14:27:16Z

Hi @AxelAramburu why did you close your PR? Do you need any help / pointers? Would be great to get this fix in

KholdStare · 2024-07-16T21:53:17Z

@AxelAramburu Running into this issue. Can you re-open?

0xalpharush · 2024-09-12T00:24:58Z

What remains to be done here? I am also having issues decoding the state dump due to odd-length fields which are expected to be hex encoded

mattsse

actual changes look good, can we undo the changes in backend/mem/mod.rs @zerosnacks then this should be good

crates/anvil/src/eth/backend/mem/mod.rs

KholdStare · 2024-09-12T18:59:04Z

Maybe this is wrong, but I think there should be a "round-trip" test in general for the dump state functionality. Given a state, does dump_state -> load_state -> dump_state produce the same result as the first dump_state? It should catch any random regressions that may happen in the future.

mattsse

good point, we should be able to easily add one

@yash-atreya could you please add such a test? but we can also do this as a followup

* Fix truncated hex in anvil dump_state * Change type of key * fixs * rustfmt * fix --------- Co-authored-by: unknown <[email protected]> Co-authored-by: Matthias Seitz <[email protected]> Co-authored-by: Yash Atreya <[email protected]>

Fix truncated hex in anvil dump_state

ff62a6c

AxelAramburu requested review from DaniPopes, mattsse and Evalir as code owners June 20, 2024 16:52

mattsse requested changes Jun 20, 2024

View reviewed changes

AxelAramburu and others added 2 commits June 20, 2024 22:53

Merge branch 'foundry-rs:master' into fix_hex_truncated

18e7dff

Change type of key

6eb01c4

mattsse requested changes Jun 21, 2024

View reviewed changes

AxelAramburu and others added 3 commits June 23, 2024 14:16

Merge branch 'foundry-rs:master' into fix_hex_truncated

1d72696

Merge branch 'foundry-rs:master' into fix_hex_truncated

aa62948

fixs

3600228

mattsse reviewed Jun 23, 2024

View reviewed changes

crates/anvil/src/eth/backend/mem/in_memory_db.rs Outdated

Copy link

Member

mattsse Jun 23, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

something went wrong here, why are all lines changed?
line endings?

AxelAramburu closed this Jul 6, 2024

zerosnacks reopened this Jul 25, 2024

zerosnacks added this to the v1.0.0 milestone Jul 31, 2024

zerosnacks added T-bug Type: bug C-anvil Command: anvil labels Jul 31, 2024

rustfmt

b1b2f29

mattsse requested a review from klkvr as a code owner September 12, 2024 06:41

mattsse reviewed Sep 12, 2024

View reviewed changes

crates/anvil/src/eth/backend/mem/mod.rs Show resolved Hide resolved

yash-atreya added 2 commits September 12, 2024 12:44

resolve conflicts

a751eda

fix

8326b48

yash-atreya enabled auto-merge (squash) September 12, 2024 08:35

yash-atreya requested a review from mattsse September 12, 2024 08:35

mattsse approved these changes Sep 13, 2024

View reviewed changes

yash-atreya merged commit 84e63fe into foundry-rs:master Sep 13, 2024
20 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix truncated hex in anvil dump_state #8216

Fix truncated hex in anvil dump_state #8216

AxelAramburu commented Jun 20, 2024 •

edited by yash-atreya

Loading

mattsse Jun 20, 2024

AxelAramburu Jun 20, 2024

DaniPopes Jun 20, 2024 •

edited

Loading

AxelAramburu Jun 21, 2024

mattsse Jun 21, 2024

AxelAramburu Jun 23, 2024

mattsse Jun 21, 2024

AxelAramburu Jun 23, 2024

mattsse Jun 21, 2024

AxelAramburu Jun 23, 2024

mattsse Jun 23, 2024

zerosnacks commented Jul 16, 2024

KholdStare commented Jul 16, 2024

0xalpharush commented Sep 12, 2024

mattsse left a comment

KholdStare commented Sep 12, 2024 •

edited

Loading

mattsse left a comment

Fix truncated hex in anvil dump_state #8216

Fix truncated hex in anvil dump_state #8216

Conversation

AxelAramburu commented Jun 20, 2024 • edited by yash-atreya Loading

Motivation

Solution

Choose a reason for hiding this comment

Choose a reason for hiding this comment

DaniPopes Jun 20, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

zerosnacks commented Jul 16, 2024

KholdStare commented Jul 16, 2024

0xalpharush commented Sep 12, 2024

mattsse left a comment

Choose a reason for hiding this comment

KholdStare commented Sep 12, 2024 • edited Loading

mattsse left a comment

Choose a reason for hiding this comment

AxelAramburu commented Jun 20, 2024 •

edited by yash-atreya

Loading

DaniPopes Jun 20, 2024 •

edited

Loading

KholdStare commented Sep 12, 2024 •

edited

Loading