Merge branch '7702-update' into t8ntool

ethereumjs · Aug 19, 2024 · 01dafa1 · 01dafa1
2 parents 3c94331 + 2043d1e
commit 01dafa1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/packages/tx/src/util.ts b/packages/tx/src/util.ts
@@ -199,6 +199,9 @@ export class AuthorizationLists {
   }
 
   public static verifyAuthorizationList(authorizationList: AuthorizationListBytes) {
+    if (authorizationList.length === 0) {
+      throw new Error('Invalid EIP-7702 transaction: authorization list is empty')
+    }
     for (let key = 0; key < authorizationList.length; key++) {
       const authorizationListItem = authorizationList[key]
       const chainId = authorizationListItem[0]

diff --git a/packages/vm/src/requests.ts b/packages/vm/src/requests.ts
@@ -69,9 +69,9 @@ const accumulateEIP7002Requests = async (
   const code = await vm.stateManager.getCode(withdrawalsAddress)
 
   if (code.length === 0) {
-    throw new Error(
+    /*throw new Error(
       'Attempt to accumulate EIP-7002 requests failed: the contract does not exist. Ensure the deployment tx has been run, or that the required contract code is stored',
-    )
+    )*/
   }
 
   const systemAddressBytes = bigIntToAddressBytes(vm.common.param('systemAddress'))
@@ -119,9 +119,9 @@ const accumulateEIP7251Requests = async (
   const code = await vm.stateManager.getCode(consolidationsAddress)
 
   if (code.length === 0) {
-    throw new Error(
+    /*throw new Error(
       'Attempt to accumulate EIP-7251 requests failed: the contract does not exist. Ensure the deployment tx has been run, or that the required contract code is stored',
-    )
+    )*/
   }
 
   const systemAddressBytes = bigIntToAddressBytes(vm.common.param('systemAddress'))