Skip to content

op-chain-ops: MergeStorage deterministic storage results order #3352

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
mergify merged 2 commits into from
Sep 8, 2022
Merged

op-chain-ops: MergeStorage deterministic storage results order #3352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a06397
op-chain-ops: MergeStorage deterministic storage results order
protolambda Sep 8, 2022
07f5d70
Merge branch 'develop' into chainops-test-storage-order-fix
mergify[bot] Sep 8, 2022
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
13 changes: 8 additions & 5 deletions op-chain-ops/state/state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,18 +76,21 @@ func ComputeStorageSlots(layout *solc.StorageLayout, values StorageValues) ([]*E
// of the produced storage slots have a matching key, if so use a
// binary or to add the storage values together
func MergeStorage(storage []*EncodedStorage) []*EncodedStorage {
encoded := make(map[common.Hash]common.Hash)
encodedKV := make(map[common.Hash]common.Hash)
var encodedKeys []common.Hash // for deterministic result order
for _, storage := range storage {
if prev, ok := encoded[storage.Key]; ok {
if prev, ok := encodedKV[storage.Key]; ok {
combined := new(big.Int).Or(prev.Big(), storage.Value.Big())
encoded[storage.Key] = common.BigToHash(combined)
encodedKV[storage.Key] = common.BigToHash(combined)
} else {
encoded[storage.Key] = storage.Value
encodedKV[storage.Key] = storage.Value
encodedKeys = append(encodedKeys, storage.Key)
}
}

results := make([]*EncodedStorage, 0)
for key, val := range encoded {
for _, key := range encodedKeys {
val := encodedKV[key]
results = append(results, &EncodedStorage{key, val})
}
return results
Expand Down
6 changes: 1 addition & 5 deletions op-chain-ops/state/state_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,11 +276,7 @@ func TestMergeStorage(t *testing.T) {

for _, test := range cases {
got := state.MergeStorage(test.input)
// deep equal check
require.Equal(t, len(got), len(test.expect))
for i := range got {
require.Equal(t, *got[i], *test.expect[i])
}
require.Equal(t, test.expect, got)
}
}

Expand Down