gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge undefined instead of panicking (#30)

Browse Source
This commit is contained in:
Guillaume Ballet 2021-11-17 09:21:06 +01:00
parent e1144745a7
commit ef08e51e40
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/types/access_witness.go
View File

@ -96,9 +96,10 @@ func (aw *AccessWitness) TouchAddressAndChargeGas(addr, value []byte) uint64 {
// of a tx, with the accumulation of witnesses that were generated during the // of a tx, with the accumulation of witnesses that were generated during the
// execution of all the txs preceding this one in a given block. // execution of all the txs preceding this one in a given block.
func (aw *AccessWitness) Merge(other *AccessWitness) { func (aw *AccessWitness) Merge(other *AccessWitness) {
// catch unresolved touched addresses for k := range other.Undefined {
if len(other.Undefined) != 0 { if _, ok := aw.Undefined[k]; !ok {
panic("undefined value in witness") aw.Undefined[k] = struct{}{}
}
} }
for k := range other.Branches { for k := range other.Branches {