handle static

Author: mmsqe

rpc/types/types.go

@@ -224,10 +224,16 @@ func ParseOverrides(overrides *json.RawMessage, isPrecompile bool) (*StateOverri
 // extractFromOverrideAccount extracts cosmos overrides from state/stateDiff fields
 func extractFromOverrideAccount(overrideAccount map[string]interface{}) []evmtypes.StoreStateDiff {
 	for stateType, stateValue := range overrideAccount {
-		if (stateType == "state" || stateType == "stateDiff") && stateValue != nil {
-			if encodedStr, ok := stateValue.(string); ok {
-				if cosmosOverrides := decodeCosmosOverrides(encodedStr); cosmosOverrides != nil {
-					return cosmosOverrides
+		if stateValue != nil {
+			if stateType == "" {
+				return make([]evmtypes.StoreStateDiff, 0)
+			}
+
+			if stateType == "state" || stateType == "stateDiff" {
+				if encodedStr, ok := stateValue.(string); ok {
+					if cosmosOverrides := decodeCosmosOverrides(encodedStr); cosmosOverrides != nil {
+						return cosmosOverrides
+					}
 				}
 			}
 		}

x/vm/keeper/precompiles.go

@@ -71,3 +71,36 @@ func (k *Keeper) GetPrecompilesCallHook(ctx sdktypes.Context) types.CallHook {
 		return nil
 	}
 }
+
+// GetPrecompileRecipientCallHook returns a closure that can be used to instantiate the EVM with a specific
+// recipient from precompiles.
+func (k *Keeper) GetPrecompileRecipientCallHook(ctx sdktypes.Context) types.CallHook {
+	return func(evm *vm.EVM, _ common.Address, recipient common.Address) error {
+		// Check if the EVM already has precompiles set (including moved precompiles from overrides)
+		activePrecompiles := evm.ActivePrecompiles()
+		if len(activePrecompiles) > 0 {
+			for _, addr := range activePrecompiles {
+				if addr == recipient {
+					evm.StateDB.AddAddressToAccessList(recipient)
+					return nil
+				}
+			}
+			return nil
+		}
+
+		// Check if the recipient is a precompile contract and if so, load the precompile instance
+		precompiles, found, err := k.GetPrecompileInstance(ctx, recipient)
+		if err != nil {
+			return err
+		}
+
+		// If the precompile instance is created, we have to update the EVM with
+		// only the recipient precompile and add it's address to the access list.
+		if found {
+			evm.WithPrecompiles(precompiles.Map)
+			evm.StateDB.AddAddressToAccessList(recipient)
+		}
+
+		return nil
+	}
+}

x/vm/keeper/state_transition.go

@@ -39,7 +39,7 @@ func (k *Keeper) NewEVMWithOverridePrecompiles(
 	cfg *statedb.EVMConfig,
 	tracer *tracing.Hooks,
 	stateDB vm.StateDB,
-	overridePrecompiles bool,
+	noOverridePrecompiles bool,
 ) *vm.EVM {
 	ctx = k.SetConsensusParamsInCtx(ctx)
 	blockCtx := vm.BlockContext{
@@ -73,9 +73,15 @@ func (k *Keeper) NewEVMWithOverridePrecompiles(
 	evmHooks.AddCallHooks(
 		accessControl.GetCallHook(signer),
 	)
-	evmHooks.AddCallHooks(
-		k.GetPrecompilesCallHook(ctx),
-	)
+	if noOverridePrecompiles {
+		evmHooks.AddCallHooks(
+			k.GetPrecompilesCallHook(ctx),
+		)
+	} else {
+		evmHooks.AddCallHooks(
+			k.GetPrecompileRecipientCallHook(ctx),
+		)
+	}
 	return vm.NewEVMWithHooks(evmHooks, blockCtx, txCtx, stateDB, ethCfg, vmConfig)
 }