Merge branch 'wevm:main' into main

txfusion · Oct 29, 2024 · 83a80b4 · 83a80b4
2 parents 323d375 + 1b88c09
commit 83a80b4
Show file tree

Hide file tree

Showing 205 changed files with 4,599 additions and 5,250 deletions.
diff --git a/.github/workflows/test-rpc-providers.yml b/.github/workflows/test-rpc-providers.yml
@@ -86,7 +86,7 @@ jobs:
 
       - name: Install Playwright Browsers
         if: ${{ matrix.runtime == 'next' || matrix.runtime == 'vite' }}
-        run: pnpx playwright@1.40.1 install --with-deps
+        run: pnpx playwright@1.41.2 install --with-deps
 
       - name: Install dependencies
         uses: ./.github/actions/install-dependencies

diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml
@@ -4,8 +4,8 @@ on:
   workflow_dispatch:
 
 jobs:
-  lint:
-    name: Lint
+  check:
+    name: Check
     runs-on: ubuntu-latest
     timeout-minutes: 5
 
@@ -18,11 +18,11 @@ jobs:
       - name: Install dependencies
         uses: ./.github/actions/install-dependencies
 
-      - name: Lint repo
-        run: pnpm lint:repo
+      - name: Check repo
+        run: pnpm check:repo
 
-      - name: Lint code
-        run: pnpm lint
+      - name: Check code
+        run: pnpm check
 
       - uses: stefanzweifel/git-auto-commit-action@v5
         env:
@@ -34,7 +34,7 @@ jobs:
 
   build:
     name: Build
-    needs: lint
+    needs: check
     runs-on: ubuntu-latest
     timeout-minutes: 5
 
@@ -61,7 +61,7 @@ jobs:
 
   types:
     name: Types
-    needs: lint
+    needs: check
     runs-on: ubuntu-latest
     timeout-minutes: 5
     strategy:
@@ -84,7 +84,7 @@ jobs:
         run: pnpm contracts:build
 
       - name: Check types
-        run: pnpm typecheck
+        run: pnpm check:types
 
       - name: Bench types
         if: matrix.version != '5.0.4'
@@ -187,7 +187,7 @@ jobs:
 
       - name: Install Playwright Browsers
         if: ${{ matrix.runtime == 'next' || matrix.runtime == 'vite' }}
-        run: pnpx playwright@1.40.1 install --with-deps
+        run: pnpx playwright@1.41.2 install --with-deps
 
       - name: Build
         run: pnpm build

