chore: upgrade yarn to v4 (#3686)

* chore: upgrade yarn to v4

* chore: gate package installs by publish age

* fix: stabilize yarn v4 dependency resolution

* fix: avoid viem tempo typecheck errors

* chore: add yarn v4 commit check skill

* chore: move shared skills to root

* fix: silence webpack vm fallback warning

.claude/SKILL.md

@@ -0,0 +1,15 @@
+---
+name: rabby-claude-skill-index
+description: Entry point for Claude-style agents working in the Rabby repository. Use it to discover shared repo-local skills stored under skills/*/SKILL.md.
+metadata:
+  short-description: Rabby Claude skill index
+---
+
+# Rabby Claude Skill Index
+
+This repository stores shared skills under `skills/*/SKILL.md`.
+
+Before starting a task, inspect the frontmatter and opening section of each matching skill file under `skills/`. Load and follow any skill whose `name` or `description` applies to the task.
+
+Do not add Claude-only copies under `.claude/skills/`. Add new reusable skills under `skills/<skill-name>/SKILL.md` so other agents can use the same instructions.
+

.codex/SKILL.md

@@ -0,0 +1,15 @@
+---
+name: rabby-codex-skill-index
+description: Entry point for Codex-style agents working in the Rabby repository. Use it to discover shared repo-local skills stored under skills/*/SKILL.md.
+metadata:
+  short-description: Rabby Codex skill index
+---
+
+# Rabby Codex Skill Index
+
+This repository stores shared skills under `skills/*/SKILL.md`.
+
+Before starting a task, inspect the frontmatter and opening section of each matching skill file under `skills/`. Load and follow any skill whose `name` or `description` applies to the task.
+
+Do not add Codex-only copies under `.codex/skills/`. Add new reusable skills under `skills/<skill-name>/SKILL.md` so other agents can use the same instructions.
+

.eslintrc

@@ -26,5 +26,20 @@
   "env": {
     "browser": true,
     "node": true
-  }
+  },
+  "overrides": [
+    {
+      "files": [
+        "*.test.js",
+        "*.test.ts",
+        "*.test.tsx",
+        "*.spec.js",
+        "*.spec.ts",
+        "*.spec.tsx"
+      ],
+      "env": {
+        "jest": true
+      }
+    }
+  ]
 }

.github/workflows/build.yml

@@ -10,80 +10,32 @@ on:
       - '*'
 
 jobs:
-  # Prepare node modules. Reuse cache if available
-  setup:
-    name: prepare build
+  build-pro:
+    name: build pro
     runs-on: ubuntu-latest
     env:
       NODE_OPTIONS: '--max_old_space_size=4096'
     steps:
       - name: checkout
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
 
       - name: Setup node
-        uses: actions/setup-node@3235b876344d2a9aa001b8d1453c930bba69e610 # v3
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
         with:
           node-version: '22.17.1'
+          cache: yarn
+          cache-dependency-path: yarn.lock
 
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "dir=$(yarn cache dir)" >> "$GITHUB_OUTPUT"
-
-      - uses: actions/cache@6f8efc29b200d32929f49075959781ed54ec270c # v3
-        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-
-      - uses: actions/cache@6f8efc29b200d32929f49075959781ed54ec270c # v3
-        id: yarn-node_modules # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-node_modules-${{ hashFiles('**/yarn.lock') }}
-
-      - name: Get Yarn Cache
-        if: steps.yarn-cache.outputs.cache-hit == 'true'
-        run: yarn --prefer-offline
+      - name: Enable Corepack
+        run: corepack enable
 
       - name: Use NPM Token with organization read access
         uses: heisenberg-2077/use-npm-token-action@99c5b17c84a15e44fdcef6712b34b76f8f0493b0 # v1
         with:
           token: '${{ secrets.NPM_AUTH_TOKEN }}'
 
-      - name: Install Dependencies
-        if: steps.yarn-cache.outputs.cache-hit != 'true'
-        run: yarn install --frozen-lockfile
-
-  build-pro:
-    name: build pro
-    runs-on: ubuntu-latest
-    needs: setup
-    env:
-      NODE_OPTIONS: '--max_old_space_size=4096'
-    steps:
-      - name: checkout
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
-
-      - name: Setup node
-        uses: actions/setup-node@3235b876344d2a9aa001b8d1453c930bba69e610 # v3
-        with:
-          node-version: '22.17.1'
-
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "dir=$(yarn cache dir)" >> "$GITHUB_OUTPUT"
-
-      - uses: actions/cache@6f8efc29b200d32929f49075959781ed54ec270c # v3
-        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-
-      - uses: actions/cache@6f8efc29b200d32929f49075959781ed54ec270c # v3
-        id: yarn-node_modules # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-node_modules-${{ hashFiles('**/yarn.lock') }}
+      - name: Install dependencies
+        run: yarn install --immutable
 
       - name: build
         run: yarn build:pro
@@ -107,33 +59,29 @@ jobs:
   build-debug:
     name: build debug
     runs-on: ubuntu-latest
-    needs: setup
     env:
       NODE_OPTIONS: '--max_old_space_size=4096'
     steps:
       - name: checkout
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
 
       - name: Setup node
-        uses: actions/setup-node@3235b876344d2a9aa001b8d1453c930bba69e610 # v3
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
         with:
           node-version: '22.17.1'
+          cache: yarn
+          cache-dependency-path: yarn.lock
 
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "dir=$(yarn cache dir)" >> "$GITHUB_OUTPUT"
+      - name: Enable Corepack
+        run: corepack enable
 
-      - uses: actions/cache@6f8efc29b200d32929f49075959781ed54ec270c # v3
-        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
+      - name: Use NPM Token with organization read access
+        uses: heisenberg-2077/use-npm-token-action@99c5b17c84a15e44fdcef6712b34b76f8f0493b0 # v1
         with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          token: '${{ secrets.NPM_AUTH_TOKEN }}'
 
-      - uses: actions/cache@6f8efc29b200d32929f49075959781ed54ec270c # v3
-        id: yarn-node_modules # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-node_modules-${{ hashFiles('**/yarn.lock') }}
+      - name: Install dependencies
+        run: yarn install --immutable
 
       - name: build
         run: yarn build:debug
@@ -152,4 +100,4 @@ jobs:
         with:
           name: Rabby_${{github.ref_name}}_debug
           path: dist
-          retention-days: 7
+          retention-days: 7

.github/workflows/flowcheck.yml

@@ -62,17 +62,6 @@ jobs:
           echo "Selected branch: $target_branch"
           echo "Notify LarkBot: ${NOTIFY_LARKBOT:-true}"
 
-      - name: Setup Node.js 22
-        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
-        with:
-          node-version: '22'
-
-      - name: Install Yarn
-        run: npm install -g yarn
-
-      - name: Install chrome-extension-automator
-        run: yarn global add chrome-extension-automator
-
       - name: Clone Rabby repository
         uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
         with:
@@ -80,9 +69,19 @@ jobs:
           ref: ${{ steps.resolve-branch.outputs.target_branch }}
           path: rabby
 
+      - name: Setup Node.js 22
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
+        with:
+          node-version: '22'
+          cache: yarn
+          cache-dependency-path: rabby/yarn.lock
+
+      - name: Enable Corepack
+        run: corepack enable
+
       - name: Install dependencies
         working-directory: rabby
-        run: yarn install
+        run: yarn install --immutable
 
       - name: Disable minimize in webpack config
         working-directory: rabby
@@ -97,4 +96,4 @@ jobs:
         env:
           RABBY_LARK_CHAT_URL: ${{ secrets.RABBY_LARK_CHAT_URL }}
           RABBY_LARK_CHAT_SECRET: ${{ secrets.RABBY_LARK_CHAT_SECRET }}
-        run: npx chrome-extension-automator rabby/dist ${{ steps.resolve-branch.outputs.target_branch }} ${{ steps.resolve-branch.outputs.notify_larkbot }}
+        run: npx -y chrome-extension-automator rabby/dist ${{ steps.resolve-branch.outputs.target_branch }} ${{ steps.resolve-branch.outputs.notify_larkbot }}

.github/workflows/prscan.yml

@@ -21,7 +21,30 @@ jobs:
         with:
           node-version: '22'
 
+      - name: Detect Yarn 4 migration
+        id: detect-yarn4-migration
+        shell: bash
+        run: |
+          set -euo pipefail
+
+          git fetch --no-tags --depth=1 origin ${{ github.event.pull_request.base.sha }}
+
+          read_package_manager() {
+            node -e "const fs = require('fs'); const pkg = JSON.parse(fs.readFileSync(0, 'utf8')); process.stdout.write(pkg.packageManager || '');"
+          }
+
+          base_package_manager="$(git show ${{ github.event.pull_request.base.sha }}:package.json | read_package_manager)"
+          head_package_manager="$(read_package_manager < package.json)"
+
+          if [[ "$base_package_manager" != yarn@4* && "$head_package_manager" == yarn@4* ]]; then
+            echo "skip=true" >> "$GITHUB_OUTPUT"
+            echo "Skipping prscan because this PR migrates yarn.lock from Yarn Classic to Yarn 4."
+          else
+            echo "skip=false" >> "$GITHUB_OUTPUT"
+          fi
+
       - name: Run prscan
+        if: steps.detect-yarn4-migration.outputs.skip != 'true'
         env:
           INPUT_PRSCAN_BOT_TOKEN: ${{ secrets.PRSCAN_BOT_TOKEN }}
-        run: npx prscan github ${{ github.event.pull_request.html_url }} --reply
+        run: npx prscan github ${{ github.event.pull_request.html_url }} --reply

.gitignore

@@ -3,7 +3,9 @@ node_modules
 yalc.lock
 dist
 dist-*
-.yarn
+.yarn/*
+!.yarn/releases/
+!.yarn/releases/*
 .DS_Store
 yarn-error
 .claude/settings.local.json

.yarnrc.yml

@@ -1 +1,10 @@
+approvedGitRepositories:
+  - "https://github.com/RabbyHub/mirror-blake2b*"
+
+enableScripts: true
+
 nodeLinker: node-modules
+
+npmMinimalAgeGate: 15d
+
+yarnPath: .yarn/releases/yarn-4.14.1.cjs

AGENTS.md

@@ -0,0 +1,6 @@
+# Rabby Agent Entry
+
+This repository keeps shared agent skills in `skills/*/SKILL.md`.
+
+For Codex-style agents, start with `.codex/SKILL.md`. It explains how to discover and load repo-local skills without duplicating skill bodies under `.codex/`.
+

CLAUDE.md

@@ -0,0 +1,6 @@
+# Rabby Claude Entry
+
+This repository keeps shared agent skills in `skills/*/SKILL.md`.
+
+For Claude-style agents, start with `.claude/SKILL.md`. It explains how to discover and load repo-local skills without duplicating skill bodies under `.claude/`.
+

README.md

@@ -44,9 +44,9 @@ Please don't hesitate to reach out if you have any doubts.
 
 ### Install Dependency
 
-1. Install Node.js version 14 or later.
-2. Install Yarn: `npm install -g yarn`
-3. Run `yarn` to install dependencies.
+1. Install Node.js version 22 or later.
+2. Enable Corepack: `corepack enable`
+3. Run `yarn install` to install dependencies.
 
 ### Development
 

build/webpack.common.config.js

@@ -360,6 +360,7 @@ const config = {
       zlib: require.resolve('browserify-zlib'),
       https: require.resolve('https-browserify'),
       http: require.resolve('stream-http'),
+      vm: false,
     },
     extensions: ['.js', 'jsx', '.ts', '.tsx'],
   },

build/webpack.hot.config.js

@@ -95,6 +95,7 @@ const commonConfig = {
       zlib: require.resolve('browserify-zlib'),
       https: require.resolve('https-browserify'),
       http: require.resolve('stream-http'),
+      vm: false,
     },
     extensions: ['.js', 'jsx', '.ts', '.tsx'],
   },

package.json

@@ -21,7 +21,10 @@
     "build:debug": "cross-env MANIFEST_TYPE=chrome-mv3 npm run build:debug:default",
     "build:sourcemap": "npm run clean && npm run make-theme && webpack --progress --env config=sourcemap",
     "sync-chain": "node ./scripts/sync-support-chain.js",
+    "lint": "eslint --ext .js,.jsx,.ts,.tsx ./src",
     "lint:fix": "eslint --fix --ext .js,.jsx,.ts,.tsx ./src",
+    "typecheck": "tsc --noEmit --skipLibCheck --pretty false",
+    "check": "npm run lint && npm run typecheck",
     "test": "jest",
     "pub": "node build/release.js",
     "postinstall": "patch-package"
@@ -130,7 +133,6 @@
     "p-queue": "7.3.0",
     "p-retry": "5.1.2",
     "patch-package": "6.4.7",
-    "postinstall-postinstall": "2.1.0",
     "process": "0.11.10",
     "qrcode.react": "3.1.0",
     "raw-loader": "4.0.2",
@@ -148,6 +150,7 @@
     "recharts": "2.7.1",
     "redux": "4.2.0",
     "reflect-metadata": "0.1.13",
+    "regenerator-runtime": "0.13.11",
     "remark-gfm": "3.0.1",
     "semver": "7.5.2",
     "semver-compare": "1.0.0",
@@ -250,10 +253,16 @@
   "resolutions": {
     "@debank/common": "^0.3.0",
     "blake2b": "https://github.com/RabbyHub/mirror-blake2b#55b93cc51a50b0af6b81bb44fcdf88e95c7e6b36",
-    "**/@types/react": "18.3.11",
-    "**/@types/react-dom": "18.3.1",
+    "@coinbase/wallet-sdk@npm:beta": "npm:3.8.0-beta.3",
+    "@keystonehq/base-eth-keyring@workspace:^": "npm:0.15.1",
+    "@rabby-wallet/eth-simple-keyring": "5.1.2",
     "@types/react": "18.3.11",
     "@types/react-dom": "18.3.1",
+    "@types/w3c-web-hid@^1.0.3": "1.0.3",
+    "@types/w3c-web-usb@^1.0.6": "1.0.10",
+    "postcss@^8.1.6": "8.4.31",
+    "postcss@^8.2.8": "8.4.31",
+    "postcss@^8.3.5": "8.4.32",
     "rc-tooltip": "5.3.1",
     "rc-picker": "2.6.9",
     "rc-trigger": "5.3.4"
@@ -264,5 +273,5 @@
   "keywords": [],
   "author": "",
   "license": "MIT",
-  "packageManager": "yarn@1.22.22"
+  "packageManager": "yarn@4.14.1"
 }

