@@ -380,15 +380,6 @@ func opExtCodeSize(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext)
380380 if err != nil {
381381 return nil , fmt .Errorf ("%w: %w" , ErrIntraBlockStateFailed , err )
382382 }
383- if codeSize == types .DelegateDesignationCodeSize {
384- _ , ok , err := interpreter .evm .IntraBlockState ().GetDelegatedDesignation (addr )
385- if err != nil {
386- return nil , fmt .Errorf ("%w: %w" , ErrIntraBlockStateFailed , err )
387- }
388- if ok {
389- codeSize = 2 // first two bytes only: EIP-7702
390- }
391- }
392383 slot .SetUint64 (uint64 (codeSize ))
393384 return nil , nil
394385}
@@ -430,9 +421,6 @@ func opExtCodeCopy(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext)
430421 if err != nil {
431422 return nil , fmt .Errorf ("%w: %w" , ErrIntraBlockStateFailed , err )
432423 }
433- if _ , ok := types .ParseDelegation (code ); ok {
434- code = append ([]byte {}, (params .DelegatedDesignationPrefix [0 :2 ])... )
435- }
436424
437425 codeCopy := getDataBig (code , & codeOffset , len64 )
438426 scope .Memory .Set (memOffset .Uint64 (), len64 , codeCopy )
@@ -488,18 +476,10 @@ func opExtCodeHash(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext)
488476 slot .Clear ()
489477 } else {
490478 var codeHash libcommon.Hash
491- _ , ok , err : = interpreter .evm .IntraBlockState ().GetDelegatedDesignation (address )
479+ codeHash , err = interpreter .evm .IntraBlockState ().GetCodeHash (address )
492480 if err != nil {
493481 return nil , fmt .Errorf ("%w: %w" , ErrIntraBlockStateFailed , err )
494482 }
495- if ok {
496- codeHash = params .DelegatedCodeHash
497- } else {
498- codeHash , err = interpreter .evm .IntraBlockState ().GetCodeHash (address )
499- if err != nil {
500- return nil , fmt .Errorf ("%w: %w" , ErrIntraBlockStateFailed , err )
501- }
502- }
503483 slot .SetBytes (codeHash .Bytes ())
504484 }
505485 return nil , nil
0 commit comments