diff --git a/contracts/src/UniversalSigValidator.sol b/contracts/src/UniversalSigValidator.sol
@@ -0,0 +1,86 @@
+pragma solidity ^0.8.17;
+
+// SPDX-License-Identifier: UNLICENSED
+
+// https://github.com/AmbireTech/signature-validator
+
+interface IERC1271Wallet {
+    function isValidSignature(
+        bytes32 hash,
+        bytes calldata signature
+    ) external view returns (bytes4 magicValue);
+}
+
+contract VerifySig {
+    // ERC-6492 suffix: https://eips.ethereum.org/EIPS/eip-6492
+    bytes32 private constant ERC6492_DETECTION_SUFFIX =
+        0x6492649264926492649264926492649264926492649264926492649264926492;
+    bytes4 private constant ERC1271_SUCCESS = 0x1626ba7e;
+
+    /**
+     * @notice Verifies that the signature is valid for that signer and hash
+     */
+    function isValidSig(
+        address _signer,
+        bytes32 _hash,
+        bytes memory _signature
+    ) public returns (bool) {
+        // The order here is strictly defined in https://eips.ethereum.org/EIPS/eip-6492
+        // - ERC-6492 suffix check and verification first, while being permissive in case the contract is already deployed so as to not invalidate old sigs
+        // - ERC-1271 verification if there's contract code
+        // - finally, ecrecover
+        if (trailingBytes32(_signature) == ERC6492_DETECTION_SUFFIX) {
+            address create2Factory;
+            bytes memory factoryCalldata;
+            bytes memory originalSig;
+            (create2Factory, factoryCalldata, originalSig) = abi.decode(
+                _signature,
+                (address, bytes, bytes)
+            );
+
+            (bool success, ) = create2Factory.call(factoryCalldata);
+
+            if (_signer.code.length == 0) {
+                require(success, "SignatureValidator: deployment");
+            }
+
+            return
+                IERC1271Wallet(_signer).isValidSignature(_hash, originalSig) ==
+                ERC1271_SUCCESS;
+        }
+
+        if (_signer.code.length > 0) {
+            return
+                IERC1271Wallet(_signer).isValidSignature(_hash, _signature) ==
+                ERC1271_SUCCESS;
+        }
+
+        // ecrecover verification
+        require(
+            _signature.length == 65,
+            "SignatureValidator#recoverSigner: invalid signature length"
+        );
+        bytes32[3] memory _sig;
+        assembly {
+            _sig := _signature
+        }
+        bytes32 r = _sig[1];
+        bytes32 s = _sig[2];
+        uint8 v = uint8(_signature[64]);
+        if (v != 27 && v != 28) {
+            revert(
+                "SignatureValidator#recoverSigner: invalid signature v value"
+            );
+        }
+        return ecrecover(_hash, v, r, s) == _signer;
+    }
+
+    function trailingBytes32(
+        bytes memory data
+    ) internal pure returns (bytes32 ret) {
+        require(data.length >= 32);
+        assembly {
+            ret := mload(add(data, mload(data)))
+        }
+    }
+}
diff --git a/contracts/src/deployless/DeploylessUniversalSigValidator.sol b/contracts/src/deployless/DeploylessUniversalSigValidator.sol
@@ -3,92 +3,14 @@ pragma solidity ^0.8.17;
 // SPDX-License-Identifier: UNLICENSED
 
 // https://github.com/AmbireTech/signature-validator
+import { VerifySig } from "../UniversalSigValidator.sol";
 
