Skip to content

state-migration: Fail if account would be overwritten #202

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
palango merged 6 commits into from
Aug 1, 2024
Merged

state-migration: Fail if account would be overwritten #202

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f9ef7a0
state-migration: Fail if account would be overwritten
palango Jul 24, 2024
daeaf0a
Review changes
palango Jul 26, 2024
7c880d8
Review changes 2
palango Jul 30, 2024
fec698f
Fail in unclear state
palango Jul 30, 2024
47b7c08
more changes
palango Jul 31, 2024
77fbec6
Use whitelist to decide if nonce and state are overwritten
palango Aug 1, 2024
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
10 changes: 8 additions & 2 deletions op-chain-ops/cmd/celo-migrate/state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,10 @@ func applyStateMigrationChanges(config *genesis.DeployConfig, genesis *core.Gene
}

// Apply the changes to the state DB.
applyAllocsToState(db, genesis, cfg)
err = applyAllocsToState(db, genesis, cfg)
if err != nil {
return nil, fmt.Errorf("cannot apply allocations to state: %w", err)
}

// Initialize the distribution schedule contract
// This uses the original config which won't enable recent hardforks (and things like the PUSH0 opcode)
Expand Down Expand Up @@ -242,7 +245,7 @@ func applyStateMigrationChanges(config *genesis.DeployConfig, genesis *core.Gene
// If an account already exists, it adds the balance of the new account to the existing balance.
// If the code of an existing account is different from the code in the genesis block, it logs a warning.
// This changes the state root, so `Commit` needs to be called after this function.
func applyAllocsToState(db *state.StateDB, genesis *core.Genesis, config *params.ChainConfig) {
func applyAllocsToState(db *state.StateDB, genesis *core.Genesis, config *params.ChainConfig) error {
log.Info("Starting to migrate OP contracts into state DB")

accountCounter := 0
Expand All @@ -264,9 +267,11 @@ func applyAllocsToState(db *state.StateDB, genesis *core.Genesis, config *params
log.Info("Account already exists with different code and is whitelisted, overwriting...", "address", k)
Comment thread
palango marked this conversation as resolved.
Outdated
} else {
log.Warn("Account already exists with different code and is not whitelisted, overwriting...", "address", k, "oldCode", db.GetCode(k), "newCode", v.Code)
return fmt.Errorf("account already exists with different code and is not whitelisted: %s", k.Hex())
Comment thread
palango marked this conversation as resolved.
Outdated
}
} else {
log.Warn("Account already exists with different code and no whitelist exists", "address", k, "oldCode", db.GetCode(k), "newCode", v.Code)
return fmt.Errorf("account already exists with different code and no whitelist exists: %s", k.Hex())
}

overwriteCounter++
Comment thread
palango marked this conversation as resolved.
Outdated
Expand All @@ -284,6 +289,7 @@ func applyAllocsToState(db *state.StateDB, genesis *core.Genesis, config *params
log.Info("Moved account", "address", k)
}
log.Info("Migrated OP contracts into state DB", "copiedAccounts", accountCounter, "overwrittenAccounts", overwriteCounter)
return nil
}

// setupDistributionSchedule sets up the distribution schedule contract with the correct balance
Expand Down