NOSTORY: viem upstream v2.29.1

.changeset/config.json

@@ -10,6 +10,9 @@
   "access": "public",
   "baseBranch": "main",
   "updateInternalDependencies": "patch",
+  "snapshot": {
+    "useCalculatedVersion": true
+  },
   "___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
     "onlyUpdatePeerDependentsWhenOutOfRange": true
   },

.github/actions/install-dependencies/action.yml

@@ -7,7 +7,7 @@ runs:
     - name: Set up foundry
       uses: foundry-rs/foundry-toolchain@v1
       with:
-        version: nightly
+        version: nightly-2564718bbbddb59cd07fc3b9ffc775dff548c558
 
     - name: Set up pnpm
       uses: wevm/actions/.github/actions/pnpm@main

.github/workflows/verify.yml

@@ -22,15 +22,7 @@ jobs:
         run: pnpm check:repo
 
       - name: Check code
-        run: pnpm check
-
-      - uses: stefanzweifel/git-auto-commit-action@v5
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          commit_message: 'chore: format'
-          commit_user_name: 'github-actions[bot]'
-          commit_user_email: 'github-actions[bot]@users.noreply.github.com'
+        run: pnpm biome check
 
   build:
     name: Build

.gitmodules

@@ -15,4 +15,7 @@
 	url = git@github.com:OpenZeppelin/openzeppelin-contracts.git
 [submodule "contracts/lib/solady-6c2d0da"]
 	path = contracts/lib/solady-6c2d0da
-	url = https://github.com/Vectorized/solady
+	url = git@github.com:Vectorized/solady.git
+[submodule "contracts/lib/account-abstraction-v07"]
+	path = contracts/lib/account-abstraction-v07
+	url = git@github.com:eth-infinitism/account-abstraction.git

contracts/foundry.toml

@@ -2,10 +2,12 @@
 libs = ["lib"]
 remappings = [
   "@openzeppelin/=lib/openzeppelin/",
+  "@account-abstraction/=lib/account-abstraction/",
   "account-abstraction/=lib/account-abstraction/contracts/",
+  "account-abstraction-v07/=lib/account-abstraction-v07/contracts/",
   "solady/=lib/solady/src/",
   "solady-dc09481/=lib/solady-dc09481/src/",
-  "solady-6c2d0da/=lib/solady-6c2d0da/src/",
+  "solady-6c2d0da/=lib/solady-6c2d0da/src/"
 ]
 src = "src"
 out = "out"

contracts/src/accounts/Simple7702Account_08.sol

@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: Unlicense
+pragma solidity ^0.8.28;
+
+import {Simple7702Account} from "account-abstraction/accounts/Simple7702Account.sol";
+
+contract Simple7702AccountV08 is Simple7702Account {}

contracts/src/accounts/SoladyAccountFactory_06.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Unlicense
-pragma solidity ^0.8.13;
+pragma solidity ^0.8.28;
 
 import {ERC4337Factory} from "solady-dc09481/accounts/ERC4337Factory.sol";
 

contracts/src/accounts/SoladyAccountFactory_07.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Unlicense
-pragma solidity ^0.8.13;
+pragma solidity ^0.8.28;
 
 import {ERC4337Factory} from "solady-6c2d0da/accounts/ERC4337Factory.sol";
 

contracts/src/accounts/SoladyAccount_06.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Unlicense
-pragma solidity ^0.8.13;
+pragma solidity ^0.8.28;
 
 import {ERC4337} from "solady-dc09481/accounts/ERC4337.sol";
 

contracts/src/accounts/SoladyAccount_07.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Unlicense
-pragma solidity ^0.8.13;
+pragma solidity ^0.8.28;
 
 import {ERC4337} from "solady-6c2d0da/accounts/ERC4337.sol";
 

contracts/src/paymasters/VerifyingPaymaster.sol → contracts/src/paymasters/VerifyingPaymaster_07.sol

@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: Unlicense
-pragma solidity ^0.8.13;
+pragma solidity ^0.8.28;
 
-import {IEntryPoint} from "account-abstraction/interfaces/IEntryPoint.sol";
-import {VerifyingPaymaster as VerifyingPaymaster_} from "account-abstraction/samples/VerifyingPaymaster.sol";
+import {IEntryPoint} from "account-abstraction-v07/interfaces/IEntryPoint.sol";
+import {VerifyingPaymaster as VerifyingPaymaster_} from "account-abstraction-v07/samples/VerifyingPaymaster.sol";
 
