add print

ethstorage · Dec 26, 2024 · a50d75e · a50d75e
1 parent a1dbba4
commit a50d75e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/core/vm/evm.go b/core/vm/evm.go
@@ -18,6 +18,7 @@ package vm
 
 import (
 	"errors"
+	"log"
 	"math/big"
 	"sync/atomic"
 
@@ -41,11 +42,13 @@ type (
 )
 
 func (evm *EVM) precompile(addr common.Address) (PrecompiledContract, bool) {
+	log.Println("-----precompile--1---")
 	p, ok := evm.precompiles[addr]
 	if evm.Config.PrecompileOverrides != nil {
 		override := evm.Config.PrecompileOverrides(evm.chainRules, p, addr)
 		return override, override != nil
 	}
+	log.Println("-----precompile--2---", evm.Config.IsEthStorage, !ok)
 	if evm.Config.IsEthStorage && !ok {
 		p, ok = PrecompiledContractsES[addr]
 	}

diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go
@@ -1272,7 +1272,13 @@ func doCall(ctx context.Context, b Backend, args TransactionArgs, state *state.S
 	} else {
 		gp.AddGas(globalGasCap)
 	}
-	return applyMessage(ctx, b, args, state, header, timeout, gp, &blockCtx, &vm.Config{NoBaseFee: true}, precompiles, true)
+
+	var isEthStorage = false
+	if ctx.Value(esKey{}) == true {
+		isEthStorage = true
+	}
+	log.Info("-----isEthStorage-----", "isEthStorage", isEthStorage)
+	return applyMessage(ctx, b, args, state, header, timeout, gp, &blockCtx, &vm.Config{NoBaseFee: true, IsEthStorage: isEthStorage}, precompiles, true)
 }
 
 func applyMessage(ctx context.Context, b Backend, args TransactionArgs, state *state.StateDB, header *types.Header, timeout time.Duration, gp *core.GasPool, blockContext *vm.BlockContext, vmConfig *vm.Config, precompiles vm.PrecompiledContracts, skipChecks bool) (*core.ExecutionResult, error) {
@@ -1289,12 +1295,7 @@ func applyMessage(ctx context.Context, b Backend, args TransactionArgs, state *s
 	if msg.BlobGasFeeCap != nil && msg.BlobGasFeeCap.BitLen() == 0 {
 		blockContext.BlobBaseFee = new(big.Int)
 	}
-	var isEthStorage = false
-	if ctx.Value(esKey{}) == true {
-		isEthStorage = true
-	}
-	evm := b.GetEVM(ctx, msg, state, header, &vm.Config{NoBaseFee: true, IsEthStorage: isEthStorage}, blockContext)
-	// TODO evm := b.GetEVM(ctx, msg, state, header, vmConfig, blockContext)
+	evm := b.GetEVM(ctx, msg, state, header, vmConfig, blockContext)
 	if precompiles != nil {
 		evm.SetPrecompiles(precompiles)
 	}