patches/dom-align+1.12.4.patch

@@ -1,18 +1,18 @@
 diff --git a/node_modules/dom-align/dist-web/index.js b/node_modules/dom-align/dist-web/index.js
-index dad0c76..86d9d0f 100644
+index 4ca5d3a..c3d22b1 100644
 --- a/node_modules/dom-align/dist-web/index.js
 +++ b/node_modules/dom-align/dist-web/index.js
-@@ -1137,8 +1137,13 @@ function doAlign(el, tgtRegion, align, isTgtRegionVisible) {
+@@ -986,8 +986,13 @@ function doAlign(el, tgtRegion, align, isTgtRegionVisible) {
    var newOverflowCfg = {};
    var fail = 0;
-   var alwaysByViewport = !!(overflow && overflow.alwaysByViewport); // 当前节点可以被放置的显示区域
-+  const viewportOffset = align.viewportOffset || [0, 0, 0, 0];
- 
-   var visibleRect = getVisibleRectForElement(source, alwaysByViewport); // 当前节点所占的区域, left/top/width/height
+   var alwaysByViewport = !!(overflow && overflow.alwaysByViewport);
++  var viewportOffset = align.viewportOffset || [0, 0, 0, 0];
+   // 当前节点可以被放置的显示区域
+   var visibleRect = getVisibleRectForElement(source, alwaysByViewport);
 +  visibleRect.top += viewportOffset[0];
 +  visibleRect.right += viewportOffset[1];
 +  visibleRect.bottom += viewportOffset[2];
 +  visibleRect.left += viewportOffset[3];
- 
-   var elRegion = getRegion(source); // 将 offset 转换成数值，支持百分比
- 
+   // 当前节点所占的区域, left/top/width/height
+   var elRegion = getRegion(source);
+   // 将 offset 转换成数值，支持百分比

patches/viem+2.47.6.patch

@@ -0,0 +1,560 @@
+diff --git a/node_modules/viem/_types/chains/definitions/tempo.d.ts b/node_modules/viem/_types/chains/definitions/tempo.d.ts
+index 66031486f..1a50dc14d 100644
+--- a/node_modules/viem/_types/chains/definitions/tempo.d.ts
++++ b/node_modules/viem/_types/chains/definitions/tempo.d.ts
+@@ -34,7 +34,7 @@ export declare const tempo: {
+     testnet?: boolean | undefined | undefined;
+     custom?: Record<string, unknown> | undefined;
+     extendSchema: {
+-        feeToken?: import("ox/tempo/TokenId").TokenIdOrAddress | undefined;
++        feeToken?: import("ox/tempo/TokenId/").TokenIdOrAddress | undefined;
+     };
+     fees?: import("../../index.js").ChainFees<undefined> | undefined;
+     formatters: {
+@@ -220,18 +220,18 @@ export declare const tempo: {
+                 yParity?: number | undefined;
+                 accessList: import("../../index.js").AccessList;
+                 authorizationList?: readonly {
+-                    address: import("ox/tempo/TempoAddress").Address;
++                    address: import("ox/tempo/TempoAddress/").Address;
+                     chainId: number;
+                     nonce: bigint;
+-                    signature: import("ox/tempo/SignatureEnvelope").SignatureEnvelope<bigint, number>;
++                    signature: import("ox/tempo/SignatureEnvelope/").SignatureEnvelope<bigint, number>;
+                 }[] | undefined;
+-                calls: readonly import("ox/tempo/TxEnvelopeTempo").Call<bigint, `0x${string}`>[];
++                calls: readonly import("ox/tempo/TxEnvelopeTempo/").Call<bigint, `0x${string}`>[];
+                 chainId: number;
+                 feeToken?: `0x${string}` | undefined;
+                 feePayerSignature?: import("../../index.js").Signature | undefined;
+-                keyAuthorization?: import("ox/tempo/KeyAuthorization").Signed<bigint, number, `0x${string}`> | null | undefined;
++                keyAuthorization?: import("ox/tempo/KeyAuthorization/").Signed<bigint, number, `0x${string}`> | null | undefined;
+                 nonceKey?: bigint | undefined;
+-                signature: import("ox/tempo/SignatureEnvelope").SignatureEnvelope;
++                signature: import("ox/tempo/SignatureEnvelope/").SignatureEnvelope;
+                 type: "tempo";
+                 validBefore?: number | undefined;
+                 validAfter?: number | undefined;
+@@ -437,10 +437,10 @@ export declare const tempo: {
+                 maxFeePerGas?: `0x${string}` | undefined;
+                 maxPriorityFeePerGas?: `0x${string}` | undefined;
+                 accessList?: import("../../index.js").AccessList | undefined;
+-                keyAuthorization?: import("ox/tempo/KeyAuthorization").Signed<`0x${string}`, `0x${string}`, `0x${string}`> | undefined;
+-                calls?: readonly import("ox/tempo/TxEnvelopeTempo").Call<`0x${string}`, import("ox/tempo/TempoAddress").Address>[] | undefined;
++                keyAuthorization?: import("ox/tempo/KeyAuthorization/").Signed<`0x${string}`, `0x${string}`, `0x${string}`> | undefined;
++                calls?: readonly import("ox/tempo/TxEnvelopeTempo/").Call<`0x${string}`, import("ox/tempo/TempoAddress/").Address>[] | undefined;
+                 feePayer?: true | import("../../index.js").Account | undefined;
+-                feeToken?: bigint | import("ox/tempo/TempoAddress").Address | undefined;
++                feeToken?: bigint | import("ox/tempo/TempoAddress/").Address | undefined;
+                 nonceKey?: `0x${string}` | "expiring" | undefined;
+                 validBefore?: `0x${string}` | undefined;
+                 validAfter?: `0x${string}` | undefined;
+@@ -463,7 +463,7 @@ export declare const tempo: {
+     };
+     verifyHash: (client: import("../../index.js").Client, parameters: import("../../index.js").VerifyHashActionParameters) => Promise<boolean>;
+     extend: <const extended_1 extends {
+-        feeToken?: import("ox/tempo/TokenId").TokenIdOrAddress | undefined;
++        feeToken?: import("ox/tempo/TokenId/").TokenIdOrAddress | undefined;
+     }>(extended: extended_1) => import("../index.js").Assign<import("../index.js").Assign<import("../index.js").Chain<undefined>, {
+         readonly id: 4217;
+         readonly blockExplorers: {
+@@ -486,7 +486,7 @@ export declare const tempo: {
+         };
+         readonly blockTime: 1000;
+         readonly extendSchema: {
+-            feeToken?: import("ox/tempo/TokenId").TokenIdOrAddress | undefined;
++            feeToken?: import("ox/tempo/TokenId/").TokenIdOrAddress | undefined;
+         };
+         readonly formatters: {
+             readonly transaction: {
+@@ -671,18 +671,18 @@ export declare const tempo: {
+                     yParity?: number | undefined;
+                     accessList: import("../../index.js").AccessList;
+                     authorizationList?: readonly {
+-                        address: import("ox/tempo/TempoAddress").Address;
++                        address: import("ox/tempo/TempoAddress/").Address;
+                         chainId: number;
+                         nonce: bigint;
+-                        signature: import("ox/tempo/SignatureEnvelope").SignatureEnvelope<bigint, number>;
++                        signature: import("ox/tempo/SignatureEnvelope/").SignatureEnvelope<bigint, number>;
+                     }[] | undefined;
+-                    calls: readonly import("ox/tempo/TxEnvelopeTempo").Call<bigint, `0x${string}`>[];
++                    calls: readonly import("ox/tempo/TxEnvelopeTempo/").Call<bigint, `0x${string}`>[];
+                     chainId: number;
+                     feeToken?: `0x${string}` | undefined;
+                     feePayerSignature?: import("../../index.js").Signature | undefined;
+-                    keyAuthorization?: import("ox/tempo/KeyAuthorization").Signed<bigint, number, `0x${string}`> | null | undefined;
++                    keyAuthorization?: import("ox/tempo/KeyAuthorization/").Signed<bigint, number, `0x${string}`> | null | undefined;
+                     nonceKey?: bigint | undefined;
+-                    signature: import("ox/tempo/SignatureEnvelope").SignatureEnvelope;
++                    signature: import("ox/tempo/SignatureEnvelope/").SignatureEnvelope;
+                     type: "tempo";
+                     validBefore?: number | undefined;
+                     validAfter?: number | undefined;
+@@ -888,10 +888,10 @@ export declare const tempo: {
+                     maxFeePerGas?: `0x${string}` | undefined;
+                     maxPriorityFeePerGas?: `0x${string}` | undefined;
+                     accessList?: import("../../index.js").AccessList | undefined;
+-                    keyAuthorization?: import("ox/tempo/KeyAuthorization").Signed<`0x${string}`, `0x${string}`, `0x${string}`> | undefined;
+-                    calls?: readonly import("ox/tempo/TxEnvelopeTempo").Call<`0x${string}`, import("ox/tempo/TempoAddress").Address>[] | undefined;
++                    keyAuthorization?: import("ox/tempo/KeyAuthorization/").Signed<`0x${string}`, `0x${string}`, `0x${string}`> | undefined;
++                    calls?: readonly import("ox/tempo/TxEnvelopeTempo/").Call<`0x${string}`, import("ox/tempo/TempoAddress/").Address>[] | undefined;
+                     feePayer?: true | import("../../index.js").Account | undefined;
+-                    feeToken?: bigint | import("ox/tempo/TempoAddress").Address | undefined;
++                    feeToken?: bigint | import("ox/tempo/TempoAddress/").Address | undefined;
+                     nonceKey?: `0x${string}` | "expiring" | undefined;
+                     validBefore?: `0x${string}` | undefined;
+                     validAfter?: `0x${string}` | undefined;
+diff --git a/node_modules/viem/_types/chains/definitions/tempoAndantino.d.ts b/node_modules/viem/_types/chains/definitions/tempoAndantino.d.ts
+index b8687fc1f..cd62d80a8 100644
+--- a/node_modules/viem/_types/chains/definitions/tempoAndantino.d.ts
++++ b/node_modules/viem/_types/chains/definitions/tempoAndantino.d.ts
+@@ -34,7 +34,7 @@ export declare const tempoAndantino: {
+     testnet?: boolean | undefined | undefined;
+     custom?: Record<string, unknown> | undefined;
+     extendSchema: {
+-        feeToken?: import("ox/tempo/TokenId").TokenIdOrAddress | undefined;
++        feeToken?: import("ox/tempo/TokenId/").TokenIdOrAddress | undefined;
+     };
+     fees?: import("../../index.js").ChainFees<undefined> | undefined;
+     formatters: {
+@@ -220,18 +220,18 @@ export declare const tempoAndantino: {
+                 yParity?: number | undefined;
+                 accessList: import("../../index.js").AccessList;
+                 authorizationList?: readonly {
+-                    address: import("ox/tempo/TempoAddress").Address;
++                    address: import("ox/tempo/TempoAddress/").Address;
+                     chainId: number;
+                     nonce: bigint;
+-                    signature: import("ox/tempo/SignatureEnvelope").SignatureEnvelope<bigint, number>;
++                    signature: import("ox/tempo/SignatureEnvelope/").SignatureEnvelope<bigint, number>;
+                 }[] | undefined;
+-                calls: readonly import("ox/tempo/TxEnvelopeTempo").Call<bigint, `0x${string}`>[];
++                calls: readonly import("ox/tempo/TxEnvelopeTempo/").Call<bigint, `0x${string}`>[];
+                 chainId: number;
+                 feeToken?: `0x${string}` | undefined;
+                 feePayerSignature?: import("../../index.js").Signature | undefined;
+-                keyAuthorization?: import("ox/tempo/KeyAuthorization").Signed<bigint, number, `0x${string}`> | null | undefined;
++                keyAuthorization?: import("ox/tempo/KeyAuthorization/").Signed<bigint, number, `0x${string}`> | null | undefined;
+                 nonceKey?: bigint | undefined;
+-                signature: import("ox/tempo/SignatureEnvelope").SignatureEnvelope;
++                signature: import("ox/tempo/SignatureEnvelope/").SignatureEnvelope;
+                 type: "tempo";
+                 validBefore?: number | undefined;
+                 validAfter?: number | undefined;
+@@ -437,10 +437,10 @@ export declare const tempoAndantino: {
+                 maxFeePerGas?: `0x${string}` | undefined;
+                 maxPriorityFeePerGas?: `0x${string}` | undefined;
+                 accessList?: import("../../index.js").AccessList | undefined;
+-                keyAuthorization?: import("ox/tempo/KeyAuthorization").Signed<`0x${string}`, `0x${string}`, `0x${string}`> | undefined;
+-                calls?: readonly import("ox/tempo/TxEnvelopeTempo").Call<`0x${string}`, import("ox/tempo/TempoAddress").Address>[] | undefined;
++                keyAuthorization?: import("ox/tempo/KeyAuthorization/").Signed<`0x${string}`, `0x${string}`, `0x${string}`> | undefined;
++                calls?: readonly import("ox/tempo/TxEnvelopeTempo/").Call<`0x${string}`, import("ox/tempo/TempoAddress/").Address>[] | undefined;
+                 feePayer?: true | import("../../index.js").Account | undefined;
+-                feeToken?: bigint | import("ox/tempo/TempoAddress").Address | undefined;
++                feeToken?: bigint | import("ox/tempo/TempoAddress/").Address | undefined;
+                 nonceKey?: `0x${string}` | "expiring" | undefined;
+                 validBefore?: `0x${string}` | undefined;
+                 validAfter?: `0x${string}` | undefined;
+@@ -463,7 +463,7 @@ export declare const tempoAndantino: {
+     };
+     verifyHash: (client: import("../../index.js").Client, parameters: import("../../index.js").VerifyHashActionParameters) => Promise<boolean>;
+     extend: <const extended_1 extends {
+-        feeToken?: import("ox/tempo/TokenId").TokenIdOrAddress | undefined;
++        feeToken?: import("ox/tempo/TokenId/").TokenIdOrAddress | undefined;
+     }>(extended: extended_1) => import("../index.js").Assign<import("../index.js").Assign<import("../index.js").Chain<undefined>, {
+         readonly id: 42429;
+         readonly blockExplorers: {
+@@ -486,7 +486,7 @@ export declare const tempoAndantino: {
+         };
+         readonly blockTime: 1000;
+         readonly extendSchema: {
+-            feeToken?: import("ox/tempo/TokenId").TokenIdOrAddress | undefined;
++            feeToken?: import("ox/tempo/TokenId/").TokenIdOrAddress | undefined;
+         };
+         readonly formatters: {
+             readonly transaction: {
+@@ -671,18 +671,18 @@ export declare const tempoAndantino: {
+                     yParity?: number | undefined;
+                     accessList: import("../../index.js").AccessList;
+                     authorizationList?: readonly {
+-                        address: import("ox/tempo/TempoAddress").Address;
++                        address: import("ox/tempo/TempoAddress/").Address;
+                         chainId: number;
+                         nonce: bigint;
+-                        signature: import("ox/tempo/SignatureEnvelope").SignatureEnvelope<bigint, number>;
++                        signature: import("ox/tempo/SignatureEnvelope/").SignatureEnvelope<bigint, number>;
+                     }[] | undefined;
+-                    calls: readonly import("ox/tempo/TxEnvelopeTempo").Call<bigint, `0x${string}`>[];
++                    calls: readonly import("ox/tempo/TxEnvelopeTempo/").Call<bigint, `0x${string}`>[];
+                     chainId: number;
+                     feeToken?: `0x${string}` | undefined;
+                     feePayerSignature?: import("../../index.js").Signature | undefined;
+-                    keyAuthorization?: import("ox/tempo/KeyAuthorization").Signed<bigint, number, `0x${string}`> | null | undefined;
++                    keyAuthorization?: import("ox/tempo/KeyAuthorization/").Signed<bigint, number, `0x${string}`> | null | undefined;
+                     nonceKey?: bigint | undefined;
+-                    signature: import("ox/tempo/SignatureEnvelope").SignatureEnvelope;
++                    signature: import("ox/tempo/SignatureEnvelope/").SignatureEnvelope;
+                     type: "tempo";
+                     validBefore?: number | undefined;
+                     validAfter?: number | undefined;
+@@ -888,10 +888,10 @@ export declare const tempoAndantino: {
+                     maxFeePerGas?: `0x${string}` | undefined;
+                     maxPriorityFeePerGas?: `0x${string}` | undefined;
+                     accessList?: import("../../index.js").AccessList | undefined;
+-                    keyAuthorization?: import("ox/tempo/KeyAuthorization").Signed<`0x${string}`, `0x${string}`, `0x${string}`> | undefined;
+-                    calls?: readonly import("ox/tempo/TxEnvelopeTempo").Call<`0x${string}`, import("ox/tempo/TempoAddress").Address>[] | undefined;
++                    keyAuthorization?: import("ox/tempo/KeyAuthorization/").Signed<`0x${string}`, `0x${string}`, `0x${string}`> | undefined;
++                    calls?: readonly import("ox/tempo/TxEnvelopeTempo/").Call<`0x${string}`, import("ox/tempo/TempoAddress/").Address>[] | undefined;
+                     feePayer?: true | import("../../index.js").Account | undefined;
+-                    feeToken?: bigint | import("ox/tempo/TempoAddress").Address | undefined;
++                    feeToken?: bigint | import("ox/tempo/TempoAddress/").Address | undefined;
+                     nonceKey?: `0x${string}` | "expiring" | undefined;
+                     validBefore?: `0x${string}` | undefined;
+                     validAfter?: `0x${string}` | undefined;
+diff --git a/node_modules/viem/_types/chains/definitions/tempoDevnet.d.ts b/node_modules/viem/_types/chains/definitions/tempoDevnet.d.ts
+index 8d5fff022..da244174d 100644
+--- a/node_modules/viem/_types/chains/definitions/tempoDevnet.d.ts
++++ b/node_modules/viem/_types/chains/definitions/tempoDevnet.d.ts
+@@ -34,7 +34,7 @@ export declare const tempoDevnet: {
+     testnet?: boolean | undefined | undefined;
+     custom?: Record<string, unknown> | undefined;
+     extendSchema: {
+-        feeToken?: import("ox/tempo/TokenId").TokenIdOrAddress | undefined;
++        feeToken?: import("ox/tempo/TokenId/").TokenIdOrAddress | undefined;
+     };
+     fees?: import("../../index.js").ChainFees<undefined> | undefined;
+     formatters: {
+@@ -220,18 +220,18 @@ export declare const tempoDevnet: {
+                 yParity?: number | undefined;
+                 accessList: import("../../index.js").AccessList;
+                 authorizationList?: readonly {
+-                    address: import("ox/tempo/TempoAddress").Address;
++                    address: import("ox/tempo/TempoAddress/").Address;
+                     chainId: number;
+                     nonce: bigint;
+-                    signature: import("ox/tempo/SignatureEnvelope").SignatureEnvelope<bigint, number>;
++                    signature: import("ox/tempo/SignatureEnvelope/").SignatureEnvelope<bigint, number>;
+                 }[] | undefined;
+-                calls: readonly import("ox/tempo/TxEnvelopeTempo").Call<bigint, `0x${string}`>[];
++                calls: readonly import("ox/tempo/TxEnvelopeTempo/").Call<bigint, `0x${string}`>[];
+                 chainId: number;
+                 feeToken?: `0x${string}` | undefined;
+                 feePayerSignature?: import("../../index.js").Signature | undefined;
+-                keyAuthorization?: import("ox/tempo/KeyAuthorization").Signed<bigint, number, `0x${string}`> | null | undefined;
++                keyAuthorization?: import("ox/tempo/KeyAuthorization/").Signed<bigint, number, `0x${string}`> | null | undefined;
+                 nonceKey?: bigint | undefined;
+-                signature: import("ox/tempo/SignatureEnvelope").SignatureEnvelope;
++                signature: import("ox/tempo/SignatureEnvelope/").SignatureEnvelope;
+                 type: "tempo";
+                 validBefore?: number | undefined;
+                 validAfter?: number | undefined;
+@@ -437,10 +437,10 @@ export declare const tempoDevnet: {
+                 maxFeePerGas?: `0x${string}` | undefined;
+                 maxPriorityFeePerGas?: `0x${string}` | undefined;
+                 accessList?: import("../../index.js").AccessList | undefined;
+-                keyAuthorization?: import("ox/tempo/KeyAuthorization").Signed<`0x${string}`, `0x${string}`, `0x${string}`> | undefined;
+-                calls?: readonly import("ox/tempo/TxEnvelopeTempo").Call<`0x${string}`, import("ox/tempo/TempoAddress").Address>[] | undefined;
++                keyAuthorization?: import("ox/tempo/KeyAuthorization/").Signed<`0x${string}`, `0x${string}`, `0x${string}`> | undefined;
++                calls?: readonly import("ox/tempo/TxEnvelopeTempo/").Call<`0x${string}`, import("ox/tempo/TempoAddress/").Address>[] | undefined;
+                 feePayer?: true | import("../../index.js").Account | undefined;
+-                feeToken?: bigint | import("ox/tempo/TempoAddress").Address | undefined;
++                feeToken?: bigint | import("ox/tempo/TempoAddress/").Address | undefined;
+                 nonceKey?: `0x${string}` | "expiring" | undefined;
+                 validBefore?: `0x${string}` | undefined;
+                 validAfter?: `0x${string}` | undefined;
+@@ -463,7 +463,7 @@ export declare const tempoDevnet: {
+     };
+     verifyHash: (client: import("../../index.js").Client, parameters: import("../../index.js").VerifyHashActionParameters) => Promise<boolean>;
+     extend: <const extended_1 extends {
+-        feeToken?: import("ox/tempo/TokenId").TokenIdOrAddress | undefined;
++        feeToken?: import("ox/tempo/TokenId/").TokenIdOrAddress | undefined;
+     }>(extended: extended_1) => import("../index.js").Assign<import("../index.js").Assign<import("../index.js").Chain<undefined>, {
+         readonly id: 31318;
+         readonly name: "Tempo Devnet";
+@@ -486,7 +486,7 @@ export declare const tempoDevnet: {
+         };
+         readonly blockTime: 1000;
+         readonly extendSchema: {
+-            feeToken?: import("ox/tempo/TokenId").TokenIdOrAddress | undefined;
++            feeToken?: import("ox/tempo/TokenId/").TokenIdOrAddress | undefined;
+         };
+         readonly formatters: {
+             readonly transaction: {
+@@ -671,18 +671,18 @@ export declare const tempoDevnet: {
+                     yParity?: number | undefined;
+                     accessList: import("../../index.js").AccessList;
+                     authorizationList?: readonly {
+-                        address: import("ox/tempo/TempoAddress").Address;
++                        address: import("ox/tempo/TempoAddress/").Address;
+                         chainId: number;
+                         nonce: bigint;
+-                        signature: import("ox/tempo/SignatureEnvelope").SignatureEnvelope<bigint, number>;
++                        signature: import("ox/tempo/SignatureEnvelope/").SignatureEnvelope<bigint, number>;
+                     }[] | undefined;
+-                    calls: readonly import("ox/tempo/TxEnvelopeTempo").Call<bigint, `0x${string}`>[];
++                    calls: readonly import("ox/tempo/TxEnvelopeTempo/").Call<bigint, `0x${string}`>[];
+                     chainId: number;
+                     feeToken?: `0x${string}` | undefined;
+                     feePayerSignature?: import("../../index.js").Signature | undefined;
+-                    keyAuthorization?: import("ox/tempo/KeyAuthorization").Signed<bigint, number, `0x${string}`> | null | undefined;
++                    keyAuthorization?: import("ox/tempo/KeyAuthorization/").Signed<bigint, number, `0x${string}`> | null | undefined;
+                     nonceKey?: bigint | undefined;
+-                    signature: import("ox/tempo/SignatureEnvelope").SignatureEnvelope;
++                    signature: import("ox/tempo/SignatureEnvelope/").SignatureEnvelope;
+                     type: "tempo";
+                     validBefore?: number | undefined;
+                     validAfter?: number | undefined;
+@@ -888,10 +888,10 @@ export declare const tempoDevnet: {
+                     maxFeePerGas?: `0x${string}` | undefined;
+                     maxPriorityFeePerGas?: `0x${string}` | undefined;
+                     accessList?: import("../../index.js").AccessList | undefined;
+-                    keyAuthorization?: import("ox/tempo/KeyAuthorization").Signed<`0x${string}`, `0x${string}`, `0x${string}`> | undefined;
+-                    calls?: readonly import("ox/tempo/TxEnvelopeTempo").Call<`0x${string}`, import("ox/tempo/TempoAddress").Address>[] | undefined;
++                    keyAuthorization?: import("ox/tempo/KeyAuthorization/").Signed<`0x${string}`, `0x${string}`, `0x${string}`> | undefined;
++                    calls?: readonly import("ox/tempo/TxEnvelopeTempo/").Call<`0x${string}`, import("ox/tempo/TempoAddress/").Address>[] | undefined;
+                     feePayer?: true | import("../../index.js").Account | undefined;
+-                    feeToken?: bigint | import("ox/tempo/TempoAddress").Address | undefined;
++                    feeToken?: bigint | import("ox/tempo/TempoAddress/").Address | undefined;
+                     nonceKey?: `0x${string}` | "expiring" | undefined;
+                     validBefore?: `0x${string}` | undefined;
+                     validAfter?: `0x${string}` | undefined;
+diff --git a/node_modules/viem/_types/chains/definitions/tempoLocalnet.d.ts b/node_modules/viem/_types/chains/definitions/tempoLocalnet.d.ts
+index 1f589b2ac..5a9ea627e 100644
+--- a/node_modules/viem/_types/chains/definitions/tempoLocalnet.d.ts
++++ b/node_modules/viem/_types/chains/definitions/tempoLocalnet.d.ts
+@@ -39,7 +39,7 @@ export declare const tempoLocalnet: {
+     testnet?: boolean | undefined | undefined;
+     custom?: Record<string, unknown> | undefined;
+     extendSchema: {
+-        feeToken?: import("ox/tempo/TokenId").TokenIdOrAddress | undefined;
++        feeToken?: import("ox/tempo/TokenId/").TokenIdOrAddress | undefined;
+     };
+     fees?: import("../../index.js").ChainFees<undefined> | undefined;
+     formatters: {
+@@ -225,18 +225,18 @@ export declare const tempoLocalnet: {
+                 yParity?: number | undefined;
+                 accessList: import("../../index.js").AccessList;
+                 authorizationList?: readonly {
+-                    address: import("ox/tempo/TempoAddress").Address;
++                    address: import("ox/tempo/TempoAddress/").Address;
+                     chainId: number;
+                     nonce: bigint;
+-                    signature: import("ox/tempo/SignatureEnvelope").SignatureEnvelope<bigint, number>;
++                    signature: import("ox/tempo/SignatureEnvelope/").SignatureEnvelope<bigint, number>;
+                 }[] | undefined;
+-                calls: readonly import("ox/tempo/TxEnvelopeTempo").Call<bigint, `0x${string}`>[];
++                calls: readonly import("ox/tempo/TxEnvelopeTempo/").Call<bigint, `0x${string}`>[];
+                 chainId: number;
+                 feeToken?: `0x${string}` | undefined;
+                 feePayerSignature?: import("../../index.js").Signature | undefined;
+-                keyAuthorization?: import("ox/tempo/KeyAuthorization").Signed<bigint, number, `0x${string}`> | null | undefined;
++                keyAuthorization?: import("ox/tempo/KeyAuthorization/").Signed<bigint, number, `0x${string}`> | null | undefined;
+                 nonceKey?: bigint | undefined;
+-                signature: import("ox/tempo/SignatureEnvelope").SignatureEnvelope;
++                signature: import("ox/tempo/SignatureEnvelope/").SignatureEnvelope;
+                 type: "tempo";
+                 validBefore?: number | undefined;
+                 validAfter?: number | undefined;
+@@ -442,10 +442,10 @@ export declare const tempoLocalnet: {
+                 maxFeePerGas?: `0x${string}` | undefined;
+                 maxPriorityFeePerGas?: `0x${string}` | undefined;
+                 accessList?: import("../../index.js").AccessList | undefined;
+-                keyAuthorization?: import("ox/tempo/KeyAuthorization").Signed<`0x${string}`, `0x${string}`, `0x${string}`> | undefined;
+-                calls?: readonly import("ox/tempo/TxEnvelopeTempo").Call<`0x${string}`, import("ox/tempo/TempoAddress").Address>[] | undefined;
++                keyAuthorization?: import("ox/tempo/KeyAuthorization/").Signed<`0x${string}`, `0x${string}`, `0x${string}`> | undefined;
++                calls?: readonly import("ox/tempo/TxEnvelopeTempo/").Call<`0x${string}`, import("ox/tempo/TempoAddress/").Address>[] | undefined;
+                 feePayer?: true | import("../../index.js").Account | undefined;
+-                feeToken?: bigint | import("ox/tempo/TempoAddress").Address | undefined;
++                feeToken?: bigint | import("ox/tempo/TempoAddress/").Address | undefined;
+                 nonceKey?: `0x${string}` | "expiring" | undefined;
+                 validBefore?: `0x${string}` | undefined;
+                 validAfter?: `0x${string}` | undefined;
+@@ -468,7 +468,7 @@ export declare const tempoLocalnet: {
+     };
+     verifyHash: (client: import("../../index.js").Client, parameters: import("../../index.js").VerifyHashActionParameters) => Promise<boolean>;
+     extend: <const extended_1 extends {
+-        feeToken?: import("ox/tempo/TokenId").TokenIdOrAddress | undefined;
++        feeToken?: import("ox/tempo/TokenId/").TokenIdOrAddress | undefined;
+     }>(extended: extended_1) => import("../index.js").Assign<import("../index.js").Assign<import("../index.js").Chain<undefined>, {
+         readonly id: 1337;
+         readonly name: "Tempo";
+@@ -484,7 +484,7 @@ export declare const tempoLocalnet: {
+         };
+         readonly blockTime: 1000;
+         readonly extendSchema: {
+-            feeToken?: import("ox/tempo/TokenId").TokenIdOrAddress | undefined;
++            feeToken?: import("ox/tempo/TokenId/").TokenIdOrAddress | undefined;
+         };
+         readonly formatters: {
+             readonly transaction: {
+@@ -669,18 +669,18 @@ export declare const tempoLocalnet: {
+                     yParity?: number | undefined;
+                     accessList: import("../../index.js").AccessList;
+                     authorizationList?: readonly {
+-                        address: import("ox/tempo/TempoAddress").Address;
++                        address: import("ox/tempo/TempoAddress/").Address;
+                         chainId: number;
+                         nonce: bigint;
+-                        signature: import("ox/tempo/SignatureEnvelope").SignatureEnvelope<bigint, number>;
++                        signature: import("ox/tempo/SignatureEnvelope/").SignatureEnvelope<bigint, number>;
+                     }[] | undefined;
+-                    calls: readonly import("ox/tempo/TxEnvelopeTempo").Call<bigint, `0x${string}`>[];
++                    calls: readonly import("ox/tempo/TxEnvelopeTempo/").Call<bigint, `0x${string}`>[];
+                     chainId: number;
+                     feeToken?: `0x${string}` | undefined;
+                     feePayerSignature?: import("../../index.js").Signature | undefined;
+-                    keyAuthorization?: import("ox/tempo/KeyAuthorization").Signed<bigint, number, `0x${string}`> | null | undefined;
++                    keyAuthorization?: import("ox/tempo/KeyAuthorization/").Signed<bigint, number, `0x${string}`> | null | undefined;
+                     nonceKey?: bigint | undefined;
+-                    signature: import("ox/tempo/SignatureEnvelope").SignatureEnvelope;
++                    signature: import("ox/tempo/SignatureEnvelope/").SignatureEnvelope;
+                     type: "tempo";
+                     validBefore?: number | undefined;
+                     validAfter?: number | undefined;
+@@ -886,10 +886,10 @@ export declare const tempoLocalnet: {
+                     maxFeePerGas?: `0x${string}` | undefined;
+                     maxPriorityFeePerGas?: `0x${string}` | undefined;
+                     accessList?: import("../../index.js").AccessList | undefined;
+-                    keyAuthorization?: import("ox/tempo/KeyAuthorization").Signed<`0x${string}`, `0x${string}`, `0x${string}`> | undefined;
+-                    calls?: readonly import("ox/tempo/TxEnvelopeTempo").Call<`0x${string}`, import("ox/tempo/TempoAddress").Address>[] | undefined;
++                    keyAuthorization?: import("ox/tempo/KeyAuthorization/").Signed<`0x${string}`, `0x${string}`, `0x${string}`> | undefined;
++                    calls?: readonly import("ox/tempo/TxEnvelopeTempo/").Call<`0x${string}`, import("ox/tempo/TempoAddress/").Address>[] | undefined;
+                     feePayer?: true | import("../../index.js").Account | undefined;
+-                    feeToken?: bigint | import("ox/tempo/TempoAddress").Address | undefined;
++                    feeToken?: bigint | import("ox/tempo/TempoAddress/").Address | undefined;
+                     nonceKey?: `0x${string}` | "expiring" | undefined;
+                     validBefore?: `0x${string}` | undefined;
+                     validAfter?: `0x${string}` | undefined;
+diff --git a/node_modules/viem/_types/chains/definitions/tempoModerato.d.ts b/node_modules/viem/_types/chains/definitions/tempoModerato.d.ts
+index 2c13cc41c..b7e3b17cb 100644
+--- a/node_modules/viem/_types/chains/definitions/tempoModerato.d.ts
++++ b/node_modules/viem/_types/chains/definitions/tempoModerato.d.ts
+@@ -34,7 +34,7 @@ export declare const tempoModerato: {
+     testnet?: boolean | undefined | undefined;
+     custom?: Record<string, unknown> | undefined;
+     extendSchema: {
+-        feeToken?: import("ox/tempo/TokenId").TokenIdOrAddress | undefined;
++        feeToken?: import("ox/tempo/TokenId/").TokenIdOrAddress | undefined;
+     };
+     fees?: import("../../index.js").ChainFees<undefined> | undefined;
+     formatters: {
+@@ -220,18 +220,18 @@ export declare const tempoModerato: {
+                 yParity?: number | undefined;
+                 accessList: import("../../index.js").AccessList;
+                 authorizationList?: readonly {
+-                    address: import("ox/tempo/TempoAddress").Address;
++                    address: import("ox/tempo/TempoAddress/").Address;
+                     chainId: number;
+                     nonce: bigint;
+-                    signature: import("ox/tempo/SignatureEnvelope").SignatureEnvelope<bigint, number>;
++                    signature: import("ox/tempo/SignatureEnvelope/").SignatureEnvelope<bigint, number>;
+                 }[] | undefined;
+-                calls: readonly import("ox/tempo/TxEnvelopeTempo").Call<bigint, `0x${string}`>[];
++                calls: readonly import("ox/tempo/TxEnvelopeTempo/").Call<bigint, `0x${string}`>[];
+                 chainId: number;
+                 feeToken?: `0x${string}` | undefined;
+                 feePayerSignature?: import("../../index.js").Signature | undefined;
+-                keyAuthorization?: import("ox/tempo/KeyAuthorization").Signed<bigint, number, `0x${string}`> | null | undefined;
++                keyAuthorization?: import("ox/tempo/KeyAuthorization/").Signed<bigint, number, `0x${string}`> | null | undefined;
+                 nonceKey?: bigint | undefined;
+-                signature: import("ox/tempo/SignatureEnvelope").SignatureEnvelope;
++                signature: import("ox/tempo/SignatureEnvelope/").SignatureEnvelope;
+                 type: "tempo";
+                 validBefore?: number | undefined;
+                 validAfter?: number | undefined;
+@@ -437,10 +437,10 @@ export declare const tempoModerato: {
+                 maxFeePerGas?: `0x${string}` | undefined;
+                 maxPriorityFeePerGas?: `0x${string}` | undefined;
+                 accessList?: import("../../index.js").AccessList | undefined;
+-                keyAuthorization?: import("ox/tempo/KeyAuthorization").Signed<`0x${string}`, `0x${string}`, `0x${string}`> | undefined;
+-                calls?: readonly import("ox/tempo/TxEnvelopeTempo").Call<`0x${string}`, import("ox/tempo/TempoAddress").Address>[] | undefined;
++                keyAuthorization?: import("ox/tempo/KeyAuthorization/").Signed<`0x${string}`, `0x${string}`, `0x${string}`> | undefined;
++                calls?: readonly import("ox/tempo/TxEnvelopeTempo/").Call<`0x${string}`, import("ox/tempo/TempoAddress/").Address>[] | undefined;
+                 feePayer?: true | import("../../index.js").Account | undefined;
+-                feeToken?: bigint | import("ox/tempo/TempoAddress").Address | undefined;
++                feeToken?: bigint | import("ox/tempo/TempoAddress/").Address | undefined;
+                 nonceKey?: `0x${string}` | "expiring" | undefined;
+                 validBefore?: `0x${string}` | undefined;
+                 validAfter?: `0x${string}` | undefined;
+@@ -463,7 +463,7 @@ export declare const tempoModerato: {
+     };
+     verifyHash: (client: import("../../index.js").Client, parameters: import("../../index.js").VerifyHashActionParameters) => Promise<boolean>;
+     extend: <const extended_1 extends {
+-        feeToken?: import("ox/tempo/TokenId").TokenIdOrAddress | undefined;
++        feeToken?: import("ox/tempo/TokenId/").TokenIdOrAddress | undefined;
+     }>(extended: extended_1) => import("../index.js").Assign<import("../index.js").Assign<import("../index.js").Chain<undefined>, {
+         readonly id: 42431;
+         readonly blockExplorers: {
+@@ -486,7 +486,7 @@ export declare const tempoModerato: {
+         };
+         readonly blockTime: 1000;
+         readonly extendSchema: {
+-            feeToken?: import("ox/tempo/TokenId").TokenIdOrAddress | undefined;
++            feeToken?: import("ox/tempo/TokenId/").TokenIdOrAddress | undefined;
+         };
+         readonly formatters: {
+             readonly transaction: {
+@@ -671,18 +671,18 @@ export declare const tempoModerato: {
+                     yParity?: number | undefined;
+                     accessList: import("../../index.js").AccessList;
+                     authorizationList?: readonly {
+-                        address: import("ox/tempo/TempoAddress").Address;
++                        address: import("ox/tempo/TempoAddress/").Address;
+                         chainId: number;
+                         nonce: bigint;
+-                        signature: import("ox/tempo/SignatureEnvelope").SignatureEnvelope<bigint, number>;
++                        signature: import("ox/tempo/SignatureEnvelope/").SignatureEnvelope<bigint, number>;
+                     }[] | undefined;
+-                    calls: readonly import("ox/tempo/TxEnvelopeTempo").Call<bigint, `0x${string}`>[];
++                    calls: readonly import("ox/tempo/TxEnvelopeTempo/").Call<bigint, `0x${string}`>[];
+                     chainId: number;
+                     feeToken?: `0x${string}` | undefined;
+                     feePayerSignature?: import("../../index.js").Signature | undefined;
+-                    keyAuthorization?: import("ox/tempo/KeyAuthorization").Signed<bigint, number, `0x${string}`> | null | undefined;
++                    keyAuthorization?: import("ox/tempo/KeyAuthorization/").Signed<bigint, number, `0x${string}`> | null | undefined;
+                     nonceKey?: bigint | undefined;
+-                    signature: import("ox/tempo/SignatureEnvelope").SignatureEnvelope;
++                    signature: import("ox/tempo/SignatureEnvelope/").SignatureEnvelope;
+                     type: "tempo";
+                     validBefore?: number | undefined;
+                     validAfter?: number | undefined;
+@@ -888,10 +888,10 @@ export declare const tempoModerato: {
+                     maxFeePerGas?: `0x${string}` | undefined;
+                     maxPriorityFeePerGas?: `0x${string}` | undefined;
+                     accessList?: import("../../index.js").AccessList | undefined;
+-                    keyAuthorization?: import("ox/tempo/KeyAuthorization").Signed<`0x${string}`, `0x${string}`, `0x${string}`> | undefined;
+-                    calls?: readonly import("ox/tempo/TxEnvelopeTempo").Call<`0x${string}`, import("ox/tempo/TempoAddress").Address>[] | undefined;
++                    keyAuthorization?: import("ox/tempo/KeyAuthorization/").Signed<`0x${string}`, `0x${string}`, `0x${string}`> | undefined;
++                    calls?: readonly import("ox/tempo/TxEnvelopeTempo/").Call<`0x${string}`, import("ox/tempo/TempoAddress/").Address>[] | undefined;
+                     feePayer?: true | import("../../index.js").Account | undefined;
+-                    feeToken?: bigint | import("ox/tempo/TempoAddress").Address | undefined;
++                    feeToken?: bigint | import("ox/tempo/TempoAddress/").Address | undefined;
+                     nonceKey?: `0x${string}` | "expiring" | undefined;
+                     validBefore?: `0x${string}` | undefined;
+                     validAfter?: `0x${string}` | undefined;
+diff --git a/node_modules/viem/_types/tempo/chainConfig.d.ts b/node_modules/viem/_types/tempo/chainConfig.d.ts
+index 5f0b12a5d..4598dd776 100644
+--- a/node_modules/viem/_types/tempo/chainConfig.d.ts
++++ b/node_modules/viem/_types/tempo/chainConfig.d.ts
+@@ -189,7 +189,7 @@ export declare const chainConfig: {
+                 yParity?: number | undefined;
+                 accessList: import("../index.js").AccessList;
+                 authorizationList?: readonly {
+-                    address: import("ox/tempo/TempoAddress").Address;
++                    address: import("ox/tempo/TempoAddress/").Address;
+                     chainId: number;
+                     nonce: bigint;
+                     signature: SignatureEnvelope.SignatureEnvelope<bigint, number>;
+@@ -407,9 +407,9 @@ export declare const chainConfig: {
+                 maxPriorityFeePerGas?: `0x${string}` | undefined;
+                 accessList?: import("../index.js").AccessList | undefined;
+                 keyAuthorization?: Transaction.z_KeyAuthorization.Signed<`0x${string}`, `0x${string}`, `0x${string}`> | undefined;
+-                calls?: readonly Transaction.z_TxEnvelopeTempo.Call<`0x${string}`, import("ox/tempo/TempoAddress").Address>[] | undefined;
++                calls?: readonly Transaction.z_TxEnvelopeTempo.Call<`0x${string}`, import("ox/tempo/TempoAddress/").Address>[] | undefined;
+                 feePayer?: true | import("../index.js").Account | undefined;
+-                feeToken?: bigint | import("ox/tempo/TempoAddress").Address | undefined;
++                feeToken?: bigint | import("ox/tempo/TempoAddress/").Address | undefined;
+                 nonceKey?: `0x${string}` | "expiring" | undefined;
+                 validBefore?: `0x${string}` | undefined;
+                 validAfter?: `0x${string}` | undefined;

skills/rabby-yarn-v4-commit-check/SKILL.md

@@ -0,0 +1,30 @@
+---
+name: rabby-yarn-v4-commit-check
+description: Use in the Rabby repository on Yarn v4 branches before creating, amending, merging, or pushing commits. Requires running yarn and yarn check from the repository root before committing, and blocks commits when either command fails.
+metadata:
+  short-description: Run Rabby Yarn v4 commit checks
+---
+
+# Rabby Yarn v4 Commit Check
+
+Use this workflow whenever a task in the Rabby repository will create a commit, amend a commit, create a merge commit, or push a branch that should already include committed work.
+
+## Required Check
+
+Before running `git commit`, `git commit --amend`, or completing a merge commit, run these commands from the repository root:
+
+```bash
+yarn
+yarn check
+```
+
+Treat the sequence as `yarn && yarn check`: only run `yarn check` after `yarn` exits successfully.
+
+## Commit Rules
+
+- Do not commit if `yarn` or `yarn check` exits non-zero.
+- If `yarn` changes tracked dependency files, inspect the diff and include only intentional changes.
+- If the failure appears unrelated to the current edit, report the exact failing command and the relevant error output before deciding whether to proceed.
+- Do not substitute `npm install`, `npm run check`, `yarn lint`, or `yarn typecheck` for the required sequence unless the user explicitly redirects the workflow.
+- After committing or pushing, report the commit hash and the validation commands that passed.
+