-contract VerifyingPaymaster is VerifyingPaymaster_ {
+contract VerifyingPaymaster_07 is VerifyingPaymaster_ {
     constructor(
         IEntryPoint entryPoint,
         address verifyingSigner

contracts/src/paymasters/VerifyingPaymaster_08.sol

@@ -0,0 +1,132 @@
+// https://github.com/eth-infinitism/account-abstraction-samples/blob/master/contracts/VerifyingPaymaster.sol
+
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity ^0.8.28;
+
+import "account-abstraction/core/BasePaymaster.sol";
+import "account-abstraction/core/UserOperationLib.sol";
+import "account-abstraction/core/Helpers.sol";
+
+import "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
+import "@openzeppelin/contracts/utils/cryptography/MessageHashUtils.sol";
+
+/**
+ * A sample paymaster that uses external service to decide whether to pay for the UserOp.
+ * The paymaster trusts an external signer to sign the transaction.
+ * The calling user must pass the UserOp to that external signer first, which performs
+ * whatever off-chain verification before signing the UserOp.
+ * Note that this signature is NOT a replacement for the account-specific signature:
+ * - the paymaster checks a signature to agree to PAY for GAS.
+ * - the account checks a signature to prove identity and account ownership.
+ */
+contract VerifyingPaymaster_08 is BasePaymaster {
+    using UserOperationLib for PackedUserOperation;
+
+    address public immutable verifyingSigner;
+
+    uint256 private constant VALID_TIMESTAMP_OFFSET = PAYMASTER_DATA_OFFSET;
+
+    uint256 private constant SIGNATURE_OFFSET = VALID_TIMESTAMP_OFFSET + 64;
+
+    constructor(
+        IEntryPoint _entryPoint,
+        address _verifyingSigner
+    ) BasePaymaster(_entryPoint) {
+        verifyingSigner = _verifyingSigner;
+    }
+
+    /**
+     * return the hash we're going to sign off-chain (and validate on-chain)
+     * this method is called by the off-chain service, to sign the request.
+     * it is called on-chain from the validatePaymasterUserOp, to validate the signature.
+     * note that this signature covers all fields of the UserOperation, except the "paymasterAndData",
+     * which will carry the signature itself.
+     */
+    function getHash(
+        PackedUserOperation calldata userOp,
+        uint48 validUntil,
+        uint48 validAfter
+    ) public view returns (bytes32) {
+        //can't use userOp.hash(), since it contains also the paymasterAndData itself.
+        return
+            keccak256(
+                abi.encode(
+                    userOp.sender,
+                    userOp.nonce,
+                    keccak256(userOp.initCode),
+                    keccak256(userOp.callData),
+                    userOp.accountGasLimits,
+                    uint256(
+                        bytes32(
+                            userOp
+                                .paymasterAndData[PAYMASTER_VALIDATION_GAS_OFFSET:PAYMASTER_DATA_OFFSET]
+                        )
+                    ),
+                    userOp.preVerificationGas,
+                    userOp.gasFees,
+                    block.chainid,
+                    address(this),
+                    validUntil,
+                    validAfter
+                )
+            );
+    }
+
+    /**
+     * verify our external signer signed this request.
+     * the "paymasterAndData" is expected to be the paymaster and a signature over the entire request params
+     * paymasterAndData[:20] : address(this)
+     * paymasterAndData[20:84] : abi.encode(validUntil, validAfter)
+     * paymasterAndData[84:] : signature
+     */
+    function _validatePaymasterUserOp(
+        PackedUserOperation calldata userOp,
+        bytes32 /*userOpHash*/,
+        uint256 requiredPreFund
+    )
+        internal
+        view
+        override
+        returns (bytes memory context, uint256 validationData)
+    {
+        (requiredPreFund);
+
+        (
+            uint48 validUntil,
+            uint48 validAfter,
+            bytes calldata signature
+        ) = parsePaymasterAndData(userOp.paymasterAndData);
+        //ECDSA library supports both 64 and 65-byte long signatures.
+        // we only "require" it here so that the revert reason on invalid signature will be of "VerifyingPaymaster", and not "ECDSA"
+        require(
+            signature.length == 64 || signature.length == 65,
+            "VerifyingPaymaster: invalid signature length in paymasterAndData"
+        );
+        bytes32 hash = MessageHashUtils.toEthSignedMessageHash(
+            getHash(userOp, validUntil, validAfter)
+        );
+
+        //don't revert on signature failure: return SIG_VALIDATION_FAILED
+        if (verifyingSigner != ECDSA.recover(hash, signature)) {
+            return ("", _packValidationData(true, validUntil, validAfter));
+        }
+
+        //no need for other on-chain validation: entire UserOp should have been checked
+        // by the external service prior to signing it.
+        return ("", _packValidationData(false, validUntil, validAfter));
+    }
+
+    function parsePaymasterAndData(
+        bytes calldata paymasterAndData
+    )
+        public
+        pure
+        returns (uint48 validUntil, uint48 validAfter, bytes calldata signature)
+    {
+        (validUntil, validAfter) = abi.decode(
+            paymasterAndData[VALID_TIMESTAMP_OFFSET:],
+            (uint48, uint48)
+        );
+        signature = paymasterAndData[SIGNATURE_OFFSET:];
+    }
+}

contracts/src/test/BatchCallDelegation.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Unlicense
-pragma solidity ^0.8.13;
+pragma solidity ^0.8.28;
 
 contract BatchCallDelegation {
     struct Call {

contracts/src/test/ERC20InvalidTransferEvent.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Unlicense
-pragma solidity ^0.8.13;
+pragma solidity ^0.8.28;
 
 contract ERC20InvalidTransferEvent {
     // Non-conforming `to` parameter (not indexed).

contracts/src/test/EnsAvatarTokenUri.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Unlicense
-pragma solidity ^0.8.13;
+pragma solidity ^0.8.28;
 
 contract EnsAvatarTokenUri {
     function ownerOf(uint256 tokenId) public view returns (address) {

contracts/src/test/ErrorsExample.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Unlicense
-pragma solidity ^0.8.13;
+pragma solidity ^0.8.28;
 
 contract ErrorsExample {
     struct Foo {

contracts/src/test/Event.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Unlicense
-pragma solidity ^0.8.13;
+pragma solidity ^0.8.28;
 
 contract Event {
     event MessageEmitted(address indexed to, uint256 value, bytes data);

contracts/src/test/GH434.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Unlicense
-pragma solidity ^0.8.13;
+pragma solidity ^0.8.28;
 
 contract GH434 {
     function foo() public pure returns (uint256 a, bool b) {

contracts/src/test/OffchainLookupExample.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Unlicense
-pragma solidity ^0.8.13;
+pragma solidity ^0.8.28;
 
 contract OffchainLookupExample {
     error OffchainLookup(
@@ -30,7 +30,10 @@ contract OffchainLookupExample {
         bytes calldata result,
         bytes calldata extraData
     ) external view returns (address) {
-        (address owner, bytes32 hash, bytes memory sig) = abi.decode(result, (address, bytes32, bytes));
+        (address owner, bytes32 hash, bytes memory sig) = abi.decode(
+            result,
+            (address, bytes32, bytes)
+        );
         address signer = recoverSigner(hash, sig);
         require(signer == owner, "invalid signature");
         return signer;

contracts/src/test/Payable.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Unlicense
-pragma solidity ^0.8.13;
+pragma solidity ^0.8.28;
 
 contract Payable {
     function pay() public payable {}

environments/bun/index.ts

@@ -3,7 +3,7 @@ import { mainnet } from 'viem/chains'
 
 const client = createPublicClient({
   chain: mainnet,
-  transport: http('https://eth.drpc.org'),
+  transport: http(),
 })
 
 const webSocketClient = createPublicClient({

environments/next/src/app/client.tsx

@@ -10,7 +10,7 @@ export function Client() {
     ;(async () => {
       const client = createPublicClient({
         chain: mainnet,
-        transport: http('https://eth.drpc.org'),
+        transport: http(),
       })
 
       const webSocketClient = createPublicClient({

environments/next/src/app/page.tsx

@@ -5,7 +5,7 @@ import { Client } from './client'
 export default async function Home() {
   const client = createPublicClient({
     chain: mainnet,
-    transport: http('https://eth.drpc.org'),
+    transport: http(),
   })
 
   const webSocketClient = createPublicClient({

environments/node/index.js

@@ -3,7 +3,7 @@ const { mainnet } = require('viem/chains')
 
 const client = createPublicClient({
   chain: mainnet,
-  transport: http('https://eth.drpc.org'),
+  transport: http(),
 })
 
 const webSocketClient = createPublicClient({

environments/node/index.mjs

@@ -3,7 +3,7 @@ import { mainnet } from 'viem/chains'
 
 const client = createPublicClient({
   chain: mainnet,
-  transport: http('https://eth.drpc.org'),
+  transport: http(),
 })
 
 const webSocketClient = createPublicClient({

environments/tsc/index.ts

@@ -3,7 +3,7 @@ import { mainnet } from 'viem/chains'
 ;(async () => {
   const client = createPublicClient({
     chain: mainnet,
-    transport: http('https://eth.drpc.org'),
+    transport: http(),
   })
 
   const webSocketClient = createPublicClient({

environments/vite/src/main.ts

@@ -3,7 +3,7 @@ import { mainnet } from 'viem/chains'
 
 const client = createPublicClient({
   chain: mainnet,
-  transport: http('https://eth.drpc.org'),
+  transport: http(),
 })
 
 const webSocketClient = createPublicClient({