[Do-Not-Merge] Implement EXTCODE* changes for pdn-5

core/state/intra_block_state.go

@@ -360,24 +360,6 @@ func (sdb *IntraBlockState) ResolveCode(addr libcommon.Address) ([]byte, error)
 	return sdb.GetCode(addr)
 }
 
-func (sdb *IntraBlockState) ResolveCodeSize(addr libcommon.Address) (int, error) {
-	// eip-7702
-	size, err := sdb.GetCodeSize(addr)
-	if err != nil {
-		return 0, err
-	}
-	if size == types.DelegateDesignationCodeSize {
-		// might be delegated designation
-		code, err := sdb.ResolveCode(addr)
-		if err != nil {
-			return 0, err
-		}
-		return len(code), nil
-	}
-
-	return size, nil
-}
-
 func (sdb *IntraBlockState) GetDelegatedDesignation(addr libcommon.Address) (libcommon.Address, bool, error) {
 	// eip-7702
 	code, err := sdb.GetCode(addr)

core/vm/evmtypes/evmtypes.go

@@ -136,7 +136,6 @@ type IntraBlockState interface {
 	// eip-7702; delegated designations
 	ResolveCodeHash(common.Address) (common.Hash, error)
 	ResolveCode(common.Address) ([]byte, error)
-	ResolveCodeSize(common.Address) (int, error)
 	GetDelegatedDesignation(common.Address) (common.Address, bool, error)
 
 	AddRefund(uint64)

core/vm/instructions.go

@@ -375,10 +375,20 @@ func opReturnDataCopy(pc *uint64, interpreter *EVMInterpreter, scope *ScopeConte
 
 func opExtCodeSize(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext) ([]byte, error) {
 	slot := scope.Stack.Peek()
-	codeSize, err := interpreter.evm.IntraBlockState().ResolveCodeSize(slot.Bytes20())
+	addr := slot.Bytes20()
+	codeSize, err := interpreter.evm.IntraBlockState().GetCodeSize(addr)
 	if err != nil {
 		return nil, fmt.Errorf("%w: %w", ErrIntraBlockStateFailed, err)
 	}
+	if codeSize == types.DelegateDesignationCodeSize  {
+		_, ok, err := interpreter.evm.IntraBlockState().GetDelegatedDesignation(addr)
+		if err != nil {
+			return nil, fmt.Errorf("%w: %w", ErrIntraBlockStateFailed, err)
+		}
+		if ok {
+			codeSize = 2 // first two bytes only: EIP-7702
+		}
+	}
 	slot.SetUint64(uint64(codeSize))
 	return nil, nil
 }
@@ -416,10 +426,14 @@ func opExtCodeCopy(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext)
 	addr := libcommon.Address(a.Bytes20())
 	len64 := length.Uint64()
 
-	code, err := interpreter.evm.IntraBlockState().ResolveCode(addr)
+	code, err := interpreter.evm.IntraBlockState().GetCode(addr)
 	if err != nil {
 		return nil, fmt.Errorf("%w: %w", ErrIntraBlockStateFailed, err)
 	}
+	if _, ok := types.ParseDelegation(code); ok {
+		code = append([]byte{}, (params.DelegatedDesignationPrefix[0:2])...)
+	}
+
 	codeCopy := getDataBig(code, &codeOffset, len64)
 	scope.Memory.Set(memOffset.Uint64(), len64, codeCopy)
 	return nil, nil
@@ -473,9 +487,18 @@ func opExtCodeHash(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext)
 	if empty {
 		slot.Clear()
 	} else {
-		codeHash, err := interpreter.evm.IntraBlockState().ResolveCodeHash(address)
+		var codeHash libcommon.Hash
+		_, ok, err := interpreter.evm.IntraBlockState().GetDelegatedDesignation(address)
 		if err != nil {
-			return nil, err
+			return nil, fmt.Errorf("%w: %w", ErrIntraBlockStateFailed, err)
+		}
+		if ok {
+			codeHash = params.DelegatedCodeHash
+		} else {
+			codeHash, err = interpreter.evm.IntraBlockState().GetCodeHash(address)
+			if err != nil {
+				return nil, fmt.Errorf("%w: %w", ErrIntraBlockStateFailed, err)
+			}
 		}
 		slot.SetBytes(codeHash.Bytes())
 	}

params/protocol_params.go

@@ -184,7 +184,9 @@ const (
 	SetCodeMagicPrefix = byte(0x05)
 )
 
+// EIP-7702: Set EOA account code
 var DelegatedDesignationPrefix = []byte{0xef, 0x01, 0x00}
+var DelegatedCodeHash = common.HexToHash("0xeadcdba66a79ab5dce91622d1d75c8cff5cff0b96944c3bf1072cd08ce018329")
 
 // EIP-4788: Beacon block root in the EVM
 var BeaconRootsAddress = common.HexToAddress("0x000F3df6D732807Ef1319fB7B8bB8522d0Beac02")