-interface IERC1271Wallet {
-    function isValidSignature(
-        bytes32 hash,
-        bytes calldata signature
-    ) external view returns (bytes4 magicValue);
-}
-
-contract VerifySig {
+contract DeploylessVerifySig is VerifySig {
     constructor(address _signer, bytes32 _hash, bytes memory _signature) {
-        bool isValidSig = isValidUniversalSig(_signer, _hash, _signature);
+        bool isValid = isValidSig(_signer, _hash, _signature);
         assembly {
-            mstore(0, isValidSig)
+            mstore(0, isValid)
             return(31, 1)
         }
     }
-
-    // ERC-6492 suffix: https://eips.ethereum.org/EIPS/eip-6492
-    bytes32 private constant ERC6492_DETECTION_SUFFIX =
-        0x6492649264926492649264926492649264926492649264926492649264926492;
-    bytes4 private constant ERC1271_SUCCESS = 0x1626ba7e;
-
-    /**
-     * @notice Verifies that the signature is valid for that signer and hash
-     */
-    function isValidUniversalSig(
-        address _signer,
-        bytes32 _hash,
-        bytes memory _signature
-    ) public returns (bool) {
-        // The order here is strictly defined in https://eips.ethereum.org/EIPS/eip-6492
-        // - ERC-6492 suffix check and verification first, while being permissive in case the contract is already deployed so as to not invalidate old sigs
-        // - ERC-1271 verification if there's contract code
-        // - finally, ecrecover
-        if (trailingBytes32(_signature) == ERC6492_DETECTION_SUFFIX) {
-            address create2Factory;
-            bytes memory factoryCalldata;
-            bytes memory originalSig;
-            (create2Factory, factoryCalldata, originalSig) = abi.decode(
-                _signature,
-                (address, bytes, bytes)
-            );
-
-            (bool success, ) = create2Factory.call(factoryCalldata);
-
-            if (_signer.code.length == 0) {
-                require(success, "SignatureValidator: deployment");
-            }
-
-            return
-                IERC1271Wallet(_signer).isValidSignature(_hash, originalSig) ==
-                ERC1271_SUCCESS;
-        }
-
-        if (_signer.code.length > 0) {
-            return
-                IERC1271Wallet(_signer).isValidSignature(_hash, _signature) ==
-                ERC1271_SUCCESS;
-        }
-
-        // ecrecover verification
-        require(
-            _signature.length == 65,
-            "SignatureValidator#recoverSigner: invalid signature length"
-        );
-        bytes32[3] memory _sig;
-        assembly {
-            _sig := _signature
-        }
-        bytes32 r = _sig[1];
-        bytes32 s = _sig[2];
-        uint8 v = uint8(_signature[64]);
-        if (v != 27 && v != 28) {
-            revert(
-                "SignatureValidator#recoverSigner: invalid signature v value"
-            );
-        }
-        return ecrecover(_hash, v, r, s) == _signer;
-    }
-
-    function trailingBytes32(
-        bytes memory data
-    ) internal pure returns (bytes32 ret) {
-        require(data.length >= 32);
-        assembly {
-            ret := mload(add(data, mload(data)))
-        }
-    }
 }
diff --git a/contracts/src/test/BatchCallInvoker.sol → contracts/src/test/BatchCallDelegation.sol b/contracts/src/test/BatchCallInvoker.sol → contracts/src/test/BatchCallDelegation.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Unlicense
 pragma solidity ^0.8.13;
 
-contract BatchCallInvoker {
+contract BatchCallDelegation {
     struct Call {
         bytes data;
         address to;

diff --git a/environments/bun/index.ts b/environments/bun/index.ts
@@ -9,7 +9,7 @@ const client = createPublicClient({
 const webSocketClient = createPublicClient({
   chain: mainnet,
   transport: webSocket(
-    'wss://eth-mainnet.g.alchemy.com/v2/4iIl6mDHqX3GFrpzmfj2Soirf3MPoAcH',
+    'wss://eth-mainnet.g.alchemy.com/v2/WV-bLot1hKjjCfpPq603Ro-jViFzwYX8',
   ),
 })
 

diff --git a/environments/next/next-env.d.ts b/environments/next/next-env.d.ts
@@ -2,4 +2,4 @@
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited
-// see https://nextjs.org/docs/basic-features/typescript for more information.
+// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.
diff --git a/environments/next/package.json b/environments/next/package.json
@@ -10,13 +10,13 @@
     "test": "playwright test"
   },
   "dependencies": {
-    "next": "13.5.4",
+    "next": "14.2.15",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "viem": "file:../../src/"
   },
   "devDependencies": {
-    "@playwright/test": "1.40.1",
+    "@playwright/test": "1.41.2",
     "@types/node": "^20.8.3",
     "@types/react": "^18.0.27",
     "@types/react-dom": "^18.0.10",

diff --git a/environments/next/src/app/client.tsx b/environments/next/src/app/client.tsx
@@ -16,7 +16,7 @@ export function Client() {
       const webSocketClient = createPublicClient({
         chain: mainnet,
         transport: webSocket(
-          'wss://eth-mainnet.g.alchemy.com/v2/4iIl6mDHqX3GFrpzmfj2Soirf3MPoAcH',
+          'wss://eth-mainnet.g.alchemy.com/v2/WV-bLot1hKjjCfpPq603Ro-jViFzwYX8',
         ),
       })
 

diff --git a/environments/next/src/app/page.tsx b/environments/next/src/app/page.tsx
@@ -11,7 +11,7 @@ export default async function Home() {
   const webSocketClient = createPublicClient({
     chain: mainnet,
     transport: webSocket(
-      'wss://eth-mainnet.g.alchemy.com/v2/4iIl6mDHqX3GFrpzmfj2Soirf3MPoAcH',
+      'wss://eth-mainnet.g.alchemy.com/v2/WV-bLot1hKjjCfpPq603Ro-jViFzwYX8',
     ),
   })
 

diff --git a/environments/node/index.js b/environments/node/index.js
@@ -9,7 +9,7 @@ const client = createPublicClient({
 const webSocketClient = createPublicClient({
   chain: mainnet,
   transport: webSocket(
-    'wss://eth-mainnet.g.alchemy.com/v2/4iIl6mDHqX3GFrpzmfj2Soirf3MPoAcH',
+    'wss://eth-mainnet.g.alchemy.com/v2/WV-bLot1hKjjCfpPq603Ro-jViFzwYX8',
   ),
 })
 ;(async () => {

diff --git a/environments/node/index.mjs b/environments/node/index.mjs
@@ -9,7 +9,7 @@ const client = createPublicClient({
 const webSocketClient = createPublicClient({
   chain: mainnet,
   transport: webSocket(
-    'wss://eth-mainnet.g.alchemy.com/v2/4iIl6mDHqX3GFrpzmfj2Soirf3MPoAcH',
+    'wss://eth-mainnet.g.alchemy.com/v2/WV-bLot1hKjjCfpPq603Ro-jViFzwYX8',
   ),
 })
 

diff --git a/environments/tsc/index.ts b/environments/tsc/index.ts
@@ -9,7 +9,7 @@ import { mainnet } from 'viem/chains'
   const webSocketClient = createPublicClient({
     chain: mainnet,
     transport: webSocket(
-      'wss://eth-mainnet.g.alchemy.com/v2/4iIl6mDHqX3GFrpzmfj2Soirf3MPoAcH',
+      'wss://eth-mainnet.g.alchemy.com/v2/WV-bLot1hKjjCfpPq603Ro-jViFzwYX8',
     ),
   })
 

diff --git a/environments/vite/package.json b/environments/vite/package.json
@@ -11,9 +11,9 @@
     "viem": "file:../../src/"
   },
   "devDependencies": {
-    "@playwright/test": "1.40.1",
+    "@playwright/test": "1.41.2",
     "@types/node": "^20.8.3",
     "typescript": "^5.0.3",
-    "vite": "^4.4.5"
+    "vite": "^5.4.8"
   }
 }
diff --git a/environments/vite/src/main.ts b/environments/vite/src/main.ts
@@ -9,7 +9,7 @@ const client = createPublicClient({
 const webSocketClient = createPublicClient({
   chain: mainnet,
   transport: webSocket(
-    'wss://eth-mainnet.g.alchemy.com/v2/4iIl6mDHqX3GFrpzmfj2Soirf3MPoAcH',
+    'wss://eth-mainnet.g.alchemy.com/v2/WV-bLot1hKjjCfpPq603Ro-jViFzwYX8',
   ),
 })
 

diff --git a/examples/_template/package.json b/examples/_template/package.json
@@ -10,6 +10,6 @@
   },
   "devDependencies": {
     "typescript": "^5.0.3",
-    "vite": "^4.4.5"
+    "vite": "^5.4.8"
   }
 }
diff --git a/examples/account-abstraction_biconomy-bundler/package.json b/examples/account-abstraction_biconomy-bundler/package.json
@@ -10,6 +10,6 @@
   },
   "devDependencies": {
     "typescript": "^5.0.3",
-    "vite": "^4.4.5"
+    "vite": "^5.4.8"
   }
 }
diff --git a/examples/blocks_fetching-blocks/package.json b/examples/blocks_fetching-blocks/package.json
@@ -10,6 +10,6 @@
   },
   "devDependencies": {
     "typescript": "^5.0.3",
-    "vite": "^4.4.5"
+    "vite": "^5.4.8"
   }
 }
diff --git a/examples/blocks_watching-blocks/package.json b/examples/blocks_watching-blocks/package.json
@@ -10,6 +10,6 @@
   },
   "devDependencies": {
     "typescript": "^5.0.3",
-    "vite": "^4.4.5"
+    "vite": "^5.4.8"
   }
 }