Use upstream statedb #669
Use upstream statedb #669
Conversation
| @@ -258,11 +258,6 @@ func (g *Genesis) toBlock(db ethdb.Database, triedb *triedb.Database) *types.Blo | |||
| for key, value := range account.Storage { | |||
| statedb.SetState(addr, key, value) | |||
| } | |||
| if account.MCBalance != nil { | |||
There was a problem hiding this comment.
How are we now handling this?
There was a problem hiding this comment.
We're not, fuji and mainnet genesis don't use it so we will be getting rid of it for better alignment with upstream.
There was a problem hiding this comment.
Can we also get rid of
- GenesisMultiCoinBalance in gen_genesis_account and from account.go
- GetAssetBalance API
| s.DumpToCollector(iterativeDump{output}, opts) | ||
| } | ||
| type ( | ||
| // XXX: Handling IsMultiCoin / extras in dump |
There was a problem hiding this comment.
What does this comment mean? You use XXX as a reminder, don't you?
There was a problem hiding this comment.
We could add support for properly dumping the extras in libevm or break api compatibility in that we just won't output IsMulticoin as I don't think anyone is really depending on it.
The XXX is here for us to make a decision
There was a problem hiding this comment.
I think we can get rid of it.
There was a problem hiding this comment.
I'm happy either way and already have it in ava-labs/libevm#49 pending what you guys decide.
| @@ -515,15 +410,16 @@ func (test *snapshotTest) checkEqual(state, checkstate *StateDB) error { | |||
| checkeq("GetCode", state.GetCode(addr), checkstate.GetCode(addr)) | |||
| checkeq("GetCodeHash", state.GetCodeHash(addr), checkstate.GetCodeHash(addr)) | |||
| checkeq("GetCodeSize", state.GetCodeSize(addr), checkstate.GetCodeSize(addr)) | |||
| // XXX: Can this be restored? | |||
There was a problem hiding this comment.
When and why was it commented out?
There was a problem hiding this comment.
It's commented out since the forEachStorage requires iterating on storage and we don't have that ability over the exported interfaces as far as I can tell.
| @@ -1170,12 +838,16 @@ func TestGenerateMultiCoinAccounts(t *testing.T) { | |||
|
|
|||
| // Get latest snapshot and make sure it has the correct account and storage | |||
| snap := snaps.Snapshot(root) | |||
| snapAccount, err := snap.Account(addrHash) | |||
| snapAccount, err := snap.AccountRLP(addrHash) | |||
There was a problem hiding this comment.
Why decode the RLP manually instead of just using Account()?
There was a problem hiding this comment.
Since there are no accessors for Extra on the SlimAccount, the only way to access it is to get the RLP and convert it to a full account (StateAccount) which we can call types.IsMuliCoin on
There was a problem hiding this comment.
ava-labs/libevm#79 adds the accessor to SlimAccount.
| s.DumpToCollector(iterativeDump{output}, opts) | ||
| } | ||
| type ( | ||
| // XXX: Handling IsMultiCoin / extras in dump |
There was a problem hiding this comment.
I think we can get rid of it.
| @@ -258,11 +258,6 @@ func (g *Genesis) toBlock(db ethdb.Database, triedb *triedb.Database) *types.Blo | |||
| for key, value := range account.Storage { | |||
| statedb.SetState(addr, key, value) | |||
| } | |||
| if account.MCBalance != nil { | |||
There was a problem hiding this comment.
Can we also get rid of
- GenesisMultiCoinBalance in gen_genesis_account and from account.go
- GetAssetBalance API
Uses upstream statedb
Import Path Updates:
github.com/ava-labs/coreth/trieandgithub.com/ava-labs/coreth/triedbtogithub.com/ava-labs/libevm/trieandgithub.com/ava-labs/libevm/triedbin several files, deleting those packages.State Management:
GetLogDatato theStateDBwrapper struct incore/extstate/statedb.go, in preparation for using upstream StateDB.commitWithSnapfunction to handle state commits with snapshot updates incore/blockchain.go.writeBlockAndSetHeadandwriteBlockWithStatefunctions to includeparentRootas a parameter incore/blockchain.go. [1] [2]core/genesis.go. [1]Error Handling Improvements (already added in master):
TestWaitDeployedCornerCasesfunction inaccounts/abi/bind/util_test.go.