-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
6 changed files
with
268 additions
and
170 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| package rlp | ||
|
|
||
| import ( | ||
| "math/big" | ||
|
|
||
| "github.com/Fantom-foundation/Substate/types" | ||
| ) | ||
|
|
||
| const berlinBlock = 37_455_223 | ||
|
|
||
| // IsBerlinFork returns true if block is part of the berlin fork block range | ||
| func IsBerlinFork(block uint64) bool { | ||
| return block >= berlinBlock && block < londonBlock | ||
| } | ||
|
|
||
| // berlinRLP represents legacy RLP structure between Berlin and London fork starting at berlinBlock ending at londonBlock | ||
| type berlinRLP struct { | ||
| InputAlloc WorldState | ||
| OutputAlloc WorldState | ||
| Env *legacyEnv | ||
| Message *berlinMessage | ||
| Result *Result | ||
| } | ||
|
|
||
| // toRLP transforms r into RLP format which is compatible with the currently used Geth fork. | ||
| func (r berlinRLP) toRLP() *RLP { | ||
| return &RLP{ | ||
| InputSubstate: r.InputAlloc, | ||
| OutputSubstate: r.OutputAlloc, | ||
| Env: r.Env.toEnv(), | ||
| Message: r.Message.toMessage(), | ||
| Result: r.Result, | ||
| } | ||
|
|
||
| } | ||
|
|
||
| type berlinMessage struct { | ||
| Nonce uint64 | ||
| CheckNonce bool | ||
| GasPrice *big.Int | ||
| Gas uint64 | ||
|
|
||
| From types.Address | ||
| To *types.Address `rlp:"nil"` // nil means contract creation | ||
| Value *big.Int | ||
| Data []byte | ||
|
|
||
| InitCodeHash *types.Hash `rlp:"nil"` // NOT nil for contract creation | ||
|
|
||
| AccessList types.AccessList // missing in substate DB from Geth v1.9.x | ||
| } | ||
|
|
||
| // toMessage transforms m into RLP format which is compatible with the currently used Geth fork. | ||
| func (m berlinMessage) toMessage() *Message { | ||
| return &Message{ | ||
| londonMessage: londonMessage{ | ||
| Nonce: m.Nonce, | ||
| CheckNonce: m.CheckNonce, | ||
| GasPrice: m.GasPrice, | ||
| Gas: m.Gas, | ||
| From: m.From, | ||
| To: m.To, | ||
| Value: new(big.Int).Set(m.Value), | ||
| Data: m.Data, | ||
| InitCodeHash: m.InitCodeHash, | ||
| AccessList: m.AccessList, | ||
|
|
||
| // Same behavior as AccessListTx.gasFeeCap() and AccessListTx.gasTipCap() | ||
| GasFeeCap: m.GasPrice, | ||
| GasTipCap: m.GasPrice, | ||
| }, | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,145 @@ | ||
| package rlp | ||
|
|
||
| import ( | ||
| "math/big" | ||
|
|
||
| "github.com/Fantom-foundation/Substate/substate" | ||
| "github.com/Fantom-foundation/Substate/types" | ||
| ) | ||
|
|
||
| const londonBlock = 37_534_833 | ||
|
|
||
| // IsLondonFork returns true if block is part of the london fork block range | ||
| func IsLondonFork(block uint64) bool { | ||
| return block >= londonBlock | ||
| } | ||
|
|
||
| func NewLondonRLP(substate *substate.Substate) *londonRLP { | ||
| return &londonRLP{ | ||
| InputSubstate: NewWorldState(substate.InputSubstate), | ||
| OutputSubstate: NewWorldState(substate.OutputSubstate), | ||
| Env: newLondonEnv(substate.Env), | ||
| Message: newLondonMessage(substate.Message), | ||
| Result: NewResult(substate.Result), | ||
| } | ||
| } | ||
|
|
||
| // londonRLP represents RLP structure after londonBlock and before cancun fork. | ||
| type londonRLP struct { | ||
| InputSubstate WorldState | ||
| OutputSubstate WorldState | ||
| Env londonEnv | ||
| Message londonMessage | ||
| Result *Result | ||
| } | ||
|
|
||
| // toRLP transforms r into RLP format which is compatible with the currently used Geth fork. | ||
| func (r londonRLP) toRLP() *RLP { | ||
| return &RLP{ | ||
| InputSubstate: r.InputSubstate, | ||
| OutputSubstate: r.OutputSubstate, | ||
| Env: r.Env.toEnv(), | ||
| Message: r.Message.toMessage(), | ||
| Result: r.Result, | ||
| } | ||
| } | ||
|
|
||
| func newLondonEnv(env *substate.Env) londonEnv { | ||
| e := londonEnv{ | ||
| Coinbase: env.Coinbase, | ||
| Difficulty: env.Difficulty, | ||
| GasLimit: env.GasLimit, | ||
| Number: env.Number, | ||
| Timestamp: env.Timestamp, | ||
| } | ||
|
|
||
| var sortedNum64 []uint64 | ||
| for num64 := range env.BlockHashes { | ||
| sortedNum64 = append(sortedNum64, num64) | ||
| } | ||
|
|
||
| for _, num64 := range sortedNum64 { | ||
| num := types.BigToHash(new(big.Int).SetUint64(num64)) | ||
| blockHash := env.BlockHashes[num64] | ||
| pair := [2]types.Hash{num, blockHash} | ||
| e.BlockHashes = append(e.BlockHashes, pair) | ||
| } | ||
|
|
||
| e.BaseFee = nil | ||
| if env.BaseFee != nil { | ||
| baseFeeHash := types.BigToHash(env.BaseFee) | ||
| e.BaseFee = &baseFeeHash | ||
| } | ||
|
|
||
| return e | ||
| } | ||
|
|
||
| type londonEnv struct { | ||
| Coinbase types.Address | ||
| Difficulty *big.Int | ||
| GasLimit uint64 | ||
| Number uint64 | ||
| Timestamp uint64 | ||
| BlockHashes [][2]types.Hash | ||
|
|
||
| BaseFee *types.Hash `rlp:"nil"` // missing in substate DB from Geth <= v1.10.3 | ||
| } | ||
|
|
||
| // toEnv transforms m into RLP format which is compatible with the currently used Geth fork. | ||
| func (e londonEnv) toEnv() *Env { | ||
| return &Env{ | ||
| londonEnv: e, | ||
| } | ||
| } | ||
|
|
||
| func newLondonMessage(message *substate.Message) londonMessage { | ||
| m := londonMessage{ | ||
| Nonce: message.Nonce, | ||
| CheckNonce: message.CheckNonce, | ||
| GasPrice: message.GasPrice, | ||
| Gas: message.Gas, | ||
| From: message.From, | ||
| To: message.To, | ||
| Value: new(big.Int).Set(message.Value), | ||
| Data: message.Data, | ||
| InitCodeHash: nil, | ||
| AccessList: message.AccessList, | ||
| GasFeeCap: message.GasFeeCap, | ||
| GasTipCap: message.GasTipCap, | ||
| } | ||
|
|
||
| if m.To == nil { | ||
| // put contract creation init code into codeDB | ||
| dataHash := message.DataHash() | ||
| m.InitCodeHash = &dataHash | ||
| m.Data = nil | ||
| } | ||
|
|
||
| return m | ||
| } | ||
|
|
||
| type londonMessage struct { | ||
| Nonce uint64 | ||
| CheckNonce bool | ||
| GasPrice *big.Int | ||
| Gas uint64 | ||
|
|
||
| From types.Address | ||
| To *types.Address `rlp:"nil"` // nil means contract creation | ||
| Value *big.Int | ||
| Data []byte | ||
|
|
||
| InitCodeHash *types.Hash `rlp:"nil"` // NOT nil for contract creation | ||
|
|
||
| AccessList types.AccessList // missing in substate DB from Geth v1.9.x | ||
|
|
||
| GasFeeCap *big.Int // missing in substate DB from Geth <= v1.10.3 | ||
| GasTipCap *big.Int // missing in substate DB from Geth <= v1.10.3 | ||
| } | ||
|
|
||
| // toMessage transforms m into RLP format which is compatible with the currently used Geth fork. | ||
| func (m londonMessage) toMessage() *Message { | ||
| return &Message{ | ||
| londonMessage: m, | ||
| } | ||
| } |
Oops, something went wrong.