vm/tx: update 7702 to devnet-4

packages/tx/src/params.ts

@@ -49,7 +49,7 @@ export const paramsTx: ParamsDict = {
   7702: {
     // TODO: Set correct minimum hardfork
     // gasPrices
-    perAuthBaseGas: 2500, // Gas cost of each authority item, provided the authority exists in the trie
+    perAuthBaseGas: 12500, // Gas cost of each authority item, provided the authority exists in the trie
     perEmptyAccountCost: 25000, // Gas cost of each authority item, in case the authority does not exist in the trie
   },
 }

packages/tx/src/util.ts

@@ -1,10 +1,7 @@
 import {
-  BIGINT_0,
-  BIGINT_1,
   MAX_INTEGER,
   MAX_UINT64,
   type PrefixedHexString,
-  SECP256K1_ORDER_DIV_2,
   TypeOutput,
   bytesToBigInt,
   bytesToHex,
@@ -213,21 +210,23 @@ export class AuthorizationLists {
       if (address.length !== 20) {
         throw new Error('Invalid EIP-7702 transaction: address length should be 20 bytes')
       }
-      if (bytesToBigInt(chainId) > MAX_INTEGER) {
-        throw new Error('Invalid EIP-7702 transaction: chainId exceeds 2^256 - 1')
+      if (bytesToBigInt(chainId) > MAX_UINT64) {
+        throw new Error('Invalid EIP-7702 transaction: chainId exceeds 2^64 - 1')
       }
       if (bytesToBigInt(nonce) > MAX_UINT64) {
         throw new Error('Invalid EIP-7702 transaction: nonce exceeds 2^64 - 1')
       }
       const yParityBigInt = bytesToBigInt(yParity)
-      if (yParityBigInt !== BIGINT_0 && yParityBigInt !== BIGINT_1) {
-        throw new Error('Invalid EIP-7702 transaction: yParity should be 0 or 1')
+      if (yParityBigInt >= BigInt(2 ** 8)) {
+        throw new Error(
+          'Invalid EIP-7702 transaction: yParity should be fit within 1 byte (0 - 255)',
+        )
       }
       if (bytesToBigInt(r) > MAX_INTEGER) {
         throw new Error('Invalid EIP-7702 transaction: r exceeds 2^256 - 1')
       }
-      if (bytesToBigInt(s) > SECP256K1_ORDER_DIV_2) {
-        throw new Error('Invalid EIP-7702 transaction: s > secp256k1n/2')
+      if (bytesToBigInt(s) > MAX_INTEGER) {
+        throw new Error('Invalid EIP-7702 transaction: s exceeds 2^256 - 1')
       }
     }
   }

packages/tx/test/eip7702.spec.ts

@@ -3,7 +3,6 @@ import {
   BIGINT_1,
   MAX_INTEGER,
   MAX_UINT64,
-  SECP256K1_ORDER_DIV_2,
   bigIntToHex,
   createAddressFromPrivateKey,
   createZeroAddress,
@@ -86,9 +85,9 @@ describe('[EOACode7702Transaction]', () => {
         { nonce: bigIntToHex(MAX_UINT64 + BIGINT_1) },
         'Invalid EIP-7702 transaction: nonce exceeds 2^64 - 1',
       ],
-      [{ yParity: '0x2' }, 'yParity should be 0 or 1'],
+      [{ yParity: '0x0100' }, 'yParity should be < 2^8'],
       [{ r: bigIntToHex(MAX_INTEGER + BIGINT_1) }, 'r exceeds 2^256 - 1'],
-      [{ s: bigIntToHex(SECP256K1_ORDER_DIV_2 + BIGINT_1) }, 's > secp256k1n/2'],
+      [{ s: bigIntToHex(MAX_INTEGER + BIGINT_1) }, 's exceeds 2^256 - 1'],
       [{ yParity: '0x0002' }, 'yParity cannot have leading zeros'],
       [{ r: '0x0001' }, 'r cannot have leading zeros'],
       [{ s: '0x0001' }, 's cannot have leading zeros'],

packages/vm/src/runTx.ts

@@ -10,6 +10,8 @@
   BIGINT_0,
   BIGINT_1,
   KECCAK256_NULL,
+  MAX_UINT64,
+  SECP256K1_ORDER_DIV_2,
   bytesToBigInt,
   bytesToHex,
   bytesToUnprefixedHex,
@@ -456,9 +458,25 @@
       // Address to take code from
       const address = data[1]
       const nonce = data[2]
+      if (bytesToBigInt(nonce) >= MAX_UINT64) {
+        // authority nonce >= 2^64 - 1. Bumping this nonce by one will not make this fit in an uint64.
+        // EIPs PR: https://github.com/ethereum/EIPs/pull/8938
+        continue
+      }
+      const s = data[5]
+      if (bytesToBigInt(s) > SECP256K1_ORDER_DIV_2) {
+        // Malleability protection to avoid "flipping" a valid signature to get
+        // another valid signature (which yields the same account on `ecrecover`)
+        // This is invalid, so skip this auth tuple
+        continue
+      }
       const yParity = bytesToBigInt(data[3])
+
+      if (yParity > BIGINT_1) {
+        continue
+      }
+
       const r = data[4]
-      const s = data[5]
 
       const rlpdSignedMessage = RLP.encode([chainId, address, nonce])
       const toSign = keccak256(concatBytes(MAGIC, rlpdSignedMessage))
@@ -506,8 +524,14 @@
       account.nonce++
       await vm.evm.journal.putAccount(authority, account)
 
-      const addressCode = concatBytes(DELEGATION_7702_FLAG, address)
-      await vm.stateManager.putCode(authority, addressCode)
+      if (equalsBytes(address, new Uint8Array(20))) {
+        // Special case (see EIP PR: https://github.com/ethereum/EIPs/pull/8929)
+        // If delegated to the zero address, clear the delegation of authority
+        await vm.stateManager.putCode(authority, new Uint8Array())
+      } else {
+        const addressCode = concatBytes(DELEGATION_7702_FLAG, address)
+        await vm.stateManager.putCode(authority, addressCode)
+      }
     }
   }
 

packages/vm/test/util.ts

@@ -136,8 +136,17 @@ export function makeTx(
       if (signature.v !== undefined) {
         signature.yParity = bytesToHex(unpadBytes(hexToBytes(signature.v)))
       }
-      if (signature.nonce !== undefined && signature.nonce[0] === '0x00') {
-        signature.nonce[0] = '0x'
+      if (signature.r !== undefined) {
+        signature.r = bytesToHex(unpadBytes(hexToBytes(signature.r)))
+      }
+      if (signature.s !== undefined) {
+        signature.s = bytesToHex(unpadBytes(hexToBytes(signature.s)))
+      }
+      if (signature.chainId !== undefined) {
+        signature.chainId = bytesToHex(unpadBytes(hexToBytes(signature.chainId)))
+      }
+      if (signature.nonce !== undefined && signature.nonce === '0x00') {
+        signature.nonce = '0x'
       }
     }
     tx = createEOACode7702Tx(txData, opts)