Skip to content
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

Added custom type for Deployed contracts throughout the repo wherever necessary #2402

Closed
wants to merge 2 commits into from
Closed

Added custom type for Deployed contracts throughout the repo wherever necessary #2402

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
55b2bec
Added custom type for Deployed contracts throughout the repo wherever…
Jan 26, 2025
1e4d7ca
cover test case
Jan 26, 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
2 changes: 1 addition & 1 deletion adapters/p2p2core/state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ func AdaptStateDiff(reader core.StateReader, contractDiffs []*gen.ContractDiff,

var deployedContracts, replacedClasses []addrToClassHash
// addr -> {key -> value, ...}
storageDiffs := make(map[felt.Felt]map[felt.Felt]*felt.Felt)
storageDiffs := make(core.StorageDiff)
nonces := make(map[felt.Felt]*felt.Felt)
for _, diff := range contractDiffs {
address := AdaptAddress(diff.Address)
Expand Down
4 changes: 2 additions & 2 deletions core/state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ func (s *State) updateStorageBuffered(contractAddr *felt.Felt, updateDiff map[fe

// updateContractStorages applies the diff set to the Trie of the
// contract at the given address in the given Txn context.
func (s *State) updateContractStorages(stateTrie *trie.Trie, diffs map[felt.Felt]map[felt.Felt]*felt.Felt,
func (s *State) updateContractStorages(stateTrie *trie.Trie, diffs StorageDiff,
blockNumber uint64, logChanges bool,
) error {
type bufferedTransactionWithAddress struct {
Expand Down Expand Up @@ -689,7 +689,7 @@ func (s *State) GetReverseStateDiff(blockNumber uint64, diff *StateDiff) (*State
reversed := *diff

// storage diffs
reversed.StorageDiffs = make(map[felt.Felt]map[felt.Felt]*felt.Felt, len(diff.StorageDiffs))
reversed.StorageDiffs = make(StorageDiff, len(diff.StorageDiffs))
for addr, storageDiffs := range diff.StorageDiffs {
reversedDiffs := make(map[felt.Felt]*felt.Felt, len(storageDiffs))
for key := range storageDiffs {
Expand Down
8 changes: 4 additions & 4 deletions core/state_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ func TestUpdate(t *testing.T) {
OldRoot: su3.NewRoot,
NewRoot: utils.HexToFelt(t, "0x68ac0196d9b6276b8d86f9e92bca0ed9f854d06ded5b7f0b8bc0eeaa4377d9e"),
StateDiff: &core.StateDiff{
StorageDiffs: map[felt.Felt]map[felt.Felt]*felt.Felt{*scAddr: {*scKey: scValue}},
StorageDiffs: core.StorageDiff{*scAddr: {*scKey: scValue}},
},
}

Expand Down Expand Up @@ -143,7 +143,7 @@ func TestUpdate(t *testing.T) {
OldRoot: su4.NewRoot,
NewRoot: utils.HexToFelt(t, "0x68ac0196d9b6276b8d86f9e92bca0ed9f854d06ded5b7f0b8bc0eeaa4377d9e"),
StateDiff: &core.StateDiff{
StorageDiffs: map[felt.Felt]map[felt.Felt]*felt.Felt{*scAddr2: {*scKey: scValue}},
StorageDiffs: core.StorageDiff{*scAddr2: {*scKey: scValue}},
},
}
assert.ErrorIs(t, state.Update(5, su5, nil), core.ErrContractNotDeployed)
Expand Down Expand Up @@ -292,7 +292,7 @@ func TestStateHistory(t *testing.T) {
NewRoot: utils.HexToFelt(t, "0xac747e0ea7497dad7407ecf2baf24b1598b0b40943207fc9af8ded09a64f1c"),
OldRoot: su0.NewRoot,
StateDiff: &core.StateDiff{
StorageDiffs: map[felt.Felt]map[felt.Felt]*felt.Felt{
StorageDiffs: core.StorageDiff{
*contractAddr: {
*changedLoc: utils.HexToFelt(t, "0x44"),
},
Expand Down Expand Up @@ -560,7 +560,7 @@ func TestRevertGenesisStateDiff(t *testing.T) {
NewRoot: utils.HexToFelt(t, "0xa89ee2d272016fd3708435efda2ce766692231f8c162e27065ce1607d5a9e8"),
OldRoot: new(felt.Felt),
StateDiff: &core.StateDiff{
StorageDiffs: map[felt.Felt]map[felt.Felt]*felt.Felt{
StorageDiffs: core.StorageDiff{
*addr: {
*key: value,
},
Expand Down
16 changes: 9 additions & 7 deletions core/state_update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,15 @@ type StateUpdate struct {
StateDiff *StateDiff
}

type StorageDiff map[felt.Felt]map[felt.Felt]*felt.Felt

type StateDiff struct {
StorageDiffs map[felt.Felt]map[felt.Felt]*felt.Felt // addr -> {key -> value, ...}
Nonces map[felt.Felt]*felt.Felt // addr -> nonce
DeployedContracts map[felt.Felt]*felt.Felt // addr -> class hash
DeclaredV0Classes []*felt.Felt // class hashes
DeclaredV1Classes map[felt.Felt]*felt.Felt // class hash -> compiled class hash
ReplacedClasses map[felt.Felt]*felt.Felt // addr -> class hash
StorageDiffs StorageDiff // addr -> {key -> value, ...}
Nonces map[felt.Felt]*felt.Felt // addr -> nonce
DeployedContracts map[felt.Felt]*felt.Felt // addr -> class hash
DeclaredV0Classes []*felt.Felt // class hashes
DeclaredV1Classes map[felt.Felt]*felt.Felt // class hash -> compiled class hash
ReplacedClasses map[felt.Felt]*felt.Felt // addr -> class hash
}

func (d *StateDiff) Length() uint64 {
Expand Down Expand Up @@ -173,7 +175,7 @@ func deprecatedDeclaredClassesDigest(declaredV0Classes []*felt.Felt, digest *cry
digest.Update(declaredV0Classes...)
}

func storageDiffDigest(storageDiffs map[felt.Felt]map[felt.Felt]*felt.Felt, digest *crypto.PoseidonDigest) {
func storageDiffDigest(storageDiffs StorageDiff, digest *crypto.PoseidonDigest) {
numOfStorageDiffs := uint64(len(storageDiffs))
digest.Update(new(felt.Felt).SetUint64(numOfStorageDiffs))

Expand Down
2 changes: 1 addition & 1 deletion migration/migration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,7 +633,7 @@ func changeStateDiffStruct(txn db.Transaction, key, value []byte, _ *utils.Netwo
return fmt.Errorf("unmarshal: %v", err)
}

storageDiffs := make(map[felt.Felt]map[felt.Felt]*felt.Felt, len(old.StateDiff.StorageDiffs))
storageDiffs := make(core.StorageDiff, len(old.StateDiff.StorageDiffs))
for addr, diff := range old.StateDiff.StorageDiffs {
newStorageDiffs := make(map[felt.Felt]*felt.Felt, len(diff))
for _, kv := range diff {
Expand Down
4 changes: 2 additions & 2 deletions migration/migration_pkg_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -671,7 +671,7 @@ func TestChangeStateDiffStruct(t *testing.T) {
NewRoot: utils.HexToFelt(t, "0x1"),
OldRoot: utils.HexToFelt(t, "0x2"),
StateDiff: &core.StateDiff{
StorageDiffs: map[felt.Felt]map[felt.Felt]*felt.Felt{
StorageDiffs: core.StorageDiff{
*utils.HexToFelt(t, "0x3"): {
*utils.HexToFelt(t, "0x4"): utils.HexToFelt(t, "0x5"),
},
Expand Down Expand Up @@ -700,7 +700,7 @@ func TestChangeStateDiffStruct(t *testing.T) {
NewRoot: utils.HexToFelt(t, "0x16"),
OldRoot: utils.HexToFelt(t, "0x17"),
StateDiff: &core.StateDiff{
StorageDiffs: map[felt.Felt]map[felt.Felt]*felt.Felt{
StorageDiffs: core.StorageDiff{
*utils.HexToFelt(t, "0x18"): {
*utils.HexToFelt(t, "0x19"): utils.HexToFelt(t, "0x20"),
},
Expand Down
2 changes: 1 addition & 1 deletion sync/pending_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ func TestPendingState(t *testing.T) {
Nonces: map[felt.Felt]*felt.Felt{
*deployedAddr: new(felt.Felt).SetUint64(44),
},
StorageDiffs: map[felt.Felt]map[felt.Felt]*felt.Felt{
StorageDiffs: core.StorageDiff{
*deployedAddr: {
*new(felt.Felt).SetUint64(44): new(felt.Felt).SetUint64(37),
},
Expand Down
2 changes: 1 addition & 1 deletion sync/sync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -710,7 +710,7 @@ func (s *Synchronizer) storeEmptyPending(latestHeader *core.Header) error {

func makeStateDiffForEmptyBlock(bc blockchain.Reader, blockNumber uint64) (*core.StateDiff, error) {
stateDiff := &core.StateDiff{
StorageDiffs: make(map[felt.Felt]map[felt.Felt]*felt.Felt),
StorageDiffs: make(core.StorageDiff),
Nonces: make(map[felt.Felt]*felt.Felt),
DeployedContracts: make(map[felt.Felt]*felt.Felt),
DeclaredV0Classes: make([]*felt.Felt, 0),
Expand Down
4 changes: 2 additions & 2 deletions vm/vm_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ func TestV0Call(t *testing.T) {
OldRoot: utils.HexToFelt(t, "0x3d452fbb3c3a32fe85b1a3fbbcdec316d5fc940cefc028ee808ad25a15991c8"),
NewRoot: utils.HexToFelt(t, "0x4a948783e8786ba9d8edaf42de972213bd2deb1b50c49e36647f1fef844890f"),
StateDiff: &core.StateDiff{
StorageDiffs: map[felt.Felt]map[felt.Felt]*felt.Felt{
StorageDiffs: core.StorageDiff{
*contractAddr: {
*utils.HexToFelt(t, "0x206f38f7e4f15e87567361213c28f235cccdaa1d7fd34c9db1dfe9489c6a091"): new(felt.Felt).SetUint64(1337),
},
Expand Down Expand Up @@ -124,7 +124,7 @@ func TestV1Call(t *testing.T) {
OldRoot: utils.HexToFelt(t, "0x2650cef46c190ec6bb7dc21a5a36781132e7c883b27175e625031149d4f1a84"),
NewRoot: utils.HexToFelt(t, "0x7a9da0a7471a8d5118d3eefb8c26a6acbe204eb1eaa934606f4757a595fe552"),
StateDiff: &core.StateDiff{
StorageDiffs: map[felt.Felt]map[felt.Felt]*felt.Felt{
StorageDiffs: core.StorageDiff{
*contractAddr: {
*storageLocation: new(felt.Felt).SetUint64(37),
},
Expand Down
Loading