e3: fix nil ptr bsc (erigontech#6162)

0xPolygonHermez · Nov 30, 2022 · cb8f609 · cb8f609
1 parent 400ad1a
commit cb8f609
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 14 deletions.
diff --git a/cmd/state/exec3/state.go b/cmd/state/exec3/state.go
@@ -178,13 +178,21 @@ func (rw *Worker) RunTxTask(txTask *exec22.TxTask) {
 		ibs.Prepare(txHash, txTask.BlockHash, txTask.TxIndex)
 		msg := txTask.TxAsMessage
 
+		//var vmenv vm.VMInterface
+		//if txTask.Tx.IsStarkNet() {
+		//	rw.starkNetEvm.Reset(evmtypes.TxContext{}, ibs)
+		//	vmenv = rw.starkNetEvm
+		//} else {
+		//	rw.evm.ResetBetweenBlocks(txTask.EvmBlockContext, core.NewEVMTxContext(msg), ibs, vmConfig, txTask.Rules)
+		//	vmenv = rw.evm
+		//}
 		var vmenv vm.VMInterface
 		if txTask.Tx.IsStarkNet() {
-			rw.starkNetEvm.Reset(evmtypes.TxContext{}, ibs)
-			vmenv = rw.starkNetEvm
+			vmenv = &vm.CVMAdapter{Cvm: vm.NewCVM(ibs)}
 		} else {
-			rw.evm.ResetBetweenBlocks(txTask.EvmBlockContext, core.NewEVMTxContext(msg), ibs, vmConfig, txTask.Rules)
-			vmenv = rw.evm
+			blockContext := core.NewEVMBlockContext(header, txTask.GetHashFn, rw.engine, nil /* author */)
+			txContext := core.NewEVMTxContext(msg)
+			vmenv = vm.NewEVM(blockContext, txContext, ibs, rw.chainConfig, vmConfig)
 		}
 		if _, err = core.ApplyMessage(vmenv, msg, gp, true /* refunds */, false /* gasBailout */); err != nil {
 			txTask.Error = err

diff --git a/core/state/rw22.go b/core/state/rw22.go
@@ -821,13 +821,22 @@ var writeListPool = sync.Pool{
 }
 
 func newWriteList() map[string]*exec22.KvList {
-	w := writeListPool.Get().(map[string]*exec22.KvList)
-	for _, tbl := range w {
-		tbl.Keys, tbl.Vals = tbl.Keys[:0], tbl.Vals[:0]
+	return map[string]*exec22.KvList{
+		kv.PlainState:        {},
+		kv.Code:              {},
+		kv.PlainContractCode: {},
+		kv.IncarnationMap:    {},
 	}
-	return w
+
+	//w := writeListPool.Get().(map[string]*exec22.KvList)
+	//for _, tbl := range w {
+	//	tbl.Keys, tbl.Vals = tbl.Keys[:0], tbl.Vals[:0]
+	//}
+	//return w
+}
+func returnWriteList(w map[string]*exec22.KvList) {
+	//writeListPool.Put(w)
 }
-func returnWriteList(w map[string]*exec22.KvList) { writeListPool.Put(w) }
 
 var readListPool = sync.Pool{
 	New: func() any {
@@ -841,10 +850,19 @@ var readListPool = sync.Pool{
 }
 
 func newReadList() map[string]*exec22.KvList {
-	w := readListPool.Get().(map[string]*exec22.KvList)
-	for _, tbl := range w {
-		tbl.Keys, tbl.Vals = tbl.Keys[:0], tbl.Vals[:0]
+	return map[string]*exec22.KvList{
+		kv.PlainState:     {},
+		kv.Code:           {},
+		CodeSizeTable:     {},
+		kv.IncarnationMap: {},
 	}
-	return w
+
+	//w := readListPool.Get().(map[string]*exec22.KvList)
+	//for _, tbl := range w {
+	//	tbl.Keys, tbl.Vals = tbl.Keys[:0], tbl.Vals[:0]
+	//}
+	//return w
+}
+func returnReadList(w map[string]*exec22.KvList) {
+	//readListPool.Put(w)
 }
-func returnReadList(w map[string]*exec22.KvList) { readListPool.Put(w) }