Skip to content

Sort storage variables by slot number #73

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ritzdorf merged 3 commits into from
Jun 12, 2025
Merged

Sort storage variables by slot number #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f31df72
Sort storage variables by slot number
GiovanniTorrisi-ChainSecurity Jun 6, 2025
e0d5f1a
fix test
ritzdorf Jun 6, 2025
45a6c21
Adjust test cases
ritzdorf Jun 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions lib/state/contract_state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,9 @@ impl<'a> ContractState<'a> {
};
critical_storage_variables.push(crit_var);
}

critical_storage_variables.sort_by_key(|crit_var| crit_var.slot);

Ok(critical_storage_variables)
}

Expand Down
234 changes: 117 additions & 117 deletions tests/expected_dvfs/CrazyHiddenStruct.dvf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"version": "0.9.1",
"id": "0xf50233de5831580f52586919088c01292c21b2ca30f629b8f8c1b03d9b930337",
"id": "0x71f27bd042cf53e6783d03336d86171f7d728e61f867e60071ae32818de10da2",
"contract_name": "CrazyHiddenStruct",
"address": "0x5fbdb2315678afecb367f032d93f642f64180aa3",
"chain_id": 1337,
Expand All @@ -12,24 +12,6 @@
"immutables": [],
"constructor_args": [],
"critical_storage_variables": [
{
"slot": "0x35651ad27f3aefbb385b9ec8083a43fa66a530f8d5c595761b795067f1e74a1e",
"offset": 0,
"var_name": "CrazyHiddenStruct.slot.Struct2.a",
"var_type": "t_uint256",
"value": "0x0000000000000000000000000000000000000000000000000000000000000033",
"value_hint": "51",
"comparison_operator": "Equal"
},
{
"slot": "0x35651ad27f3aefbb385b9ec8083a43fa66a530f8d5c595761b795067f1e74a1f",
"offset": 0,
"var_name": "CrazyHiddenStruct.slot.Struct2.b",
"var_type": "t_uint192",
"value": "0x000000000000000000000000000000000000000000000034",
"value_hint": "52",
"comparison_operator": "Equal"
},
{
"slot": "0x15a25abce1e290903dfb3bf850cde568a79974bd708fad6773051983c8f32392",
"offset": 0,
Expand All @@ -48,6 +30,15 @@
"value_hint": "54",
"comparison_operator": "Equal"
},
{
"slot": "0x236453792347cdd69067164d0e3b70a6cccb56abd581bf2f84ba13b07bf3c58d",
"offset": 0,
"var_name": "CrazyHiddenStruct.StorageLocation2.Struct1._mapping[0x5fbdb2315678afecb367f032d93f642f64180aa3]",
"var_type": "t_uint256",
"value": "0x000000000000000000000000000000000000000000000000000000000000002f",
"value_hint": "47",
"comparison_operator": "Equal"
},
{
"slot": "0x23a5f7cc72e23cdd4f1db53ce1b03f6dc7fc47aeb7fdbce350f3d3985d8279ce",
"offset": 0,
Expand All @@ -67,21 +58,21 @@
"comparison_operator": "Equal"
},
{
"slot": "0x9791306d36f884f84fb67051679efcfc2826c7a42c194c1ea63f58f3d1d1a1d4",
"slot": "0x35651ad27f3aefbb385b9ec8083a43fa66a530f8d5c595761b795067f1e74a1e",
"offset": 0,
"var_name": "CrazyHiddenStruct.KeccakStorageLocation2.Struct2.a",
"var_name": "CrazyHiddenStruct.slot.Struct2.a",
"var_type": "t_uint256",
"value": "0x000000000000000000000000000000000000000000000000000000000000003d",
"value_hint": "61",
"value": "0x0000000000000000000000000000000000000000000000000000000000000033",
"value_hint": "51",
"comparison_operator": "Equal"
},
{
"slot": "0x9791306d36f884f84fb67051679efcfc2826c7a42c194c1ea63f58f3d1d1a1d5",
"slot": "0x35651ad27f3aefbb385b9ec8083a43fa66a530f8d5c595761b795067f1e74a1f",
"offset": 0,
"var_name": "CrazyHiddenStruct.KeccakStorageLocation2.Struct2.b",
"var_name": "CrazyHiddenStruct.slot.Struct2.b",
"var_type": "t_uint192",
"value": "0x00000000000000000000000000000000000000000000003e",
"value_hint": "62",
"value": "0x000000000000000000000000000000000000000000000034",
"value_hint": "52",
"comparison_operator": "Equal"
},
{
Expand Down Expand Up @@ -147,33 +138,6 @@
"value_hint": "3",
"comparison_operator": "Equal"
},
{
"slot": "0x5b1dc9b27b9505294a9eec7abe23dbfc1a1b1453a90ad80e89410fd965346456",
"offset": 0,
"var_name": "CrazyHiddenStruct.StorageLocation1.Struct1._dynArrayUint40[0]",
"var_type": "t_uint40",
"value": "0x0000000019",
"value_hint": "25",
"comparison_operator": "Equal"
},
{
"slot": "0x5b1dc9b27b9505294a9eec7abe23dbfc1a1b1453a90ad80e89410fd965346456",
"offset": 5,
"var_name": "CrazyHiddenStruct.StorageLocation1.Struct1._dynArrayUint40[1]",
"var_type": "t_uint40",
"value": "0x000000001a",
"value_hint": "26",
"comparison_operator": "Equal"
},
{
"slot": "0x5b1dc9b27b9505294a9eec7abe23dbfc1a1b1453a90ad80e89410fd965346456",
"offset": 10,
"var_name": "CrazyHiddenStruct.StorageLocation1.Struct1._dynArrayUint40[2]",
"var_type": "t_uint40",
"value": "0x000000001b",
"value_hint": "27",
"comparison_operator": "Equal"
},
{
"slot": "0x41ef84cfd2398a02556624f13effd41aa790a48ce39e70d3a0dc298f7a4dec8e",
"offset": 0,
Expand Down Expand Up @@ -217,15 +181,6 @@
"value_hint": "30",
"comparison_operator": "Equal"
},
{
"slot": "0x9aaec34ad20a36f142849df84dc18f6cca8d9667522d7459cee106efd7f1ebe8",
"offset": 0,
"var_name": "CrazyHiddenStruct.StorageLocation1.Struct1._mapping[0x5fbdb2315678afecb367f032d93f642f64180aa3]",
"var_type": "t_uint256",
"value": "0x0000000000000000000000000000000000000000000000000000000000000020",
"value_hint": "32",
"comparison_operator": "Equal"
},
{
"slot": "0x41ef84cfd2398a02556624f13effd41aa790a48ce39e70d3a0dc298f7a4dec94",
"offset": 0,
Expand Down Expand Up @@ -278,6 +233,78 @@
"value": "0x00000000000000000000000000000023",
"comparison_operator": "Equal"
},
{
"slot": "0x42d0407cb447148fd182bf527909ab1ba2fbaefe3f25cbe9851153586910b294",
"offset": 0,
"var_name": "DirectStorageLocation2",
"var_type": "t_uint256",
"value": "0x0000000000000000000000000000000000000000000000000000000000000038",
"value_hint": "56",
"comparison_operator": "Equal"
},
{
"slot": "0x4a7aec098045e3d96a6592c68c6dbd22bd3358e23bcaa52ab70d20bef4f890ef",
"offset": 0,
"var_name": "[_setDirect4].unnamed",
"var_type": "t_uint128",
"value": "0x0000000000000000000000000000003a",
"value_hint": "58",
"comparison_operator": "Equal"
},
{
"slot": "0x5b1dc9b27b9505294a9eec7abe23dbfc1a1b1453a90ad80e89410fd965346456",
"offset": 0,
"var_name": "CrazyHiddenStruct.StorageLocation1.Struct1._dynArrayUint40[0]",
"var_type": "t_uint40",
"value": "0x0000000019",
"value_hint": "25",
"comparison_operator": "Equal"
},
{
"slot": "0x5b1dc9b27b9505294a9eec7abe23dbfc1a1b1453a90ad80e89410fd965346456",
"offset": 5,
"var_name": "CrazyHiddenStruct.StorageLocation1.Struct1._dynArrayUint40[1]",
"var_type": "t_uint40",
"value": "0x000000001a",
"value_hint": "26",
"comparison_operator": "Equal"
},
{
"slot": "0x5b1dc9b27b9505294a9eec7abe23dbfc1a1b1453a90ad80e89410fd965346456",
"offset": 10,
"var_name": "CrazyHiddenStruct.StorageLocation1.Struct1._dynArrayUint40[2]",
"var_type": "t_uint40",
"value": "0x000000001b",
"value_hint": "27",
"comparison_operator": "Equal"
},
{
"slot": "0x729d4e87c26acdd3d89aba983a003ca2c8c8a63969ac31180cb88ef645276a20",
"offset": 0,
"var_name": "CrazyHiddenStruct.StorageLocation2.Struct1._dynArrayUint40[0]",
"var_type": "t_uint40",
"value": "0x0000000029",
"value_hint": "41",
"comparison_operator": "Equal"
},
{
"slot": "0x729d4e87c26acdd3d89aba983a003ca2c8c8a63969ac31180cb88ef645276a20",
"offset": 5,
"var_name": "CrazyHiddenStruct.StorageLocation2.Struct1._dynArrayUint40[1]",
"var_type": "t_uint40",
"value": "0x000000002a",
"value_hint": "42",
"comparison_operator": "Equal"
},
{
"slot": "0x729d4e87c26acdd3d89aba983a003ca2c8c8a63969ac31180cb88ef645276a20",
"offset": 10,
"var_name": "CrazyHiddenStruct.StorageLocation2.Struct1._dynArrayUint40[2]",
"var_type": "t_uint40",
"value": "0x000000002b",
"value_hint": "43",
"comparison_operator": "Equal"
},
{
"slot": "0x852cbd6b186221cbf354c68826ab57cef1512cf2f5d959ca4501e155cbea7ae8",
"offset": 0,
Expand Down Expand Up @@ -332,33 +359,6 @@
"value_hint": "3",
"comparison_operator": "Equal"
},
{
"slot": "0x729d4e87c26acdd3d89aba983a003ca2c8c8a63969ac31180cb88ef645276a20",
"offset": 0,
"var_name": "CrazyHiddenStruct.StorageLocation2.Struct1._dynArrayUint40[0]",
"var_type": "t_uint40",
"value": "0x0000000029",
"value_hint": "41",
"comparison_operator": "Equal"
},
{
"slot": "0x729d4e87c26acdd3d89aba983a003ca2c8c8a63969ac31180cb88ef645276a20",
"offset": 5,
"var_name": "CrazyHiddenStruct.StorageLocation2.Struct1._dynArrayUint40[1]",
"var_type": "t_uint40",
"value": "0x000000002a",
"value_hint": "42",
"comparison_operator": "Equal"
},
{
"slot": "0x729d4e87c26acdd3d89aba983a003ca2c8c8a63969ac31180cb88ef645276a20",
"offset": 10,
"var_name": "CrazyHiddenStruct.StorageLocation2.Struct1._dynArrayUint40[2]",
"var_type": "t_uint40",
"value": "0x000000002b",
"value_hint": "43",
"comparison_operator": "Equal"
},
{
"slot": "0x852cbd6b186221cbf354c68826ab57cef1512cf2f5d959ca4501e155cbea7aec",
"offset": 0,
Expand Down Expand Up @@ -402,15 +402,6 @@
"value_hint": "46",
"comparison_operator": "Equal"
},
{
"slot": "0x236453792347cdd69067164d0e3b70a6cccb56abd581bf2f84ba13b07bf3c58d",
"offset": 0,
"var_name": "CrazyHiddenStruct.StorageLocation2.Struct1._mapping[0x5fbdb2315678afecb367f032d93f642f64180aa3]",
"var_type": "t_uint256",
"value": "0x000000000000000000000000000000000000000000000000000000000000002f",
"value_hint": "47",
"comparison_operator": "Equal"
},
{
"slot": "0x852cbd6b186221cbf354c68826ab57cef1512cf2f5d959ca4501e155cbea7af2",
"offset": 0,
Expand Down Expand Up @@ -464,11 +455,30 @@
"comparison_operator": "Equal"
},
{
"slot": "0xe82aa111a62567be9a414850f7168d2e6c9f9d61a82b90598df0a59035cd53a6",
"slot": "0x9791306d36f884f84fb67051679efcfc2826c7a42c194c1ea63f58f3d1d1a1d4",
"offset": 0,
"var_name": "CrazyHiddenStruct.StorageLocation4.AddressSlot.value",
"var_type": "t_address",
"value": "0x5fbdb2315678afecb367f032d93f642f64180aa3",
"var_name": "CrazyHiddenStruct.KeccakStorageLocation2.Struct2.a",
"var_type": "t_uint256",
"value": "0x000000000000000000000000000000000000000000000000000000000000003d",
"value_hint": "61",
"comparison_operator": "Equal"
},
{
"slot": "0x9791306d36f884f84fb67051679efcfc2826c7a42c194c1ea63f58f3d1d1a1d5",
"offset": 0,
"var_name": "CrazyHiddenStruct.KeccakStorageLocation2.Struct2.b",
"var_type": "t_uint192",
"value": "0x00000000000000000000000000000000000000000000003e",
"value_hint": "62",
"comparison_operator": "Equal"
},
{
"slot": "0x9aaec34ad20a36f142849df84dc18f6cca8d9667522d7459cee106efd7f1ebe8",
"offset": 0,
"var_name": "CrazyHiddenStruct.StorageLocation1.Struct1._mapping[0x5fbdb2315678afecb367f032d93f642f64180aa3]",
"var_type": "t_uint256",
"value": "0x0000000000000000000000000000000000000000000000000000000000000020",
"value_hint": "32",
"comparison_operator": "Equal"
},
{
Expand All @@ -488,15 +498,6 @@
"value_hint": "55",
"comparison_operator": "Equal"
},
{
"slot": "0x42d0407cb447148fd182bf527909ab1ba2fbaefe3f25cbe9851153586910b294",
"offset": 0,
"var_name": "DirectStorageLocation2",
"var_type": "t_uint256",
"value": "0x0000000000000000000000000000000000000000000000000000000000000038",
"value_hint": "56",
"comparison_operator": "Equal"
},
{
"slot": "0xd63cda19032c797bc0681e2077ae95a9a76af0fdb8f771b8f1cfcdf6578aca6c",
"offset": 0,
Expand All @@ -507,12 +508,11 @@
"comparison_operator": "Equal"
},
{
"slot": "0x4a7aec098045e3d96a6592c68c6dbd22bd3358e23bcaa52ab70d20bef4f890ef",
"slot": "0xe82aa111a62567be9a414850f7168d2e6c9f9d61a82b90598df0a59035cd53a6",
"offset": 0,
"var_name": "[_setDirect4].unnamed",
"var_type": "t_uint128",
"value": "0x0000000000000000000000000000003a",
"value_hint": "58",
"var_name": "CrazyHiddenStruct.StorageLocation4.AddressSlot.value",
"var_type": "t_address",
"value": "0x5fbdb2315678afecb367f032d93f642f64180aa3",
"comparison_operator": "Equal"
}
],
Expand Down
22 changes: 11 additions & 11 deletions tests/expected_dvfs/Deploy_0.dvf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"version": "0.9.1",
"id": "0xd5c2ba6466b7c6138861f139a9c71fc2c62202a847c354eed6084bbb8fd93c0c",
"id": "0xaf3c754d94b0f9857c409046651ccf6c73d812b7d9db1c04a74652e8437421cc",
"contract_name": "BytesMapping",
"address": "0x5fbdb2315678afecb367f032d93f642f64180aa3",
"chain_id": 1337,
Expand All @@ -13,12 +13,12 @@
"constructor_args": [],
"critical_storage_variables": [
{
"slot": "0xb37d9860c28a567bf45179fa03c86974dd335ac8196411736cdce29fbfda6ec1",
"slot": "0x1",
"offset": 0,
"var_name": "x[0x41]",
"var_type": "t_uint256",
"value": "0x0000000000000000000000000000000000000000000000000000000000000064",
"value_hint": "100",
"var_name": "b (length=23)",
"var_type": "t_bytes_storage",
"value": "0x4a75737420736f6d65206e6f726d616c2062797465732e00000000000000002e",
"value_hint": "4a75737420736f6d65206e6f726d616c2062797465732e",
"comparison_operator": "Equal"
},
{
Expand Down Expand Up @@ -49,12 +49,12 @@
"comparison_operator": "Equal"
},
{
"slot": "0x1",
"slot": "0xb37d9860c28a567bf45179fa03c86974dd335ac8196411736cdce29fbfda6ec1",
"offset": 0,
"var_name": "b (length=23)",
"var_type": "t_bytes_storage",
"value": "0x4a75737420736f6d65206e6f726d616c2062797465732e00000000000000002e",
"value_hint": "4a75737420736f6d65206e6f726d616c2062797465732e",
"var_name": "x[0x41]",
"var_type": "t_uint256",
"value": "0x0000000000000000000000000000000000000000000000000000000000000064",
"value_hint": "100",
"comparison_operator": "Equal"
}
],
Expand Down
Loading
Loading