diff --git a/.cursorrules b/.cursorrules
new file mode 100644
index 000000000..eb67e3b0d
--- /dev/null
+++ b/.cursorrules
@@ -0,0 +1,11 @@
+# Cursor AI Assistant Rules
+
+## Test Execution Guidelines
+
+### Always use non-interactive mode for tests
+When running tests with npm, yarn, or vitest, ALWAYS include flags to prevent interactive/watch mode:
+
+- For npm test: use `npm test -- --run`
+- For yarn test: use `yarn test --run`
+- For vitest directly: use `vitest run`
+- For jest: use `jest --no-watch`
\ No newline at end of file
diff --git a/.github/workflows/generator-generic-ossf-slsa3-publish.yml b/.github/workflows/generator-generic-ossf-slsa3-publish.yml
new file mode 100644
index 000000000..35c829b13
--- /dev/null
+++ b/.github/workflows/generator-generic-ossf-slsa3-publish.yml
@@ -0,0 +1,66 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+# This workflow lets you generate SLSA provenance file for your project.
+# The generation satisfies level 3 for the provenance requirements - see https://slsa.dev/spec/v0.1/requirements
+# The project is an initiative of the OpenSSF (openssf.org) and is developed at
+# https://github.com/slsa-framework/slsa-github-generator.
+# The provenance file can be verified using https://github.com/slsa-framework/slsa-verifier.
+# For more information about SLSA and how it improves the supply-chain, visit slsa.dev.
+
+name: SLSA generic generator
+on:
+  workflow_dispatch:
+  release:
+    types: [created]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    outputs:
+      digests: ${{ steps.hash.outputs.digests }}
+
+    steps:
+      - uses: actions/checkout@v4
+
+      # ========================================================
+      #
+      # Step 1: Build your artifacts.
+      #
+      # ========================================================
+      - name: Build artifacts
+        run: |
+            # These are some amazing artifacts.
+            echo "artifact1" > artifact1
+            echo "artifact2" > artifact2
+
+      # ========================================================
+      #
+      # Step 2: Add a step to generate the provenance subjects
+      #         as shown below. Update the sha256 sum arguments
+      #         to include all binaries that you generate
+      #         provenance for.
+      #
+      # ========================================================
+      - name: Generate subject for provenance
+        id: hash
+        run: |
+          set -euo pipefail
+
+          # List the artifacts the provenance will refer to.
+          files=$(ls artifact*)
+          # Generate the subjects (base64 encoded).
+          echo "hashes=$(sha256sum $files | base64 -w0)" >> "${GITHUB_OUTPUT}"
+
+  provenance:
+    needs: [build]
+    permissions:
+      actions: read   # To read the workflow path.
+      id-token: write # To sign the provenance.
+      contents: write # To add assets to a release.
+    uses: slsa-framework/slsa-github-generator/.github/workflows/generator_generic_slsa3.yml@v1.4.0
+    with:
+      base64-subjects: "${{ needs.build.outputs.digests }}"
+      upload-assets: true # Optional: Upload to a new release
diff --git a/.github/workflows/transactions (1).csv b/.github/workflows/transactions (1).csv
new file mode 100644
index 000000000..8ff0029db
--- /dev/null
+++ b/.github/workflows/transactions (1).csv	
@@ -0,0 +1,312 @@
+Date,Type,Transaction ID,Received Quantity,Received Currency,Received Cost Basis (USD),Received Wallet,Received Address,Received Comment,Sent Quantity,Sent Currency,Sent Cost Basis (USD),Sent Wallet,Sent Address,Sent Comment,Fee Amount,Fee Currency,Fee Cost Basis (USD),Realized Return (USD),Fee Realized Return (USD),Transaction Hash
+09/13/2024 15:37:34,TRADE,019223e4-58ed-7b32-ac7e-b563617498ed,586.499218,USDC,586.5,Coinbase USDC Wallet,,,586.446438,USDT,586.49,Coinbase USDT Wallet,,,,,,0.01,,
+09/13/2024 15:36:19,BUY,019223e4-5a35-7353-b7e0-ab1eee44a383,586.42,USDT,586.46,Coinbase USDT Wallet,,,586.4551852,USD,,Coinbase Cash (USD),,,0.00586455,USD,,,,
+09/14/2024 2:47:01,BUY,019223e4-57a1-7e3f-82bc-61b00cd9fea0,500,USDC,500,Coinbase USDC Wallet,,,500,USD,,Coinbase Cash (USD),,,,,,,,
+09/13/2024 15:40:41,SELL,019223e4-5795-7a79-94be-bba488a08898,500,USD,,Coinbase Cash (USD),,,500,USDC,500,Coinbase USDC Wallet,,,,,,0,,
+09/18/2024 9:00:23,SEND,019223e4-5aec-7180-ac96-05c566d5e16f,,,,,,,300.672124,USDC,300.67,Coinbase USDC Wallet,,,,,,0,,
+09/13/2024 16:09:45,SELL,019223e4-579d-785d-8a49-44cfb322166a,300,USD,,Coinbase Cash (USD),,,300,USDC,300,Coinbase USDC Wallet,,,,,,0,,
+09/18/2024 9:00:25,SEND,019223e4-5b2f-76db-a4eb-befb7dced9ae,,,,,,,2.01984888,SOL,279.85,Coinbase SOL Wallet,,,,,,-15.86,,
+09/13/2024 15:43:15,BUY,019223e4-5799-7c23-be69-1d1fbb426719,259,USDC,259,Coinbase USDC Wallet,,,259,USD,,Coinbase Cash (USD),,,,,,,,
+09/13/2024 16:12:18,TRADE,019223e4-58f1-7def-bfd8-56132ffa724a,1.05191529,SOL,145.5,Coinbase SOL Wallet,,,145.504323,USDC,145.5,Coinbase USDC Wallet,,,,,,0,,
+09/13/2024 16:12:23,TRANSFER,019223e4-5b2c-7a50-b5d0-d9417ab79843,1.05191529,SOL,0,Coinbase Staked SOL,,"Staked SOL
+on Coinbase",1.05191529,SOL,0,Coinbase SOL Wallet,,"Staked SOL
+on Coinbase",,,,0,,
+09/17/2024 2:00:06,TRANSFER,019223e4-5b44-7c98-8ecc-7ded93c7c5ac,1.05628402,SOL,0,Coinbase SOL Wallet,,,1.05628402,SOL,0,Coinbase Staked SOL,,,,,,0,,
+09/14/2024 12:10:01,BUY,019223e4-5a17-7e8a-aaf9-1d0893429d85,0.96314501,SOL,133.63,Coinbase SOL Wallet,,,132.0471809,USD,,Coinbase Cash (USD),,,1.58456617,USD,,,,
+09/18/2024 9:00:27,SEND,019223e4-5b5d-7a72-ae3e-01ca6b80fa5e,,,,,,,20.685297,TIA,98.94,Coinbase TIA Wallet,,,,,,9.43,,
+09/13/2024 2:55:43,BUY,019223e4-5791-7460-bd47-b1212c04ff41,100,USDC,100,Coinbase USDC Wallet,,,100,USD,,Coinbase Cash (USD),,,,,,,,
+09/14/2024 12:12:53,TRADE,019223e4-5a05-7464-8e94-ef8305b4e6f1,168.93004,XRP,99.04,Coinbase XRP Wallet,,,99.04368245,USDC,99.05,Coinbase USDC Wallet,,,1.18852419,USDC,1.19,-1.2,0,
+09/18/2024 9:00:29,SEND,019223e4-5b47-7c70-b084-b3028187ee9c,,,,,,,168.997781,XRP,99.08,Coinbase XRP Wallet,,,,,,-1.68,,
+09/15/2024 8:35:51,TRADE,019223e4-59ed-776a-9f50-1e68c2de7459,18.68,TIA,89.35,Coinbase TIA Wallet,,,89.34644,USDC,89.35,Coinbase USDC Wallet,,,1.07215728,USDC,1.07,-1.07,0,
+09/14/2024 2:40:33,BUY,019223e4-57cb-7100-bcc9-cdfc2b8bdb6f,3538241.601,SHIB,50,Coinbase SHIB Wallet,,,50,USD,,Coinbase Cash (USD),,,,,,,,
+09/18/2024 9:00:30,SEND,019223e4-5ae3-72b0-9b40-ae1d827a3766,,,,,,,0.00079286,BTC,48.65,Coinbase BTC Wallet,,,,,,-0.95,,
+09/18/2024 9:00:31,SEND,019223e4-5b5a-7953-b7f5-2fb4c0dd84f8,,,,,,,3538241.601,SHIB,50,Coinbase SHIB Wallet,,,,,,-3.34,,
+09/13/2024 21:05:35,BUY,019223e4-5a29-7ea8-99fc-b657d5906c7f,5.78980119,DOT,26.02,Coinbase DOT Wallet,,,25.70671728,USD,,Coinbase Cash (USD),,,0.30848061,USD,,,,
+09/14/2024 2:31:39,TRADE,019223e4-5873-76f7-9490-8dc1b680d08d,0.00041623,BTC,25.65,Coinbase BTC Wallet,,,5.79220525,DOT,26.03,Coinbase DOT Wallet,,,,,,-0.38,,
+09/14/2024 2:33:05,BUY,019223e4-577d-7aaa-a460-6a0d24d35f31,0.00037663,BTC,23,Coinbase BTC Wallet,,,23,USD,,Coinbase Cash (USD),,,,,,,,
+04/28/2024 2:32:55,TRADE,019223e4-57df-7b1e-b7cd-b7d75a92f9ce,10.567794,USDC,10.68,Coinbase USDC Wallet,,,0.00016801,BTC,11.01,Coinbase BTC Wallet,,,,,,-0.33,,
+04/28/2024 2:35:51,TRADE,019223e4-5877-7d11-a565-deb92898a822,0.00319417,ETH,10.57,Coinbase ETH Wallet,,,10.567794,USDC,10.68,Coinbase USDC Wallet,,,,,,-0.11,,
+04/28/2024 2:37:25,SEND,019223e4-5af4-7f41-8990-c5da04f6a0c8,,,,,,,0.00306817,ETH,10.15,Coinbase ETH Wallet,,,0.000126,ETH,0.42,-0.51,0,
+07/10/2024 6:03:02,INCOME,019223e4-492d-7f08-bfa5-1c2bc0be33b4,386.8471954,VET,10,Coinbase VET Wallet,,,,,,,,,,,,,,
+07/10/2024 6:12:50,TRADE,019223e4-5929-7f7b-aa17-123c71b936ff,0.06651872,SOL,9.85,Coinbase SOL Wallet,,,377.9742287,VET,9.77,Coinbase VET Wallet,,,3.87296669,VET,0.1,-0.02,0,
+07/10/2024 6:12:56,TRANSFER,019223e4-5b1b-7df9-bd04-a6b2be8e5bab,0.06651872,SOL,0,Coinbase Staked SOL,,"Staked SOL
+on Coinbase",0.06651872,SOL,0,Coinbase SOL Wallet,,"Staked SOL
+on Coinbase",,,,0,,
+09/15/2024 8:35:51,TRADE,019223e4-59f3-7b4a-b2e6-459465103556,1.99,TIA,9.52,Coinbase TIA Wallet,,,9.51618,USDC,9.52,Coinbase USDC Wallet,,,0.11419416,USDC,0.11,-0.11,0,
+07/13/2024 10:00:04,TRANSFER,019223e4-5b3e-74f8-8c9a-fc0ab5d6c58d,0.06237438,SOL,0,Coinbase SOL Wallet,,,0.06237438,SOL,0,Coinbase Staked SOL,,,,,,0,,
+07/17/2024 4:31:41,TRANSFER,019223e4-5b0d-71bf-b8d1-a5774b3f406d,7.4,MATIC,0,Coinbase Staked MATIC,,"Staked MATIC
+on Coinbase",7.4,MATIC,0,Coinbase MATIC Wallet,,"Staked MATIC
+on Coinbase",,,,0,,
+07/15/2024 10:50:49,BUY,019223e4-5ad7-71a9-ba6b-2b5098b757aa,7.4,MATIC,3.96,Coinbase MATIC Wallet,,,3.93532,USD,,Coinbase Cash (USD),,,0.02361192,USD,,,,
+07/14/2024 23:42:21,SEND,019223e4-5b21-754c-af5d-42f808aae5e5,,,,,,,0.02608616,SOL,3.86,Coinbase SOL Wallet,,,0.0001,SOL,0.01,0,0,
+04/26/2024 11:19:15,TRADE,019223e4-57d7-77ed-9137-a8a7e5f90d5a,0.00004577,BTC,3,Coinbase BTC Wallet,,,0.41844932,NEAR,3,Coinbase NEAR Wallet,,,,,,0,,
+04/26/2024 11:17:16,TRADE,019223e4-57d3-74e3-9629-b22de04edc76,0.00004579,BTC,3,Coinbase BTC Wallet,,,0.643546,AKT,3,Coinbase AKT Wallet,,,,,,0,,
+04/26/2024 11:02:11,TRADE,019223e4-57cf-7711-bf93-2705b9beb00a,0.00004582,BTC,3,Coinbase BTC Wallet,,,30.88803089,VARA,3,Coinbase VARA Wallet,,,,,,0,,
+04/26/2024 11:00:38,INCOME,019223e4-4924-7565-abd2-fdcf121be36e,30.88803089,VARA,3,Coinbase VARA Wallet,,,,,,,,,,,,,,
+08/06/2024 18:32:54,TRADE,019223e4-5989-721e-a593-9853b2f597ab,5.46418838,ZETA,2.41,Coinbase ZETA Wallet,,,5.70599614,MATIC,3.05,Coinbase MATIC Wallet,,,0.12088974,MATIC,0.06,-0.69,-0.01,
+08/05/2024 22:00:30,TRANSFER,019223e4-5b54-77d2-9829-68501f8019a1,5.82920431,MATIC,0,Coinbase MATIC Wallet,,,5.82920431,MATIC,0,Coinbase Staked MATIC,,,,,,0,,
+07/14/2024 10:07:22,TRADE,019223e4-58bd-7f19-bee5-eb70454adbe2,1.999727,USDC,2.02,Coinbase USDC Wallet,,,0.01377805,SOL,2.04,Coinbase SOL Wallet,,,,,,-0.02,,
+04/26/2024 11:19:45,TRADE,019223e4-57db-7015-b455-e6c7836fc93e,0.00003063,BTC,2.01,Coinbase BTC Wallet,,,51.04970986,VET,2,Coinbase VET Wallet,,,,,,0.01,,
+06/14/2024 15:36:29,TRADE,019223e4-57e3-72f2-8cc2-851657ab59e7,0.00002853,BTC,2,Coinbase BTC Wallet,,,0.73557149,RON,2,Coinbase RONIN Wallet,,,0.0188608,RON,0.05,-0.05,0,
+08/09/2024 22:21:50,SELL,019223e4-5a6b-7360-af8e-abaadefd73de,1.9996,USD,,Coinbase Cash (USD),,,4,ZETA,1.76,Coinbase ZETA Wallet,,,0.0239952,USD,,0.21,,
+07/14/2024 10:10:50,SELL,019223e4-5781-7506-b8ae-cc8c8ddbde50,1.99,USD,,Coinbase Cash (USD),,,1.999727,USDC,2.02,Coinbase USDC Wallet,,,,,,-0.03,,
+08/15/2024 4:53:00,BUY,019223e4-5785-7b6e-b22f-b9eed8714b9f,1.98,USDC,1.98,Coinbase USDC Wallet,,,1.98,USD,,Coinbase Cash (USD),,,,,,,,
+08/15/2024 11:36:53,SELL,019223e4-5789-769b-b94b-b63836409f95,1.42,USD,,Coinbase Cash (USD),,,1.424065,USDC,1.42,Coinbase USDC Wallet,,,,,,0,,
+07/14/2024 20:42:00,SELL,019223e4-5add-7f6c-a635-7268a8e7bcbd,1.27779732,USD,,Coinbase Cash (USD),,,0.00872872,SOL,1.29,Coinbase SOL Wallet,,,0.00766678,USD,,-0.02,,
+06/14/2024 17:02:39,TRANSFER,019223e4-5af9-7021-98b0-9340a3b43988,0.00037207,ETH,0,Coinbase Staked ETH,,"Staked ETH
+on Coinbase",0.00037207,ETH,0,Coinbase ETH Wallet,,"Staked ETH
+on Coinbase",,,,0,,
+09/12/2024 23:50:41,TRADE,019223e4-5a41-754a-979e-c846f9672a62,0.00047354,ETH,1.12,Coinbase ETH Wallet,,,1.11954327,USDC,1.86,Coinbase USDC Wallet,,,0.01343452,USDC,0.01,-0.75,0,
+09/18/2024 9:00:32,SEND,019223e4-5b0a-7259-bc2e-08db8d9e2634,,,,,,,0.00047647,ETH,1.13,Coinbase ETH Wallet,,,,,,-0.03,,
+08/15/2024 7:42:23,TRADE,019223e4-58cb-7e74-b69e-2cca56a7d9e8,22.05558006,VET,1,Coinbase VET Wallet,,,0.5,USDC,0.5,Coinbase USDC Wallet,,,0.5,USDC,0.5,-0.5,0.5,
+07/14/2024 10:06:22,TRADE,019223e4-5981-73e6-9cdb-8e95d1064842,0.00030471,ETH,1,Coinbase ETH Wallet,,,0.0068106,SOL,1.01,Coinbase SOL Wallet,,,,,,-0.01,,
+06/14/2024 15:48:32,TRADE,019223e4-594b-702f-a6a7-80d9320e97de,0.00027949,ETH,1,Coinbase ETH Wallet,,,0.37844038,RON,1.03,Coinbase RONIN Wallet,,,0.00382262,RON,0.01,-0.04,0,
+06/14/2024 15:37:41,TRADE,019223e4-57e9-76b6-bdd4-473073cd4e74,0.499634,USDC,1,Coinbase USDC Wallet,,,0.00000747,BTC,0.52,Coinbase BTC Wallet,,,0.00000748,BTC,0.52,-0.52,0.48,
+06/14/2024 14:08:16,INCOME,019223e4-495d-7029-a2e8-909310695e63,0.36866359,RON,1,Coinbase RONIN Wallet,,,,,,,,,,,,,,
+06/14/2024 14:07:34,INCOME,019223e4-495a-74d9-8aa7-e530d16419d7,0.36873156,RON,1,Coinbase RONIN Wallet,,,,,,,,,,,,,,
+06/14/2024 14:06:51,INCOME,019223e4-4957-7ad7-8311-fc53cce23c10,0.36879955,RON,1,Coinbase RONIN Wallet,,,,,,,,,,,,,,
+06/14/2024 14:06:17,INCOME,019223e4-4954-70bf-b2f4-40da7c6650d2,0.36920804,RON,1,Coinbase RONIN Wallet,,,,,,,,,,,,,,
+06/14/2024 14:05:46,INCOME,019223e4-4951-7a60-9828-6f02a5c6f67a,0.36907178,RON,1,Coinbase RONIN Wallet,,,,,,,,,,,,,,
+04/26/2024 11:11:54,INCOME,019223e4-493f-754a-ac4b-9b14920932b6,0.214477,AKT,1,Coinbase AKT Wallet,,,,,,,,,,,,,,
+04/26/2024 11:11:13,INCOME,019223e4-493c-7e9a-9cea-8ca309e70e62,0.214523,AKT,1,Coinbase AKT Wallet,,,,,,,,,,,,,,
+04/26/2024 11:10:41,INCOME,019223e4-4939-7809-a4f3-3db98beff6ef,0.214546,AKT,1,Coinbase AKT Wallet,,,,,,,,,,,,,,
+04/26/2024 11:09:13,INCOME,019223e4-4936-7f2e-8169-eb635261ee7d,0.13931457,NEAR,1,Coinbase NEAR Wallet,,,,,,,,,,,,,,
+04/26/2024 11:08:15,INCOME,019223e4-4933-7a4b-b424-e56298b02f34,0.1394992,NEAR,1,Coinbase NEAR Wallet,,,,,,,,,,,,,,
+04/26/2024 11:06:56,INCOME,019223e4-4930-759f-9403-8484401ab24d,0.13963555,NEAR,1,Coinbase NEAR Wallet,,,,,,,,,,,,,,
+04/26/2024 11:05:07,INCOME,019223e4-492a-74f3-9fe3-fdf3124f2cba,25.52648372,VET,1,Coinbase VET Wallet,,,,,,,,,,,,,,
+04/26/2024 11:04:03,INCOME,019223e4-4927-7768-9d9a-7c54b5efeb1b,25.52322613,,1,Coinbase VET Wallet,,,,,,,,,,,,,,
+07/14/2024 10:06:28,TRANSFER,019223e4-5b02-7e3f-b831-ceae448a72e3,0.00030471,,0,Coinbase Staked ETH,,"Staked ETH
+on Coinbase",0.00030471,ETH,0,Coinbase ETH Wallet,,"Staked ETH
+on Coinbase",,,,0,,
+08/29/2024 2:00:10,TRANSFER,019223e4-5b41-7e23-85e8-02cee526b40d,0.00658079,,0,Coinbase SOL Wallet,,,0.00658079,SOL,0,Coinbase Staked SOL,,,,,,0,,
+07/10/2024 2:09:04,TRADE,019223e4-597b-7e54-94f0-b32774083252,0.00614016,,0.89,Coinbase SOL Wallet,,,0.0002871,ETH,1.05,Coinbase ETH Wallet,,,0.00000327,ETH,0.01,-0.17,0,
+09/03/2024 7:27:12,TRADE,019223e4-59c5-7546-9d2c-7ad39cee326a,1.67683609,,0.88,Coinbase ARB Wallet,,,0.00658079,SOL,0.97,Coinbase SOL Wallet,,,,,,-0.09,,
+07/10/2024 6:02:19,SEND,019223e4-5b16-7d44-8253-b2a195e2f3fc,,,,,,,0.00604016,SOL,0.88,Coinbase SOL Wallet,,,0.0001,SOL,0.01,-0.01,0,
+07/08/2024 6:00:38,TRANSFER,019223e4-5ae6-75f6-a5aa-3552d0b5cb82,0.00029037,,0,Coinbase ETH Wallet,,"Unstaked ETH
+on Coinbase",0.00029037,ETH,0,Coinbase Staked ETH,,"Unstaked ETH
+on Coinbase",,,,0,,
+09/07/2024 20:45:29,TRADE,019223e4-58d7-7392-a5f0-d2de37652ce3,0.419424,,0.84,Coinbase USDC Wallet,,,0.83801045,ARB,0.44,Coinbase ARB Wallet,,,0.83882564,ARB,0.44,-0.44,0.4,
+06/14/2024 16:33:42,TRADE,019223e4-587b-79ca-afe0-cf8ef23056e0,0.409043,,0.82,Coinbase USDC Wallet,,,0.15947103,RON,0.43,Coinbase RONIN Wallet,,,0.15947102,RON,0.43,-0.43,0.39,
+08/27/2024 9:44:35,TRADE,019223e4-58d1-7550-ad6a-69f8d86a8802,0.39655,,0.79,Coinbase USDT Wallet,,,0.396558,USDC,0.4,Coinbase USDC Wallet,,,0.39,USDC,0.39,-0.39,0.39,
+08/25/2024 21:50:54,BUY,019223e4-578d-7691-b997-37bbef23b324,0.77,,0.77,Coinbase USDC Wallet,,,0.77,USD,,Coinbase Cash (USD),,,,,,,,
+09/18/2024 9:00:34,SEND,019223e4-5ae9-7e32-a9d9-b05638b459ec,,,,,,,0.00032511,ETH,1.09,Coinbase Staked ETH,,,,,,-0.34,,
+08/22/2024 8:58:07,BUY,019223e4-5a4d-7f08-9472-801abf1d9594,1.4,,0.73,Coinbase MATIC Wallet,,,0.7301,USD,,Coinbase Cash (USD),,,0.0043806,USD,,,,
+08/27/2024 9:24:11,TRADE,019223e4-593f-7e95-8fda-9d8704263bd8,28.61754567,,0.71,Coinbase VET Wallet,,,1.38036521,MATIC,0.72,Coinbase MATIC Wallet,,,0.01963479,MATIC,0.01,-0.02,0,
+08/30/2024 2:00:04,TRANSFER,019223e4-5b57-7cbe-a1eb-9ca61e0588b9,1.58445143,,0,Coinbase MATIC Wallet,,,1.58445143,MATIC,0,Coinbase Staked MATIC,,,,,,0,,
+08/29/2024 13:43:53,TRADE,019223e4-5945-746b-ade7-b2b553ed1872,0.00435755,,0.65,Coinbase SOL Wallet,,,28.18048274,VET,0.7,Coinbase VET Wallet,,,0.43706293,VET,0.01,-0.06,0,
+08/29/2024 13:43:58,TRANSFER,019223e4-5b29-7a55-a1d3-df8e2f03655a,0.00435755,,0,Coinbase Staked SOL,,"Staked SOL
+on Coinbase",0.00435755,SOL,0,Coinbase SOL Wallet,,"Staked SOL
+on Coinbase",,,,0,,
+09/07/2024 20:46:04,TRADE,019223e4-58dd-71e7-83e8-6c8154552abc,0.299572,USDC,0.59,Coinbase USDC Wallet,,,0.80530044,MATIC,0.43,Coinbase MATIC Wallet,,,0.77915099,MATIC,0.41,-0.41,0.16,
+06/14/2024 16:52:06,TRADE,019223e4-5801-7f8c-8582-f44ce5643dcf,0.05374523,UNI,0.58,Coinbase UNI Wallet,,,0.00000871,BTC,0.72,Coinbase BTC Wallet,,,0.00000015,BTC,0.01,-0.15,0,
+08/25/2024 21:37:37,TRADE,019223e4-586d-702f-8f7e-484ddd993e16,0.00018951,ETH,0.55,Coinbase ETH Wallet,,,0.00000835,BTC,0.49,Coinbase BTC Wallet,,,0.00000016,BTC,0.01,0.05,0,
+08/15/2024 19:46:08,TRADE,019223e4-5867-780e-bc41-26ff54900330,0.00000848,BTC,0.5,Coinbase BTC Wallet,,,22.32714695,VET,1.01,Coinbase VET Wallet,,,0.45330915,VET,0.02,-0.52,-0.01,
+06/14/2024 16:50:40,TRADE,019223e4-599b-7cc3-9b68-2dbe8bc2bf8f,0.00336497,SOL,0.5,Coinbase SOL Wallet,,,0.19132999,RON,0.52,Coinbase RONIN Wallet,,,0.00390625,RON,0.01,-0.03,0,
+06/14/2024 16:30:05,TRADE,019223e4-57ef-7f35-b036-63fc4f0ec771,0.00000383,BTC,0.5,Coinbase BTC Wallet,,,0.249634,USDC,0.5,Coinbase USDC Wallet,,,0.25,USDC,0.5,-0.5,0,
+06/14/2024 17:18:12,SELL,019223e4-57af-7aea-9bdc-b419b44ca998,0.48,USD,,Coinbase Cash (USD),,,0.19360096,RON,0.52,Coinbase RONIN Wallet,,,0.24,USD,,-0.28,,
+06/14/2024 17:02:11,TRANSFER,019223e4-5b10-7696-ad01-c2716f0f94cc,0.00336497,SOL,0,Coinbase Staked SOL,,"Staked SOL
+on Coinbase",0.00336497,SOL,0,Coinbase SOL Wallet,,"Staked SOL
+on Coinbase",,,,0,,
+08/08/2024 2:35:30,SELL,019223e4-5a71-7baa-9eee-484976d62c6e,,USD,,Coinbase Cash (USD),,,1.1,ZETA,0.49,Coinbase ZETA Wallet,,,0.00277794,USD,,-0.02,,
+06/20/2024 6:00:06,TRANSFER,019223e4-5b38-7f14-a91e-1e76697fcf5c,0.00336746,SOL,0,Coinbase SOL Wallet,,,0.00336746,SOL,0,Coinbase Staked SOL,,,,,,0,,
+08/15/2024 5:57:36,BUY,019223e4-5a65-76c1-bf2d-6c1d47ebb2ef,0.00133171,BCH,0.45,Coinbase BCH Wallet,,,0.44519065,USD,,Coinbase Cash (USD),,,0.00267114,USD,,,,
+08/15/2024 6:59:23,TRADE,019223e4-5a5f-763d-9b62-45943558c270,0.44480446,USDC,0.44,Coinbase USDC Wallet,,,0.00133171,BCH,0.45,Coinbase BCH Wallet,,,0.00266883,USDC,0,-0.01,0,
+07/14/2024 8:06:53,SELL,019223e4-57b5-7872-8dce-962b4579619c,0.44,USD,,Coinbase Cash (USD),,,0.00307851,SOL,0.47,Coinbase SOL Wallet,,,0.22,USD,,-0.25,,
+06/14/2024 23:12:46,TRADE,019223e4-5807-7d63-8c1c-48fa660ad21e,0.00011872,ETH,0.43,Coinbase ETH Wallet,,,0.00000639,BTC,0.45,Coinbase BTC Wallet,,,0.00000015,BTC,0.01,-0.03,0,
+09/14/2024 12:10:02,RECEIVE,019223e4-490c-7a58-b3dc-e33cb9abb017,0.396142,USDC,0.4,Coinbase USDC Wallet,,,,,,,,,,,,,,
+09/07/2024 20:46:45,TRADE,019223e4-58e3-7466-be4f-101d5afa42bb,0.39651,USDC,0.4,Coinbase USDC Wallet,,,0.39655,USDT,0.79,Coinbase USDT Wallet,,,,,,-0.39,,
+06/14/2024 16:41:02,TRADE,019223e4-57f5-7b84-987b-e63c200cb34b,0.00000306,BTC,0.4,Coinbase BTC Wallet,,,0.2,USDC,0.4,Coinbase USDC Wallet,,,0.2,USDC,0.4,-0.4,0,
+08/25/2024 21:44:19,SEND,019223e4-5b05-736a-b97e-9239ccd8679d,,,,,,,0.00012651,ETH,0.37,Coinbase ETH Wallet,,,0.000063,ETH,0.18,-0.19,-0.01,
+06/14/2024 16:45:50,TRADE,019223e4-57fb-76fc-bdab-713664047504,0.00009258,ETH,0.33,Coinbase ETH Wallet,,,0.00000492,BTC,0.64,Coinbase BTC Wallet,,,0.00000015,BTC,0.02,-0.32,-0.01,
+06/17/2024 6:46:47,TRADE,019223e4-5779-7fc6-a47f-c495856dde5d,0.00008365,CBETH,0.32,Coinbase CBETH Wallet,,ETH2/CBETH wrap/unwrap,0.00008985,ETH,0.32,Coinbase Staked ETH,,ETH2/CBETH wrap/unwrap,,,,0,,
+07/15/2024 3:12:02,SELL,019223e4-57a5-7302-b1a5-470394278e4e,0.31,USD,,Coinbase Cash (USD),,,0.00081366,BCH,0.31,Coinbase BCH Wallet,,,,,,0,,
+07/15/2024 0:46:29,TRADE,019223e4-58f5-7a04-b259-fcfd9c2bf438,0.00081366,BCH,0.31,Coinbase BCH Wallet,,,9.89485992,VET,0.3,Coinbase VET Wallet,,,,,,0.01,,
+09/14/2024 12:12:54,RECEIVE,019223e4-4915-7269-9a4c-01a99cbdfd8c,0.297131,USDC,0.3,Coinbase USDC Wallet,,,,,,,,,,,,,,
+07/14/2024 8:10:12,TRADE,019223e4-592f-719d-9a80-04878534eecc,9.89485992,VET,0.3,Coinbase VET Wallet,,,0.00199972,SOL,0.3,Coinbase SOL Wallet,,,0.00006896,SOL,0.01,-0.01,0,
+06/19/2024 8:05:52,TRADE,019223e4-582b-7ac5-9777-23b08feac258,0.15263,USDC,0.3,Coinbase USDC Wallet,,,0.00000234,BTC,0.18,Coinbase BTC Wallet,,,0.0000023,BTC,0.16,-0.17,0.13,
+06/14/2024 17:08:24,TRADE,019223e4-59a1-75ce-8728-c2f9454179b1,0.00202142,SOL,0.3,Coinbase SOL Wallet,,,0.02802932,UNI,0.3,Coinbase UNI Wallet,,,0.00096459,UNI,0.01,-0.01,0,
+06/14/2024 17:09:31,TRANSFER,019223e4-5b13-7ed1-98bd-19307d6efcb0,0.00202142,SOL,0,Coinbase Staked SOL,,"Staked SOL
+on Coinbase",0.00202142,SOL,0,Coinbase SOL Wallet,,"Staked SOL
+on Coinbase",,,,0,,
+09/15/2024 8:35:53,RECEIVE,019223e4-491b-7ff9-befd-19514947ad10,0.268039,USDC,0.27,Coinbase USDC Wallet,,,,,,,,,,,,,,
+07/14/2024 8:09:06,TRADE,019223e4-59bf-76f5-b52c-e022827e3de7,0.02813202,UNI,0.25,Coinbase UNI Wallet,,,0.00165472,SOL,0.25,Coinbase SOL Wallet,,,0.00006895,SOL,0.01,-0.01,0,
+07/15/2024 15:50:41,TRANSFER,019223e4-5b26-7f08-be8c-9d727689f8dc,0.00154665,SOL,0,Coinbase Staked SOL,,"Staked SOL
+on Coinbase",0.00154665,SOL,0,Coinbase SOL Wallet,,"Staked SOL
+on Coinbase",,,,0,,
+07/15/2024 15:50:36,TRADE,019223e4-5985-7508-b99b-20526f3349e3,0.00154665,SOL,0.24,Coinbase SOL Wallet,,,0.00007158,ETH,0.23,Coinbase ETH Wallet,,,,,,0.01,,
+06/20/2024 12:36:58,TRADE,019223e4-5855-7d09-8094-b1a75baf4bf4,0.00005977,ETH,0.23,Coinbase ETH Wallet,,,0.00000332,BTC,0.25,Coinbase BTC Wallet,,,0.00000015,BTC,0.01,-0.03,0,
+06/20/2024 12:26:18,TRADE,019223e4-584f-7766-aed4-564f70877bbe,0.00000324,BTC,0.23,Coinbase BTC Wallet,,,0.00157327,SOL,0.23,Coinbase SOL Wallet,,,0.00007207,SOL,0.01,-0.01,0,
+06/15/2024 12:58:19,TRADE,019223e4-580d-7f83-ae2c-54d6887f298b,0.00000325,BTC,0.23,Coinbase BTC Wallet,,,0.00006176,ETH,0.29,Coinbase ETH Wallet,,,0.0000028,ETH,0.01,-0.07,0,
+06/20/2024 12:41:04,TRADE,019223e4-59b3-7f6f-b097-40eca54ab038,0.0000031,WBTC,0.22,Coinbase WBTC Wallet,,,0.00150841,SOL,0.23,Coinbase SOL Wallet,,,0.00007218,SOL,0.01,-0.02,0,
+06/17/2024 7:03:48,TRADE,019223e4-5825-7815-ad1e-604d345baebb,0.0000031,BTC,0.22,Coinbase BTC Wallet,,,0.00005486,CBETH,0.21,Coinbase CBETH Wallet,,,0.00000262,CBETH,0.01,0,0,
+06/15/2024 13:00:58,TRADE,019223e4-5813-7948-ae10-aecea288854e,0.419469,XRP,0.22,Coinbase XRP Wallet,,,0.0000031,BTC,0.22,Coinbase BTC Wallet,,,0.00000015,BTC,0.01,-0.01,0,
+07/15/2024 3:09:39,SELL,019223e4-57c1-7f05-b0b5-b981f67aa71e,0.21,USD,,Coinbase Cash (USD),,,0.02505351,UNI,0.22,Coinbase UNI Wallet,,,,,,-0.01,,
+06/20/2024 12:40:26,TRADE,019223e4-5975-7c61-af5d-86b26c512bd3,0.00144546,SOL,0.21,Coinbase SOL Wallet,,,0.00005699,ETH,0.22,Coinbase ETH Wallet,,,0.00000278,ETH,0.01,-0.02,0,
+06/19/2024 6:39:19,TRADE,019223e4-58ab-7d37-bfae-2785fa6bbde1,0.104864,USDC,0.21,Coinbase USDC Wallet,,,0.00074504,SOL,0.12,Coinbase SOL Wallet,,,0.00078142,SOL,0.12,-0.12,0.1,
+06/24/2024 4:33:15,TRADE,019223e4-59e1-7bf0-a9b1-606525bef3ba,0.23238996,ZETA,0.2,Coinbase ZETA Wallet,,,0.13359585,SAFE,0.21,Coinbase SAFE Wallet,,,0.00703135,SAFE,0.01,-0.02,0,
+06/20/2024 11:55:48,TRADE,019223e4-5969-7d4c-b2cf-76c7bb514aaf,0.00005173,ETH,0.2,Coinbase ETH Wallet,,,0.00136328,SOL,0.2,Coinbase SOL Wallet,,,0.00007175,SOL,0.01,-0.01,0,
+06/18/2024 18:00:04,TRANSFER,019223e4-5b35-78ae-ba7f-308ad09cf600,0.00152645,SOL,0,Coinbase SOL Wallet,,,0.00152645,SOL,0,Coinbase Staked SOL,,,,,,0,,
+06/15/2024 13:02:40,TRADE,019223e4-5893-77e5-b902-55338a8bb3d3,0.101366,USDC,0.2,Coinbase USDC Wallet,,,0.211179,XRP,0.11,Coinbase XRP Wallet,,,0.20829,XRP,0.11,-0.11,0.09,
+06/14/2024 16:54:40,TRADE,019223e4-590b-7744-8924-0273f3aa9334,6.55946573,VET,0.2,Coinbase VET Wallet,,,0.01835749,UNI,0.2,Coinbase UNI Wallet,,,0.00096618,UNI,0.01,-0.01,0,
+06/30/2024 10:15:14,TRADE,019223e4-5905-7a02-bef3-c5ae85b0d1c9,0.00233498,LTC,0.19,Coinbase LTC Wallet,,,0.22012003,ZETA,0.19,Coinbase ZETA Wallet,,,0.01226993,ZETA,0.01,-0.01,0,
+07/01/2024 0:08:53,TRADE,019223e4-585b-79b3-a8bc-e242bd34e8bc,0.00000259,BTC,0.18,Coinbase BTC Wallet,,,0.00220198,LTC,0.18,Coinbase LTC Wallet,,,0.000133,LTC,0.01,-0.01,0,
+06/14/2024 17:20:59,TRADE,019223e4-5887-7348-9c3f-9b1c1547ff32,0.094878,USDC,0.18,Coinbase USDC Wallet,,,3.36684424,VET,0.1,Coinbase VET Wallet,,,3.19262149,VET,0.1,-0.09,0.07,
+07/01/2024 0:12:49,TRADE,019223e4-5861-74c5-a92f-da41fa336a38,0.00004288,ETH,0.16,Coinbase ETH Wallet,,,0.0000024,BTC,0.17,Coinbase BTC Wallet,,,0.00000016,BTC,0.01,-0.02,0,
+06/23/2024 17:31:10,TRADE,019223e4-58f9-7379-9f3a-c1bd85f974fa,0.00191297,LTC,0.16,Coinbase LTC Wallet,,,0.17724414,ZETA,0.21,Coinbase ZETA Wallet,,,0.01212856,ZETA,0.01,-0.06,0,
+06/19/2024 8:06:55,TRADE,019223e4-58b7-76c3-a09a-d17d684dc139,0.00002189,ETH,0.16,Coinbase ETH Wallet,,,0.077494,USDC,0.16,Coinbase USDC Wallet,,,0.08,USDC,0.16,-0.16,0.01,
+08/09/2024 22:24:29,TRADE,019223e4-598f-7fbc-b41f-ee186c08b09f,0.32688576,MATIC,0.15,Coinbase MATIC Wallet,,,0.28005187,ZETA,0.12,Coinbase ZETA Wallet,,,0.01994813,ZETA,0.01,0.02,0,
+08/15/2024 4:51:00,TRADE,019223e4-5995-7590-8459-83f22ab30a03,0.20591719,ZETA,0.14,Coinbase ZETA Wallet,,,0.30569138,MATIC,0.14,Coinbase MATIC Wallet,,,0.02351281,MATIC,0.01,-0.01,0,
+06/23/2024 21:40:01,TRADE,019223e4-58ff-7a5e-9b87-6efa66265789,0.01301949,UNI,0.14,Coinbase UNI Wallet,,,0.00177765,LTC,0.15,Coinbase LTC Wallet,,,0.00013532,LTC,0.01,-0.02,0,
+07/10/2024 6:10:36,TRADE,019223e4-5923-722b-b7e0-953e5816475a,0.00081067,SOL,0.13,Coinbase SOL Wallet,,,4.61225282,VET,0.12,Coinbase VET Wallet,,,0.38774718,VET,0.01,0,0,
+07/06/2024 7:32:06,TRADE,019223e4-591d-7b60-a3b5-ebe9cdccb1af,4.9468588,VET,0.13,Coinbase VET Wallet,,,0.00003956,ETH,0.15,Coinbase ETH Wallet,,,0.00000332,ETH,0.01,-0.03,0,
+06/23/2024 21:41:12,TRADE,019223e4-59c9-7a2e-9f2f-d7b8e8dee1bf,0.08192718,SAFE,0.13,Coinbase SAFE Wallet,,,0.01200653,UNI,0.13,Coinbase UNI Wallet,,,0.00101296,UNI,0.01,-0.01,0,
+06/19/2024 8:07:35,TRADE,019223e4-5957-70e3-9206-a2439711c7af,0.00082307,SOL,0.13,Coinbase SOL Wallet,,,0.00003312,ETH,0.24,Coinbase ETH Wallet,,,0.00000282,ETH,0.02,-0.12,-0.01,
+06/14/2024 23:16:20,TRADE,019223e4-588d-79de-be36-7d0009e25723,0.00001742,ETH,0.13,Coinbase ETH Wallet,,,0.060469,USDC,0.15,Coinbase USDC Wallet,,,0.07,USDC,0.13,-0.15,0.02,
+07/10/2024 6:00:31,SEND,019223e4-5aef-7747-87d1-6ea029550377,,,,,,,4.87065194,VET,0.13,Coinbase VET Wallet,,,0.07620686,VET,0,0,0,
+07/10/2024 6:17:40,TRANSFER,019223e4-5b1e-7806-b51a-9eba36655663,0.00081067,SOL,0,Coinbase Staked SOL,,"Staked SOL
+on Coinbase",0.00081067,SOL,0,Coinbase SOL Wallet,,"Staked SOL
+on Coinbase",,,,0,,
+06/15/2024 13:30:38,TRADE,019223e4-5911-7ac7-9cfe-53d9c6c053ca,3.72043121,VET,0.12,Coinbase VET Wallet,,,0.00971927,UNI,0.22,Coinbase UNI Wallet,,,0.00088425,UNI,0.02,-0.11,-0.01,
+06/15/2024 13:29:13,BUY,019223e4-57bb-7766-9df7-8c965ea4b4a2,0.01060352,UNI,0.24,Coinbase UNI Wallet,,,0.12,USD,,Coinbase Cash (USD),,,0.12,USD,,,,
+06/19/2024 8:11:56,TRADE,019223e4-5831-74eb-a5f4-bcb28509af35,0.00000157,BTC,0.11,Coinbase BTC Wallet,,,0.00075139,SOL,0.12,Coinbase SOL Wallet,,,0.00007168,SOL,0.01,-0.02,0,
+06/15/2024 13:32:27,TRADE,019223e4-5917-777e-866b-27981ecb4821,0.013395,ATOM,0.11,Coinbase ATOM Wallet,,,3.37500807,VET,0.11,Coinbase VET Wallet,,,0.34542314,VET,0.01,-0.01,0,
+06/23/2024 17:32:59,TRADE,019223e4-59db-72e7-b958-876c28953f78,0.06177853,SAFE,0.1,Coinbase SAFE Wallet,,,0.0000014,WBTC,0.1,Coinbase WBTC Wallet,,,0.00000016,WBTC,0.01,-0.01,0,
+06/20/2024 17:18:04,TRADE,019223e4-59d5-748a-aec6-53b19e368ca8,0.10228126,ZETA,0.1,Coinbase ZETA Wallet,,,0.00000139,WBTC,0.1,Coinbase WBTC Wallet,,,0.00000015,WBTC,0.01,-0.01,0,
+06/20/2024 11:57:19,SELL,019223e4-57a9-7edd-b91c-5cc87717f7a8,0.1,USD,,Coinbase Cash (USD),,,0.00002778,ETH,0.11,Coinbase ETH Wallet,,,0.05,USD,,-0.06,,
+06/19/2024 6:41:26,TRADE,019223e4-58b1-7585-b092-6137da7d63b8,0.00001405,ETH,0.1,Coinbase ETH Wallet,,,0.05,USDC,0.1,Coinbase USDC Wallet,,,0.05,USDC,0.1,-0.1,0,
+06/17/2024 6:47:29,TRADE,019223e4-581f-7cdf-bb67-737a34dc02d4,0.00000133,BTC,0.1,Coinbase BTC Wallet,,,0.00002356,CBETH,0.09,Coinbase CBETH Wallet,,,0.00000261,CBETH,0.01,0,0,
+06/15/2024 13:33:34,TRADE,019223e4-5951-7635-b865-67bf2f673d78,0.00002358,ETH,0.1,Coinbase ETH Wallet,,,0.011996,ATOM,0.1,Coinbase ATOM Wallet,,,0.001399,ATOM,0.01,-0.01,0,
+06/15/2024 13:04:08,TRADE,019223e4-5899-714d-b70e-301f66af7a8d,0.00000077,WBTC,0.1,Coinbase WBTC Wallet,,,0.051366,USDC,0.1,Coinbase USDC Wallet,,,0.05,USDC,0.1,-0.1,0,
+06/19/2024 8:19:00,TRADE,019223e4-5837-7e15-a066-9a3a1230bf07,0.00056301,SOL,0.09,Coinbase SOL Wallet,,,0.00000123,BTC,0.09,Coinbase BTC Wallet,,,0.00000015,BTC,0.01,-0.01,0,
+09/23/2024 11:22:26,STAKING_REWARD,019223e4-4972-719c-a776-0e46b7a0c3c3,0.00058071,SOL,0.08,Coinbase SOL Wallet,,,,,,,,,,,,,,
+09/13/2024 21:05:36,RECEIVE,019223e4-4903-7202-951a-5624388e06d7,0.07712,USDC,0.08,Coinbase USDC Wallet,,,,,,,,,,,,,,
+06/19/2024 8:26:19,TRADE,019223e4-5843-797a-9263-e4be7f6bde42,0.00001927,ETH,0.08,Coinbase ETH Wallet,,,0.00000107,BTC,0.08,Coinbase BTC Wallet,,,0.00000015,BTC,0.01,-0.01,0,
+06/19/2024 8:23:55,TRADE,019223e4-583d-757a-9c95-de0a8499344a,0.00000103,BTC,0.08,Coinbase BTC Wallet,,,0.00049107,SOL,0.08,Coinbase SOL Wallet,,,0.00007194,SOL,0.01,-0.01,0,
+06/15/2024 13:37:11,TRADE,019223e4-589f-7dbc-bb94-d6e33869e5d1,0.043926,USDC,0.08,Coinbase USDC Wallet,,,0.00001235,ETH,0.05,Coinbase ETH Wallet,,,0.00001123,ETH,0.05,-0.05,0.03,
+09/15/2024 8:35:51,TRADE,019223e4-59e7-74ec-a86d-e8c686ec1c6e,0.0152971,TIA,0.07,Coinbase TIA Wallet,,,0.07315075,USDC,0.07,Coinbase USDC Wallet,,,0.00087781,USDC,0,0,0,
+06/23/2024 10:31:42,TRADE,019223e4-59b9-7d59-bc1d-2a2d35633341,0.06385994,ZETA,0.07,Coinbase ZETA Wallet,,,0.00041796,SOL,0.06,Coinbase SOL Wallet,,,0.00007453,SOL,0.01,0,0,
+06/22/2024 18:00:12,TRANSFER,019223e4-5b3b-7663-89e4-0a9ab1a5622b,0.00049249,SOL,0,Coinbase SOL Wallet,,,0.00049249,SOL,0,Coinbase Staked SOL,,,,,,0,,
+06/19/2024 10:14:31,TRADE,019223e4-595d-7269-9989-545e70a59873,0.00041099,SOL,0.07,Coinbase SOL Wallet,,,0.00001644,ETH,0.07,Coinbase ETH Wallet,,,0.00000283,ETH,0.01,-0.01,0,
+08/15/2024 13:05:08,SELL,019223e4-5a59-70d5-94c9-dd3d521707fa,0.0613,USD,,Coinbase Cash (USD),,,0.1,ZETA,0.07,Coinbase ZETA Wallet,,,0.0003678,USD,,-0.01,,
+06/19/2024 10:19:06,TRADE,019223e4-5963-7588-ad75-67e39bf4e1e7,0.00001301,ETH,0.06,Coinbase ETH Wallet,,,0.00033876,SOL,0.06,Coinbase SOL Wallet,,,0.00007223,SOL,0.01,-0.01,0,
+06/14/2024 17:16:05,TRADE,019223e4-5881-7124-8e5f-71bdeb2b572e,0.026548,USDC,0.06,Coinbase USDC Wallet,,,0.0025483,UNI,0.04,Coinbase UNI Wallet,,,0.00287935,UNI,0.03,-0.04,0.04,
+09/07/2024 20:47:36,TRADE,019223e4-58e7-70b7-bd4e-519def4ddad0,0.028133,USDC,0.05,Coinbase USDC Wallet,,,0.06191279,ZETA,0.04,Coinbase ZETA Wallet,,,0.0440044,ZETA,0.03,-0.03,0.01,
+06/20/2024 11:58:24,TRANSFER,019223e4-5aff-7ea5-87b0-dc5a8e3545f8,0.00001389,ETH,0,Coinbase Staked ETH,,"Staked ETH
+on Coinbase",0.00001389,ETH,0,Coinbase ETH Wallet,,"Staked ETH
+on Coinbase",,,,0,,
+06/19/2024 10:21:55,TRANSFER,019223e4-5afc-7193-8f71-5a94e7e6fb8a,0.00001301,ETH,0,Coinbase Staked ETH,,"Staked ETH
+on Coinbase",0.00001301,ETH,0,Coinbase ETH Wallet,,"Staked ETH
+on Coinbase",,,,0,,
+09/14/2024 12:10:01,BUY,019223e4-5a11-7761-9d3c-f7d5abee6414,0.00036455,SOL,0.05,Coinbase SOL Wallet,,,0.0499798,USD,,Coinbase Cash (USD),,,0.00059976,USD,,,,
+06/15/2024 13:06:01,SEND,019223e4-5b4a-7f4c-89b8-d78d6e58061b,,,,,,,0.00000075,WBTC,0.1,Coinbase WBTC Wallet,,,0.00000002,WBTC,0,-0.05,0,
+09/14/2024 12:12:53,TRADE,019223e4-59ff-76c3-a7c8-f3e9c3b61d33,0.067685,XRP,0.04,Coinbase XRP Wallet,,,0.03968372,USDC,0.04,Coinbase USDC Wallet,,,0.0004762,USDC,0,0,0,
+06/20/2024 12:02:39,TRADE,019223e4-596f-775d-8973-0f50d459575e,0.00253764,UNI,0.04,Coinbase UNI Wallet,,,0.00000728,ETH,0.03,Coinbase ETH Wallet,,,0.00000278,ETH,0.01,0,0,
+06/20/2024 12:01:25,TRADE,019223e4-59a7-7a03-ac85-fd9196c0b31e,0.00338145,ICP,0.04,Coinbase ICP Wallet,,,0.00021532,SOL,0.03,Coinbase SOL Wallet,,,0.00007177,SOL,0.01,-0.01,0,
+06/15/2024 13:38:54,TRADE,019223e4-58a5-7df8-82ed-2937cb69c2a6,0.00211342,UNI,0.04,Coinbase UNI Wallet,,,0.023926,USDC,0.04,Coinbase USDC Wallet,,,0.02,USDC,0.04,-0.04,0,
+09/15/2024 8:35:54,RECEIVE,019223e4-4921-70b7-a48a-644f87f0ebe5,0.028549,USDC,0.03,Coinbase USDC Wallet,,,,,,,,,,,,,,
+08/07/2024 6:43:43,TRADE,019223e4-59cf-738b-b1e1-c74908b94804,0.00271764,UNI,0.03,Coinbase UNI Wallet,,,0.024848,XTZ,0.02,Coinbase XTZ Wallet,,,0.015152,XTZ,0.01,0,0.01,
+08/06/2024 23:17:57,TRADE,019223e4-5939-7744-a3a9-6bec1873e0ad,0.72487604,VET,0.03,Coinbase VET Wallet,,,0.04021332,ZETA,0.02,Coinbase ZETA Wallet,,,0.02397506,ZETA,0.01,-0.01,0.01,
+07/15/2024 3:04:22,TRADE,019223e4-5935-73cd-949c-53b515f098c1,0.81229717,VET,0.03,Coinbase VET Wallet,,,0.00307851,UNI,0.03,Coinbase UNI Wallet,,,,,,0,,
+06/20/2024 12:39:11,TRADE,019223e4-59ad-7a3a-b2cd-4c55e72260ff,0.00013513,SOL,0.03,Coinbase SOL Wallet,,,0.00222122,ICP,0.03,Coinbase ICP Wallet,,,0.00116023,ICP,0.01,-0.01,0,
+06/20/2024 12:24:08,TRADE,019223e4-5849-7219-be39-b0cbd0716b6b,0.00000023,BTC,0.03,Coinbase BTC Wallet,,,0.00154173,UNI,0.02,Coinbase UNI Wallet,,,0.00099591,UNI,0.02,-0.01,0,
+09/13/2024 15:36:19,BUY,019223e4-5a2f-7004-a41b-9762938e2cd4,0.0264384,USDT,0.03,Coinbase USDT Wallet,,,0.02643998,USD,,Coinbase Cash (USD),,,0.00000026,USD,,,,
+08/27/2024 9:42:34,TRADE,019223e4-5a47-7ebd-ad4c-b57a08103e1c,0.01675846,USDC,0.02,Coinbase USDC Wallet,,,0.002717,UNI,0.03,Coinbase UNI Wallet,,,0.0002011,USDC,0,-0.01,0,
+08/01/2024 11:06:33,TRADE,019223e4-58c5-7afe-8465-ccb8f3f4e22d,0.00000019,WBTC,0.02,Coinbase WBTC Wallet,,,0.012392,USDC,0.02,Coinbase USDC Wallet,,,0.01,USDC,0.01,-0.01,0.01,
+07/31/2024 17:14:08,TRADE,019223e4-58c1-7abe-8c72-3930d35450c8,0.021956,USDC,0.02,Coinbase USDC Wallet,,,0.81229717,VET,0.03,Coinbase VET Wallet,,,,,,-0.01,,
+06/20/2024 17:16:31,BUY,019223e4-57c5-776e-a442-6897d53a0d7c,0.0232315,ZETA,0.05,Coinbase ZETA Wallet,,,0.02,USD,,Coinbase Cash (USD),,,0.03,USD,,,,
+06/16/2024 1:41:51,TRADE,019223e4-5819-7c46-81d3-4bc60e3bfd42,0.00000021,BTC,0.02,Coinbase BTC Wallet,,,0.0012468,UNI,0.02,Coinbase UNI Wallet,,,0.00086662,UNI,0.02,-0.02,0,
+08/15/2024 13:12:27,SELL,019223e4-5a53-7cc3-9513-943a6953bc90,0.01961568,USD,,Coinbase Cash (USD),,,0.00013622,SOL,0.02,Coinbase SOL Wallet,,,0.00011769,USD,,0,,
+08/05/2024 1:06:30,BUY,019223e4-5aa1-745d-9c10-eee3befa8f83,0.03,XTZ,0.02,Coinbase XTZ Wallet,,,0.01875,USD,,Coinbase Cash (USD),,,0.0001125,USD,,,,
+09/12/2024 23:50:41,TRADE,019223e4-5a3b-7853-a705-263b01da8871,0.00000294,ETH,0.01,Coinbase ETH Wallet,,,0.00693895,USDC,0.01,Coinbase USDC Wallet,,,0.00008327,USDC,0,0,0,
+08/01/2024 14:31:10,TRADE,019223e4-5ad1-723b-b850-6f88fa2eb936,0.00004358,SOL,0.01,Coinbase SOL Wallet,,,0.00729573,USDC,0,Coinbase USDC Wallet,,,0.00004377,USDC,0,0,0,
+07/20/2024 9:20:07,STAKING_REWARD,019223e4-4987-70f6-b14a-0d254acc758a,0.00004142,SOL,0.01,Coinbase Staked SOL,,,,,,,,,,,,,,
+07/15/2024 10:50:50,RECEIVE,019223e4-48fd-7b32-8bd2-36fb5ee9401d,0.005903,USDC,0.01,Coinbase USDC Wallet,,,,,,,,,,,,,,
+09/13/2024 21:05:35,BUY,019223e4-5a23-7ce9-b4ce-307cecceecbb,0.00225135,DOT,0.01,Coinbase DOT Wallet,,,0.00999599,USD,,Coinbase Cash (USD),,,0.00011995,USD,,,,
+08/06/2024 19:04:36,BUY,019223e4-5a89-74c9-a13f-83bc4c23a1a5,0.00006802,SOL,0.01,Coinbase SOL Wallet,,,0.0098799,USD,,Coinbase Cash (USD),,,0.00005928,USD,,,,
+08/05/2024 5:04:42,BUY,019223e4-5a95-7570-9525-59a4d9bec1f0,0.00008083,SOL,0.01,Coinbase SOL Wallet,,,0.00987985,USD,,Coinbase Cash (USD),,,0.00005928,USD,,,,
+08/05/2024 0:34:20,BUY,019223e4-5abf-719c-82af-b3fdd8d71044,0.0000723,SOL,0.01,Coinbase SOL Wallet,,,0.0098798,USD,,Coinbase Cash (USD),,,0.00005928,USD,,,,
+08/25/2024 21:47:29,SEND,019223e4-5b4f-7cca-8556-08aad8542ae1,,,,,,,0.00000018,WBTC,0.02,Coinbase WBTC Wallet,,,0.00000001,WBTC,0,-0.01,0,
+09/14/2024 12:10:01,BUY,019223e4-5a0b-7a15-814a-ec7afe7bf103,0.00005531,SOL,0.01,Coinbase SOL Wallet,,,0.00758241,USD,,Coinbase Cash (USD),,,0.00009099,USD,,,,
+08/05/2024 0:38:54,BUY,019223e4-5ab9-760f-a05e-bba0a9bcac50,0.01,XTZ,0.01,Coinbase XTZ Wallet,,,0.00651,USD,,Coinbase Cash (USD),,,0.00003906,USD,,,,
+08/05/2024 0:40:21,SELL,019223e4-5aa7-7eb8-a68d-fd6511bc7ccc,0.00412346,USD,,Coinbase Cash (USD),,,0.00003056,SOL,0,Coinbase SOL Wallet,,,0.00004948,USD,,0,,
+08/05/2024 3:36:00,SELL,019223e4-5a9b-717a-b163-ae4a8044effc,0.00293848,USD,,Coinbase Cash (USD),,,0.00002293,SOL,0,Coinbase SOL Wallet,,,0.00003526,USD,,0,,
+08/05/2024 0:39:43,SELL,019223e4-5aad-763b-98c0-c8fbc917af8d,0.00274078,USD,,Coinbase Cash (USD),,,0.00002037,SOL,0,Coinbase SOL Wallet,,,0.00003289,USD,,0,,
+08/05/2024 0:32:17,SELL,019223e4-5ac5-7515-9563-47bee05da4c0,0.00167386,USD,,Coinbase Cash (USD),,,0.00001226,SOL,0,Coinbase SOL Wallet,,,0.00002009,USD,,0,,
+08/05/2024 0:38:55,SELL,019223e4-5ab3-7d28-a5bf-a5527516b763,0.00146917,USD,,Coinbase Cash (USD),,,0.00001089,SOL,0,Coinbase SOL Wallet,,,0.00001763,USD,,0,,
+08/07/2024 2:31:35,TRADE,019223e4-5a77-7648-a19c-940a9f6cfa51,0.00114458,USDC,0,Coinbase USDC Wallet,,,0.00000758,SOL,0,Coinbase SOL Wallet,,,0.00000687,USDC,0,0,0,
+08/05/2024 0:31:41,SELL,019223e4-5acb-7d5a-a47b-e5dd6c1586c6,0.00111831,USD,,Coinbase Cash (USD),,,0.00000817,SOL,0,Coinbase SOL Wallet,,,0.00001342,USD,,0,,
+08/05/2024 16:25:11,SELL,019223e4-5a8f-7042-b6b1-6aff9d0c1fe1,0.0010298,USD,,Coinbase Cash (USD),,,0.00000764,SOL,0,Coinbase SOL Wallet,,,0.00000618,USD,,0,,
+08/07/2024 2:26:43,TRADE,019223e4-5a83-7ff1-9aae-45ba817b4071,0.00075715,USDC,0,Coinbase USDC Wallet,,,0.00000505,SOL,0,Coinbase SOL Wallet,,,0.00000909,USDC,0,0,0,0
+09/13/2024 21:05:35,BUY,019223e4-5a1d-7ee6-9355-898ab1a7e22c,0.00015271,DOT,0,Coinbase DOT Wallet,,,0.00067803,USD,,Coinbase Cash (USD),,,0.00000814,USD,,,,
+08/07/2024 2:27:54,SELL,019223e4-5a7d-7280-ae94-740e0c51a5f3,0.00046056,USD,,Coinbase Cash (USD),,,0.00000306,SOL,0,Coinbase SOL Wallet,,,0.00000276,USD,,0,,
+09/14/2024 12:12:53,TRADE,019223e4-59f9-7d90-80e2-17c6d0f7501c,0.00005636,XRP,0,Coinbase XRP Wallet,,,0.00003304,USDC,0,Coinbase USDC Wallet,,,0.0000004,USDC,0,0,0,0
+09/22/2024 14:29:14,STAKING_REWARD,019223e4-494e-7f9f-b583-385b38e9831d,0.00000071,MATIC,0,Coinbase MATIC Wallet,,,348259.1795,,,,,,,17.72804807,,1.01,1,1
+09/21/2024 6:32:12,STAKING_REWARD,019223e4-48f7-7ccc-a22d-5873417c6e20,0.00000003,ETH,0,Coinbase Staked ETH,,,,,,,,,,,,,1,
+09/19/2024 22:30:18,STAKING_REWARD,019223e4-4945-7568-be99-501f522de5d4,0.00000001,ETH,0,Coinbase ETH Wallet,,,,,,,,,,,-10.08,,,
+09/19/2024 15:23:06,STAKING_REWARD,019223e4-49b1-795b-b9cd-9f9addb25499,0.0000048,SOL,0,Coinbase Staked SOL,,,,,,,,,,,,,,
+09/18/2024 12:28:56,STAKING_REWARD,019223e4-48f4-7437-b610-cc56b256c78f,0.00000005,ETH,0,Coinbase Staked ETH,,,,,,,,,,,,,0.5,
+09/17/2024 10:45:46,STAKING_REWARD,019223e4-49e1-7b20-8669-1481c05e2ed2,0.0000009,MATIC,0,Coinbase Staked MATIC,,,,,,,,,,,,-25.04,-25.05,
+09/15/2024 18:15:39,STAKING_REWARD,019223e4-48f1-70b3-be73-84cb4c4e7af6,0.00000005,ETH,0,Coinbase Staked ETH,,,,,,,,,,,,,#N/A,
+09/15/2024 8:35:54,RECEIVE,019223e4-491e-78f5-b9b3-162ea8340ea4,0.000219,USDC,0,Coinbase USDC Wallet,,,,,,,,,,,,,,
+09/14/2024 12:12:55,RECEIVE,019223e4-4918-7ce9-b234-54bb9478c259,0.000119,USDC,0,Coinbase USDC Wallet,,,,,,,,,,,,,,
+09/14/2024 12:10:04,RECEIVE,019223e4-4912-76c9-a175-63d69931a95f,0.000023,USDC,0,Coinbase USDC Wallet,,,,,,,,,,,,,,
+09/14/2024 12:10:03,RECEIVE,019223e4-490f-7ec0-be0c-e73feb44e4bb,0.00015,USDC,0,Coinbase USDC Wallet,,,,,,,,,,,,,,
+09/13/2024 21:05:37,RECEIVE,019223e4-4909-7dad-80f2-eaf8899bfa1f,0.000002,USDC,0,Coinbase USDC Wallet,,,,,,,,,,,,,,
+09/13/2024 21:05:36,RECEIVE,019223e4-4906-787c-a9e1-e7946d50c862,0.00003,USDC,0,Coinbase USDC Wallet,,,,,,,,,,,,,,
+09/13/2024 15:36:30,RECEIVE,019223e4-4900-703e-840b-8baf386b98b1,0.001466,USDC,0,Coinbase USDC Wallet,,,,,,,,,,,,,,
+09/13/2024 4:54:35,STAKING_REWARD,019223e4-49de-7fb1-8955-783e4d409c52,0.00014588,MATIC,0,Coinbase Staked MATIC,,,,,,,,,,,,,,
+09/13/2024 1:06:44,STAKING_REWARD,019223e4-49db-79f7-8f7d-aa2239ad95c9,0.00000026,MATIC,0,Coinbase Staked MATIC,,,,,,,,,,,,,,
+09/11/2024 4:31:31,STAKING_REWARD,019223e4-48ee-734c-844e-1a4058caaedc,0.00000005,ETH,0,Coinbase Staked ETH,,,,,,,,,,,,,,
+09/09/2024 8:26:44,STAKING_REWARD,019223e4-48eb-7f00-a541-3fc3cb49c851,0.00000005,ETH,0,Coinbase Staked ETH,,,,,,,,,,,,,,
+09/09/2024 8:20:45,STAKING_REWARD,019223e4-49ab-7b44-b220-54b72a564c0e,0.00000368,SOL,0,Coinbase Staked SOL,,,,,,,,,,,,,,
+09/07/2024 12:08:28,STAKING_REWARD,019223e4-49d8-75b1-b1c9-8970abac4f38,0.00091731,MATIC,0,Coinbase Staked MATIC,,,,,,,,,,,,,,
+09/06/2024 0:30:31,STAKING_REWARD,019223e4-48e8-7673-bcac-68edebc22c59,0.00000005,ETH,0,Coinbase Staked ETH,,,,,,,,,,,,,,
+09/03/2024 10:50:45,STAKING_REWARD,019223e4-48e5-7177-9d70-58a0ba405fa6,0.00000005,ETH,0,Coinbase Staked ETH,,,,,,,,,,,,,,
+09/02/2024 23:39:47,STAKING_REWARD,019223e4-49a8-746a-b4fd-dd1392986336,0.00000375,SOL,0,Coinbase Staked SOL,,,,,,,,,,,,,,
+09/02/2024 17:16:21,STAKING_REWARD,019223e4-49d5-7c90-ad8e-daf8e84f6365,0.00040327,MATIC,0,Coinbase Staked MATIC,,,,,,,,,,,,,,
+08/31/2024 11:07:29,STAKING_REWARD,019223e4-49a5-75b3-899d-cb7224485aad,0.00000376,SOL,0,Coinbase Staked SOL,,,,,,,,,,,,,,
+08/31/2024 2:30:16,STAKING_REWARD,019223e4-48e2-7b84-94ad-fa886ec26d61,0.00000005,ETH,0,Coinbase Staked ETH,,,,,,,,,,,,,,
+08/28/2024 20:17:36,STAKING_REWARD,019223e4-49d2-7e39-acb1-bf50d5ce504d,0.00090379,MATIC,0,Coinbase Staked MATIC,,,,,,,,,,,,,,
+08/28/2024 17:35:20,STAKING_REWARD,019223e4-49cf-7355-b46c-cd65d79ce9a3,0.00000761,MATIC,0,Coinbase Staked MATIC,,,,,,,,,,,,,,
+08/26/2024 17:09:26,STAKING_REWARD,019223e4-48df-7f32-ab94-94303c73b1ab,0.00000006,ETH,0,Coinbase Staked ETH,,,,,,,,,,,,,,
+08/25/2024 18:20:00,STAKING_REWARD,019223e4-499f-7eb9-96a4-918bf0672f16,0.00000579,SOL,0,Coinbase Staked SOL,,,,,,,,,,,,,,
+08/25/2024 3:59:55,STAKING_REWARD,019223e4-48dc-7c5a-8257-13a2caa79e25,0.00000004,ETH,0,Coinbase Staked ETH,,,,,,,,,,,,,,
+08/23/2024 22:02:28,STAKING_REWARD,019223e4-49cc-7ce6-ada6-610d60929cb0,0.00075879,MATIC,0,Coinbase Staked MATIC,,,,,,,,,,,,,,
+08/23/2024 14:51:30,STAKING_REWARD,019223e4-49c9-773e-b102-9f9d52819c3a,0.00022167,MATIC,0,Coinbase Staked MATIC,,,,,,,,,,,,,,
+08/21/2024 7:26:33,STAKING_REWARD,019223e4-499c-7fbf-9351-79fac55f7fb0,0.0000041,SOL,0,Coinbase Staked SOL,,,,,,,,,,,,,,
+08/20/2024 15:48:19,STAKING_REWARD,019223e4-48d9-7295-a8e4-6ce906dbd7f0,0.00000005,ETH,0,Coinbase Staked ETH,,,,,,,,,,,,,,
+08/18/2024 12:35:47,STAKING_REWARD,019223e4-49c6-79b4-a059-1f2b0de763db,0.0005875,MATIC,0,Coinbase Staked MATIC,,,,,,,,,,,,,,
+08/18/2024 3:31:51,STAKING_REWARD,019223e4-48d6-7183-8acf-167a4cbdb3a9,0.00000005,ETH,0,Coinbase Staked ETH,,,,,,,,,,,,,,
+08/14/2024 22:11:48,STAKING_REWARD,019223e4-48d3-7bbc-ab40-75fa0c0d5b2b,0.00000005,ETH,0,Coinbase Staked ETH,,,,,,,,,,,,,,
+08/14/2024 12:08:40,STAKING_REWARD,019223e4-4999-7334-bb13-5edd9ab49f43,0.00000627,SOL,0,Coinbase Staked SOL,,,,,,,,,,,,,,
+08/13/2024 15:26:51,STAKING_REWARD,019223e4-49c3-77c1-96ea-a528ddd5c270,0.00289599,MATIC,0,Coinbase Staked MATIC,,,,,,,,,,,,,,
+08/11/2024 20:35:02,STAKING_REWARD,019223e4-48d0-701f-8b82-6d15cadd947c,0.00000005,ETH,0,Coinbase Staked ETH,,,,,,,,,,,,,,
+08/10/2024 4:44:37,STAKING_REWARD,019223e4-4996-71e9-8fc0-95c9b0427090,0.00000416,SOL,0,Coinbase Staked SOL,,,,,,,,,,,,,,
+08/09/2024 13:33:51,STAKING_REWARD,019223e4-48cd-7670-a06c-fb6c36a4d4c9,0.00000007,ETH,0,Coinbase Staked ETH,,,,,,,,,,,,,,
+08/09/2024 2:59:07,STAKING_REWARD,019223e4-49c0-7fd7-bd42-a8e0c340b90b,0.00004777,MATIC,0,Coinbase Staked MATIC,,,,,,,,,,,,,,
+08/08/2024 16:15:04,STAKING_REWARD,019223e4-49bd-7071-9310-eaafaf698aef,0.0034198,MATIC,0,Coinbase Staked MATIC,,,,,,,,,,,,,,
+08/06/2024 23:46:33,STAKING_REWARD,019223e4-48ca-7e24-90b4-94c1b06238db,0.00000006,ETH,0,Coinbase Staked ETH,,,,,,,,,,,,,,
+08/06/2024 9:29:44,STAKING_REWARD,019223e4-4993-7990-989b-1929fa8ef34a,0.00000437,SOL,0,Coinbase Staked SOL,,,,,,,,,,,,,,
+08/04/2024 9:02:27,STAKING_REWARD,019223e4-48c7-7775-b451-4bbaee93eb39,0.00000005,ETH,0,Coinbase Staked ETH,,,,,,,,,,,,,,
+08/04/2024 3:20:06,STAKING_REWARD,019223e4-4990-7cb1-a010-111685828b77,0.00000398,SOL,0,Coinbase Staked SOL,,,,,,,,,,,,,,
+08/03/2024 14:31:44,STAKING_REWARD,019223e4-49ba-76fb-b484-0c247467f81d,0.00316953,MATIC,0,Coinbase Staked MATIC,,,,,,,,,,,,,,
+08/02/2024 7:04:20,STAKING_REWARD,019223e4-48c4-7f7c-8bc4-0c0012ff811e,0.00000004,ETH,0,Coinbase Staked ETH,,,,,,,,,,,,,,
+08/01/2024 15:45:22,STAKING_REWARD,019223e4-498d-7038-a521-50cc35b9d8cd,0.00000379,SOL,0,Coinbase Staked SOL,,,,,,,,,,,,,,
+07/30/2024 14:51:06,STAKING_REWARD,019223e4-48c1-7ae3-80c3-2b61bfad37f6,0.00000006,ETH,0,Coinbase Staked ETH,,,,,,,,,,,,,,
+07/29/2024 9:25:11,STAKING_REWARD,019223e4-49b7-7191-8006-8fd583f93260,0.00255465,MATIC,0,Coinbase Staked MATIC,,,,,,,,,,,,,,
+07/29/2024 5:29:57,STAKING_REWARD,019223e4-48be-78fb-a995-bcc1b355596b,0.00000005,ETH,0,Coinbase Staked ETH,,,,,,,,,,,,,,
+07/27/2024 12:54:28,STAKING_REWARD,019223e4-48bb-7465-821f-32e1659b00ad,0.00000006,ETH,0,Coinbase Staked ETH,,,,,,,,,,,,,,
+07/23/2024 20:05:40,STAKING_REWARD,019223e4-498a-7782-a6e9-555b618f2a67,0.00000198,SOL,0,Coinbase Staked SOL,,,,,,,,,,,,,,
+07/23/2024 9:24:52,STAKING_REWARD,019223e4-48b8-7d4a-914f-6f2554816fe8,0.00000003,ETH,0,Coinbase Staked ETH,,,,,,,,,,,,,,
+07/14/2024 20:42:01,RECEIVE,019223e4-48fa-7bf9-91a5-b9a592a2f193,0.001917,USDC,0,Coinbase USDC Wallet,,,,,,,,,,,,,,
+07/14/2024 1:05:44,STAKING_REWARD,019223e4-48b2-7465-99da-c2d71e4d8b3d,0.00000005,ETH,0,Coinbase Staked ETH,,,,,,,,,,,,,,
+07/12/2024 20:46:20,STAKING_REWARD,019223e4-48af-7e10-bc69-5e15745b730b,0.00000007,ETH,0,Coinbase Staked ETH,,,,,,,,,,,,,,
+07/09/2024 23:15:34,STAKING_REWARD,019223e4-48ac-76a6-aeb2-a83101678729,0.00000006,ETH,0,Coinbase Staked ETH,,,,,,,,,,,,,,
+07/05/2024 15:56:57,STAKING_REWARD,019223e4-48a9-7be1-8089-a62a32054084,0.00000005,ETH,0,Coinbase Staked ETH,,,,,,,,,,,,,,
+07/04/2024 1:27:41,STAKING_REWARD,019223e4-48a6-7a2b-a3eb-cc0677fd44ce,0.00000007,ETH,0,Coinbase Staked ETH,,,,,,,,,,,,,,
+07/01/2024 6:11:34,STAKING_REWARD,019223e4-48a3-781b-97ad-2ee69dc7811d,0.00000006,ETH,0,Coinbase Staked ETH,,,,,,,,,,,,,,
+06/28/2024 20:13:38,STAKING_REWARD,019223e4-48a0-7ec4-8388-e893dcfe1c29,0.00000005,ETH,0,Coinbase Staked ETH,,,,,,,,,,,,,,
+06/25/2024 5:45:03,STAKING_REWARD,019223e4-489d-77d6-a8c9-3e9a3c897e72,0.00000008,ETH,0,Coinbase Staked ETH,,,,,,,,,,,,,,
+06/25/2024 0:09:40,STAKING_REWARD,019223e4-497b-785d-a6ed-d382b5023d5a,0.00000327,SOL,0,Coinbase Staked SOL,,,,,,,,,,,,,,
+,,,,,471.1533333=,,,,,,,,,,,,,,,
+,,,,,427.9033333,,,,,,,,,,,,,,,
\ No newline at end of file
diff --git a/examples/testapp/package.json b/examples/testapp/package.json
index ac737058e..9e39f0bfe 100644
--- a/examples/testapp/package.json
+++ b/examples/testapp/package.json
@@ -24,6 +24,7 @@
     "acorn": "^8.15.0",
     "framer-motion": "^10.13.1",
     "next": "^14.2.10",
+    "qrcode.react": "^4.2.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-hook-form": "7.45.2",
@@ -31,6 +32,7 @@
   },
   "devDependencies": {
     "@testing-library/react": "^16.2.0",
+    "@types/qrcode.react": "^3.0.0",
     "@types/react": "18.2.15",
     "typescript": "^5.1.6",
     "vitest": "^3.0.4"
diff --git a/examples/testapp/src/components/Layout.tsx b/examples/testapp/src/components/Layout.tsx
index 29a3b102e..3fef44b1f 100644
--- a/examples/testapp/src/components/Layout.tsx
+++ b/examples/testapp/src/components/Layout.tsx
@@ -33,8 +33,11 @@ const PAGES = [
   '/add-sub-account',
   '/import-sub-account',
   '/auto-sub-account',
+  '/spend-permission',
   '/payment',
   '/pay-playground',
+  '/subscribe-playground',
+  '/prolink-playground',
 ];
 
 export function Layout({ children }: LayoutProps) {
diff --git a/examples/testapp/src/components/RpcMethods/RpcMethodCard.tsx b/examples/testapp/src/components/RpcMethods/RpcMethodCard.tsx
index 05ebc8cb8..8817d1b9b 100644
--- a/examples/testapp/src/components/RpcMethods/RpcMethodCard.tsx
+++ b/examples/testapp/src/components/RpcMethods/RpcMethodCard.tsx
@@ -76,6 +76,34 @@ export function RpcMethodCard({ format, method, params, shortcuts }) {
           (shortcut) => Number(shortcut.data.chainId) === hexToNumber(chainId)
         )?.data.chain ?? mainnet;
 
+      if (method.includes('wallet_sign')) {
+        const type = data.type || (data.request as any).type;
+        const walletSignData = data.data || (data.request as any).data;
+        let result: string | null = null;
+        if (type === '0x01') {
+          result = await verifySignMsg({
+            method: 'eth_signTypedData_v4',
+            from: data.address?.toLowerCase(),
+            sign: response,
+            message: walletSignData,
+            chain: chain as Chain,
+          });
+        }
+        if (type === '0x45') {
+          result = await verifySignMsg({
+            method: 'personal_sign',
+            from: data.address?.toLowerCase(),
+            sign: response,
+            message: walletSignData.message,
+            chain: chain as Chain,
+          });
+        }
+        if (result) {
+          setVerifyResult(result);
+          return;
+        }
+      }
+
       const verifyResult = await verifySignMsg({
         method,
         from: data.address?.toLowerCase(),
@@ -83,6 +111,7 @@ export function RpcMethodCard({ format, method, params, shortcuts }) {
         message: data.message,
         chain: chain as Chain,
       });
+
       if (verifyResult) {
         setVerifyResult(verifyResult);
         return;
@@ -118,7 +147,7 @@ export function RpcMethodCard({ format, method, params, shortcuts }) {
       }
       try {
         const response = (await provider.request({
-          method,
+          method: method.split('#')[0], // so we can use # to add a description in method name
           params: values,
           // biome-ignore lint/suspicious/noExplicitAny: old code, refactor soon
         })) as any;
diff --git a/examples/testapp/src/components/RpcMethods/method/ephemeralMethods.ts b/examples/testapp/src/components/RpcMethods/method/ephemeralMethods.ts
index 8bb9a75bb..8b98290bd 100644
--- a/examples/testapp/src/components/RpcMethods/method/ephemeralMethods.ts
+++ b/examples/testapp/src/components/RpcMethods/method/ephemeralMethods.ts
@@ -1,3 +1,4 @@
+import { parseMessage } from '../shortcut/ShortcutType';
 import { RpcRequestInput } from './RpcRequestInput';
 
 const walletSendCallsEphemeral: RpcRequestInput = {
@@ -16,12 +17,50 @@ const walletSendCallsEphemeral: RpcRequestInput = {
   ],
 };
 
-const walletSignEphemeral: RpcRequestInput = {
-  method: 'wallet_sign',
-  params: [{ key: 'message', required: true }],
+const walletSignOldSpecEphemeral: RpcRequestInput = {
+  method: 'wallet_sign#old',
+  params: [
+    { key: 'version', required: true },
+    { key: 'type', required: true },
+    { key: 'address', required: false },
+    { key: 'data', required: true },
+    { key: 'capabilities', required: false },
+    { key: 'mutableData', required: false },
+  ],
+  format: (data: Record<string, string>) => [
+    {
+      version: data.version,
+      type: data.type,
+      address: data.address,
+      data: parseMessage(data.data),
+      capabilities: data.capabilities,
+      mutableData: data.mutableData,
+    },
+  ],
+};
+
+const walletSignNewSpecEphemeral: RpcRequestInput = {
+  method: 'wallet_sign#new',
+  params: [
+    { key: 'version', required: true },
+    { key: 'request', required: true },
+    { key: 'address', required: false },
+    { key: 'capabilities', required: false },
+    { key: 'mutableData', required: false },
+  ],
   format: (data: Record<string, string>) => [
-    `0x${Buffer.from(data.message, 'utf8').toString('hex')}`,
+    {
+      version: data.version,
+      request: parseMessage(data.request),
+      address: data.address,
+      capabilities: data.capabilities,
+      mutableData: data.mutableData,
+    },
   ],
 };
 
-export const ephemeralMethods = [walletSendCallsEphemeral, walletSignEphemeral];
+export const ephemeralMethods = [
+  walletSendCallsEphemeral,
+  walletSignOldSpecEphemeral,
+  walletSignNewSpecEphemeral,
+];
diff --git a/examples/testapp/src/components/RpcMethods/method/experimentalMethods.ts b/examples/testapp/src/components/RpcMethods/method/experimentalMethods.ts
new file mode 100644
index 000000000..168e022e2
--- /dev/null
+++ b/examples/testapp/src/components/RpcMethods/method/experimentalMethods.ts
@@ -0,0 +1,18 @@
+import { RpcRequestInput } from './RpcRequestInput';
+
+const baseRequestInfo: RpcRequestInput = {
+  method: 'experimental_requestInfo',
+  params: [
+    {
+      key: 'requests',
+      required: true,
+    },
+  ],
+  format: (data: Record<string, string>) => [
+    {
+      requests: data.requests,
+    },
+  ],
+};
+
+export const experimentalMethods = [baseRequestInfo];
diff --git a/examples/testapp/src/components/RpcMethods/method/signMessageMethods.ts b/examples/testapp/src/components/RpcMethods/method/signMessageMethods.ts
index ee76e6def..564dfb657 100644
--- a/examples/testapp/src/components/RpcMethods/method/signMessageMethods.ts
+++ b/examples/testapp/src/components/RpcMethods/method/signMessageMethods.ts
@@ -1,4 +1,4 @@
-import { Chain, createPublicClient, http, TypedDataDomain } from 'viem';
+import { Chain, TypedDataDomain, createPublicClient, http } from 'viem';
 
 import { parseMessage } from '../shortcut/ShortcutType';
 import { RpcRequestInput } from './RpcRequestInput';
@@ -54,12 +54,54 @@ const ethSignTypedDataV4: RpcRequestInput = {
   format: (data: Record<string, string>) => [data.address, parseMessage(data.message)],
 };
 
+const walletSignOldSpec: RpcRequestInput = {
+  method: 'wallet_sign#old',
+  params: [
+    { key: 'version', required: true },
+    { key: 'type', required: true },
+    { key: 'address', required: false },
+    { key: 'data', required: true },
+    { key: 'capabilities', required: false },
+  ],
+  format: (data: Record<string, string>) => [
+    {
+      version: data.version,
+      type: data.type,
+      address: data.address,
+      data: parseMessage(data.data),
+      capabilities: data.capabilities,
+    },
+  ],
+};
+
+const walletSignNewSpec: RpcRequestInput = {
+  method: 'wallet_sign#new',
+  params: [
+    { key: 'version', required: true },
+    { key: 'request', required: true },
+    { key: 'address', required: false },
+    { key: 'capabilities', required: false },
+    { key: 'mutableData', required: false },
+  ],
+  format: (data: Record<string, string>) => [
+    {
+      version: data.version,
+      request: parseMessage(data.request),
+      address: data.address,
+      mutableData: data.mutableData,
+      capabilities: data.capabilities,
+    },
+  ],
+};
+
 export const signMessageMethods = [
   ethSign,
   personalSign,
   ethSignTypedDataV1,
   ethSignTypedDataV3,
   ethSignTypedDataV4,
+  walletSignOldSpec,
+  walletSignNewSpec,
 ];
 
 export const verifySignMsg = async ({
diff --git a/examples/testapp/src/components/RpcMethods/shortcut/connectionMethodShortcuts.ts b/examples/testapp/src/components/RpcMethods/shortcut/connectionMethodShortcuts.ts
index 32c45d21f..92a86d1cd 100644
--- a/examples/testapp/src/components/RpcMethods/shortcut/connectionMethodShortcuts.ts
+++ b/examples/testapp/src/components/RpcMethods/shortcut/connectionMethodShortcuts.ts
@@ -1,3 +1,4 @@
+import { toHex } from 'viem';
 import { ShortcutType } from './ShortcutType';
 
 const walletConnectShortcuts: ShortcutType[] = [
@@ -7,7 +8,7 @@ const walletConnectShortcuts: ShortcutType[] = [
       version: '1',
       capabilities: {
         signInWithEthereum: {
-          chainId: 84532,
+          chainId: toHex(84532),
           nonce: Math.random().toString(36).substring(2, 15),
         },
       },
diff --git a/examples/testapp/src/components/RpcMethods/shortcut/ephemeralMethodShortcuts.ts b/examples/testapp/src/components/RpcMethods/shortcut/ephemeralMethodShortcuts.ts
index bf5ad79ff..f2bf72f65 100644
--- a/examples/testapp/src/components/RpcMethods/shortcut/ephemeralMethodShortcuts.ts
+++ b/examples/testapp/src/components/RpcMethods/shortcut/ephemeralMethodShortcuts.ts
@@ -1,5 +1,87 @@
 import { ShortcutType } from './ShortcutType';
 
+const PLACEHOLDER_ADDRESS = '0xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
+
+const BASE_PAY_DATA = {
+  domain: {
+    chainId: 8453,
+    name: 'USDC',
+    verifyingContract: '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913',
+    version: '2',
+  },
+  message: {
+    from: PLACEHOLDER_ADDRESS,
+    nonce: '0xbda37619d3004dba4ac2491022bc82b7df64c2f68e8a349422c71983a80d16ca',
+    to: '0xbc4c0191af73c4953b54f21ae0c74b31fc6cb21b',
+    validAfter: '0',
+    validBefore: '1914749767655',
+    value: '10000',
+  },
+  primaryType: 'ReceiveWithAuthorization',
+  types: {
+    ReceiveWithAuthorization: [
+      {
+        name: 'from',
+        type: 'address',
+      },
+      {
+        name: 'to',
+        type: 'address',
+      },
+      {
+        name: 'value',
+        type: 'uint256',
+      },
+      {
+        name: 'validAfter',
+        type: 'uint256',
+      },
+      {
+        name: 'validBefore',
+        type: 'uint256',
+      },
+      {
+        name: 'nonce',
+        type: 'bytes32',
+      },
+    ],
+  },
+};
+
+const SUBSCRIPTION_DATA = {
+  domain: {
+    name: 'Spend Permission Manager',
+    version: '1',
+    chainId: 8453,
+    verifyingContract: '0xf85210B21cC50302F477BA56686d2019dC9b67Ad',
+  },
+  types: {
+    SpendPermission: [
+      { name: 'account', type: 'address' },
+      { name: 'spender', type: 'address' },
+      { name: 'token', type: 'address' },
+      { name: 'allowance', type: 'uint160' },
+      { name: 'period', type: 'uint48' },
+      { name: 'start', type: 'uint48' },
+      { name: 'end', type: 'uint48' },
+      { name: 'salt', type: 'uint256' },
+      { name: 'extraData', type: 'bytes' },
+    ],
+  },
+  primaryType: 'SpendPermission',
+  message: {
+    account: '0xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA', // Placeholder
+    spender: '0xd4e17478581878A967aA22d45a5158A9fE96AA08',
+    token: '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE',
+    allowance: '1000000',
+    period: 86400,
+    start: 1724264802,
+    end: 17242884802,
+    salt: '0x1',
+    extraData: '0x',
+  },
+};
+
 const walletSendCallsEphemeralShortcuts: ShortcutType[] = [
   {
     key: 'wallet_sendCalls',
@@ -11,16 +93,62 @@ const walletSendCallsEphemeralShortcuts: ShortcutType[] = [
   },
 ];
 
-const walletSignEphemeralShortcuts: ShortcutType[] = [
+const walletSignOldSpecEphemeralShortcuts: ShortcutType[] = [
+  {
+    key: 'Base Pay',
+    data: {
+      version: '1.0',
+      type: '0x01',
+      data: BASE_PAY_DATA,
+      mutableData: {
+        fields: ['message.from'],
+      },
+    },
+  },
+  {
+    key: 'Subscription',
+    data: {
+      version: '1.0',
+      type: '0x01',
+      data: SUBSCRIPTION_DATA,
+      mutableData: {
+        fields: ['message.account'],
+      },
+    },
+  },
+];
+
+const walletSignNewSpecEphemeralShortcuts: ShortcutType[] = [
+  {
+    key: 'Base Pay',
+    data: {
+      version: '1.0',
+      request: {
+        type: '0x01',
+        data: BASE_PAY_DATA,
+      },
+      mutableData: {
+        fields: ['message.from'],
+      },
+    },
+  },
   {
-    key: 'wallet_sign',
+    key: 'Subscription',
     data: {
-      message: 'Hello, world!',
+      version: '1.0',
+      request: {
+        type: '0x01',
+        data: SUBSCRIPTION_DATA,
+      },
+      mutableData: {
+        fields: ['message.account'],
+      },
     },
   },
 ];
 
 export const ephemeralMethodShortcutsMap = {
   wallet_sendCalls: walletSendCallsEphemeralShortcuts,
-  wallet_sign: walletSignEphemeralShortcuts,
+  ['wallet_sign#old']: walletSignOldSpecEphemeralShortcuts,
+  ['wallet_sign#new']: walletSignNewSpecEphemeralShortcuts,
 };
diff --git a/examples/testapp/src/components/RpcMethods/shortcut/experimentalShortcuts.ts b/examples/testapp/src/components/RpcMethods/shortcut/experimentalShortcuts.ts
new file mode 100644
index 000000000..692e5a229
--- /dev/null
+++ b/examples/testapp/src/components/RpcMethods/shortcut/experimentalShortcuts.ts
@@ -0,0 +1,29 @@
+import { ShortcutType } from './ShortcutType';
+
+const experimentalRequestInfoShortcut: ShortcutType = {
+  key: 'Experimental Request Info',
+  data: {
+    requests: [
+      {
+        type: 'email' as const,
+        optional: true,
+      },
+      {
+        type: 'physicalAddress' as const,
+        optional: true,
+      },
+      {
+        type: 'name' as const,
+        optional: false,
+      },
+      {
+        type: 'phoneNumber' as const,
+        optional: false,
+      },
+    ],
+  },
+};
+
+export const baseProfileShortcutsMap: Record<string, ShortcutType[]> = {
+  experimental_requestInfo: [experimentalRequestInfoShortcut],
+};
diff --git a/examples/testapp/src/components/RpcMethods/shortcut/signMessageShortcuts.ts b/examples/testapp/src/components/RpcMethods/shortcut/signMessageShortcuts.ts
index 8bb571fc4..294c96865 100644
--- a/examples/testapp/src/components/RpcMethods/shortcut/signMessageShortcuts.ts
+++ b/examples/testapp/src/components/RpcMethods/shortcut/signMessageShortcuts.ts
@@ -1,5 +1,102 @@
-import { ADDR_TO_FILL, EXAMPLE_MESSAGE } from './const';
 import { ShortcutType } from './ShortcutType';
+import { ADDR_TO_FILL, EXAMPLE_MESSAGE } from './const';
+
+const TYPED_DATA_V4_DATA = {
+  domain: {
+    chainId: '84532',
+    name: 'Ether Mail',
+    verifyingContract: '0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC',
+    version: '1',
+  },
+  message: {
+    contents: 'Hello, Bob!',
+    from: {
+      name: 'Cow',
+      wallets: [
+        '0xCD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826',
+        '0xDeaDbeefdEAdbeefdEadbEEFdeadbeEFdEaDbeeF',
+      ],
+    },
+    to: [
+      {
+        name: 'Bob',
+        wallets: [
+          '0xbBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB',
+          '0xB0BdaBea57B0BDABeA57b0bdABEA57b0BDabEa57',
+          '0xB0B0b0b0b0b0B000000000000000000000000000',
+        ],
+      },
+    ],
+  },
+  primaryType: 'Mail',
+  types: {
+    EIP712Domain: [
+      { name: 'name', type: 'string' },
+      { name: 'version', type: 'string' },
+      { name: 'chainId', type: 'uint256' },
+      { name: 'verifyingContract', type: 'address' },
+    ],
+    Group: [
+      { name: 'name', type: 'string' },
+      { name: 'members', type: 'Person[]' },
+    ],
+    Mail: [
+      { name: 'from', type: 'Person' },
+      { name: 'to', type: 'Person[]' },
+      { name: 'contents', type: 'string' },
+    ],
+    Person: [
+      { name: 'name', type: 'string' },
+      { name: 'wallets', type: 'address[]' },
+    ],
+  },
+};
+
+const BASE_PAY_DATA = {
+  domain: {
+    chainId: 8453,
+    name: 'USDC',
+    verifyingContract: '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913',
+    version: '2',
+  },
+  message: {
+    from: ADDR_TO_FILL,
+    nonce: '0xbda37619d3004dba4ac2491022bc82b7df64c2f68e8a349422c71983a80d16ca',
+    to: '0xbc4c0191af73c4953b54f21ae0c74b31fc6cb21b',
+    validAfter: '0',
+    validBefore: '1914749767655',
+    value: '10000',
+  },
+  primaryType: 'ReceiveWithAuthorization',
+  types: {
+    ReceiveWithAuthorization: [
+      {
+        name: 'from',
+        type: 'address',
+      },
+      {
+        name: 'to',
+        type: 'address',
+      },
+      {
+        name: 'value',
+        type: 'uint256',
+      },
+      {
+        name: 'validAfter',
+        type: 'uint256',
+      },
+      {
+        name: 'validBefore',
+        type: 'uint256',
+      },
+      {
+        name: 'nonce',
+        type: 'bytes32',
+      },
+    ],
+  },
+};
 
 const personalSignShortcuts: ShortcutType[] = [
   {
@@ -77,56 +174,7 @@ const ethSignTypedDataV4Shortcuts: (chainId: number) => ShortcutType[] = (chainI
   {
     key: EXAMPLE_MESSAGE,
     data: {
-      message: {
-        domain: {
-          chainId,
-          name: 'Ether Mail',
-          verifyingContract: '0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC',
-          version: '1',
-        },
-        message: {
-          contents: 'Hello, Bob!',
-          from: {
-            name: 'Cow',
-            wallets: [
-              '0xCD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826',
-              '0xDeaDbeefdEAdbeefdEadbEEFdeadbeEFdEaDbeeF',
-            ],
-          },
-          to: [
-            {
-              name: 'Bob',
-              wallets: [
-                '0xbBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB',
-                '0xB0BdaBea57B0BDABeA57b0bdABEA57b0BDabEa57',
-                '0xB0B0b0b0b0b0B000000000000000000000000000',
-              ],
-            },
-          ],
-        },
-        primaryType: 'Mail',
-        types: {
-          EIP712Domain: [
-            { name: 'name', type: 'string' },
-            { name: 'version', type: 'string' },
-            { name: 'chainId', type: 'uint256' },
-            { name: 'verifyingContract', type: 'address' },
-          ],
-          Group: [
-            { name: 'name', type: 'string' },
-            { name: 'members', type: 'Person[]' },
-          ],
-          Mail: [
-            { name: 'from', type: 'Person' },
-            { name: 'to', type: 'Person[]' },
-            { name: 'contents', type: 'string' },
-          ],
-          Person: [
-            { name: 'name', type: 'string' },
-            { name: 'wallets', type: 'address[]' },
-          ],
-        },
-      },
+      message: TYPED_DATA_V4_DATA,
       address: ADDR_TO_FILL,
     },
   },
@@ -171,9 +219,81 @@ const ethSignTypedDataV4Shortcuts: (chainId: number) => ShortcutType[] = (chainI
   },
 ];
 
+const walletSignOldSpecShortcuts: ShortcutType[] = [
+  {
+    key: 'Base Pay',
+    data: {
+      version: '1.0',
+      type: '0x01',
+      address: ADDR_TO_FILL,
+      data: BASE_PAY_DATA,
+    },
+  },
+  {
+    key: 'Typed Data',
+    data: {
+      version: '1.0',
+      type: '0x01',
+      address: ADDR_TO_FILL,
+      data: TYPED_DATA_V4_DATA,
+    },
+  },
+  {
+    key: 'Personal Sign',
+    data: {
+      version: '1.0',
+      type: '0x45',
+      address: ADDR_TO_FILL,
+      data: {
+        message: 'Hello, World!',
+      },
+    },
+  },
+];
+
+const walletSignNewSpecShortcuts: ShortcutType[] = [
+  {
+    key: 'Base Pay',
+    data: {
+      version: '1.0',
+      request: {
+        type: '0x01',
+        data: BASE_PAY_DATA,
+      },
+      address: ADDR_TO_FILL,
+    },
+  },
+  {
+    key: 'Typed Data',
+    data: {
+      version: '1.0',
+      request: {
+        type: '0x01',
+        data: TYPED_DATA_V4_DATA,
+      },
+      address: ADDR_TO_FILL,
+    },
+  },
+  {
+    key: 'Personal Sign',
+    data: {
+      version: '1.0',
+      request: {
+        type: '0x45',
+        data: {
+          message: 'Hello, World!',
+        },
+      },
+      address: ADDR_TO_FILL,
+    },
+  },
+];
+
 export const signMessageShortcutsMap = (chainId: number) => ({
   personal_sign: personalSignShortcuts,
   eth_signTypedData_v1: ethSignTypedDataV1Shortcuts,
   eth_signTypedData_v3: ethSignTypedDataV3Shortcuts(chainId),
   eth_signTypedData_v4: ethSignTypedDataV4Shortcuts(chainId),
+  ['wallet_sign#old']: walletSignOldSpecShortcuts,
+  ['wallet_sign#new']: walletSignNewSpecShortcuts,
 });
diff --git a/examples/testapp/src/components/RpcMethods/shortcut/walletTxShortcuts.ts b/examples/testapp/src/components/RpcMethods/shortcut/walletTxShortcuts.ts
index f5aba0ce5..81601cde6 100644
--- a/examples/testapp/src/components/RpcMethods/shortcut/walletTxShortcuts.ts
+++ b/examples/testapp/src/components/RpcMethods/shortcut/walletTxShortcuts.ts
@@ -16,6 +16,39 @@ const walletSendCallsShortcuts: ShortcutType[] = [
       },
     },
   },
+  {
+    key: 'data_callback',
+    data: {
+      chainId: CHAIN_ID_TO_FILL,
+      from: ADDR_TO_FILL,
+      calls: [],
+      version: '1',
+      capabilities: {
+        paymaster: {
+          url: 'https://paymaster.base.org',
+        },
+        dataCallback: {
+          requests: [
+            {
+              type: 'email' as const,
+              optional: false,
+            },
+            {
+              type: 'physicalAddress' as const,
+              optional: true,
+            },
+            {
+              type: 'phoneNumber' as const,
+              optional: false,
+            },
+            {
+              type: 'name' as const,
+            },
+          ],
+        },
+      },
+    },
+  },
 ];
 
 export const walletTxShortcutsMap = {
diff --git a/examples/testapp/src/context/EIP1193ProviderContextProvider.test.tsx b/examples/testapp/src/context/EIP1193ProviderContextProvider.test.tsx
index aaa43effc..20ba1296e 100644
--- a/examples/testapp/src/context/EIP1193ProviderContextProvider.test.tsx
+++ b/examples/testapp/src/context/EIP1193ProviderContextProvider.test.tsx
@@ -49,7 +49,9 @@ describe('EIP1193ProviderContextProvider', () => {
       setScwUrlAndSave: vi.fn(),
       setConfig: vi.fn(),
       subAccountsConfig: {
-        enableAutoSubAccounts: true,
+        creation: 'on-connect',
+        defaultAccount: 'sub',
+        funding: 'spend-permissions',
       },
       setSubAccountsConfig: vi.fn(),
     });
@@ -88,7 +90,9 @@ describe('EIP1193ProviderContextProvider', () => {
         walletUrl: 'https://keys-dev.coinbase.com/connect',
       },
       subAccounts: {
-        enableAutoSubAccounts: true,
+        creation: 'on-connect',
+        defaultAccount: 'sub',
+        funding: 'spend-permissions',
       },
     });
     expect(screen.getByTestId('sdk-exists')).toBeTruthy();
@@ -103,7 +107,9 @@ describe('EIP1193ProviderContextProvider', () => {
       scwUrl: 'https://keys-dev.coinbase.com/connect',
       config: { attribution: { dataSuffix: '0xtestattribution' } },
       subAccountsConfig: {
-        enableAutoSubAccounts: true,
+        creation: 'on-connect',
+        defaultAccount: 'sub',
+        funding: 'spend-permissions',
       },
       setSDKVersion: vi.fn(),
       setScwUrlAndSave: vi.fn(),
@@ -125,7 +131,9 @@ describe('EIP1193ProviderContextProvider', () => {
         walletUrl: 'https://keys-dev.coinbase.com/connect',
       },
       subAccounts: {
-        enableAutoSubAccounts: true,
+        creation: 'on-connect',
+        defaultAccount: 'sub',
+        funding: 'spend-permissions',
       },
     });
   });
diff --git a/examples/testapp/src/pages/add-sub-account/components/AddSubAccount.tsx b/examples/testapp/src/pages/add-sub-account/components/AddSubAccount.tsx
index a9377bae8..589277fd5 100644
--- a/examples/testapp/src/pages/add-sub-account/components/AddSubAccount.tsx
+++ b/examples/testapp/src/pages/add-sub-account/components/AddSubAccount.tsx
@@ -1,5 +1,6 @@
 import { createBaseAccountSDK, getCryptoKeyAccount } from '@base-org/account';
-import { Box, Button } from '@chakra-ui/react';
+import { ExternalLinkIcon } from '@chakra-ui/icons';
+import { Box, Button, HStack, Link, Text } from '@chakra-ui/react';
 import { useCallback, useState } from 'react';
 import { numberToHex } from 'viem';
 
@@ -62,6 +63,17 @@ export function AddSubAccount({ sdk, onAddSubAccount, signerFn }: AddSubAccountP
 
   return (
     <>
+      <HStack w="full" justify="space-between" align="center">
+        <Text fontWeight="medium">wallet_addSubAccount</Text>
+        <Link
+          href="https://docs.base.org/base-account/improve-ux/sub-accounts"
+          isExternal
+          color="blue.500"
+          fontSize="sm"
+        >
+          Docs <ExternalLinkIcon mx="2px" />
+        </Link>
+      </HStack>
       <Button
         w="full"
         onClick={handleAddSubAccount}
diff --git a/examples/testapp/src/pages/add-sub-account/index.page.tsx b/examples/testapp/src/pages/add-sub-account/index.page.tsx
index 987fad107..4c60d71d9 100644
--- a/examples/testapp/src/pages/add-sub-account/index.page.tsx
+++ b/examples/testapp/src/pages/add-sub-account/index.page.tsx
@@ -26,20 +26,26 @@ import { SendCalls } from './components/SendCalls';
 import { SpendPermissions } from './components/SpendPermissions';
 
 type SignerType = 'cryptokey' | 'secp256k1';
+type FundingMode = 'spend-permissions' | 'manual';
 
 export default function SubAccounts() {
   const { sdk } = useEIP1193Provider();
   const { setSubAccountsConfig } = useConfig();
   const [subAccountAddress, setSubAccountAddress] = useState<string>();
   const [signerType, setSignerType] = useState<SignerType>('cryptokey');
+  const [fundingMode, setFundingMode] = useState<FundingMode>('manual');
   const [getSubAccountSigner, setGetSubAccountSigner] = useState<typeof getCryptoKeyAccount>(
     () => getCryptoKeyAccount
   );
 
   useEffect(() => {
-    const stored = localStorage.getItem('signer-type');
-    if (stored !== null) {
-      setSignerType(stored as SignerType);
+    const storedSignerType = localStorage.getItem('signer-type');
+    if (storedSignerType !== null) {
+      setSignerType(storedSignerType as SignerType);
+    }
+    const storedFundingMode = localStorage.getItem('funding-mode');
+    if (storedFundingMode !== null) {
+      setFundingMode(storedFundingMode as FundingMode);
     }
   }, []);
 
@@ -47,6 +53,10 @@ export default function SubAccounts() {
     localStorage.setItem('signer-type', signerType);
   }, [signerType]);
 
+  useEffect(() => {
+    localStorage.setItem('funding-mode', fundingMode);
+  }, [fundingMode]);
+
   useEffect(() => {
     const getSigner =
       signerType === 'cryptokey'
@@ -61,8 +71,8 @@ export default function SubAccounts() {
           };
 
     setGetSubAccountSigner(() => getSigner);
-    setSubAccountsConfig({ toOwnerAccount: getSigner });
-  }, [signerType, setSubAccountsConfig]);
+    setSubAccountsConfig({ toOwnerAccount: getSigner, funding: fundingMode });
+  }, [signerType, fundingMode, setSubAccountsConfig]);
 
   return (
     <Container mb={16}>
@@ -77,6 +87,16 @@ export default function SubAccounts() {
           </RadioGroup>
         </FormControl>
 
+        <FormControl>
+          <FormLabel>Funding Mode</FormLabel>
+          <RadioGroup value={fundingMode} onChange={(value: FundingMode) => setFundingMode(value)}>
+            <Stack direction="row">
+              <Radio value="manual">Manual</Radio>
+              <Radio value="spend-permissions">Spend Permissions</Radio>
+            </Stack>
+          </RadioGroup>
+        </FormControl>
+
         <Connect sdk={sdk} />
         <AddSubAccount
           sdk={sdk}
diff --git a/examples/testapp/src/pages/auto-sub-account/index.page.tsx b/examples/testapp/src/pages/auto-sub-account/index.page.tsx
index dd99ed005..0d99e3960 100644
--- a/examples/testapp/src/pages/auto-sub-account/index.page.tsx
+++ b/examples/testapp/src/pages/auto-sub-account/index.page.tsx
@@ -1,4 +1,5 @@
 import { getCryptoKeyAccount } from '@base-org/account';
+import { ExternalLinkIcon } from '@chakra-ui/icons';
 import {
   Box,
   Button,
@@ -8,8 +9,10 @@ import {
   FormLabel,
   HStack,
   Input,
+  Link,
   Radio,
   RadioGroup,
+  Select,
   Stack,
   Text,
   VStack,
@@ -22,45 +25,95 @@ import {
   numberToHex,
   parseEther,
   parseUnits,
+  toHex,
 } from 'viem';
 import { privateKeyToAccount } from 'viem/accounts';
-import { baseSepolia } from 'viem/chains';
+import * as chains from 'viem/chains';
 import { useConfig } from '../../context/ConfigContextProvider';
 import { useEIP1193Provider } from '../../context/EIP1193ProviderContextProvider';
 import { unsafe_generateOrLoadPrivateKey } from '../../utils/unsafe_generateOrLoadPrivateKey';
 
 type SignerType = 'cryptokey' | 'secp256k1';
+type SendMethod = 'eth_sendTransaction' | 'wallet_sendCalls';
 
 interface WalletConnectResponse {
   accounts: Array<{
     address: string;
     capabilities?: Record<string, unknown>;
   }>;
+  chainIds?: string[];
 }
 
+const LOCAL_STORAGE_KEY = 'ba-playground:config';
+
 export default function AutoSubAccount() {
   const [accounts, setAccounts] = useState<string[]>([]);
   const [lastResult, setLastResult] = useState<string>();
   const [sendingAmounts, setSendingAmounts] = useState<Record<number, boolean>>({});
   const [sendingUsdcAmounts, setSendingUsdcAmounts] = useState<Record<string, boolean>>({});
   const [signerType, setSignerType] = useState<SignerType>('cryptokey');
+  const [sendMethod, setSendMethod] = useState<SendMethod>('eth_sendTransaction');
   const [walletConnectCapabilities, setWalletConnectCapabilities] = useState({
     siwe: false,
     addSubAccount: false,
   });
+  const [availableChains, setAvailableChains] = useState<string[]>([]);
+  const [currentChainId, setCurrentChainId] = useState<string>('');
   const { subAccountsConfig, setSubAccountsConfig, config, setConfig } = useConfig();
   const { provider } = useEIP1193Provider();
 
+  // Load persisted configs on mount
   useEffect(() => {
-    const stored = localStorage.getItem('signer-type');
-    if (stored !== null) {
-      setSignerType(stored as SignerType);
+    const stored = localStorage.getItem(LOCAL_STORAGE_KEY);
+    if (stored) {
+      try {
+        const parsed = JSON.parse(stored);
+
+        if (parsed.signerType) setSignerType(parsed.signerType);
+        if (parsed.sendMethod) setSendMethod(parsed.sendMethod);
+        if (parsed.walletConnectCapabilities)
+          setWalletConnectCapabilities(parsed.walletConnectCapabilities);
+
+        if (parsed.subAccountCreation) {
+          setSubAccountsConfig((prev) => ({ ...prev, creation: parsed.subAccountCreation }));
+        }
+        if (parsed.defaultAccount) {
+          setSubAccountsConfig((prev) => ({ ...prev, defaultAccount: parsed.defaultAccount }));
+        }
+        if (parsed.funding) {
+          setSubAccountsConfig((prev) => ({ ...prev, funding: parsed.funding }));
+        }
+        if (parsed.attribution) {
+          setConfig((prev) => ({ ...prev, attribution: parsed.attribution }));
+        }
+      } catch (e) {
+        console.error('Failed to parse stored config:', e);
+      }
     }
-  }, []);
+  }, [setSubAccountsConfig, setConfig]);
 
+  // Persist configs on change
   useEffect(() => {
-    localStorage.setItem('signer-type', signerType);
-  }, [signerType]);
+    const configToStore = {
+      signerType,
+      sendMethod,
+      walletConnectCapabilities,
+      subAccountCreation: subAccountsConfig?.creation,
+      defaultAccount: subAccountsConfig?.defaultAccount,
+      funding: subAccountsConfig?.funding,
+      attribution: config?.attribution,
+    };
+
+    localStorage.setItem(LOCAL_STORAGE_KEY, JSON.stringify(configToStore));
+  }, [
+    signerType,
+    sendMethod,
+    walletConnectCapabilities,
+    subAccountsConfig?.creation,
+    subAccountsConfig?.defaultAccount,
+    subAccountsConfig?.funding,
+    config?.attribution,
+  ]);
 
   useEffect(() => {
     const getSigner =
@@ -78,6 +131,31 @@ export default function AutoSubAccount() {
     setSubAccountsConfig((prev) => ({ ...prev, toOwnerAccount: getSigner }));
   }, [signerType, setSubAccountsConfig]);
 
+  const getPublicClient = async () => {
+    if (!provider) throw new Error('Provider not initialized');
+
+    // Get current chain ID if not already set
+    const chainId =
+      currentChainId ||
+      ((await provider.request({
+        method: 'eth_chainId',
+        params: [],
+      })) as string);
+
+    const chainIdDecimal = Number.parseInt(chainId, 16);
+
+    // Find the chain in viem/chains
+    const chain = Object.values(chains).find((c) => c.id === chainIdDecimal);
+    if (!chain) {
+      throw new Error(`Chain with ID ${chainIdDecimal} (${chainId}) not found in viem/chains`);
+    }
+
+    return createPublicClient({
+      chain,
+      transport: http(),
+    });
+  };
+
   const handleRequestAccounts = async () => {
     if (!provider) return;
 
@@ -132,10 +210,40 @@ export default function AutoSubAccount() {
     }
   };
 
+  const handlePersonalSign = async () => {
+    if (!provider || !accounts.length) return;
+
+    try {
+      const message = 'Hello from Coinbase Account SDK!';
+      const hexMessage = toHex(message);
+
+      const response = await provider.request({
+        method: 'personal_sign',
+        params: [hexMessage, accounts[0]],
+      });
+
+      const publicClient = await getPublicClient();
+
+      const isValid = await publicClient.verifyMessage({
+        address: accounts[0] as `0x${string}`,
+        message,
+        signature: response as `0x${string}`,
+      });
+
+      setLastResult(`isValid: ${isValid}\n${response}`);
+    } catch (e) {
+      console.error('error', e);
+      setLastResult(JSON.stringify(e, null, 2));
+    }
+  };
+
   const handleSignTypedData = async () => {
     if (!provider || !accounts.length) return;
 
     try {
+      const publicClient = await getPublicClient();
+      const chainIdDecimal = publicClient.chain.id;
+
       const typedData = {
         types: {
           EIP712Domain: [
@@ -153,7 +261,7 @@ export default function AutoSubAccount() {
         domain: {
           name: 'Test Domain',
           version: '1',
-          chainId: baseSepolia.id,
+          chainId: chainIdDecimal,
           verifyingContract: '0x0000000000000000000000000000000000000000' as `0x${string}`,
         },
         message: {
@@ -167,11 +275,6 @@ export default function AutoSubAccount() {
         params: [accounts[0], JSON.stringify(typedData)],
       });
 
-      const publicClient = createPublicClient({
-        chain: baseSepolia,
-        transport: http(),
-      });
-
       const isValid = await publicClient.verifyTypedData({
         address: accounts[0] as `0x${string}`,
         domain: typedData.domain,
@@ -200,7 +303,7 @@ export default function AutoSubAccount() {
       // Add SIWE capability if selected
       if (walletConnectCapabilities.siwe) {
         capabilities.signInWithEthereum = {
-          chainId: 84532,
+          chainId: toHex(84532),
           nonce: Math.random().toString(36).substring(2, 15),
         };
       }
@@ -234,7 +337,88 @@ export default function AutoSubAccount() {
         method: 'wallet_connect',
         params,
       })) as WalletConnectResponse;
-      setLastResult(JSON.stringify(response, null, 2));
+
+      // Verify SIWE signature if present
+      let verificationResult = '';
+      if (response.accounts && response.accounts.length > 0) {
+        const account = response.accounts[0];
+        if (account.capabilities && 'signInWithEthereum' in account.capabilities) {
+          const siweCapability = account.capabilities.signInWithEthereum as {
+            message: string;
+            signature: string;
+          };
+
+          try {
+            // Parse chain ID from SIWE message
+            const chainIdMatch = siweCapability.message.match(/Chain ID: (\d+)/);
+            if (!chainIdMatch) {
+              throw new Error('Could not extract chain ID from SIWE message');
+            }
+            const siweChainId = Number.parseInt(chainIdMatch[1], 10);
+
+            // Find the chain in viem/chains
+            const chain = Object.values(chains).find((c) => c.id === siweChainId);
+            if (!chain) {
+              throw new Error(`Chain with ID ${siweChainId} not found in viem/chains`);
+            }
+
+            // Create a public client for the SIWE chain
+            const publicClient = createPublicClient({
+              chain,
+              transport: http(),
+            });
+
+            // Verify the SIWE signature
+            const isValid = await publicClient.verifyMessage({
+              address: account.address as `0x${string}`,
+              message: siweCapability.message,
+              signature: siweCapability.signature as `0x${string}`,
+            });
+
+            verificationResult = `SIWE Signature Verification: ${isValid ? '✓ VALID' : '✗ INVALID'} (Chain ID: ${siweChainId})\n\n`;
+          } catch (verifyError) {
+            console.error('SIWE verification error:', verifyError);
+            verificationResult = `SIWE Signature Verification: ERROR - ${verifyError instanceof Error ? verifyError.message : String(verifyError)}\n\n`;
+          }
+        }
+      }
+
+      setLastResult(verificationResult + JSON.stringify(response, null, 2));
+
+      // Extract available chains from response
+      if (response.chainIds && response.chainIds.length > 0) {
+        setAvailableChains(response.chainIds);
+      }
+
+      // Call eth_accounts to get and set the accounts after successful connection
+      const accountsResponse = await provider.request({
+        method: 'eth_accounts',
+        params: [],
+      });
+      setAccounts(accountsResponse as string[]);
+
+      // Get current chain ID
+      const chainId = await provider.request({
+        method: 'eth_chainId',
+        params: [],
+      });
+      setCurrentChainId(chainId as string);
+    } catch (e) {
+      console.error('error', e);
+      setLastResult(JSON.stringify(e, null, 2));
+    }
+  };
+
+  const handleSwitchChain = async (chainId: string) => {
+    if (!provider) return;
+
+    try {
+      await provider.request({
+        method: 'wallet_switchEthereumChain',
+        params: [{ chainId }],
+      });
+      setCurrentChainId(chainId);
+      setLastResult(`Switched to chain: ${chainId}`);
     } catch (e) {
       console.error('error', e);
       setLastResult(JSON.stringify(e, null, 2));
@@ -249,17 +433,52 @@ export default function AutoSubAccount() {
       const to = '0x8d25687829d6b85d9e0020b8c89e3ca24de20a89';
       const value = parseEther(amount);
 
-      const response = await provider.request({
-        method: 'eth_sendTransaction',
-        params: [
-          {
-            from: accounts[0],
-            to: to,
-            value: numberToHex(value),
-            data: '0x',
-          },
-        ],
-      });
+      let response;
+      if (sendMethod === 'eth_sendTransaction') {
+        response = await provider.request({
+          method: 'eth_sendTransaction',
+          params: [
+            {
+              from: accounts[0],
+              to: to,
+              value: numberToHex(value),
+              data: '0x',
+            },
+          ],
+        });
+      } else {
+        // Get current chain ID if not already set
+        const chainId =
+          currentChainId ||
+          ((await provider.request({
+            method: 'eth_chainId',
+            params: [],
+          })) as string);
+
+        // wallet_sendCalls with paymaster support
+        response = await provider.request({
+          method: 'wallet_sendCalls',
+          params: [
+            {
+              version: '1.0',
+              chainId: chainId,
+              from: accounts[0],
+              calls: [
+                {
+                  to: to,
+                  value: numberToHex(value),
+                  data: '0x',
+                },
+              ],
+              capabilities: {
+                paymasterService: {
+                  url: 'https://api.developer.coinbase.com/rpc/v1/base-sepolia/S-fOd2n2Oi4fl4e1Crm83XeDXZ7tkg8O',
+                },
+              },
+            },
+          ],
+        });
+      }
       setLastResult(JSON.stringify(response, null, 2));
     } catch (e) {
       console.error('error', e);
@@ -270,11 +489,31 @@ export default function AutoSubAccount() {
   };
 
   const handleUsdcSend = async (amount: string) => {
-    if (!provider || accounts.length < 2) return;
+    if (!provider || !accounts.length) return;
 
     try {
       setSendingUsdcAmounts((prev) => ({ ...prev, [amount]: true }));
-      const usdcAddress = '0x036cbd53842c5426634e7929541ec2318f3dcf7e';
+
+      // Get current chain ID if not already set
+      const chainId =
+        currentChainId ||
+        ((await provider.request({
+          method: 'eth_chainId',
+          params: [],
+        })) as string);
+      const chainIdDecimal = Number.parseInt(chainId, 16);
+
+      // USDC contract addresses by chain ID
+      const usdcAddresses: Record<number, string> = {
+        8453: '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913', // Base mainnet
+        84532: '0x036cbd53842c5426634e7929541ec2318f3dcf7e', // Base Sepolia
+      };
+
+      const usdcAddress = usdcAddresses[chainIdDecimal];
+      if (!usdcAddress) {
+        throw new Error(`USDC not supported on chain ID ${chainIdDecimal}`);
+      }
+
       const to = '0x8d25687829d6b85d9e0020b8c89e3ca24de20a89';
       const value = parseUnits(amount, 6); // USDC has 6 decimals
 
@@ -295,17 +534,44 @@ export default function AutoSubAccount() {
         args: [to, value],
       });
 
-      const response = await provider.request({
-        method: 'eth_sendTransaction',
-        params: [
-          {
-            from: accounts[0],
-            to: usdcAddress,
-            value: '0x0',
-            data,
-          },
-        ],
-      });
+      let response;
+      if (sendMethod === 'eth_sendTransaction') {
+        response = await provider.request({
+          method: 'eth_sendTransaction',
+          params: [
+            {
+              from: accounts[0],
+              to: usdcAddress,
+              value: '0x0',
+              data,
+            },
+          ],
+        });
+      } else {
+        // wallet_sendCalls with paymaster support
+        response = await provider.request({
+          method: 'wallet_sendCalls',
+          params: [
+            {
+              version: '1.0',
+              chainId: chainId,
+              from: accounts[0],
+              calls: [
+                {
+                  to: usdcAddress,
+                  value: '0x0',
+                  data,
+                },
+              ],
+              capabilities: {
+                paymasterService: {
+                  url: 'https://api.developer.coinbase.com/rpc/v1/base-sepolia/S-fOd2n2Oi4fl4e1Crm83XeDXZ7tkg8O',
+                },
+              },
+            },
+          ],
+        });
+      }
       setLastResult(JSON.stringify(response, null, 2));
     } catch (e) {
       console.error('error', e);
@@ -370,36 +636,64 @@ export default function AutoSubAccount() {
           </RadioGroup>
         </FormControl>
         <FormControl>
-          <FormLabel>Auto Sub-Accounts</FormLabel>
+          <FormLabel>
+            Sub-Account Creation{' '}
+            <Link
+              href="https://docs.base.org/base-account/improve-ux/sub-accounts"
+              isExternal
+              color="blue.500"
+              fontSize="sm"
+              fontWeight="normal"
+            >
+              Docs <ExternalLinkIcon mx="2px" />
+            </Link>
+          </FormLabel>
+          <RadioGroup
+            value={subAccountsConfig?.creation || 'manual'}
+            onChange={(value) =>
+              setSubAccountsConfig((prev) => ({
+                ...prev,
+                creation: value as 'on-connect' | 'manual',
+              }))
+            }
+          >
+            <Stack direction="row">
+              <Radio value="on-connect">On Connect</Radio>
+              <Radio value="manual">Manual</Radio>
+            </Stack>
+          </RadioGroup>
+        </FormControl>
+        <FormControl>
+          <FormLabel>Default Account</FormLabel>
           <RadioGroup
-            value={(subAccountsConfig?.enableAutoSubAccounts || false).toString()}
+            value={subAccountsConfig?.defaultAccount || 'universal'}
             onChange={(value) =>
               setSubAccountsConfig((prev) => ({
                 ...prev,
-                enableAutoSubAccounts: value === 'true',
+                defaultAccount: value as 'sub' | 'universal',
               }))
             }
           >
             <Stack direction="row">
-              <Radio value="true">Enabled</Radio>
-              <Radio value="false">Disabled</Radio>
+              <Radio value="sub">Sub</Radio>
+              <Radio value="universal">Universal</Radio>
             </Stack>
           </RadioGroup>
         </FormControl>
         <FormControl>
-          <FormLabel>Enable Auto Spend Permissions (Unstable)</FormLabel>
+          <FormLabel>Funding Mode</FormLabel>
           <RadioGroup
-            value={(subAccountsConfig?.unstable_enableAutoSpendPermissions ?? true).toString()}
+            value={subAccountsConfig?.funding || 'spend-permissions'}
             onChange={(value) =>
               setSubAccountsConfig((prev) => ({
                 ...prev,
-                unstable_enableAutoSpendPermissions: value === 'true',
+                funding: value as 'spend-permissions' | 'manual',
               }))
             }
           >
             <Stack direction="row">
-              <Radio value="true">Enabled</Radio>
-              <Radio value="false">Disabled</Radio>
+              <Radio value="spend-permissions">Spend Permissions</Radio>
+              <Radio value="manual">Manual</Radio>
             </Stack>
           </RadioGroup>
         </FormControl>
@@ -470,6 +764,31 @@ export default function AutoSubAccount() {
             </VStack>
           </Box>
         )}
+        {availableChains.length > 0 && (
+          <FormControl>
+            <FormLabel>Available Chains</FormLabel>
+            <Select
+              value={currentChainId}
+              onChange={(e) => handleSwitchChain(e.target.value)}
+              placeholder="Select chain"
+            >
+              {availableChains.map((chainId) => (
+                <option key={chainId} value={chainId}>
+                  Chain ID: {chainId}{' '}
+                  {Number.parseInt(chainId, 16) ? `(${Number.parseInt(chainId, 16)})` : ''}
+                </option>
+              ))}
+            </Select>
+            {currentChainId && (
+              <Text mt={2} fontSize="sm" color="gray.600" _dark={{ color: 'gray.400' }}>
+                Current Chain: {currentChainId}{' '}
+                {Number.parseInt(currentChainId, 16)
+                  ? `(${Number.parseInt(currentChainId, 16)})`
+                  : ''}
+              </Text>
+            )}
+          </FormControl>
+        )}
         <Box w="full" textAlign="left" fontSize="lg" fontWeight="bold">
           RPCs
         </Box>
@@ -522,6 +841,23 @@ export default function AutoSubAccount() {
         >
           eth_sendTransaction
         </Button>
+        <Button
+          w="full"
+          onClick={handlePersonalSign}
+          isDisabled={!accounts.length}
+          bg="blue.500"
+          color="white"
+          border="1px solid"
+          borderColor="blue.500"
+          _hover={{ bg: 'blue.600', borderColor: 'blue.600' }}
+          _dark={{
+            bg: 'blue.600',
+            borderColor: 'blue.600',
+            _hover: { bg: 'blue.700', borderColor: 'blue.700' },
+          }}
+        >
+          personal_sign
+        </Button>
         <Button
           w="full"
           onClick={handleSignTypedData}
@@ -555,6 +891,15 @@ export default function AutoSubAccount() {
         >
           wallet_connect
         </Button>
+        <FormControl>
+          <FormLabel>Send Method</FormLabel>
+          <RadioGroup value={sendMethod} onChange={(value: SendMethod) => setSendMethod(value)}>
+            <Stack direction="row">
+              <Radio value="eth_sendTransaction">eth_sendTransaction</Radio>
+              <Radio value="wallet_sendCalls">wallet_sendCalls (with paymaster)</Radio>
+            </Stack>
+          </RadioGroup>
+        </FormControl>
         <Box w="full" textAlign="left" fontSize="lg" fontWeight="bold">
           Send
         </Box>
@@ -587,12 +932,12 @@ export default function AutoSubAccount() {
           Send USDC
         </Box>
         <HStack w="full" spacing={4}>
-          {['0.01', '0.1', '1'].map((amount) => (
+          {['0.001', '0.01', '0.1', '1'].map((amount) => (
             <Button
               key={amount}
               flex={1}
               onClick={() => handleUsdcSend(amount)}
-              isDisabled={accounts.length < 2 || sendingUsdcAmounts[amount]}
+              isDisabled={!accounts.length || sendingUsdcAmounts[amount]}
               isLoading={sendingUsdcAmounts[amount]}
               loadingText="Sending..."
               size="lg"
diff --git a/examples/testapp/src/pages/import-sub-account/components/AccountsList.tsx b/examples/testapp/src/pages/import-sub-account/components/AccountsList.tsx
new file mode 100644
index 000000000..6ab37b9b9
--- /dev/null
+++ b/examples/testapp/src/pages/import-sub-account/components/AccountsList.tsx
@@ -0,0 +1,412 @@
+import { createBaseAccountSDK } from '@base-org/account';
+import { CopyIcon, DeleteIcon, ExternalLinkIcon } from '@chakra-ui/icons';
+import {
+  Badge,
+  Box,
+  Button,
+  Divider,
+  HStack,
+  IconButton,
+  Input,
+  Link,
+  Text,
+  VStack,
+  useToast,
+} from '@chakra-ui/react';
+import { useCallback, useEffect, useState } from 'react';
+import { numberToHex } from 'viem';
+import { SmartAccount } from 'viem/account-abstraction';
+import { baseSepolia } from 'viem/chains';
+import { abi } from '../../../constants';
+import type { StoredAccount } from '../../../utils/unsafe_manageMultipleAccounts';
+import { AddGlobalOwner } from './AddGlobalOwner';
+import { DeploySubAccount } from './DeploySubAccount';
+
+type AccountsListProps = {
+  accounts: Array<{
+    stored: StoredAccount;
+    smartAccount: SmartAccount;
+    isDeployed: boolean;
+  }>;
+  sdk: ReturnType<typeof createBaseAccountSDK>;
+  onAddAccount: () => void;
+  onRemoveAccount: (id: string) => void;
+  onAccountDeployed: (id: string) => void;
+};
+
+export function AccountsList({
+  accounts,
+  sdk,
+  onAddAccount,
+  onRemoveAccount,
+  onAccountDeployed,
+}: AccountsListProps) {
+  const toast = useToast();
+  const [importingAccountId, setImportingAccountId] = useState<string | null>(null);
+  const [customLabels, setCustomLabels] = useState<Record<string, string>>({});
+  const [ownershipStatus, setOwnershipStatus] = useState<Record<string, boolean>>({});
+  const [connectedAddress, setConnectedAddress] = useState<string | null>(null);
+
+  // Get connected address
+  useEffect(() => {
+    const getConnectedAddress = async () => {
+      if (!sdk) return;
+
+      try {
+        const provider = sdk.getProvider();
+        const addresses = (await provider.request({
+          method: 'eth_accounts',
+        })) as string[];
+        if (addresses && addresses.length > 0) {
+          setConnectedAddress(addresses[0]);
+        }
+      } catch (error) {
+        console.error('Failed to get connected address:', error);
+      }
+    };
+
+    getConnectedAddress();
+  }, [sdk]);
+
+  // Check ownership for deployed accounts
+  useEffect(() => {
+    const checkOwnership = async () => {
+      if (!connectedAddress) return;
+
+      const newOwnershipStatus: Record<string, boolean> = {};
+
+      await Promise.all(
+        accounts.map(async (account) => {
+          if (!account.isDeployed) {
+            // Undeployed accounts don't have ownership yet
+            newOwnershipStatus[account.stored.id] = false;
+            return;
+          }
+
+          try {
+            // @ts-ignore - viem type inference issue with SmartAccount client
+            const isOwner = (await account.smartAccount.client.readContract({
+              address: account.smartAccount.address,
+              abi,
+              functionName: 'isOwnerAddress',
+              args: [connectedAddress as `0x${string}`],
+            })) as boolean;
+
+            newOwnershipStatus[account.stored.id] = isOwner;
+          } catch (error) {
+            console.error(`Failed to check ownership for ${account.smartAccount.address}:`, error);
+            newOwnershipStatus[account.stored.id] = false;
+          }
+        })
+      );
+
+      setOwnershipStatus(newOwnershipStatus);
+    };
+
+    checkOwnership();
+  }, [accounts, connectedAddress]);
+
+  const handleImportAccount = useCallback(
+    async (account: (typeof accounts)[0]) => {
+      if (!sdk) {
+        toast({
+          title: 'SDK not initialized',
+          status: 'error',
+          duration: 3000,
+        });
+        return;
+      }
+
+      setImportingAccountId(account.stored.id);
+
+      try {
+        const provider = sdk.getProvider();
+        await provider.request({
+          method: 'wallet_switchEthereumChain',
+          params: [{ chainId: numberToHex(84532) }],
+        });
+
+        const customLabel = customLabels[account.stored.id] || '';
+
+        if (account.isDeployed) {
+          // Import as deployed
+          const response = (await provider.request({
+            method: 'wallet_addSubAccount',
+            params: [
+              {
+                version: '1',
+                account: {
+                  type: 'deployed',
+                  address: account.smartAccount.address,
+                  chainId: baseSepolia.id,
+                  ...(customLabel && { label: customLabel }),
+                },
+              },
+            ],
+          })) as { address: string };
+
+          toast({
+            title: 'Deployed account imported',
+            description: `Address: ${response.address}${
+              customLabel ? `\nLabel: ${customLabel}` : ''
+            }`,
+            status: 'success',
+            duration: 5000,
+          });
+        } else {
+          // Import as undeployed
+          const factoryArgs = await account.smartAccount.getFactoryArgs();
+          const response = (await provider.request({
+            method: 'wallet_addSubAccount',
+            params: [
+              {
+                version: '1',
+                account: {
+                  type: 'undeployed',
+                  address: account.smartAccount.address,
+                  factory: factoryArgs?.factory,
+                  factoryData: factoryArgs?.factoryData,
+                  ...(customLabel && { label: customLabel }),
+                },
+              },
+            ],
+          })) as { address: string };
+
+          toast({
+            title: 'Undeployed account imported',
+            description: `Address: ${response.address}${
+              customLabel ? `\nLabel: ${customLabel}` : ''
+            }`,
+            status: 'success',
+            duration: 5000,
+          });
+        }
+      } catch (error) {
+        console.error('Failed to import account:', error);
+        toast({
+          title: 'Import failed',
+          description: error instanceof Error ? error.message : 'Unknown error',
+          status: 'error',
+          duration: 5000,
+        });
+      } finally {
+        setImportingAccountId(null);
+      }
+    },
+    [sdk, customLabels, toast]
+  );
+
+  const handleLabelChange = useCallback((accountId: string, label: string) => {
+    setCustomLabels((prev) => ({
+      ...prev,
+      [accountId]: label,
+    }));
+  }, []);
+
+  const handleOwnerAdded = useCallback(
+    async (accountId: string) => {
+      if (!connectedAddress) return;
+
+      // Re-check ownership status for this account
+      const account = accounts.find((acc) => acc.stored.id === accountId);
+      if (!account || !account.isDeployed) return;
+
+      try {
+        // @ts-ignore - viem type inference issue with SmartAccount client
+        const isOwner = (await account.smartAccount.client.readContract({
+          address: account.smartAccount.address,
+          abi,
+          functionName: 'isOwnerAddress',
+          args: [connectedAddress as `0x${string}`],
+        })) as boolean;
+
+        setOwnershipStatus((prev) => ({
+          ...prev,
+          [accountId]: isOwner,
+        }));
+
+        if (isOwner) {
+          toast({
+            title: 'Owner added successfully',
+            description: 'You can now import this account',
+            status: 'success',
+            duration: 3000,
+          });
+        }
+      } catch (error) {
+        console.error('Failed to re-check ownership:', error);
+      }
+    },
+    [accounts, connectedAddress, toast]
+  );
+
+  const truncateAddress = (address: string) => {
+    return `${address.slice(0, 6)}...${address.slice(-4)}`;
+  };
+
+  const handleCopyAddress = useCallback(
+    (address: string) => {
+      navigator.clipboard.writeText(address);
+      toast({
+        title: 'Address copied',
+        description: address,
+        status: 'success',
+        duration: 2000,
+      });
+    },
+    [toast]
+  );
+
+  return (
+    <VStack w="full" spacing={4} align="stretch">
+      <HStack justify="space-between">
+        <HStack spacing={2}>
+          <Text fontSize="lg" fontWeight="bold">
+            Test Sub Accounts ({accounts.length})
+          </Text>
+          <Link
+            href="https://docs.base.org/base-account/improve-ux/sub-accounts"
+            isExternal
+            color="blue.500"
+            fontSize="sm"
+          >
+            Docs <ExternalLinkIcon mx="2px" />
+          </Link>
+        </HStack>
+        <Button size="sm" colorScheme="green" onClick={onAddAccount}>
+          + Generate New Account
+        </Button>
+      </HStack>
+
+      {accounts.length === 0 ? (
+        <Box p={4} bg="gray.50" borderRadius="md" textAlign="center" _dark={{ bg: 'gray.800' }}>
+          <Text color="gray.600" _dark={{ color: 'gray.400' }}>
+            No test accounts yet. Click "Generate New Account" to create one.
+          </Text>
+        </Box>
+      ) : (
+        accounts.map((account, index) => (
+          <Box
+            key={account.stored.id}
+            p={4}
+            bg="white"
+            borderRadius="md"
+            border="1px solid"
+            borderColor="gray.200"
+            _dark={{ bg: 'gray.900', borderColor: 'gray.700' }}
+          >
+            <VStack align="stretch" spacing={3}>
+              <HStack justify="space-between">
+                <HStack>
+                  <Text fontWeight="bold" fontSize="sm">
+                    Account #{index + 1}
+                  </Text>
+                  <Badge colorScheme={account.isDeployed ? 'green' : 'orange'}>
+                    {account.isDeployed ? 'Deployed' : 'Undeployed'}
+                  </Badge>
+                </HStack>
+                <IconButton
+                  aria-label="Delete account"
+                  icon={<DeleteIcon />}
+                  size="sm"
+                  colorScheme="red"
+                  variant="ghost"
+                  onClick={() => onRemoveAccount(account.stored.id)}
+                />
+              </HStack>
+
+              <Box>
+                <Text fontSize="xs" color="gray.600" _dark={{ color: 'gray.400' }}>
+                  Address
+                </Text>
+                <HStack spacing={2}>
+                  <Text fontSize="sm" fontFamily="mono">
+                    {truncateAddress(account.smartAccount.address)}
+                  </Text>
+                  <IconButton
+                    aria-label="Copy address"
+                    icon={<CopyIcon />}
+                    size="xs"
+                    variant="ghost"
+                    onClick={() => handleCopyAddress(account.smartAccount.address)}
+                  />
+                </HStack>
+              </Box>
+
+              <Box>
+                <Text fontSize="xs" color="gray.600" _dark={{ color: 'gray.400' }}>
+                  Chain
+                </Text>
+                <HStack spacing={1}>
+                  <Text fontSize="sm" fontWeight="medium">
+                    Base Sepolia
+                  </Text>
+                  <Badge colorScheme="purple" fontSize="xs">
+                    {baseSepolia.id}
+                  </Badge>
+                </HStack>
+              </Box>
+
+              <Divider />
+
+              <VStack spacing={2}>
+                <Input
+                  size="sm"
+                  placeholder="Custom label (e.g., Trading Account)"
+                  value={customLabels[account.stored.id] || ''}
+                  onChange={(e) => handleLabelChange(account.stored.id, e.target.value)}
+                  bg="gray.50"
+                  _dark={{ bg: 'gray.800' }}
+                />
+
+                {!account.isDeployed && (
+                  <DeploySubAccount
+                    sdk={sdk}
+                    subAccount={account.smartAccount}
+                    onDeployed={() => onAccountDeployed(account.stored.id)}
+                  />
+                )}
+
+                {account.isDeployed && !ownershipStatus[account.stored.id] && (
+                  <>
+                    <Box
+                      w="full"
+                      p={2}
+                      bg="orange.50"
+                      borderRadius="md"
+                      border="1px solid"
+                      borderColor="orange.200"
+                      _dark={{ bg: 'orange.900', borderColor: 'orange.700' }}
+                    >
+                      <Text fontSize="xs" color="orange.800" _dark={{ color: 'orange.200' }}>
+                        ⚠️ Connected address is not an owner. Add yourself as an owner first.
+                      </Text>
+                    </Box>
+                    <AddGlobalOwner
+                      sdk={sdk}
+                      subAccount={account.smartAccount}
+                      onOwnerAdded={() => handleOwnerAdded(account.stored.id)}
+                    />
+                  </>
+                )}
+
+                <Button
+                  w="full"
+                  size="sm"
+                  colorScheme="blue"
+                  onClick={() => handleImportAccount(account)}
+                  isLoading={importingAccountId === account.stored.id}
+                  loadingText="Importing..."
+                  isDisabled={account.isDeployed && !ownershipStatus[account.stored.id]}
+                >
+                  Import to Wallet
+                  {customLabels[account.stored.id] && ` as "${customLabels[account.stored.id]}"`}
+                </Button>
+              </VStack>
+            </VStack>
+          </Box>
+        ))
+      )}
+    </VStack>
+  );
+}
diff --git a/examples/testapp/src/pages/import-sub-account/components/AddGlobalOwner.tsx b/examples/testapp/src/pages/import-sub-account/components/AddGlobalOwner.tsx
index 938b3e066..e0cf78d72 100644
--- a/examples/testapp/src/pages/import-sub-account/components/AddGlobalOwner.tsx
+++ b/examples/testapp/src/pages/import-sub-account/components/AddGlobalOwner.tsx
@@ -9,26 +9,31 @@ import { abi } from '../../../constants';
 export function AddGlobalOwner({
   sdk,
   subAccount,
+  onOwnerAdded,
 }: {
   sdk: ReturnType<typeof createBaseAccountSDK>;
   subAccount: SmartAccount;
+  onOwnerAdded?: () => void;
 }) {
   const [state, setState] = useState<string>();
+  const [isAdding, setIsAdding] = useState(false);
 
   const handleAddGlobalOwner = useCallback(async () => {
-    if (!sdk) {
+    if (!sdk || isAdding) {
       return;
     }
 
-    const provider = sdk.getProvider();
-    const accounts = await provider.request({
-      method: 'eth_accounts',
-    });
-
-    // biome-ignore lint/suspicious/noConsole: internal logging
-    console.log('customlogs: accounts', accounts);
+    setIsAdding(true);
 
     try {
+      const provider = sdk.getProvider();
+      const accounts = await provider.request({
+        method: 'eth_accounts',
+      });
+
+      // biome-ignore lint/suspicious/noConsole: internal logging
+      console.log('customlogs: accounts', accounts);
+
       const client = createPublicClient({
         chain: baseSepolia,
         transport: http(),
@@ -46,7 +51,7 @@ export function AddGlobalOwner({
         ),
         paymaster: paymasterClient,
       });
-      // @ts-expect-error
+      // @ts-ignore
       const hash = await bundlerClient.sendUserOperation({
         calls: [
           {
@@ -62,26 +67,37 @@ export function AddGlobalOwner({
       });
 
       console.info('response', hash);
-      setState(hash as string);
+      setState(`Adding owner... UserOp: ${hash as string}`);
+
+      // Wait a bit for the transaction to be processed
+      setTimeout(() => {
+        setState(`Owner added! UserOp: ${hash as string}`);
+        onOwnerAdded?.();
+      }, 2000);
     } catch (e) {
       console.error('error', e);
+      setState(`Error: ${e instanceof Error ? e.message : 'Unknown error'}`);
+    } finally {
+      setIsAdding(false);
     }
-  }, [sdk, subAccount]);
+  }, [sdk, subAccount, onOwnerAdded, isAdding]);
 
   return (
     <>
       <Button
         w="full"
         onClick={handleAddGlobalOwner}
-        bg="blue.500"
+        isLoading={isAdding}
+        loadingText="Adding Owner..."
+        bg="orange.500"
         color="white"
         border="1px solid"
-        borderColor="blue.500"
-        _hover={{ bg: 'blue.600', borderColor: 'blue.600' }}
+        borderColor="orange.500"
+        _hover={{ bg: 'orange.600', borderColor: 'orange.600' }}
         _dark={{
-          bg: 'blue.600',
-          borderColor: 'blue.600',
-          _hover: { bg: 'blue.700', borderColor: 'blue.700' },
+          bg: 'orange.600',
+          borderColor: 'orange.600',
+          _hover: { bg: 'orange.700', borderColor: 'orange.700' },
         }}
       >
         Add Global Owner
diff --git a/examples/testapp/src/pages/import-sub-account/components/AddSubAccountDeployed.tsx b/examples/testapp/src/pages/import-sub-account/components/AddSubAccountDeployed.tsx
index 4bc94fbcd..3e3e4b04b 100644
--- a/examples/testapp/src/pages/import-sub-account/components/AddSubAccountDeployed.tsx
+++ b/examples/testapp/src/pages/import-sub-account/components/AddSubAccountDeployed.tsx
@@ -1,5 +1,5 @@
 import { createBaseAccountSDK } from '@base-org/account';
-import { Box, Button } from '@chakra-ui/react';
+import { Box, Button, Input, VStack, FormControl, FormLabel } from '@chakra-ui/react';
 import { useCallback, useState } from 'react';
 import { numberToHex } from 'viem';
 import { SmartAccount } from 'viem/account-abstraction';
@@ -12,6 +12,7 @@ type AddSubAccountProps = {
 
 export function AddSubAccountDeployed({ sdk, subAccount }: AddSubAccountProps) {
   const [subAccountAddress, setSubAccountAddress] = useState<string | null>(null);
+  const [customLabel, setCustomLabel] = useState<string>('');
 
   const handleAddSubAccount = useCallback(async () => {
     if (!sdk) {
@@ -32,6 +33,7 @@ export function AddSubAccountDeployed({ sdk, subAccount }: AddSubAccountProps) {
             type: 'deployed',
             address: subAccount.address,
             chainId: baseSepolia.id,
+            ...(customLabel && { label: customLabel }),
           },
         },
       ],
@@ -39,10 +41,22 @@ export function AddSubAccountDeployed({ sdk, subAccount }: AddSubAccountProps) {
 
     console.info('response', response);
     setSubAccountAddress(response.address);
-  }, [sdk, subAccount]);
+  }, [sdk, subAccount, customLabel]);
 
   return (
-    <>
+    <VStack w="full" spacing={2}>
+      <FormControl>
+        <FormLabel fontSize="sm" color="gray.600" _dark={{ color: 'gray.400' }}>
+          Custom Label (optional)
+        </FormLabel>
+        <Input
+          placeholder="e.g., Trading Account, Savings Wallet"
+          value={customLabel}
+          onChange={(e) => setCustomLabel(e.target.value)}
+          bg="white"
+          _dark={{ bg: 'gray.800' }}
+        />
+      </FormControl>
       <Button
         w="full"
         onClick={handleAddSubAccount}
@@ -74,6 +88,6 @@ export function AddSubAccountDeployed({ sdk, subAccount }: AddSubAccountProps) {
           {subAccountAddress}
         </Box>
       )}
-    </>
+    </VStack>
   );
 }
diff --git a/examples/testapp/src/pages/import-sub-account/components/AddSubAccountUndeployed.tsx b/examples/testapp/src/pages/import-sub-account/components/AddSubAccountUndeployed.tsx
index 87f58cfbe..7324dd617 100644
--- a/examples/testapp/src/pages/import-sub-account/components/AddSubAccountUndeployed.tsx
+++ b/examples/testapp/src/pages/import-sub-account/components/AddSubAccountUndeployed.tsx
@@ -1,5 +1,5 @@
 import { createBaseAccountSDK } from '@base-org/account';
-import { Box, Button } from '@chakra-ui/react';
+import { Box, Button, FormControl, FormLabel, Input, VStack } from '@chakra-ui/react';
 import { useCallback, useState } from 'react';
 import { numberToHex } from 'viem';
 import { SmartAccount } from 'viem/account-abstraction';
@@ -11,6 +11,7 @@ type AddSubAccountUndeployedProps = {
 
 export function AddSubAccountUndeployed({ sdk, subAccount }: AddSubAccountUndeployedProps) {
   const [subAccountAddress, setSubAccountAddress] = useState<string | null>(null);
+  const [customLabel, setCustomLabel] = useState<string>('');
 
   const handleAddSubAccount = useCallback(async () => {
     if (!sdk) {
@@ -34,6 +35,7 @@ export function AddSubAccountUndeployed({ sdk, subAccount }: AddSubAccountUndepl
             address: subAccount.address,
             factory: factoryArgs?.factory,
             factoryData: factoryArgs?.factoryData,
+            ...(customLabel && { label: customLabel }),
           },
         },
       ],
@@ -41,10 +43,22 @@ export function AddSubAccountUndeployed({ sdk, subAccount }: AddSubAccountUndepl
 
     console.info('response', response);
     setSubAccountAddress(response.address);
-  }, [sdk, subAccount]);
+  }, [sdk, subAccount, customLabel]);
 
   return (
-    <>
+    <VStack w="full" spacing={2}>
+      <FormControl>
+        <FormLabel fontSize="sm" color="gray.600" _dark={{ color: 'gray.400' }}>
+          Custom Label (optional)
+        </FormLabel>
+        <Input
+          placeholder="e.g., DeFi Portfolio, NFT Wallet"
+          value={customLabel}
+          onChange={(e) => setCustomLabel(e.target.value)}
+          bg="white"
+          _dark={{ bg: 'gray.800' }}
+        />
+      </FormControl>
       <Button
         w="full"
         onClick={handleAddSubAccount}
@@ -76,6 +90,6 @@ export function AddSubAccountUndeployed({ sdk, subAccount }: AddSubAccountUndepl
           {subAccountAddress}
         </Box>
       )}
-    </>
+    </VStack>
   );
 }
diff --git a/examples/testapp/src/pages/import-sub-account/components/DeploySubAccount.tsx b/examples/testapp/src/pages/import-sub-account/components/DeploySubAccount.tsx
index 43b447c5c..321366751 100644
--- a/examples/testapp/src/pages/import-sub-account/components/DeploySubAccount.tsx
+++ b/examples/testapp/src/pages/import-sub-account/components/DeploySubAccount.tsx
@@ -8,17 +8,22 @@ import { baseSepolia } from 'viem/chains';
 export function DeploySubAccount({
   sdk,
   subAccount,
+  onDeployed,
 }: {
   sdk: ReturnType<typeof createBaseAccountSDK>;
   subAccount: SmartAccount;
+  onDeployed?: () => void;
 }) {
   const [state, setState] = useState<string>();
+  const [isDeploying, setIsDeploying] = useState(false);
 
   const handleDeploySubAccount = useCallback(async () => {
-    if (!sdk) {
+    if (!sdk || isDeploying) {
       return;
     }
 
+    setIsDeploying(true);
+
     try {
       const client = createPublicClient({
         chain: baseSepolia,
@@ -43,18 +48,37 @@ export function DeploySubAccount({
         calls: [],
       });
 
-      console.info('response', hash);
-      setState(hash as string);
+      console.info('deployment userOp hash:', hash);
+      setState(`Deploying... UserOp: ${hash}`);
+
+      // Wait for the UserOperation to be included in a block
+      const receipt = await bundlerClient.waitForUserOperationReceipt({
+        hash,
+      });
+
+      console.info('deployment receipt:', receipt);
+
+      if (receipt.success) {
+        setState(`Deployed! UserOp: ${hash}`);
+        onDeployed?.();
+      } else {
+        setState(`Deployment failed. UserOp: ${hash}`);
+      }
     } catch (e) {
       console.error('error', e);
+      setState(`Error: ${e instanceof Error ? e.message : 'Unknown error'}`);
+    } finally {
+      setIsDeploying(false);
     }
-  }, [sdk, subAccount]);
+  }, [sdk, subAccount, onDeployed, isDeploying]);
 
   return (
     <>
       <Button
         w="full"
         onClick={handleDeploySubAccount}
+        isLoading={isDeploying}
+        loadingText="Deploying..."
         bg="blue.500"
         color="white"
         border="1px solid"
diff --git a/examples/testapp/src/pages/import-sub-account/index.page.tsx b/examples/testapp/src/pages/import-sub-account/index.page.tsx
index 609c31b2f..087f68544 100644
--- a/examples/testapp/src/pages/import-sub-account/index.page.tsx
+++ b/examples/testapp/src/pages/import-sub-account/index.page.tsx
@@ -1,27 +1,34 @@
 import { createBaseAccountSDK } from '@base-org/account';
-import { Container, Text, VStack } from '@chakra-ui/react';
-import { useEffect, useState } from 'react';
-import { Client, Hex, createPublicClient, http } from 'viem';
+import { Alert, AlertIcon, Button, Container, Divider, Text, VStack } from '@chakra-ui/react';
+import { useCallback, useEffect, useState } from 'react';
+import { Client, createPublicClient, http } from 'viem';
 import { SmartAccount, toCoinbaseSmartAccount } from 'viem/account-abstraction';
 import { privateKeyToAccount } from 'viem/accounts';
 import { baseSepolia } from 'viem/chains';
 
-import { unsafe_generateOrLoadPrivateKey } from '../../utils/unsafe_generateOrLoadPrivateKey';
-import { AddGlobalOwner } from './components/AddGlobalOwner';
-import { AddSubAccountDeployed } from './components/AddSubAccountDeployed';
-import { AddSubAccountUndeployed } from './components/AddSubAccountUndeployed';
+import { useConfig } from '../../context/ConfigContextProvider';
+import {
+  type StoredAccount,
+  unsafe_manageMultipleAccounts,
+} from '../../utils/unsafe_manageMultipleAccounts';
+import { AccountsList } from './components/AccountsList';
 import { Connect } from './components/Connect';
-import { DeploySubAccount } from './components/DeploySubAccount';
-import { PersonalSign } from './components/PersonalSign';
-import { SendCalls } from './components/SendCalls';
 
 export default function SubAccounts() {
+  const { scwUrl } = useConfig();
   const [sdk, setSDK] = useState<ReturnType<typeof createBaseAccountSDK>>();
-  const [subAccount, setSubAccount] = useState<SmartAccount>();
-  const [deployed, setDeployed] = useState<boolean>(false);
+  const [accounts, setAccounts] = useState<
+    Array<{
+      stored: StoredAccount;
+      smartAccount: SmartAccount;
+      isDeployed: boolean;
+    }>
+  >([]);
 
-  async function getSubAccount(pk: Hex) {
-    const account = privateKeyToAccount(pk);
+  const accountManager = unsafe_manageMultipleAccounts();
+
+  async function createSmartAccount(stored: StoredAccount) {
+    const account = privateKeyToAccount(stored.privateKey);
     const client = createPublicClient({
       chain: baseSepolia,
       transport: http(),
@@ -31,24 +38,90 @@ export default function SubAccounts() {
       client: client as Client,
       owners: [account],
     });
-    return smartAccount;
+
+    const isDeployed = await smartAccount.isDeployed();
+
+    return {
+      stored,
+      smartAccount,
+      isDeployed,
+    };
   }
 
+  // biome-ignore lint/correctness/useExhaustiveDependencies: accountManager and createSmartAccount are stable
+  const loadAccounts = useCallback(async () => {
+    const storedAccounts = accountManager.getAll();
+
+    // If no accounts exist, create one default account
+    if (storedAccounts.length === 0) {
+      const newAccount = accountManager.add('Default Account');
+      storedAccounts.push(newAccount);
+    }
+
+    const accountsWithSmart = await Promise.all(
+      storedAccounts.map((stored) => createSmartAccount(stored))
+    );
+
+    setAccounts(accountsWithSmart);
+  }, []);
+
+  // biome-ignore lint/correctness/useExhaustiveDependencies: accountManager and createSmartAccount are stable
+  const handleAddAccount = useCallback(async () => {
+    const newStored = accountManager.add();
+    const newAccount = await createSmartAccount(newStored);
+    setAccounts((prev) => [...prev, newAccount]);
+  }, []);
+
+  // biome-ignore lint/correctness/useExhaustiveDependencies: accountManager is stable
+  const handleRemoveAccount = useCallback((id: string) => {
+    accountManager.remove(id);
+    setAccounts((prev) => prev.filter((acc) => acc.stored.id !== id));
+  }, []);
+
+  const handleAccountDeployed = useCallback((id: string) => {
+    // Update deployment status immediately after successful deployment
+    setAccounts((prev) => {
+      const accountIndex = prev.findIndex((acc) => acc.stored.id === id);
+      if (accountIndex === -1) return prev;
+
+      const updated = [...prev];
+      updated[accountIndex] = { ...updated[accountIndex], isDeployed: true };
+      return updated;
+    });
+  }, []);
+
+  // biome-ignore lint/correctness/useExhaustiveDependencies: accountManager is stable
+  const handleClearAll = useCallback(() => {
+    if (window.confirm('Are you sure you want to clear all test accounts?')) {
+      accountManager.clear();
+      setAccounts([]);
+      // Reload to create default account
+      loadAccounts();
+    }
+  }, [loadAccounts]);
+
   // biome-ignore lint/correctness/useExhaustiveDependencies: no dep
   useEffect(() => {
     // THIS IS NOT SAFE, THIS IS ONLY FOR TESTING
-    // IN A REAL APP YOU SHOULD NOT STORE/EXPOSE A PRIVATE KEY
-    const pk = unsafe_generateOrLoadPrivateKey();
-    const account = privateKeyToAccount(pk);
+    // IN A REAL APP YOU SHOULD NOT STORE/EXPOSE PRIVATE KEYS
+
+    // Get first account for SDK initialization
+    let storedAccounts = accountManager.getAll();
+    if (storedAccounts.length === 0) {
+      accountManager.add('Default Account');
+      storedAccounts = accountManager.getAll();
+    }
+
+    const firstAccount = privateKeyToAccount(storedAccounts[0].privateKey);
 
     const sdk = createBaseAccountSDK({
       appName: 'CryptoPlayground',
       preference: {
-        walletUrl: 'http://localhost:3005/connect',
+        walletUrl: scwUrl,
         options: 'smartWalletOnly',
       },
       subAccounts: {
-        toOwnerAccount: () => Promise.resolve({ account }),
+        toOwnerAccount: () => Promise.resolve({ account: firstAccount }),
       },
     });
 
@@ -56,41 +129,46 @@ export default function SubAccounts() {
       return;
     }
 
-    (async () => {
-      const sa = await getSubAccount(pk);
-
-      const isDeployed = await sa.isDeployed();
-      setDeployed(isDeployed);
-      setSubAccount(sa);
-    })();
-
     setSDK(sdk);
     const provider = sdk.getProvider();
 
     provider.on('accountsChanged', (accounts) => {
       console.info('accountsChanged', accounts);
     });
-  }, []);
+
+    // Load all accounts
+    loadAccounts();
+  }, [scwUrl, loadAccounts]);
 
   return (
-    <Container mb={16}>
+    <Container maxW="container.md" mb={16}>
       <Text fontSize="3xl" fontWeight="bold" mb={4}>
-        Import Sub Account
+        Import Multiple Sub Accounts
       </Text>
-      <VStack w="full" spacing={4}>
+
+      <Alert status="info" mb={4} borderRadius="md">
+        <AlertIcon />
+        Test importing multiple sub accounts with custom labels. Each account can be deployed
+        separately and imported with a unique label.
+      </Alert>
+
+      <VStack w="full" spacing={6}>
         <Connect sdk={sdk} />
-        {deployed ? (
-          <>
-            <AddSubAccountDeployed sdk={sdk} subAccount={subAccount} />
-            <AddGlobalOwner sdk={sdk} subAccount={subAccount} />
-            <PersonalSign sdk={sdk} subAccountAddress={subAccount?.address} />
-            <SendCalls sdk={sdk} subAccount={subAccount} />
-          </>
-        ) : (
-          <>
-            <DeploySubAccount sdk={sdk} subAccount={subAccount} />
-            <AddSubAccountUndeployed sdk={sdk} subAccount={subAccount} />
-          </>
+
+        <Divider />
+
+        <AccountsList
+          accounts={accounts}
+          sdk={sdk}
+          onAddAccount={handleAddAccount}
+          onRemoveAccount={handleRemoveAccount}
+          onAccountDeployed={handleAccountDeployed}
+        />
+
+        {accounts.length > 0 && (
+          <Button w="full" size="sm" variant="outline" colorScheme="red" onClick={handleClearAll}>
+            Clear All Test Accounts
+          </Button>
         )}
       </VStack>
     </Container>
diff --git a/examples/testapp/src/pages/index.page.tsx b/examples/testapp/src/pages/index.page.tsx
index 9eb4ddc51..2b1aa68ec 100644
--- a/examples/testapp/src/pages/index.page.tsx
+++ b/examples/testapp/src/pages/index.page.tsx
@@ -6,6 +6,7 @@ import { WIDTH_2XL } from '../components/Layout';
 import { MethodsSection } from '../components/MethodsSection/MethodsSection';
 import { connectionMethods } from '../components/RpcMethods/method/connectionMethods';
 import { ephemeralMethods } from '../components/RpcMethods/method/ephemeralMethods';
+import { experimentalMethods } from '../components/RpcMethods/method/experimentalMethods';
 import { multiChainMethods } from '../components/RpcMethods/method/multiChainMethods';
 import { readonlyJsonRpcMethods } from '../components/RpcMethods/method/readonlyJsonRpcMethods';
 import { sendMethods } from '../components/RpcMethods/method/sendMethods';
@@ -13,6 +14,7 @@ import { signMessageMethods } from '../components/RpcMethods/method/signMessageM
 import { walletTxMethods } from '../components/RpcMethods/method/walletTxMethods';
 import { connectionMethodShortcutsMap } from '../components/RpcMethods/shortcut/connectionMethodShortcuts';
 import { ephemeralMethodShortcutsMap } from '../components/RpcMethods/shortcut/ephemeralMethodShortcuts';
+import { baseProfileShortcutsMap } from '../components/RpcMethods/shortcut/experimentalShortcuts';
 import { multiChainShortcutsMap } from '../components/RpcMethods/shortcut/multipleChainShortcuts';
 import { readonlyJsonRpcShortcutsMap } from '../components/RpcMethods/shortcut/readonlyJsonRpcShortcuts';
 import { sendShortcutsMap } from '../components/RpcMethods/shortcut/sendShortcuts';
@@ -23,8 +25,7 @@ import { useEIP1193Provider } from '../context/EIP1193ProviderContextProvider';
 
 export default function Home() {
   const { provider } = useEIP1193Provider();
-  // @ts-expect-error refactor soon
-  const [connected, setConnected] = React.useState(Boolean(provider?.connected));
+  const [connected, setConnected] = React.useState(false);
   const [chainId, setChainId] = React.useState<number | undefined>(undefined);
   // This is for Extension compatibility, Extension with SDK3.9 does not emit connect event
   // correctly, so we manually check if the extension is connected, and set the connected state
@@ -40,21 +41,19 @@ export default function Home() {
       setConnected(true);
     });
     provider?.on('chainChanged', (newChainId) => {
-      // @ts-expect-error refactor soon
-      setChainId(newChainId);
+      setChainId(Number.parseInt(newChainId as string, 16));
     });
   }, [provider]);
 
   useEffect(() => {
     if (connected) {
       provider?.request({ method: 'eth_chainId' }).then((chainId) => {
-        // @ts-expect-error refactor soon
-        setChainId(Number.parseInt(chainId, 16));
+        setChainId(Number.parseInt(chainId as string, 16));
       });
     }
 
     // Injected provider does not emit a 'connect' event
-    // @ts-expect-error refactor soon
+    // @ts-expect-error isCoinbaseBrowser only exists on injected providers
     if (provider?.isCoinbaseBrowser) {
       setConnected(true);
     }
@@ -86,6 +85,11 @@ export default function Home() {
         methods={ephemeralMethods}
         shortcutsMap={ephemeralMethodShortcutsMap}
       />
+      <MethodsSection
+        title="Base Profile"
+        methods={experimentalMethods}
+        shortcutsMap={baseProfileShortcutsMap}
+      />
       {shouldShowMethodsRequiringConnection && (
         <>
           <MethodsSection
diff --git a/examples/testapp/src/pages/pay-playground/components/Header.module.css b/examples/testapp/src/pages/pay-playground/components/Header.module.css
index 653ea55b6..a81e0c927 100644
--- a/examples/testapp/src/pages/pay-playground/components/Header.module.css
+++ b/examples/testapp/src/pages/pay-playground/components/Header.module.css
@@ -32,6 +32,17 @@
   color: #64748b;
 }
 
+.docsLink {
+  color: #3b82f6;
+  text-decoration: none;
+  transition: color 0.2s ease;
+}
+
+.docsLink:hover {
+  color: #2563eb;
+  text-decoration: underline;
+}
+
 /* Responsive design */
 @media (max-width: 768px) {
   .header {
diff --git a/examples/testapp/src/pages/pay-playground/constants/playground.ts b/examples/testapp/src/pages/pay-playground/constants/playground.ts
index 81d6fe4d9..6dc8e54a6 100644
--- a/examples/testapp/src/pages/pay-playground/constants/playground.ts
+++ b/examples/testapp/src/pages/pay-playground/constants/playground.ts
@@ -41,7 +41,7 @@ export const DEFAULT_GET_PAYMENT_STATUS_CODE = `import { base } from '@base-org/
 
 try {
   const result = await base.getPaymentStatus({
-    id: '0x...', // Automatically filled with your recent transaction
+    id: '0x...', // Replace with a transaction ID
     testnet: true
   })
   
diff --git a/examples/testapp/src/pages/pay-playground/index.page.tsx b/examples/testapp/src/pages/pay-playground/index.page.tsx
index 477144558..ea2a0ee12 100644
--- a/examples/testapp/src/pages/pay-playground/index.page.tsx
+++ b/examples/testapp/src/pages/pay-playground/index.page.tsx
@@ -78,7 +78,17 @@ try {
       <main className={styles.main}>
         {/* pay Section */}
         <section className={styles.section}>
-          <h2 className={styles.sectionTitle}>pay Function</h2>
+          <div className={styles.sectionHeader}>
+            <h2 className={styles.sectionTitle}>pay Function</h2>
+            <a
+              href="https://docs.base.org/base-account/reference/base-pay/pay"
+              target="_blank"
+              rel="noopener noreferrer"
+              className={styles.docsLink}
+            >
+              Docs ↗
+            </a>
+          </div>
           <p className={styles.sectionDescription}>Send USDC payments on Base</p>
 
           <div className={styles.playground}>
@@ -109,7 +119,17 @@ try {
 
         {/* getPaymentStatus Section */}
         <section className={styles.section}>
-          <h2 className={styles.sectionTitle}>getPaymentStatus Function</h2>
+          <div className={styles.sectionHeader}>
+            <h2 className={styles.sectionTitle}>getPaymentStatus Function</h2>
+            <a
+              href="https://docs.base.org/base-account/reference/base-pay/getPaymentStatus"
+              target="_blank"
+              rel="noopener noreferrer"
+              className={styles.docsLink}
+            >
+              Docs ↗
+            </a>
+          </div>
           <p className={styles.sectionDescription}>Check the status of a payment</p>
 
           <div className={styles.playground}>
diff --git a/examples/testapp/src/pages/pay-playground/styles/Home.module.css b/examples/testapp/src/pages/pay-playground/styles/Home.module.css
index 6b77a8335..e6a0fe494 100644
--- a/examples/testapp/src/pages/pay-playground/styles/Home.module.css
+++ b/examples/testapp/src/pages/pay-playground/styles/Home.module.css
@@ -16,6 +16,12 @@
   margin-bottom: 4rem;
 }
 
+.sectionHeader {
+  display: flex;
+  align-items: center;
+  gap: 1rem;
+}
+
 .sectionTitle {
   font-size: 2rem;
   font-weight: 700;
@@ -23,6 +29,18 @@
   margin-bottom: 0.5rem;
 }
 
+.docsLink {
+  color: #3b82f6;
+  text-decoration: none;
+  font-size: 0.875rem;
+  transition: color 0.2s ease;
+}
+
+.docsLink:hover {
+  color: #2563eb;
+  text-decoration: underline;
+}
+
 .sectionDescription {
   font-size: 1.125rem;
   color: #64748b;
diff --git a/examples/testapp/src/pages/payment/index.page.tsx b/examples/testapp/src/pages/payment/index.page.tsx
index 7dd38af9a..a8cf6e00b 100644
--- a/examples/testapp/src/pages/payment/index.page.tsx
+++ b/examples/testapp/src/pages/payment/index.page.tsx
@@ -1,4 +1,5 @@
 import { type PaymentResult, type PaymentStatus, getPaymentStatus, pay } from '@base-org/account';
+import { ExternalLinkIcon } from '@chakra-ui/icons';
 import {
   Accordion,
   AccordionButton,
@@ -16,6 +17,7 @@ import {
   HStack,
   Heading,
   Input,
+  Link,
   Select,
   Switch,
   Text,
@@ -228,7 +230,17 @@ export default function Payment() {
         {/* Pay Section */}
         <Box borderWidth="1px" borderRadius="lg" p={6} bg={bgColor} borderColor={borderColor}>
           <VStack spacing={6} align="stretch">
-            <Heading size="md">Send Payment</Heading>
+            <HStack justify="space-between" align="center">
+              <Heading size="md">Send Payment</Heading>
+              <Link
+                href="https://docs.base.org/base-account/reference/base-pay/pay"
+                isExternal
+                color="blue.500"
+                fontSize="sm"
+              >
+                Docs <ExternalLinkIcon mx="2px" />
+              </Link>
+            </HStack>
 
             <HStack spacing={4} align="start">
               <FormControl flex={1}>
@@ -451,7 +463,17 @@ export default function Payment() {
         {/* Status Check Section */}
         <Box borderWidth="1px" borderRadius="lg" p={6} bg={bgColor} borderColor={borderColor}>
           <VStack spacing={4} align="stretch">
-            <Heading size="md">Check Payment Status</Heading>
+            <HStack justify="space-between" align="center">
+              <Heading size="md">Check Payment Status</Heading>
+              <Link
+                href="https://docs.base.org/base-account/reference/base-pay/getPaymentStatus"
+                isExternal
+                color="blue.500"
+                fontSize="sm"
+              >
+                Docs <ExternalLinkIcon mx="2px" />
+              </Link>
+            </HStack>
 
             <FormControl display="flex" alignItems="center" mb={4}>
               <FormLabel mb="0">Use Testnet</FormLabel>
diff --git a/examples/testapp/src/pages/prolink-playground/index.page.tsx b/examples/testapp/src/pages/prolink-playground/index.page.tsx
new file mode 100644
index 000000000..815f5afac
--- /dev/null
+++ b/examples/testapp/src/pages/prolink-playground/index.page.tsx
@@ -0,0 +1,943 @@
+import { createProlinkUrl, decodeProlink, encodeProlink } from '@base-org/account';
+import { ExternalLinkIcon } from '@chakra-ui/icons';
+import {
+  Box,
+  Button,
+  Code,
+  Container,
+  Divider,
+  FormControl,
+  FormLabel,
+  HStack,
+  Heading,
+  Input,
+  Link,
+  Select,
+  Switch,
+  Tab,
+  TabList,
+  TabPanel,
+  TabPanels,
+  Tabs,
+  Text,
+  Textarea,
+  VStack,
+  useColorModeValue,
+  useToast,
+} from '@chakra-ui/react';
+import { QRCodeSVG } from 'qrcode.react';
+import { useEffect, useState } from 'react';
+import { encodeFunctionData, type Address } from 'viem';
+
+// Token configuration
+const TOKENS = {
+  USDC: {
+    name: 'USDC',
+    decimals: 6,
+    addresses: {
+      '8453': '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913', // Base mainnet
+      '84532': '0x036CbD53842c5426634e7929541eC2318f3dCF7e', // Base Sepolia
+      '1': '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48', // Ethereum mainnet
+    },
+  },
+  ETH: {
+    name: 'ETH',
+    decimals: 18,
+    addresses: {
+      '8453': '0x0000000000000000000000000000000000000000',
+      '84532': '0x0000000000000000000000000000000000000000',
+      '1': '0x0000000000000000000000000000000000000000',
+    },
+  },
+} as const;
+
+// ERC20 transfer ABI
+const ERC20_TRANSFER_ABI = [
+  {
+    name: 'transfer',
+    type: 'function',
+    stateMutability: 'nonpayable',
+    inputs: [
+      { name: 'to', type: 'address' },
+      { name: 'amount', type: 'uint256' },
+    ],
+    outputs: [{ name: '', type: 'bool' }],
+  },
+] as const;
+
+export default function ProlinkPlayground() {
+  const toast = useToast();
+
+  // Color mode values
+  const bgColor = useColorModeValue('white', 'gray.800');
+  const borderColor = useColorModeValue('gray.200', 'gray.600');
+  const codeBgColor = useColorModeValue('gray.50', 'gray.900');
+  const simpleModeBgColor = useColorModeValue('blue.50', 'blue.900');
+  const simpleModeBorderColor = useColorModeValue('blue.200', 'blue.700');
+
+  // Method selection
+  const [methodType, setMethodType] = useState<'wallet_sendCalls' | 'generic'>('wallet_sendCalls');
+
+  // Common fields
+  const [chainId, setChainId] = useState('84532'); // Base Sepolia (testnet)
+
+  // wallet_sendCalls fields
+  const [callsTo, setCallsTo] = useState('0x036CbD53842c5426634e7929541eC2318f3dCF7e'); // USDC on Base Sepolia
+  const [callsData, setCallsData] = useState(
+    '0xa9059cbb000000000000000000000000fe21034794a5a574b94fe4fdfd16e005f1c96e5100000000000000000000000000000000000000000000000000000000004c4b40'
+  ); // ERC20 transfer
+  const [callsValue, setCallsValue] = useState('0x0');
+  const [callsVersion, setCallsVersion] = useState('1.0');
+
+  // Simple mode for wallet_sendCalls
+  const [useSimpleMode, setUseSimpleMode] = useState(true);
+  const [selectedToken, setSelectedToken] = useState<'USDC' | 'ETH'>('USDC');
+  const [tokenAmount, setTokenAmount] = useState('10000'); // 1 cent USDC in wei (6 decimals)
+  const [recipientAddress, setRecipientAddress] = useState(
+    '0xfe21034794a5a574b94fe4fdfd16e005f1c96e51'
+  );
+
+  // Generic JSON-RPC fields
+  const [genericMethod, setGenericMethod] = useState('eth_sendTransaction');
+  const [genericParams, setGenericParams] = useState(
+    JSON.stringify(
+      [
+        {
+          from: '0x1111111111111111111111111111111111111111',
+          to: '0x2222222222222222222222222222222222222222',
+          value: '0x100',
+          data: '0x',
+        },
+      ],
+      null,
+      2
+    )
+  );
+
+  // Capabilities
+  const [useCapabilities, setUseCapabilities] = useState(false);
+  const [capabilitiesJson, setCapabilitiesJson] = useState(
+    JSON.stringify(
+      {
+        dataCallback: {
+          callbackURL: 'https://example.com/callback',
+          events: [
+            { type: 'initiated', context: { orderId: '123' } },
+            { type: 'preSign', context: { shippingTier: 'express' } },
+            { type: 'postSign', context: { webhookTag: 'after' } },
+          ],
+        },
+      },
+      null,
+      2
+    )
+  );
+
+  // Results
+  const [loading, setLoading] = useState(false);
+  const [encodedPayload, setEncodedPayload] = useState('');
+  const [error, setError] = useState<string | null>(null);
+  const [decodedResult, setDecodedResult] = useState<unknown>(null);
+  const [webhookUuid, setWebhookUuid] = useState<string | null>(null);
+
+  // Decode section
+  const [decodeInput, setDecodeInput] = useState('');
+  const [decodeLoading, setDecodeLoading] = useState(false);
+  const [decodeError, setDecodeError] = useState<string | null>(null);
+  const [decodeResult, setDecodeResult] = useState<unknown>(null);
+
+  // Compute base deeplink from encoded payload
+  const baseDeeplink = encodedPayload ? createProlinkUrl(encodedPayload) : null;
+
+  // Auto-update calldata when simple mode fields change
+  useEffect(() => {
+    if (!useSimpleMode || !methodType || methodType !== 'wallet_sendCalls') return;
+
+    try {
+      const token = TOKENS[selectedToken];
+      const tokenAddress =
+        token.addresses[chainId as keyof typeof token.addresses] || token.addresses['8453'];
+
+      if (selectedToken === 'ETH') {
+        // For ETH, set value and empty calldata
+        setCallsTo(recipientAddress);
+        setCallsData('0x');
+        const amountInWei = BigInt(tokenAmount || '0');
+        setCallsValue(`0x${amountInWei.toString(16)}`);
+      } else {
+        // For ERC20 (USDC), encode transfer calldata using wei amount directly
+        setCallsTo(tokenAddress);
+        setCallsValue('0x0');
+        const amountInWei = BigInt(tokenAmount || '0');
+        const calldata = encodeFunctionData({
+          abi: ERC20_TRANSFER_ABI,
+          functionName: 'transfer',
+          args: [recipientAddress as Address, amountInWei],
+        });
+        setCallsData(calldata);
+      }
+    } catch (error) {
+      // Invalid input, don't update
+      console.error('Error encoding calldata:', error);
+    }
+  }, [useSimpleMode, selectedToken, tokenAmount, recipientAddress, chainId, methodType]);
+
+  // Auto-generate webhook.site URL when capabilities are enabled
+  useEffect(() => {
+    if (!useCapabilities) return;
+
+    const generateWebhook = async () => {
+      try {
+        // Use CORS proxy to avoid CORS issues in the browser
+        const response = await fetch('https://corsproxy.io/?https://webhook.site/token', {
+          method: 'POST',
+        });
+        const data = await response.json();
+
+        if (data.uuid) {
+          setWebhookUuid(data.uuid);
+
+          // Update capabilities JSON with the webhook URL
+          const capabilities = {
+            dataCallback: {
+              callbackURL: `https://webhook.site/${data.uuid}`,
+              events: [
+                { type: 'initiated', context: { orderId: '123' } },
+                { type: 'preSign', context: { shippingTier: 'express' } },
+                { type: 'postSign', context: { webhookTag: 'after' } },
+              ],
+            },
+          };
+          setCapabilitiesJson(JSON.stringify(capabilities, null, 2));
+
+          toast({
+            title: 'Webhook generated!',
+            description: 'A temporary webhook.site URL has been created',
+            status: 'success',
+            duration: 3000,
+          });
+        }
+      } catch (error) {
+        console.error('Error generating webhook:', error);
+        toast({
+          title: 'Failed to generate webhook',
+          description: 'Could not create webhook.site URL',
+          status: 'error',
+          duration: 3000,
+        });
+      }
+    };
+
+    generateWebhook();
+  }, [useCapabilities, toast]);
+
+  const generateProlink = async () => {
+    setLoading(true);
+    setError(null);
+    setEncodedPayload('');
+    setDecodedResult(null);
+
+    try {
+      let request: {
+        method: string;
+        params: unknown;
+        chainId?: number;
+        capabilities?: Record<string, unknown>;
+      };
+
+      if (methodType === 'wallet_sendCalls') {
+        request = {
+          method: 'wallet_sendCalls',
+          params: [
+            {
+              version: callsVersion,
+              chainId: `0x${Number.parseInt(chainId).toString(16)}`,
+              calls: [
+                {
+                  to: callsTo,
+                  data: callsData,
+                  value: callsValue,
+                },
+              ],
+            },
+          ],
+        };
+      } else {
+        // generic
+        request = {
+          method: genericMethod,
+          params: JSON.parse(genericParams),
+          chainId: Number.parseInt(chainId),
+        };
+      }
+
+      // Add capabilities if enabled
+      if (useCapabilities) {
+        try {
+          request.capabilities = JSON.parse(capabilitiesJson);
+        } catch (e) {
+          throw new Error(
+            `Invalid capabilities JSON: ${e instanceof Error ? e.message : 'unknown'}`
+          );
+        }
+      }
+
+      // Encode the prolink
+      const payload = await encodeProlink(request);
+      setEncodedPayload(payload);
+
+      // Decode to verify
+      const decoded = await decodeProlink(payload);
+      setDecodedResult(decoded);
+
+      toast({
+        title: 'Prolink generated!',
+        description: `Payload size: ${payload.length} characters`,
+        status: 'success',
+        duration: 3000,
+      });
+    } catch (e) {
+      const errorMessage = e instanceof Error ? e.message : 'Unknown error';
+      setError(errorMessage);
+      toast({
+        title: 'Error generating prolink',
+        description: errorMessage,
+        status: 'error',
+        duration: 5000,
+      });
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  const copyToClipboard = async () => {
+    try {
+      await navigator.clipboard.writeText(encodedPayload);
+      toast({
+        title: 'Copied!',
+        description: 'Payload copied to clipboard',
+        status: 'success',
+        duration: 2000,
+      });
+    } catch (_error) {
+      toast({
+        title: 'Failed to copy',
+        description: 'Please copy the payload manually',
+        status: 'error',
+        duration: 3000,
+      });
+    }
+  };
+
+  const copyDeeplinkToClipboard = async () => {
+    if (baseDeeplink) {
+      try {
+        await navigator.clipboard.writeText(baseDeeplink);
+        toast({
+          title: 'Copied!',
+          description: 'Base deeplink copied to clipboard',
+          status: 'success',
+          duration: 2000,
+        });
+      } catch (_error) {
+        toast({
+          title: 'Failed to copy',
+          description: 'Please copy the link manually',
+          status: 'error',
+          duration: 3000,
+        });
+      }
+    }
+  };
+
+  const decodePayload = async () => {
+    setDecodeLoading(true);
+    setDecodeError(null);
+    setDecodeResult(null);
+
+    try {
+      const decoded = await decodeProlink(decodeInput.trim());
+      setDecodeResult(decoded);
+
+      toast({
+        title: 'Prolink decoded!',
+        description: `Method: ${decoded.method}`,
+        status: 'success',
+        duration: 3000,
+      });
+    } catch (e) {
+      const errorMessage = e instanceof Error ? e.message : 'Unknown error';
+      setDecodeError(errorMessage);
+      toast({
+        title: 'Error decoding prolink',
+        description: errorMessage,
+        status: 'error',
+        duration: 5000,
+      });
+    } finally {
+      setDecodeLoading(false);
+    }
+  };
+
+  const copyDecodedToClipboard = async () => {
+    try {
+      await navigator.clipboard.writeText(JSON.stringify(decodeResult, null, 2));
+      toast({
+        title: 'Copied!',
+        description: 'Decoded result copied to clipboard',
+        status: 'success',
+        duration: 2000,
+      });
+    } catch (_error) {
+      toast({
+        title: 'Failed to copy',
+        description: 'Please copy the result manually',
+        status: 'error',
+        duration: 3000,
+      });
+    }
+  };
+
+  return (
+    <Container maxW="container.xl" py={8}>
+      <VStack spacing={8} align="stretch">
+        <Heading>Prolink Playground</Heading>
+        <Text color="gray.600">
+          Encode and decode compressed, URL-safe payloads for wallet_sendCalls and generic JSON-RPC
+          requests
+        </Text>
+
+        <Tabs variant="enclosed" colorScheme="blue">
+          <TabList>
+            <Tab>Encode</Tab>
+            <Tab>Decode</Tab>
+          </TabList>
+
+          <TabPanels>
+            {/* Encode Tab */}
+            <TabPanel px={0}>
+              <HStack mb={4}>
+                <Heading size="md">encodeProlink</Heading>
+                <Link
+                  href="https://docs.base.org/base-account/reference/prolink-utilities/encodeProlink"
+                  isExternal
+                  color="blue.500"
+                  fontSize="sm"
+                >
+                  Docs <ExternalLinkIcon mx="2px" />
+                </Link>
+              </HStack>
+              {/* Method Selection */}
+              <Box borderWidth="1px" borderRadius="lg" p={6} bg={bgColor} borderColor={borderColor}>
+                <VStack spacing={6} align="stretch">
+                  <FormControl>
+                    <FormLabel>Method Type</FormLabel>
+                    <Select
+                      value={methodType}
+                      onChange={(e) =>
+                        setMethodType(e.target.value as 'wallet_sendCalls' | 'generic')
+                      }
+                      size="lg"
+                    >
+                      <option value="wallet_sendCalls">wallet_sendCalls (EIP-5792)</option>
+                      <option value="generic">Generic JSON-RPC</option>
+                    </Select>
+                  </FormControl>
+
+                  <Divider />
+
+                  {/* Method-specific fields */}
+                  {methodType === 'wallet_sendCalls' && (
+                    <VStack spacing={4} align="stretch">
+                      <HStack justify="space-between" align="center">
+                        <Heading size="sm">wallet_sendCalls Parameters</Heading>
+                        <HStack>
+                          <Text fontSize="sm" color="gray.600">
+                            Advanced Mode
+                          </Text>
+                          <Switch
+                            isChecked={!useSimpleMode}
+                            onChange={(e) => setUseSimpleMode(!e.target.checked)}
+                            colorScheme="blue"
+                          />
+                        </HStack>
+                      </HStack>
+
+                      <FormControl>
+                        <FormLabel>Chain ID</FormLabel>
+                        <Select value={chainId} onChange={(e) => setChainId(e.target.value)}>
+                          <option value="8453">Base (8453)</option>
+                          <option value="84532">Base Sepolia (84532)</option>
+                          <option value="1">Ethereum (1)</option>
+                        </Select>
+                      </FormControl>
+                      <FormControl>
+                        <FormLabel>Version</FormLabel>
+                        <Input
+                          value={callsVersion}
+                          onChange={(e) => setCallsVersion(e.target.value)}
+                        />
+                      </FormControl>
+
+                      {useSimpleMode ? (
+                        <>
+                          {/* Simple Mode: Token selector and amount */}
+                          <Box
+                            p={4}
+                            borderRadius="md"
+                            bg={simpleModeBgColor}
+                            borderWidth="1px"
+                            borderColor={simpleModeBorderColor}
+                          >
+                            <VStack spacing={4} align="stretch">
+                              <FormControl>
+                                <FormLabel>Token</FormLabel>
+                                <Select
+                                  value={selectedToken}
+                                  onChange={(e) => {
+                                    const newToken = e.target.value as 'USDC' | 'ETH';
+                                    setSelectedToken(newToken);
+                                    // Set default wei amounts when switching tokens
+                                    if (newToken === 'USDC') {
+                                      setTokenAmount('10000'); // 1 cent USDC
+                                    } else {
+                                      setTokenAmount('1000'); // dust ETH
+                                    }
+                                  }}
+                                  bg={bgColor}
+                                >
+                                  <option value="USDC">USDC</option>
+                                  <option value="ETH">ETH</option>
+                                </Select>
+                              </FormControl>
+                              <FormControl>
+                                <FormLabel>Amount (wei)</FormLabel>
+                                <Input
+                                  type="text"
+                                  value={tokenAmount}
+                                  onChange={(e) => setTokenAmount(e.target.value)}
+                                  placeholder="10000"
+                                  bg={bgColor}
+                                />
+                                <Text fontSize="xs" color="gray.500" mt={1}>
+                                  {selectedToken === 'USDC'
+                                    ? '10000 = $0.01 (USDC has 6 decimals)'
+                                    : '1000 = 0.000000000000001 ETH (dust)'}
+                                </Text>
+                              </FormControl>
+                              <FormControl>
+                                <FormLabel>Recipient Address</FormLabel>
+                                <Input
+                                  fontFamily="mono"
+                                  value={recipientAddress}
+                                  onChange={(e) => setRecipientAddress(e.target.value)}
+                                  placeholder="0x..."
+                                  bg={bgColor}
+                                />
+                              </FormControl>
+                              <Text fontSize="sm" color="gray.600">
+                                Calldata will be automatically encoded based on your selection
+                              </Text>
+                            </VStack>
+                          </Box>
+
+                          {/* Show computed values */}
+                          <Box
+                            p={4}
+                            borderRadius="md"
+                            bg={codeBgColor}
+                            borderWidth="1px"
+                            borderColor={borderColor}
+                          >
+                            <VStack spacing={3} align="stretch">
+                              <Heading size="xs" mb={2}>
+                                Generated Calldata
+                              </Heading>
+                              <FormControl>
+                                <FormLabel fontSize="sm">To Address</FormLabel>
+                                <Input
+                                  size="sm"
+                                  fontFamily="mono"
+                                  value={callsTo}
+                                  isReadOnly
+                                  bg={bgColor}
+                                />
+                              </FormControl>
+                              <FormControl>
+                                <FormLabel fontSize="sm">Data (hex)</FormLabel>
+                                <Textarea
+                                  size="sm"
+                                  fontFamily="mono"
+                                  value={callsData}
+                                  isReadOnly
+                                  rows={3}
+                                  bg={bgColor}
+                                />
+                              </FormControl>
+                              <FormControl>
+                                <FormLabel fontSize="sm">Value (hex)</FormLabel>
+                                <Input
+                                  size="sm"
+                                  fontFamily="mono"
+                                  value={callsValue}
+                                  isReadOnly
+                                  bg={bgColor}
+                                />
+                              </FormControl>
+                            </VStack>
+                          </Box>
+                        </>
+                      ) : (
+                        <>
+                          {/* Advanced Mode: Raw calldata inputs */}
+                          <FormControl>
+                            <FormLabel>To Address</FormLabel>
+                            <Input
+                              fontFamily="mono"
+                              value={callsTo}
+                              onChange={(e) => setCallsTo(e.target.value)}
+                              placeholder="0x..."
+                            />
+                          </FormControl>
+                          <FormControl>
+                            <FormLabel>Data (hex)</FormLabel>
+                            <Textarea
+                              fontFamily="mono"
+                              value={callsData}
+                              onChange={(e) => setCallsData(e.target.value)}
+                              placeholder="0x..."
+                              rows={3}
+                            />
+                          </FormControl>
+                          <FormControl>
+                            <FormLabel>Value (hex)</FormLabel>
+                            <Input
+                              fontFamily="mono"
+                              value={callsValue}
+                              onChange={(e) => setCallsValue(e.target.value)}
+                              placeholder="0x0"
+                            />
+                          </FormControl>
+                        </>
+                      )}
+                    </VStack>
+                  )}
+
+                  {methodType === 'generic' && (
+                    <VStack spacing={4} align="stretch">
+                      <Heading size="sm">Generic JSON-RPC Parameters</Heading>
+                      <FormControl>
+                        <FormLabel>Chain ID</FormLabel>
+                        <Input
+                          type="number"
+                          value={chainId}
+                          onChange={(e) => setChainId(e.target.value)}
+                        />
+                      </FormControl>
+                      <FormControl>
+                        <FormLabel>Method</FormLabel>
+                        <Input
+                          value={genericMethod}
+                          onChange={(e) => setGenericMethod(e.target.value)}
+                          placeholder="eth_sendTransaction"
+                        />
+                      </FormControl>
+                      <FormControl>
+                        <FormLabel>Params (JSON)</FormLabel>
+                        <Textarea
+                          fontFamily="mono"
+                          value={genericParams}
+                          onChange={(e) => setGenericParams(e.target.value)}
+                          rows={10}
+                          placeholder='[{ "from": "0x...", "to": "0x...", "value": "0x100" }]'
+                        />
+                      </FormControl>
+                    </VStack>
+                  )}
+
+                  <Divider />
+
+                  {/* Capabilities */}
+                  <VStack spacing={4} align="stretch">
+                    <FormControl display="flex" alignItems="center">
+                      <FormLabel mb="0">Include Capabilities</FormLabel>
+                      <input
+                        type="checkbox"
+                        checked={useCapabilities}
+                        onChange={(e) => setUseCapabilities(e.target.checked)}
+                      />
+                    </FormControl>
+                    {useCapabilities && (
+                      <FormControl>
+                        <FormLabel>Capabilities JSON</FormLabel>
+                        <Textarea
+                          fontFamily="mono"
+                          value={capabilitiesJson}
+                          onChange={(e) => setCapabilitiesJson(e.target.value)}
+                          rows={8}
+                        />
+                      </FormControl>
+                    )}
+                  </VStack>
+
+                  <Button
+                    colorScheme="blue"
+                    size="lg"
+                    onClick={generateProlink}
+                    isLoading={loading}
+                    loadingText="Generating..."
+                  >
+                    Generate Prolink
+                  </Button>
+                </VStack>
+              </Box>
+
+              {/* Results */}
+              {(encodedPayload || error) && (
+                <Box
+                  borderWidth="1px"
+                  borderRadius="lg"
+                  p={6}
+                  mt={6}
+                  bg={bgColor}
+                  borderColor={borderColor}
+                >
+                  <VStack spacing={6} align="stretch">
+                    <Heading size="md">Results</Heading>
+
+                    {error && (
+                      <Box
+                        p={4}
+                        bg="red.50"
+                        borderRadius="md"
+                        borderColor="red.200"
+                        borderWidth="1px"
+                      >
+                        <Text color="red.700" fontWeight="bold">
+                          Error:
+                        </Text>
+                        <Text color="red.600" mt={2}>
+                          {error}
+                        </Text>
+                      </Box>
+                    )}
+
+                    {encodedPayload && (
+                      <Tabs>
+                        <TabList>
+                          <Tab>Encoded Payload</Tab>
+                          <Tab>Decoded Result</Tab>
+                        </TabList>
+
+                        <TabPanels>
+                          {/* Encoded Payload Tab */}
+                          <TabPanel>
+                            <VStack spacing={6} align="stretch">
+                              <Box>
+                                <HStack mb={2}>
+                                  <Text fontWeight="bold">Payload Length:</Text>
+                                  <Text>{encodedPayload.length} characters</Text>
+                                  <Button size="sm" onClick={copyToClipboard}>
+                                    Copy
+                                  </Button>
+                                </HStack>
+                                <Box p={4} bg={codeBgColor} borderRadius="md" overflowX="auto">
+                                  <Code display="block" whiteSpace="pre-wrap" wordBreak="break-all">
+                                    {encodedPayload}
+                                  </Code>
+                                </Box>
+                              </Box>
+
+                              <Divider />
+
+                              {/* Base Deeplink & QR Code */}
+                              <VStack spacing={4} align="stretch">
+                                <Heading size="sm">Base Deeplink & QR Code</Heading>
+                                <Text color="gray.600" fontSize="sm">
+                                  Base App deeplink to use this prolink in the Base mobile app. The
+                                  deeplink automatically includes the encoded prolink as a URL
+                                  parameter.
+                                </Text>
+
+                                <Box>
+                                  <HStack mb={2}>
+                                    <Text fontWeight="bold">Base Deeplink URL:</Text>
+                                    <Button size="sm" onClick={copyDeeplinkToClipboard}>
+                                      Copy
+                                    </Button>
+                                  </HStack>
+                                  <Box p={4} bg={codeBgColor} borderRadius="md" overflowX="auto">
+                                    <Code
+                                      display="block"
+                                      whiteSpace="pre-wrap"
+                                      wordBreak="break-all"
+                                    >
+                                      {baseDeeplink}
+                                    </Code>
+                                  </Box>
+                                </Box>
+
+                                <Box>
+                                  <Text fontWeight="bold" mb={4}>
+                                    QR Code:
+                                  </Text>
+                                  <Box
+                                    display="flex"
+                                    justifyContent="center"
+                                    p={6}
+                                    bg="white"
+                                    borderRadius="md"
+                                    borderWidth="1px"
+                                    borderColor={borderColor}
+                                  >
+                                    <QRCodeSVG value={baseDeeplink} size={256} />
+                                  </Box>
+                                  <Text fontSize="sm" color="gray.600" mt={2} textAlign="center">
+                                    Scan this QR code with the Base mobile app to execute the
+                                    prolink
+                                  </Text>
+                                </Box>
+
+                                {/* Show webhook.site view URL if capabilities are enabled */}
+                                {useCapabilities && webhookUuid && (
+                                  <Box mt={4}>
+                                    <Text fontWeight="bold" mb={2}>
+                                      View Data Callback Responses:
+                                    </Text>
+                                    <Link
+                                      href={`https://webhook.site/#!/view/${webhookUuid}`}
+                                      isExternal
+                                      color="blue.500"
+                                      fontSize="sm"
+                                    >
+                                      https://webhook.site/#!/view/{webhookUuid}
+                                    </Link>
+                                  </Box>
+                                )}
+                              </VStack>
+                            </VStack>
+                          </TabPanel>
+
+                          {/* Decoded Result Tab */}
+                          <TabPanel>
+                            <Box p={4} bg={codeBgColor} borderRadius="md" overflowX="auto">
+                              <Code display="block" whiteSpace="pre" fontSize="sm">
+                                {JSON.stringify(decodedResult, null, 2)}
+                              </Code>
+                            </Box>
+                          </TabPanel>
+                        </TabPanels>
+                      </Tabs>
+                    )}
+                  </VStack>
+                </Box>
+              )}
+            </TabPanel>
+
+            {/* Decode Tab */}
+            <TabPanel px={0}>
+              <HStack mb={4}>
+                <Heading size="md">decodeProlink</Heading>
+                <Link
+                  href="https://docs.base.org/base-account/reference/prolink-utilities/decodeProlink"
+                  isExternal
+                  color="blue.500"
+                  fontSize="sm"
+                >
+                  Docs <ExternalLinkIcon mx="2px" />
+                </Link>
+              </HStack>
+              <Box borderWidth="1px" borderRadius="lg" p={6} bg={bgColor} borderColor={borderColor}>
+                <VStack spacing={6} align="stretch">
+                  <Text color="gray.600">
+                    Paste an encoded prolink payload to decode and inspect its contents
+                  </Text>
+
+                  <FormControl>
+                    <FormLabel>Encoded Prolink Payload</FormLabel>
+                    <Textarea
+                      fontFamily="mono"
+                      value={decodeInput}
+                      onChange={(e) => setDecodeInput(e.target.value)}
+                      placeholder="Paste base64url-encoded prolink payload here..."
+                      rows={6}
+                    />
+                  </FormControl>
+
+                  <Button
+                    colorScheme="blue"
+                    size="lg"
+                    onClick={decodePayload}
+                    isLoading={decodeLoading}
+                    loadingText="Decoding..."
+                    isDisabled={!decodeInput.trim()}
+                  >
+                    Decode Prolink
+                  </Button>
+                </VStack>
+              </Box>
+
+              {/* Decode Results */}
+              {(decodeResult || decodeError) && (
+                <Box
+                  borderWidth="1px"
+                  borderRadius="lg"
+                  p={6}
+                  mt={6}
+                  bg={bgColor}
+                  borderColor={borderColor}
+                >
+                  <VStack spacing={6} align="stretch">
+                    <Heading size="md">Decoded Result</Heading>
+
+                    {decodeError && (
+                      <Box
+                        p={4}
+                        bg="red.50"
+                        borderRadius="md"
+                        borderColor="red.200"
+                        borderWidth="1px"
+                      >
+                        <Text color="red.700" fontWeight="bold">
+                          Error:
+                        </Text>
+                        <Text color="red.600" mt={2}>
+                          {decodeError}
+                        </Text>
+                      </Box>
+                    )}
+
+                    {decodeResult && (
+                      <>
+                        <HStack>
+                          <Text fontWeight="bold">Method:</Text>
+                          <Text>
+                            {
+                              (
+                                decodeResult as {
+                                  method: string;
+                                }
+                              ).method
+                            }
+                          </Text>
+                          <Button size="sm" onClick={copyDecodedToClipboard}>
+                            Copy JSON
+                          </Button>
+                        </HStack>
+                        <Box p={4} bg={codeBgColor} borderRadius="md" overflowX="auto">
+                          <Code display="block" whiteSpace="pre" fontSize="sm">
+                            {JSON.stringify(decodeResult, null, 2)}
+                          </Code>
+                        </Box>
+                      </>
+                    )}
+                  </VStack>
+                </Box>
+              )}
+            </TabPanel>
+          </TabPanels>
+        </Tabs>
+      </VStack>
+    </Container>
+  );
+}
diff --git a/examples/testapp/src/pages/spend-permission/components/CopyableText.tsx b/examples/testapp/src/pages/spend-permission/components/CopyableText.tsx
new file mode 100644
index 000000000..e6980059f
--- /dev/null
+++ b/examples/testapp/src/pages/spend-permission/components/CopyableText.tsx
@@ -0,0 +1,108 @@
+import { CopyIcon, CheckIcon } from '@chakra-ui/icons';
+import { Flex, Icon, Text, Tooltip, useClipboard, type TextProps } from '@chakra-ui/react';
+
+type CopyableTextProps = {
+  /** The full value to copy */
+  value: string;
+  /** Optional display text (if different from value, e.g., truncated) */
+  displayText?: string;
+  /** Whether to show the copy icon */
+  showIcon?: boolean;
+  /** Tooltip label when hovering (default: "Click to copy") */
+  tooltipLabel?: string;
+  /** Tooltip label after copying (default: "Copied!") */
+  copiedLabel?: string;
+} & Omit<TextProps, 'children'>;
+
+export function CopyableText({
+  value,
+  displayText,
+  showIcon = true,
+  tooltipLabel = 'Click to copy',
+  copiedLabel = 'Copied!',
+  ...textProps
+}: CopyableTextProps) {
+  const { hasCopied, onCopy } = useClipboard(value);
+
+  return (
+    <Tooltip label={hasCopied ? copiedLabel : tooltipLabel} hasArrow closeOnClick={false}>
+      <Flex
+        as="span"
+        align="center"
+        gap={1}
+        cursor="pointer"
+        onClick={onCopy}
+        role="button"
+        tabIndex={0}
+        onKeyDown={(e) => {
+          if (e.key === 'Enter' || e.key === ' ') {
+            e.preventDefault();
+            onCopy();
+          }
+        }}
+        borderRadius="md"
+        px={1.5}
+        py={0.5}
+        mx={-1.5}
+        my={-0.5}
+        transition="all 0.15s"
+        _hover={{
+          bg: hasCopied ? 'green.100' : 'gray.100',
+          _dark: {
+            bg: hasCopied ? 'green.900' : 'gray.700',
+          },
+        }}
+        _active={{
+          transform: 'scale(0.98)',
+        }}
+      >
+        <Text
+          as="span"
+          fontFamily="mono"
+          color={hasCopied ? 'green.600' : undefined}
+          _dark={{
+            color: hasCopied ? 'green.400' : undefined,
+          }}
+          transition="color 0.15s"
+          {...textProps}
+        >
+          {displayText ?? value}
+        </Text>
+        {showIcon && (
+          <Icon
+            as={hasCopied ? CheckIcon : CopyIcon}
+            boxSize={3}
+            color={hasCopied ? 'green.500' : 'gray.400'}
+            _dark={{
+              color: hasCopied ? 'green.400' : 'gray.500',
+            }}
+            transition="all 0.15s"
+            flexShrink={0}
+          />
+        )}
+      </Flex>
+    </Tooltip>
+  );
+}
+
+/**
+ * Helper to truncate an address or hash for display
+ * e.g., "0x1234...5678"
+ */
+export function truncateAddress(address: string, startChars = 6, endChars = 4): string {
+  if (address.length <= startChars + endChars + 3) {
+    return address;
+  }
+  return `${address.slice(0, startChars)}...${address.slice(-endChars)}`;
+}
+
+/**
+ * Helper to truncate a hash for display
+ * e.g., "0x1234567890..."
+ */
+export function truncateHash(hash: string, chars = 10): string {
+  if (hash.length <= chars + 3) {
+    return hash;
+  }
+  return `${hash.slice(0, chars)}...`;
+}
diff --git a/examples/testapp/src/pages/spend-permission/components/FundSpenderCard.tsx b/examples/testapp/src/pages/spend-permission/components/FundSpenderCard.tsx
new file mode 100644
index 000000000..b9dc26e16
--- /dev/null
+++ b/examples/testapp/src/pages/spend-permission/components/FundSpenderCard.tsx
@@ -0,0 +1,216 @@
+import { RepeatIcon } from '@chakra-ui/icons';
+import {
+  Box,
+  Button,
+  Card,
+  CardBody,
+  Flex,
+  FormControl,
+  FormLabel,
+  Grid,
+  Heading,
+  NumberInput,
+  NumberInputField,
+  Skeleton,
+  Text,
+  VStack,
+} from '@chakra-ui/react';
+
+import { NETWORKS, getNativeTokenSymbol } from '../constants';
+import type { SpenderBalance } from '../types';
+
+type FundSpenderCardProps = {
+  spenderBalances: SpenderBalance[];
+  isFetchingBalances: boolean;
+  onRefreshBalances: () => void;
+  selectedChainId: number | null;
+  onSelectChain: (chainId: number) => void;
+  fundAmount: string;
+  onFundAmountChange: (value: string) => void;
+  onFundSpender: () => void;
+  isFunding: boolean;
+  formatUsd?: (amount: string | number, chainId?: number | null) => string | null;
+};
+
+export function FundSpenderCard({
+  spenderBalances,
+  isFetchingBalances,
+  onRefreshBalances,
+  selectedChainId,
+  onSelectChain,
+  fundAmount,
+  onFundAmountChange,
+  onFundSpender,
+  isFunding,
+  formatUsd,
+}: FundSpenderCardProps) {
+  const selectedNetwork = NETWORKS.find((n) => n.chainId === selectedChainId);
+
+  return (
+    <Card
+      variant="outline"
+      borderRadius="xl"
+      shadow="sm"
+      bg="blue.50"
+      borderColor="blue.200"
+      _dark={{ bg: 'blue.900', borderColor: 'blue.700' }}
+    >
+      <CardBody p={{ base: 4, md: 6 }}>
+        <Flex align="center" justify="space-between" mb={3}>
+          <Heading size={{ base: 'sm', md: 'md' }}>Fund Local Spender</Heading>
+          <Button
+            size="xs"
+            variant="ghost"
+            colorScheme="blue"
+            onClick={onRefreshBalances}
+            isLoading={isFetchingBalances}
+            leftIcon={<RepeatIcon />}
+          >
+            Refresh Balances
+          </Button>
+        </Flex>
+        <Text fontSize="sm" color="gray.600" _dark={{ color: 'gray.300' }} mb={4}>
+          Send native tokens from your connected wallet to the local spender for testing.
+        </Text>
+
+        {/* Native Token Balances */}
+        <Box mb={6}>
+          <Text fontSize="xs" fontWeight="medium" color="gray.500" mb={2}>
+            Spender Balances (click to select)
+          </Text>
+          {isFetchingBalances ? (
+            <VStack spacing={1}>
+              <Skeleton height="24px" w="full" borderRadius="md" />
+              <Skeleton height="24px" w="full" borderRadius="md" />
+            </VStack>
+          ) : (
+            <Grid
+              templateColumns={{
+                base: 'repeat(2, 1fr)',
+                sm: 'repeat(3, 1fr)',
+                md: 'repeat(4, 1fr)',
+              }}
+              gap={2}
+            >
+              {spenderBalances.map((bal) => (
+                <Box
+                  key={bal.chainId}
+                  p={2}
+                  borderRadius="md"
+                  borderWidth="1px"
+                  borderColor={selectedChainId === bal.chainId ? `${bal.color}.400` : 'gray.200'}
+                  bg={selectedChainId === bal.chainId ? `${bal.color}.100` : 'white'}
+                  _dark={{
+                    bg: selectedChainId === bal.chainId ? `${bal.color}.800` : 'gray.800',
+                    borderColor: selectedChainId === bal.chainId ? `${bal.color}.600` : 'gray.600',
+                  }}
+                  cursor="pointer"
+                  onClick={() => onSelectChain(bal.chainId)}
+                  transition="all 0.15s"
+                  _hover={{
+                    borderColor: `${bal.color}.400`,
+                  }}
+                >
+                  <Flex align="center" gap={1} mb={1}>
+                    <Box w={2} h={2} borderRadius="full" bg={`${bal.color}.400`} flexShrink={0} />
+                    <Text
+                      fontSize="xs"
+                      fontWeight="medium"
+                      color="gray.600"
+                      _dark={{ color: 'gray.400' }}
+                    >
+                      {bal.chainName}
+                    </Text>
+                  </Flex>
+                  <Text
+                    fontSize="xs"
+                    fontFamily="mono"
+                    fontWeight={Number(bal.balance) > 0 ? 'semibold' : 'normal'}
+                    color={Number(bal.balance) > 0 ? 'green.600' : 'gray.400'}
+                    _dark={{
+                      color: Number(bal.balance) > 0 ? 'green.400' : 'gray.500',
+                    }}
+                  >
+                    {Number(bal.balance).toFixed(6)}
+                  </Text>
+                  {formatUsd?.(bal.balance, bal.chainId) && (
+                    <Text fontSize="2xs" color="gray.500" _dark={{ color: 'gray.500' }}>
+                      {formatUsd(bal.balance, bal.chainId)}
+                    </Text>
+                  )}
+                </Box>
+              ))}
+            </Grid>
+          )}
+        </Box>
+
+        {/* Send Funds Form */}
+        {!selectedChainId ? (
+          <Box
+            p={4}
+            borderRadius="lg"
+            bg="gray.100"
+            borderWidth="1px"
+            borderColor="gray.200"
+            _dark={{ bg: 'gray.900', borderColor: 'gray.700' }}
+            textAlign="center"
+          >
+            <Text color="gray.500" fontSize="sm">
+              👆 Select a network above to fund
+            </Text>
+          </Box>
+        ) : (
+          <Box
+            p={4}
+            borderRadius="lg"
+            bg="white"
+            borderWidth="1px"
+            borderColor="blue.200"
+            _dark={{ bg: 'gray.800', borderColor: 'blue.700' }}
+          >
+            <Text fontSize="sm" fontWeight="medium" mb={3}>
+              Send Native Token to Local Spender
+            </Text>
+            <Text fontSize="xs" color="gray.500" _dark={{ color: 'gray.400' }} mb={3}>
+              This will switch your wallet to the selected chain if needed.
+            </Text>
+
+            <VStack spacing={3} align="stretch">
+              <Flex gap={3} align="flex-end" flexWrap="wrap">
+                <FormControl flex="1" minW="120px">
+                  <FormLabel fontSize="xs">
+                    Amount ({getNativeTokenSymbol(selectedChainId)})
+                  </FormLabel>
+                  <NumberInput
+                    value={fundAmount}
+                    onChange={(valueString) => onFundAmountChange(valueString)}
+                    min={0}
+                    precision={6}
+                    size="sm"
+                  >
+                    <NumberInputField borderRadius="md" bg="white" _dark={{ bg: 'gray.900' }} />
+                  </NumberInput>
+                </FormControl>
+
+                <Button
+                  colorScheme={selectedNetwork?.color || 'blue'}
+                  onClick={onFundSpender}
+                  isLoading={isFunding}
+                  loadingText="Sending..."
+                  size="sm"
+                  borderRadius="lg"
+                  px={6}
+                >
+                  Send {fundAmount} {getNativeTokenSymbol(selectedChainId)}
+                  {formatUsd?.(fundAmount, selectedChainId) &&
+                    ` (${formatUsd(fundAmount, selectedChainId)})`}{' '}
+                  to {selectedNetwork?.name}
+                </Button>
+              </Flex>
+            </VStack>
+          </Box>
+        )}
+      </CardBody>
+    </Card>
+  );
+}
diff --git a/examples/testapp/src/pages/spend-permission/components/LocalSpenderCard.tsx b/examples/testapp/src/pages/spend-permission/components/LocalSpenderCard.tsx
new file mode 100644
index 000000000..078a129d4
--- /dev/null
+++ b/examples/testapp/src/pages/spend-permission/components/LocalSpenderCard.tsx
@@ -0,0 +1,121 @@
+import { CopyIcon, RepeatIcon } from '@chakra-ui/icons';
+import {
+  Box,
+  Card,
+  CardBody,
+  Flex,
+  Heading,
+  IconButton,
+  Input,
+  InputGroup,
+  InputRightElement,
+  Text,
+  Tooltip,
+  VStack,
+  useClipboard,
+} from '@chakra-ui/react';
+
+type LocalSpenderCardProps = {
+  address: string | null;
+  privateKey: string | null;
+  onGenerateNew: () => void;
+};
+
+export function LocalSpenderCard({ address, privateKey, onGenerateNew }: LocalSpenderCardProps) {
+  const { hasCopied: hasCopiedAddress, onCopy: onCopyAddress } = useClipboard(address || '');
+  const { hasCopied: hasCopiedPK, onCopy: onCopyPK } = useClipboard(privateKey || '');
+
+  return (
+    <Card
+      variant="outline"
+      borderRadius="xl"
+      shadow="sm"
+      bg="orange.50"
+      borderColor="orange.200"
+      _dark={{ bg: 'orange.900', borderColor: 'orange.700' }}
+    >
+      <CardBody p={{ base: 4, md: 6 }}>
+        <Flex align="center" justify="space-between" mb={3}>
+          <Heading size={{ base: 'sm', md: 'md' }}>Local Spender Account</Heading>
+          <Tooltip label="Generate new account" hasArrow>
+            <IconButton
+              aria-label="Generate new spender"
+              icon={<RepeatIcon />}
+              size="sm"
+              variant="ghost"
+              colorScheme="orange"
+              onClick={onGenerateNew}
+            />
+          </Tooltip>
+        </Flex>
+        <Text fontSize="sm" color="gray.600" _dark={{ color: 'gray.300' }} mb={4}>
+          This is a local EOA account cached in your browser. Use it as a spender for testing.
+        </Text>
+
+        <VStack spacing={3} align="stretch">
+          {/* Address */}
+          <Box>
+            <Text fontSize="xs" fontWeight="medium" color="gray.500" mb={1}>
+              Address
+            </Text>
+            <InputGroup size="sm">
+              <Input
+                value={address || ''}
+                isReadOnly
+                fontFamily="mono"
+                fontSize="xs"
+                bg="white"
+                _dark={{ bg: 'gray.800' }}
+              />
+              <InputRightElement>
+                <Tooltip label={hasCopiedAddress ? 'Copied!' : 'Copy address'} hasArrow>
+                  <IconButton
+                    aria-label="Copy address"
+                    icon={<CopyIcon />}
+                    size="xs"
+                    variant="ghost"
+                    onClick={onCopyAddress}
+                    colorScheme={hasCopiedAddress ? 'green' : 'gray'}
+                  />
+                </Tooltip>
+              </InputRightElement>
+            </InputGroup>
+          </Box>
+
+          {/* Private Key (hidden by default) */}
+          <Box>
+            <Text fontSize="xs" fontWeight="medium" color="gray.500" mb={1}>
+              Private Key (for testing only)
+            </Text>
+            <InputGroup size="sm">
+              <Input
+                value={privateKey || ''}
+                isReadOnly
+                fontFamily="mono"
+                fontSize="xs"
+                type="password"
+                bg="white"
+                _dark={{ bg: 'gray.800' }}
+              />
+              <InputRightElement>
+                <Tooltip label={hasCopiedPK ? 'Copied!' : 'Copy private key'} hasArrow>
+                  <IconButton
+                    aria-label="Copy private key"
+                    icon={<CopyIcon />}
+                    size="xs"
+                    variant="ghost"
+                    onClick={onCopyPK}
+                    colorScheme={hasCopiedPK ? 'green' : 'gray'}
+                  />
+                </Tooltip>
+              </InputRightElement>
+            </InputGroup>
+            <Text fontSize="xs" color="red.500" mt={1}>
+              ⚠️ Never use this account with real funds
+            </Text>
+          </Box>
+        </VStack>
+      </CardBody>
+    </Card>
+  );
+}
diff --git a/examples/testapp/src/pages/spend-permission/components/NetworkSwitcher.tsx b/examples/testapp/src/pages/spend-permission/components/NetworkSwitcher.tsx
new file mode 100644
index 000000000..bfcac42cc
--- /dev/null
+++ b/examples/testapp/src/pages/spend-permission/components/NetworkSwitcher.tsx
@@ -0,0 +1,104 @@
+import { Box, Button, Card, CardBody, Flex, Grid, Heading, Skeleton, Text } from '@chakra-ui/react';
+
+import { NETWORKS, getNativeTokenSymbol } from '../constants';
+
+type NetworkSwitcherProps = {
+  currentChainId: number | null;
+  onSwitchNetwork: (chainId: number) => void;
+  isSwitching: boolean;
+  formatUsd?: (amount: string | number, chainId?: number | null) => string | null;
+  connectedBalance?: string | null;
+  isLoadingBalance?: boolean;
+};
+
+export function NetworkSwitcher({
+  currentChainId,
+  onSwitchNetwork,
+  isSwitching,
+  formatUsd,
+  connectedBalance,
+  isLoadingBalance,
+}: NetworkSwitcherProps) {
+  return (
+    <Card
+      variant="outline"
+      borderRadius="xl"
+      shadow="sm"
+      _dark={{ bg: 'gray.800', borderColor: 'gray.700' }}
+    >
+      <CardBody p={{ base: 4, md: 6 }}>
+        <Heading size={{ base: 'sm', md: 'md' }} mb={4}>
+          Switch Network
+        </Heading>
+
+        <Grid
+          templateColumns={{
+            base: 'repeat(2, 1fr)',
+            sm: 'repeat(3, 1fr)',
+            md: 'repeat(4, 1fr)',
+          }}
+          gap={2}
+        >
+          {NETWORKS.map((network) => {
+            const isActive = currentChainId === network.chainId;
+            return (
+              <Button
+                key={network.chainId}
+                size="sm"
+                variant={isActive ? 'solid' : 'outline'}
+                colorScheme={network.color}
+                onClick={() => onSwitchNetwork(network.chainId)}
+                isLoading={isSwitching}
+                borderRadius="lg"
+                h="auto"
+                py={2}
+                px={3}
+              >
+                <Flex direction="column" align="center" gap={0.5}>
+                  <Box
+                    w={2}
+                    h={2}
+                    borderRadius="full"
+                    bg={isActive ? 'white' : `${network.color}.400`}
+                  />
+                  <Text fontSize="xs" fontWeight="medium">
+                    {network.name}
+                  </Text>
+                </Flex>
+              </Button>
+            );
+          })}
+        </Grid>
+
+        {currentChainId && (
+          <Flex mt={4} justify="center">
+            <Text fontSize="xs" color="gray.500">
+              Balance on {NETWORKS.find((n) => n.chainId === currentChainId)?.name}:{' '}
+              {isLoadingBalance ? (
+                <Skeleton as="span" height="14px" width="80px" display="inline-block" ml={1} />
+              ) : connectedBalance !== null && connectedBalance !== undefined ? (
+                <Text
+                  as="span"
+                  fontWeight="semibold"
+                  color="gray.700"
+                  _dark={{ color: 'gray.300' }}
+                >
+                  {Number(connectedBalance).toFixed(6)} {getNativeTokenSymbol(currentChainId)}
+                  {formatUsd?.(connectedBalance, currentChainId) && (
+                    <Text as="span" color="gray.500" fontWeight="normal" ml={1}>
+                      ({formatUsd(connectedBalance, currentChainId)})
+                    </Text>
+                  )}
+                </Text>
+              ) : (
+                <Text as="span" color="gray.400">
+                  —
+                </Text>
+              )}
+            </Text>
+          </Flex>
+        )}
+      </CardBody>
+    </Card>
+  );
+}
diff --git a/examples/testapp/src/pages/spend-permission/components/StatusItem.tsx b/examples/testapp/src/pages/spend-permission/components/StatusItem.tsx
new file mode 100644
index 000000000..9ea56d032
--- /dev/null
+++ b/examples/testapp/src/pages/spend-permission/components/StatusItem.tsx
@@ -0,0 +1,43 @@
+import { Badge, Flex, Text } from '@chakra-ui/react';
+
+type StatusItemProps = {
+  label: string;
+  status: 'yes' | 'no' | 'na' | 'error';
+  yesColor?: string;
+  noColor?: string;
+};
+
+export function StatusItem({
+  label,
+  status,
+  yesColor = 'green',
+  noColor = 'orange',
+}: StatusItemProps) {
+  const config = {
+    yes: { label: 'Yes', colorScheme: yesColor },
+    no: { label: 'No', colorScheme: noColor },
+    na: { label: '—', colorScheme: 'gray' },
+    error: { label: 'Err', colorScheme: 'red' },
+  };
+
+  const { label: statusLabel, colorScheme } = config[status];
+
+  return (
+    <Flex
+      align="center"
+      justify="space-between"
+      bg="gray.50"
+      _dark={{ bg: 'gray.700' }}
+      px={2}
+      py={1.5}
+      borderRadius="md"
+    >
+      <Text fontSize="xs" color="gray.600" _dark={{ color: 'gray.400' }} fontWeight="medium">
+        {label}
+      </Text>
+      <Badge colorScheme={colorScheme} fontSize="xs" px={1.5}>
+        {statusLabel}
+      </Badge>
+    </Flex>
+  );
+}
diff --git a/examples/testapp/src/pages/spend-permission/components/index.ts b/examples/testapp/src/pages/spend-permission/components/index.ts
new file mode 100644
index 000000000..b3b86841d
--- /dev/null
+++ b/examples/testapp/src/pages/spend-permission/components/index.ts
@@ -0,0 +1,5 @@
+export { CopyableText, truncateAddress, truncateHash } from './CopyableText';
+export { FundSpenderCard } from './FundSpenderCard';
+export { LocalSpenderCard } from './LocalSpenderCard';
+export { NetworkSwitcher } from './NetworkSwitcher';
+export { StatusItem } from './StatusItem';
diff --git a/examples/testapp/src/pages/spend-permission/constants.ts b/examples/testapp/src/pages/spend-permission/constants.ts
new file mode 100644
index 000000000..8791aee15
--- /dev/null
+++ b/examples/testapp/src/pages/spend-permission/constants.ts
@@ -0,0 +1,124 @@
+import { arbitrum, avalanche, base, bsc, mainnet, optimism, polygon } from 'viem/chains';
+
+// Local storage key for spender account
+export const SPENDER_ACCOUNT_STORAGE_KEY = 'base-acc-sdk.spend-permission.spender-pk';
+
+// EIP-7702 delegation designation prefix
+export const EIP7702_DELEGATION_PREFIX = '0xef0100';
+
+// SpendPermissionManager address
+export const SPEND_PERMISSION_MANAGER_ADDRESS = '0xf85210B21cC50302F477BA56686d2019dC9b67Ad';
+
+// Default token addresses (native token represented as special address)
+export const NATIVE_TOKEN = '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE';
+
+// ABI for checking if an address is an owner
+export const IS_OWNER_ADDRESS_ABI = [
+  {
+    inputs: [{ name: 'account', type: 'address' }],
+    name: 'isOwnerAddress',
+    outputs: [{ name: '', type: 'bool' }],
+    stateMutability: 'view',
+    type: 'function',
+  },
+] as const;
+
+// ABI for getting owner count and owners
+export const OWNER_ABI = [
+  {
+    inputs: [],
+    name: 'ownerCount',
+    outputs: [{ name: '', type: 'uint256' }],
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    inputs: [{ name: 'index', type: 'uint256' }],
+    name: 'ownerAtIndex',
+    outputs: [{ name: '', type: 'bytes' }],
+    stateMutability: 'view',
+    type: 'function',
+  },
+] as const;
+
+// Supported networks for switching
+export const NETWORKS = [
+  {
+    name: 'Ethereum',
+    chain: mainnet,
+    chainId: 1,
+    color: 'gray',
+    nativeToken: 'ETH',
+    explorer: 'https://etherscan.io',
+  },
+  {
+    name: 'Base',
+    chain: base,
+    chainId: 8453,
+    color: 'blue',
+    nativeToken: 'ETH',
+    explorer: 'https://basescan.org',
+  },
+  {
+    name: 'Arbitrum',
+    chain: arbitrum,
+    chainId: 42161,
+    color: 'cyan',
+    nativeToken: 'ETH',
+    explorer: 'https://arbiscan.io',
+  },
+  {
+    name: 'Optimism',
+    chain: optimism,
+    chainId: 10,
+    color: 'red',
+    nativeToken: 'ETH',
+    explorer: 'https://optimistic.etherscan.io',
+  },
+  {
+    name: 'Polygon',
+    chain: polygon,
+    chainId: 137,
+    color: 'purple',
+    nativeToken: 'POL',
+    explorer: 'https://polygonscan.com',
+  },
+  {
+    name: 'BNB',
+    chain: bsc,
+    chainId: 56,
+    color: 'yellow',
+    nativeToken: 'BNB',
+    explorer: 'https://bscscan.com',
+  },
+  {
+    name: 'Avalanche',
+    chain: avalanche,
+    chainId: 43114,
+    color: 'orange',
+    nativeToken: 'AVAX',
+    explorer: 'https://snowtrace.io',
+  },
+] as const;
+
+export type Network = (typeof NETWORKS)[number];
+
+// CoinGecko IDs for native tokens
+export const COINGECKO_IDS: Record<string, string> = {
+  ETH: 'ethereum',
+  POL: 'matic-network',
+  BNB: 'binancecoin',
+  AVAX: 'avalanche-2',
+};
+
+// Helper to get native token symbol for a chain
+export const getNativeTokenSymbol = (chainId: number | null | undefined): string => {
+  if (!chainId) return 'ETH';
+  const network = NETWORKS.find((n) => n.chainId === chainId);
+  return network?.nativeToken || 'ETH';
+};
+
+// Helper to get network by chainId
+export const getNetworkByChainId = (chainId: number): Network | undefined => {
+  return NETWORKS.find((n) => n.chainId === chainId);
+};
diff --git a/examples/testapp/src/pages/spend-permission/hooks/index.ts b/examples/testapp/src/pages/spend-permission/hooks/index.ts
new file mode 100644
index 000000000..c3c4f0d0f
--- /dev/null
+++ b/examples/testapp/src/pages/spend-permission/hooks/index.ts
@@ -0,0 +1,2 @@
+export { useLocalSpender } from './useLocalSpender';
+export { useTokenPrices } from './useTokenPrices';
diff --git a/examples/testapp/src/pages/spend-permission/hooks/useLocalSpender.ts b/examples/testapp/src/pages/spend-permission/hooks/useLocalSpender.ts
new file mode 100644
index 000000000..8d36c5640
--- /dev/null
+++ b/examples/testapp/src/pages/spend-permission/hooks/useLocalSpender.ts
@@ -0,0 +1,90 @@
+import { useCallback, useEffect, useState } from 'react';
+import { createPublicClient, formatUnits, getAddress, http } from 'viem';
+import { generatePrivateKey, privateKeyToAccount } from 'viem/accounts';
+
+import { NETWORKS, SPENDER_ACCOUNT_STORAGE_KEY } from '../constants';
+import type { SpenderBalance } from '../types';
+
+export function useLocalSpender() {
+  const [localSpenderAddress, setLocalSpenderAddress] = useState<string | null>(null);
+  const [localSpenderPrivateKey, setLocalSpenderPrivateKey] = useState<string | null>(null);
+  const [spenderBalances, setSpenderBalances] = useState<SpenderBalance[]>([]);
+  const [isFetchingBalances, setIsFetchingBalances] = useState(false);
+
+  // Initialize or load local spender account
+  useEffect(() => {
+    const storedPK = localStorage.getItem(SPENDER_ACCOUNT_STORAGE_KEY);
+    if (storedPK) {
+      try {
+        const account = privateKeyToAccount(storedPK as `0x${string}`);
+        setLocalSpenderAddress(account.address);
+        setLocalSpenderPrivateKey(storedPK);
+      } catch {
+        // Invalid stored key, generate new one
+        generateNewSpender();
+      }
+    } else {
+      generateNewSpender();
+    }
+  }, []);
+
+  const generateNewSpender = useCallback(() => {
+    const pk = generatePrivateKey();
+    const account = privateKeyToAccount(pk);
+    localStorage.setItem(SPENDER_ACCOUNT_STORAGE_KEY, pk);
+    setLocalSpenderPrivateKey(pk);
+    setLocalSpenderAddress(account.address);
+  }, []);
+
+  // Fetch balances for local spender on all chains
+  const fetchSpenderBalances = useCallback(async () => {
+    if (!localSpenderAddress) return;
+
+    setIsFetchingBalances(true);
+    try {
+      const balances: SpenderBalance[] = await Promise.all(
+        NETWORKS.map(async (network) => {
+          try {
+            const client = createPublicClient({
+              chain: network.chain,
+              transport: http(),
+            });
+            const balance = await client.getBalance({ address: getAddress(localSpenderAddress) });
+            return {
+              chainId: network.chainId,
+              chainName: network.name,
+              balance: formatUnits(balance, 18),
+              color: network.color,
+            };
+          } catch {
+            return {
+              chainId: network.chainId,
+              chainName: network.name,
+              balance: '0',
+              color: network.color,
+            };
+          }
+        })
+      );
+      setSpenderBalances(balances);
+    } finally {
+      setIsFetchingBalances(false);
+    }
+  }, [localSpenderAddress]);
+
+  // Auto-fetch balances when address is available
+  useEffect(() => {
+    if (localSpenderAddress) {
+      fetchSpenderBalances();
+    }
+  }, [localSpenderAddress, fetchSpenderBalances]);
+
+  return {
+    localSpenderAddress,
+    localSpenderPrivateKey,
+    spenderBalances,
+    isFetchingBalances,
+    generateNewSpender,
+    fetchSpenderBalances,
+  };
+}
diff --git a/examples/testapp/src/pages/spend-permission/hooks/useTokenPrices.ts b/examples/testapp/src/pages/spend-permission/hooks/useTokenPrices.ts
new file mode 100644
index 000000000..6d81ef36c
--- /dev/null
+++ b/examples/testapp/src/pages/spend-permission/hooks/useTokenPrices.ts
@@ -0,0 +1,59 @@
+import { useCallback, useEffect, useState } from 'react';
+
+import { COINGECKO_IDS, getNativeTokenSymbol } from '../constants';
+import type { TokenPrices } from '../types';
+
+export function useTokenPrices() {
+  const [tokenPrices, setTokenPrices] = useState<TokenPrices>({});
+
+  const fetchTokenPrices = useCallback(async () => {
+    try {
+      const ids = Object.values(COINGECKO_IDS).join(',');
+      const response = await fetch(
+        `https://api.coingecko.com/api/v3/simple/price?ids=${ids}&vs_currencies=usd`
+      );
+      const data = await response.json();
+
+      const prices: TokenPrices = {};
+      for (const [symbol, geckoId] of Object.entries(COINGECKO_IDS)) {
+        if (data[geckoId]?.usd) {
+          prices[symbol] = data[geckoId].usd;
+        }
+      }
+      setTokenPrices(prices);
+    } catch {
+      // Silently fail - USD prices are optional
+    }
+  }, []);
+
+  // Fetch token prices on mount and refresh every 5 minutes
+  useEffect(() => {
+    fetchTokenPrices();
+    const interval = setInterval(fetchTokenPrices, 5 * 60 * 1000);
+    return () => clearInterval(interval);
+  }, [fetchTokenPrices]);
+
+  // Helper to format USD amount
+  const formatUsd = useCallback(
+    (amount: string | number, chainId?: number | null): string | null => {
+      const symbol = getNativeTokenSymbol(chainId);
+      const price = tokenPrices[symbol];
+      if (!price) return null;
+
+      const numAmount = typeof amount === 'string' ? parseFloat(amount) : amount;
+      if (isNaN(numAmount)) return null;
+
+      const usdValue = numAmount * price;
+      if (usdValue < 0.01) {
+        return `$${usdValue.toFixed(6)}`;
+      }
+      if (usdValue < 1) {
+        return `$${usdValue.toFixed(4)}`;
+      }
+      return `$${usdValue.toFixed(2)}`;
+    },
+    [tokenPrices]
+  );
+
+  return { tokenPrices, formatUsd, fetchTokenPrices };
+}
diff --git a/examples/testapp/src/pages/spend-permission/index.page.tsx b/examples/testapp/src/pages/spend-permission/index.page.tsx
new file mode 100644
index 000000000..59602947e
--- /dev/null
+++ b/examples/testapp/src/pages/spend-permission/index.page.tsx
@@ -0,0 +1,1563 @@
+import {
+  fetchPermissions,
+  prepareSpendCallData,
+  requestSpendPermission,
+} from '@base-org/account/spend-permission';
+import { ChevronDownIcon, ChevronUpIcon, ExternalLinkIcon, RepeatIcon } from '@chakra-ui/icons';
+import {
+  Badge,
+  Box,
+  Button,
+  Card,
+  CardBody,
+  Collapse,
+  Container,
+  Flex,
+  FormControl,
+  FormLabel,
+  Grid,
+  Heading,
+  Icon,
+  Link,
+  NumberInput,
+  NumberInputField,
+  Skeleton,
+  Table,
+  Tbody,
+  Td,
+  Text,
+  Th,
+  Thead,
+  Tr,
+  VStack,
+  useBreakpointValue,
+  useToast,
+} from '@chakra-ui/react';
+import { useCallback, useEffect, useState } from 'react';
+import {
+  createPublicClient,
+  createWalletClient,
+  formatUnits,
+  getAddress,
+  http,
+  parseUnits,
+  type Hex,
+} from 'viem';
+import { privateKeyToAccount } from 'viem/accounts';
+
+import { useEIP1193Provider } from '../../context/EIP1193ProviderContextProvider';
+import {
+  CopyableText,
+  FundSpenderCard,
+  LocalSpenderCard,
+  NetworkSwitcher,
+  StatusItem,
+  truncateAddress,
+  truncateHash,
+} from './components';
+import {
+  EIP7702_DELEGATION_PREFIX,
+  IS_OWNER_ADDRESS_ABI,
+  NATIVE_TOKEN,
+  NETWORKS,
+  OWNER_ABI,
+  SPEND_PERMISSION_MANAGER_ADDRESS,
+  getNativeTokenSymbol,
+  getNetworkByChainId,
+} from './constants';
+import { useLocalSpender, useTokenPrices } from './hooks';
+import type { AllChainsStatus, FetchedPermission, SpendResult } from './types';
+import { parseChainIdHex } from './utils';
+
+export default function SpendPermissionPage() {
+  const { provider } = useEIP1193Provider();
+  const toast = useToast();
+
+  // Responsive values
+  const containerPadding = useBreakpointValue({ base: 4, md: 8 });
+  const headingSize = useBreakpointValue({ base: 'lg', md: 'xl' });
+
+  // Wallet connection state
+  const [connected, setConnected] = useState(false);
+  const [connectedAddress, setConnectedAddress] = useState<string | null>(null);
+  const [currentChainId, setCurrentChainId] = useState<number | null>(null);
+  const [connectedBalance, setConnectedBalance] = useState<string | null>(null);
+  const [isLoadingBalance, setIsLoadingBalance] = useState(false);
+
+  // Chain status state
+  const [allChainsStatus, setAllChainsStatus] = useState<AllChainsStatus>({});
+  const [isLoadingStatus, setIsLoadingStatus] = useState(false);
+  const [isChainStatusExpanded, setIsChainStatusExpanded] = useState(false);
+
+  // Network switching state
+  const [isSwitchingNetwork, setIsSwitchingNetwork] = useState(false);
+
+  // Hooks
+  const { formatUsd } = useTokenPrices();
+  const {
+    localSpenderAddress,
+    localSpenderPrivateKey,
+    spenderBalances,
+    isFetchingBalances,
+    generateNewSpender,
+    fetchSpenderBalances,
+  } = useLocalSpender();
+
+  // Spend Permission Request State
+  const [spSpender, setSpSpender] = useState<string>('');
+  const [spToken] = useState<string>(NATIVE_TOKEN);
+  const [spAllowance, setSpAllowance] = useState<string>('0.001');
+  const [spPeriodInDays, setSpPeriodInDays] = useState<number>(30);
+  const [isRequestingPermission, setIsRequestingPermission] = useState(false);
+  const [isRequestSettingsExpanded, setIsRequestSettingsExpanded] = useState(false);
+
+  // Fetched Permissions State
+  const [fetchedPermissions, setFetchedPermissions] = useState<FetchedPermission[]>([]);
+  const [isFetchingPermissions, setIsFetchingPermissions] = useState(false);
+  const [isPermissionHistoryExpanded, setIsPermissionHistoryExpanded] = useState(false);
+
+  // Selected Permission State (for spending)
+  const [selectedPermission, setSelectedPermission] = useState<FetchedPermission | null>(null);
+  const [spendAmount, setSpendAmount] = useState<string>('0.000001');
+  const [isSpending, setIsSpending] = useState(false);
+  const [spendResult, setSpendResult] = useState<SpendResult | null>(null);
+
+  // Fund Spender State
+  const [fundChainId, setFundChainId] = useState<number | null>(null);
+  const [fundAmount, setFundAmount] = useState<string>('0.01');
+  const [isFundingSpender, setIsFundingSpender] = useState(false);
+
+  // Auto-fill spender address when local spender is available
+  useEffect(() => {
+    if (localSpenderAddress && !spSpender) {
+      setSpSpender(localSpenderAddress);
+    }
+  }, [localSpenderAddress, spSpender]);
+
+  // Fetch connected wallet balance
+  const fetchConnectedBalance = useCallback(async () => {
+    if (!connectedAddress || !currentChainId) {
+      setConnectedBalance(null);
+      return;
+    }
+
+    setIsLoadingBalance(true);
+    try {
+      const network = NETWORKS.find((n) => n.chainId === currentChainId);
+      if (!network) {
+        setConnectedBalance(null);
+        return;
+      }
+
+      const client = createPublicClient({
+        chain: network.chain,
+        transport: http(),
+      });
+
+      const balance = await client.getBalance({ address: getAddress(connectedAddress) });
+      setConnectedBalance(formatUnits(balance, 18));
+    } catch (error) {
+      console.error('Failed to fetch connected balance:', error);
+      setConnectedBalance(null);
+    } finally {
+      setIsLoadingBalance(false);
+    }
+  }, [connectedAddress, currentChainId]);
+
+  useEffect(() => {
+    fetchConnectedBalance();
+  }, [fetchConnectedBalance]);
+
+  // Check for existing connection on page load
+  const checkExistingConnection = useCallback(async () => {
+    if (!provider) return;
+
+    try {
+      // Use eth_accounts to check without prompting
+      const accounts = (await provider.request({
+        method: 'eth_accounts',
+      })) as string[];
+
+      if (accounts.length > 0) {
+        setConnectedAddress(accounts[0]);
+        setConnected(true);
+
+        const chainIdHex = (await provider.request({
+          method: 'eth_chainId',
+        })) as string;
+        setCurrentChainId(parseChainIdHex(chainIdHex));
+      }
+    } catch (error) {
+      // Silently fail - user can manually connect
+      console.error('Failed to check existing connection:', error);
+    }
+  }, [provider]);
+
+  // Auto-check for existing connection on mount
+  useEffect(() => {
+    checkExistingConnection();
+  }, [checkExistingConnection]);
+
+  // Handle wallet connection (manual connect button)
+  const handleConnect = useCallback(async () => {
+    if (!provider) return;
+
+    try {
+      const accounts = (await provider.request({
+        method: 'eth_requestAccounts',
+      })) as string[];
+
+      if (accounts.length > 0) {
+        setConnectedAddress(accounts[0]);
+        setConnected(true);
+
+        const chainIdHex = (await provider.request({
+          method: 'eth_chainId',
+        })) as string;
+        setCurrentChainId(parseChainIdHex(chainIdHex));
+      }
+    } catch (error) {
+      console.error('Failed to connect:', error);
+      toast({
+        title: 'Connection Failed',
+        description: error instanceof Error ? error.message : 'Unknown error',
+        status: 'error',
+        duration: 5000,
+        isClosable: true,
+      });
+    }
+  }, [provider, toast]);
+
+  // Fetch all chains status
+  const fetchAllChainsStatus = useCallback(async () => {
+    if (!connectedAddress) return;
+
+    setIsLoadingStatus(true);
+
+    try {
+      // Fetch bytecode and owner info for all chains in parallel
+      const results = await Promise.allSettled(
+        NETWORKS.map(async (network) => {
+          const client = createPublicClient({
+            chain: network.chain,
+            transport: http(),
+          });
+
+          const address = getAddress(connectedAddress);
+          const bytecode = await client.getCode({ address });
+
+          let is7702 = false;
+          let delegateAddress: string | null = null;
+          let isDeployed = false;
+          let hasPermissionManagerAsOwner = false;
+          const owners: string[] = [];
+
+          if (bytecode && bytecode !== '0x') {
+            isDeployed = true;
+
+            // Check for 7702 delegation
+            if (bytecode.toLowerCase().startsWith(EIP7702_DELEGATION_PREFIX.toLowerCase())) {
+              is7702 = true;
+              delegateAddress = `0x${bytecode.slice(EIP7702_DELEGATION_PREFIX.length, EIP7702_DELEGATION_PREFIX.length + 40)}`;
+            }
+
+            // Get the contract to query for owners (either delegate or the address itself)
+            const contractToQuery = is7702 && delegateAddress ? delegateAddress : address;
+
+            // Fetch owners
+            try {
+              const ownerCount = (await client.readContract({
+                address: contractToQuery as `0x${string}`,
+                abi: OWNER_ABI,
+                functionName: 'ownerCount',
+              })) as bigint;
+
+              for (let i = 0; i < Number(ownerCount); i++) {
+                const ownerBytes = (await client.readContract({
+                  address: contractToQuery as `0x${string}`,
+                  abi: OWNER_ABI,
+                  functionName: 'ownerAtIndex',
+                  args: [BigInt(i)],
+                })) as `0x${string}`;
+                owners.push(ownerBytes.toLowerCase());
+              }
+            } catch {
+              // No owners or not a smart wallet
+            }
+
+            // Check if Permission Manager is an owner
+            try {
+              const isPMOwner = (await client.readContract({
+                address: contractToQuery as `0x${string}`,
+                abi: IS_OWNER_ADDRESS_ABI,
+                functionName: 'isOwnerAddress',
+                args: [SPEND_PERMISSION_MANAGER_ADDRESS],
+              })) as boolean;
+              hasPermissionManagerAsOwner = isPMOwner;
+            } catch {
+              // Not a smart wallet or doesn't have isOwnerAddress
+            }
+          }
+
+          return {
+            chainId: network.chainId,
+            chainName: network.name,
+            bytecode,
+            is7702,
+            delegateAddress,
+            isDeployed,
+            hasPermissionManagerAsOwner,
+            owners,
+          };
+        })
+      );
+
+      // Build a union of all owners across all chains
+      const allOwnersUnion = new Set<string>();
+      for (const result of results) {
+        if (result.status === 'fulfilled' && result.value.owners.length > 0) {
+          for (const owner of result.value.owners) {
+            allOwnersUnion.add(owner);
+          }
+        }
+      }
+
+      // Determine if the address is a smart wallet on any chain
+      const isSmartWalletOnAnyChain = results.some(
+        (result) => result.status === 'fulfilled' && result.value.isDeployed && !result.value.is7702
+      );
+
+      // Build status map
+      const statusMap: AllChainsStatus = {};
+
+      for (const result of results) {
+        if (result.status !== 'fulfilled') continue;
+
+        const accountType =
+          result.value.isDeployed || isSmartWalletOnAnyChain ? 'Smart Wallet' : 'EOA';
+
+        // Check pending ownership
+        let hasPendingOwnershipChange = false;
+        if (
+          (result.value.isDeployed || result.value.is7702) &&
+          result.value.owners.length > 0 &&
+          allOwnersUnion.size > 0
+        ) {
+          const chainOwnerSet = new Set(result.value.owners);
+          const allOwnersArray = Array.from(allOwnersUnion);
+          for (const owner of allOwnersArray) {
+            if (!chainOwnerSet.has(owner)) {
+              hasPendingOwnershipChange = true;
+              break;
+            }
+          }
+        }
+
+        statusMap[result.value.chainId] = {
+          chainId: result.value.chainId,
+          chainName: result.value.chainName,
+          accountType,
+          isEOA7702Delegated: result.value.is7702,
+          hasPendingOwnershipChange,
+          isDeployed: result.value.isDeployed,
+          hasPermissionManagerAsOwner: result.value.hasPermissionManagerAsOwner,
+          bytecode: result.value.bytecode,
+        };
+      }
+
+      setAllChainsStatus(statusMap);
+    } catch (error) {
+      console.error('Failed to fetch wallet status:', error);
+    } finally {
+      setIsLoadingStatus(false);
+    }
+  }, [connectedAddress]);
+
+  // Fetch status when connected
+  useEffect(() => {
+    if (connected && connectedAddress) {
+      fetchAllChainsStatus();
+    }
+  }, [connected, connectedAddress, fetchAllChainsStatus]);
+
+  // Handle network switch
+  const handleSwitchNetwork = useCallback(
+    async (chainId: number) => {
+      if (!provider) return;
+
+      setIsSwitchingNetwork(true);
+      try {
+        await provider.request({
+          method: 'wallet_switchEthereumChain',
+          params: [{ chainId: `0x${chainId.toString(16)}` }],
+        });
+        setCurrentChainId(chainId);
+      } catch (error) {
+        console.error('Failed to switch network:', error);
+        toast({
+          title: 'Network Switch Failed',
+          description: error instanceof Error ? error.message : 'Unknown error',
+          status: 'error',
+          duration: 5000,
+          isClosable: true,
+        });
+      } finally {
+        setIsSwitchingNetwork(false);
+      }
+    },
+    [provider, toast]
+  );
+
+  // Handle fund spender
+  const handleFundSpender = useCallback(async () => {
+    if (!provider || !localSpenderAddress || !fundChainId) return;
+
+    setIsFundingSpender(true);
+
+    try {
+      const amountInWei = parseUnits(fundAmount, 18);
+
+      // Switch to the selected chain first if needed
+      if (currentChainId !== fundChainId) {
+        await provider.request({
+          method: 'wallet_switchEthereumChain',
+          params: [{ chainId: `0x${fundChainId.toString(16)}` }],
+        });
+        setCurrentChainId(fundChainId);
+      }
+
+      // Send transaction
+      const txHash = await provider.request({
+        method: 'eth_sendTransaction',
+        params: [
+          {
+            to: localSpenderAddress,
+            value: `0x${amountInWei.toString(16)}`,
+          },
+        ],
+      });
+
+      toast({
+        title: 'Funding Successful',
+        description: `Sent ${fundAmount} ${getNativeTokenSymbol(fundChainId)} to local spender. Tx: ${(txHash as string).slice(0, 10)}...`,
+        status: 'success',
+        duration: 5000,
+        isClosable: true,
+      });
+
+      await fetchSpenderBalances();
+      await fetchConnectedBalance();
+    } catch (error) {
+      console.error('Failed to fund spender:', error);
+      toast({
+        title: 'Funding Failed',
+        description: error instanceof Error ? error.message : 'Unknown error',
+        status: 'error',
+        duration: 5000,
+        isClosable: true,
+      });
+    } finally {
+      setIsFundingSpender(false);
+    }
+  }, [
+    provider,
+    localSpenderAddress,
+    fundChainId,
+    fundAmount,
+    currentChainId,
+    toast,
+    fetchSpenderBalances,
+    fetchConnectedBalance,
+  ]);
+
+  // Fetch all permissions
+  const handleFetchAllPermissions = useCallback(
+    async (showToast = true) => {
+      if (!connectedAddress || !localSpenderAddress) return;
+
+      setIsFetchingPermissions(true);
+      setFetchedPermissions([]);
+
+      try {
+        const allPermissions: FetchedPermission[] = [];
+
+        const results = await Promise.allSettled(
+          NETWORKS.map(async (network) => {
+            try {
+              const permissions = await fetchPermissions({
+                account: connectedAddress,
+                spender: localSpenderAddress,
+                chainId: network.chainId,
+              });
+              return { chainId: network.chainId, chainName: network.name, permissions };
+            } catch {
+              return { chainId: network.chainId, chainName: network.name, permissions: [] };
+            }
+          })
+        );
+
+        for (const result of results) {
+          if (result.status === 'fulfilled' && result.value.permissions.length > 0) {
+            for (const perm of result.value.permissions) {
+              allPermissions.push({
+                chainId: result.value.chainId,
+                chainName: result.value.chainName,
+                permissionHash: perm.permissionHash,
+                account: perm.permission.account,
+                token: perm.permission.token,
+                allowance: perm.permission.allowance,
+                period: perm.permission.period,
+                start: perm.permission.start,
+                end: perm.permission.end,
+                spender: perm.permission.spender,
+                salt: perm.permission.salt,
+                extraData: perm.permission.extraData,
+                signature: perm.signature,
+                createdAt: perm.createdAt,
+              });
+            }
+          }
+        }
+
+        setFetchedPermissions(allPermissions);
+
+        // Auto-select the latest permission
+        if (allPermissions.length > 0) {
+          const sorted = [...allPermissions].sort(
+            (a, b) => (b.createdAt || 0) - (a.createdAt || 0)
+          );
+          setSelectedPermission(sorted[0]);
+        } else {
+          setSelectedPermission(null);
+        }
+
+        if (showToast) {
+          toast({
+            title: 'Permissions Fetched',
+            description: `Found ${allPermissions.length} permission(s) across all chains.`,
+            status: 'success',
+            duration: 3000,
+            isClosable: true,
+          });
+        }
+      } catch (error) {
+        if (showToast) {
+          toast({
+            title: 'Fetch Failed',
+            description: error instanceof Error ? error.message : 'Unknown error',
+            status: 'error',
+            duration: 5000,
+            isClosable: true,
+          });
+        }
+      } finally {
+        setIsFetchingPermissions(false);
+      }
+    },
+    [connectedAddress, localSpenderAddress, toast]
+  );
+
+  // Auto-fetch permissions on load
+  useEffect(() => {
+    if (connected && connectedAddress && localSpenderAddress) {
+      handleFetchAllPermissions(false);
+    }
+  }, [connected, connectedAddress, localSpenderAddress, handleFetchAllPermissions]);
+
+  // Handle request spend permission
+  const handleRequestSpendPermission = useCallback(async () => {
+    if (!provider || !connectedAddress || !currentChainId) return;
+
+    setIsRequestingPermission(true);
+
+    try {
+      const allowanceInWei = parseUnits(spAllowance, 18);
+
+      await requestSpendPermission({
+        provider,
+        account: connectedAddress,
+        spender: spSpender,
+        token: spToken,
+        chainId: currentChainId,
+        allowance: allowanceInWei,
+        periodInDays: spPeriodInDays,
+      });
+
+      const networkName = getNetworkByChainId(currentChainId)?.name || 'Unknown';
+
+      toast({
+        title: 'Permission Requested',
+        description: `Spend permission signed for ${networkName}.`,
+        status: 'success',
+        duration: 5000,
+        isClosable: true,
+      });
+
+      // Refresh permissions
+      await handleFetchAllPermissions(false);
+    } catch (error) {
+      console.error('Failed to request permission:', error);
+      toast({
+        title: 'Request Failed',
+        description: error instanceof Error ? error.message : 'Unknown error',
+        status: 'error',
+        duration: 5000,
+        isClosable: true,
+      });
+    } finally {
+      setIsRequestingPermission(false);
+    }
+  }, [
+    provider,
+    connectedAddress,
+    currentChainId,
+    spAllowance,
+    spSpender,
+    spToken,
+    spPeriodInDays,
+    toast,
+    handleFetchAllPermissions,
+  ]);
+
+  // Handle spend
+  const handleSpend = useCallback(async () => {
+    if (!selectedPermission || !localSpenderPrivateKey || !connectedAddress) return;
+
+    setIsSpending(true);
+    setSpendResult(null);
+
+    try {
+      const amountInWei = parseUnits(spendAmount, 18);
+      const network = NETWORKS.find((n) => n.chainId === selectedPermission.chainId);
+
+      if (!network) {
+        throw new Error('Network not found for permission');
+      }
+
+      const permissionForSpend = {
+        permissionHash: selectedPermission.permissionHash,
+        chainId: selectedPermission.chainId,
+        permission: {
+          account: selectedPermission.account,
+          spender: selectedPermission.spender,
+          token: selectedPermission.token,
+          allowance: selectedPermission.allowance,
+          period: selectedPermission.period,
+          start: selectedPermission.start,
+          end: selectedPermission.end,
+          salt: selectedPermission.salt,
+          extraData: selectedPermission.extraData as Hex,
+        },
+        signature: selectedPermission.signature,
+        createdAt: selectedPermission.createdAt,
+      };
+
+      const calls = await prepareSpendCallData(permissionForSpend, amountInWei);
+
+      const account = privateKeyToAccount(localSpenderPrivateKey as `0x${string}`);
+      const walletClient = createWalletClient({
+        account,
+        chain: network.chain,
+        transport: http(),
+      });
+
+      const publicClient = createPublicClient({
+        chain: network.chain,
+        transport: http(),
+      });
+
+      const txHashes: string[] = [];
+      for (let i = 0; i < calls.length; i++) {
+        const call = calls[i];
+        const hash = await walletClient.sendTransaction({
+          account,
+          to: call.to,
+          data: call.data,
+          value: call.value,
+          chain: network.chain,
+          kzg: undefined,
+        } as Parameters<typeof walletClient.sendTransaction>[0]);
+        txHashes.push(hash);
+
+        if (i < calls.length - 1) {
+          toast({
+            title: 'Waiting for Confirmation',
+            description: `Transaction ${i + 1}/${calls.length} submitted. Waiting for confirmation...`,
+            status: 'info',
+            duration: 3000,
+            isClosable: true,
+          });
+          await publicClient.waitForTransactionReceipt({
+            hash,
+            confirmations: 1,
+          });
+        }
+      }
+
+      setSpendResult({
+        success: true,
+        message: 'Transaction submitted successfully!',
+        txHashes,
+        chainId: selectedPermission.chainId,
+      });
+
+      toast({
+        title: 'Spend Successful',
+        description: `Spent ${spendAmount} ${getNativeTokenSymbol(selectedPermission.chainId)} from permission`,
+        status: 'success',
+        duration: 5000,
+        isClosable: true,
+      });
+
+      await fetchSpenderBalances();
+    } catch (error) {
+      console.error('Failed to spend:', error);
+      const errorMessage = error instanceof Error ? error.message : 'Unknown error';
+      setSpendResult({
+        success: false,
+        message: errorMessage,
+      });
+      toast({
+        title: 'Spend Failed',
+        status: 'error',
+        duration: 5000,
+        isClosable: true,
+      });
+    } finally {
+      setIsSpending(false);
+    }
+  }, [
+    selectedPermission,
+    localSpenderPrivateKey,
+    connectedAddress,
+    spendAmount,
+    toast,
+    fetchSpenderBalances,
+  ]);
+
+  // Helper functions
+  const formatAllowance = (allowance: string, chainId?: number) => {
+    try {
+      const amount = formatUnits(BigInt(allowance), 18);
+      const usdAmount = formatUsd(amount, chainId);
+      const base = `${amount} ${getNativeTokenSymbol(chainId)}`;
+      return usdAmount ? `${base} (${usdAmount})` : base;
+    } catch {
+      return allowance;
+    }
+  };
+
+  const formatTimestamp = (timestamp: number) => {
+    if (timestamp === 0) return 'N/A';
+    if (timestamp === 281474976710655) return 'Never';
+    return new Date(timestamp * 1000).toLocaleDateString();
+  };
+
+  const formatDateTime = (timestamp: number | undefined) => {
+    if (!timestamp) return 'N/A';
+    const date = new Date(timestamp * 1000);
+    return date.toLocaleString(undefined, {
+      month: 'short',
+      day: 'numeric',
+      hour: '2-digit',
+      minute: '2-digit',
+    });
+  };
+
+  // Get aggregated status
+  const aggregatedStatus = Object.values(allChainsStatus)[0];
+  const isSmartWallet = aggregatedStatus?.accountType === 'Smart Wallet';
+
+  // Get sorted permissions
+  const sortedPermissions = [...fetchedPermissions].sort(
+    (a, b) => (b.createdAt || 0) - (a.createdAt || 0)
+  );
+  const latestPermissions = sortedPermissions.slice(0, 10);
+
+  return (
+    <Container maxW="container.lg" py={containerPadding} px={{ base: 4, md: 6 }}>
+      <VStack spacing={{ base: 4, md: 8 }} align="stretch">
+        {/* Hero Header */}
+        <Box
+          textAlign="center"
+          py={{ base: 6, md: 8 }}
+          px={{ base: 4, md: 6 }}
+          borderRadius="2xl"
+          bg="linear-gradient(135deg, #667eea 0%, #764ba2 100%)"
+          color="white"
+          shadow="xl"
+        >
+          <Heading size={headingSize} mb={2} fontWeight="bold">
+            Spend Permission
+          </Heading>
+          <Text opacity={0.9} fontSize={{ base: 'sm', md: 'lg' }}>
+            Manage spend permissions across chains
+          </Text>
+        </Box>
+
+        {/* ==================== SECTION 1: ACCOUNT OVERVIEW ==================== */}
+        <Flex align="center" gap={2}>
+          <Box w={1} h={6} bg="purple.500" borderRadius="full" />
+          <Heading size="sm" color="gray.600" _dark={{ color: 'gray.400' }}>
+            1. Account Overview
+          </Heading>
+        </Flex>
+
+        {/* Connection Card */}
+        <Card
+          variant="outline"
+          borderRadius="xl"
+          shadow="sm"
+          _dark={{ bg: 'gray.800', borderColor: 'gray.700' }}
+        >
+          <CardBody p={{ base: 4, md: 6 }}>
+            {!connected ? (
+              <VStack spacing={4}>
+                <Icon viewBox="0 0 24 24" boxSize={12} color="purple.500">
+                  <path
+                    fill="currentColor"
+                    d="M21 18v1c0 1.1-.9 2-2 2H5c-1.11 0-2-.9-2-2V5c0-1.1.89-2 2-2h14c1.1 0 2 .9 2 2v1h-9c-1.11 0-2 .9-2 2v8c0 1.1.89 2 2 2h9zm-9-2h10V8H12v8zm4-2.5c-.83 0-1.5-.67-1.5-1.5s.67-1.5 1.5-1.5 1.5.67 1.5 1.5-.67 1.5-1.5 1.5z"
+                  />
+                </Icon>
+                <Text color="gray.500" textAlign="center">
+                  Connect your wallet to manage spend permissions
+                </Text>
+                <Button
+                  colorScheme="purple"
+                  size="lg"
+                  onClick={handleConnect}
+                  borderRadius="xl"
+                  px={8}
+                >
+                  Connect Wallet
+                </Button>
+              </VStack>
+            ) : (
+              <VStack spacing={3} align="stretch">
+                <Flex
+                  justify="space-between"
+                  align={{ base: 'flex-start', sm: 'center' }}
+                  flexDirection={{ base: 'column', sm: 'row' }}
+                  gap={3}
+                >
+                  <Box>
+                    <Flex align="center" gap={2} mb={1}>
+                      <Box w={2} h={2} borderRadius="full" bg="green.400" />
+                      <Text
+                        fontSize="sm"
+                        fontWeight="medium"
+                        color="green.600"
+                        _dark={{ color: 'green.400' }}
+                      >
+                        Connected
+                      </Text>
+                    </Flex>
+                    {connectedAddress && (
+                      <CopyableText
+                        value={connectedAddress}
+                        displayText={truncateAddress(connectedAddress)}
+                        fontSize={{ base: 'sm', md: 'md' }}
+                        fontWeight="medium"
+                        color="gray.700"
+                        _dark={{ color: 'gray.200' }}
+                        tooltipLabel="Click to copy address"
+                      />
+                    )}
+                    <Flex align="center" gap={1} mt={1}>
+                      <Text fontSize="xs" color="gray.500" _dark={{ color: 'gray.400' }}>
+                        Balance:
+                      </Text>
+                      {isLoadingBalance ? (
+                        <Skeleton height="14px" width="100px" borderRadius="sm" />
+                      ) : connectedBalance !== null ? (
+                        <Text
+                          fontSize="xs"
+                          fontWeight="semibold"
+                          color={Number(connectedBalance) > 0 ? 'green.600' : 'gray.500'}
+                          _dark={{
+                            color: Number(connectedBalance) > 0 ? 'green.400' : 'gray.400',
+                          }}
+                        >
+                          {Number(connectedBalance).toFixed(6)}{' '}
+                          {getNativeTokenSymbol(currentChainId)}
+                          {formatUsd(connectedBalance, currentChainId) && (
+                            <Text as="span" color="gray.500" fontWeight="normal" ml={1}>
+                              ({formatUsd(connectedBalance, currentChainId)})
+                            </Text>
+                          )}
+                        </Text>
+                      ) : (
+                        <Text fontSize="xs" color="gray.400">
+                          —
+                        </Text>
+                      )}
+                    </Flex>
+                  </Box>
+                  <Flex gap={2} flexWrap="wrap">
+                    {aggregatedStatus && (
+                      <Badge
+                        colorScheme={
+                          aggregatedStatus.accountType === 'Smart Wallet' ? 'purple' : 'gray'
+                        }
+                        fontSize="xs"
+                        px={2}
+                        py={1}
+                        borderRadius="md"
+                      >
+                        {aggregatedStatus.accountType}
+                      </Badge>
+                    )}
+                    {currentChainId && (
+                      <Badge
+                        colorScheme={getNetworkByChainId(currentChainId)?.color || 'gray'}
+                        fontSize="xs"
+                        px={2}
+                        py={1}
+                        borderRadius="md"
+                      >
+                        {getNetworkByChainId(currentChainId)?.name || 'Unknown'}
+                      </Badge>
+                    )}
+                  </Flex>
+                </Flex>
+              </VStack>
+            )}
+          </CardBody>
+        </Card>
+
+        {/* Chain Status - Collapsible */}
+        {connected && (
+          <Card
+            variant="outline"
+            borderRadius="xl"
+            shadow="sm"
+            _dark={{ bg: 'gray.800', borderColor: 'gray.700' }}
+          >
+            <CardBody p={{ base: 4, md: 6 }}>
+              <Flex
+                align="center"
+                justify="space-between"
+                cursor="pointer"
+                onClick={() => setIsChainStatusExpanded(!isChainStatusExpanded)}
+              >
+                <Flex align="center" gap={2}>
+                  <Heading size={{ base: 'sm', md: 'md' }}>Chain Status</Heading>
+                  <Button
+                    size="xs"
+                    variant="ghost"
+                    colorScheme="blue"
+                    onClick={(e) => {
+                      e.stopPropagation();
+                      fetchAllChainsStatus();
+                    }}
+                    isLoading={isLoadingStatus}
+                    leftIcon={<RepeatIcon />}
+                  >
+                    Refresh
+                  </Button>
+                </Flex>
+                <Icon as={isChainStatusExpanded ? ChevronUpIcon : ChevronDownIcon} boxSize={5} />
+              </Flex>
+
+              <Collapse in={isChainStatusExpanded} animateOpacity>
+                <Box mt={4}>
+                  {isLoadingStatus ? (
+                    <VStack spacing={2}>
+                      {[...new Array(3)].map((_, i) => (
+                        <Skeleton key={i} height="60px" w="full" borderRadius="md" />
+                      ))}
+                    </VStack>
+                  ) : (
+                    <VStack spacing={3} align="stretch">
+                      {NETWORKS.map((network) => {
+                        const status = allChainsStatus[network.chainId];
+                        if (!status) return null;
+
+                        return (
+                          <Box
+                            key={network.chainId}
+                            p={3}
+                            borderRadius="lg"
+                            borderWidth="1px"
+                            borderColor="gray.200"
+                            _dark={{ borderColor: 'gray.600' }}
+                          >
+                            <Flex align="center" gap={2} mb={2}>
+                              <Box w={3} h={3} borderRadius="full" bg={`${network.color}.400`} />
+                              <Text fontWeight="semibold" fontSize="sm">
+                                {network.name}
+                              </Text>
+                            </Flex>
+                            <Grid templateColumns="repeat(2, 1fr)" gap={{ base: 2, md: 3 }}>
+                              <StatusItem
+                                label="Deployed"
+                                status={
+                                  status.error
+                                    ? 'error'
+                                    : !isSmartWallet
+                                      ? 'na'
+                                      : status.isDeployed
+                                        ? 'yes'
+                                        : 'no'
+                                }
+                              />
+                              <StatusItem
+                                label="7702"
+                                status={
+                                  isSmartWallet ? 'na' : status.isEOA7702Delegated ? 'yes' : 'no'
+                                }
+                              />
+                              <StatusItem
+                                label="Pending Sync"
+                                status={
+                                  !(isSmartWallet && status.isDeployed) &&
+                                  !status.isEOA7702Delegated
+                                    ? 'na'
+                                    : status.hasPendingOwnershipChange
+                                      ? 'yes'
+                                      : 'no'
+                                }
+                                yesColor="orange"
+                                noColor="green"
+                              />
+                              <StatusItem
+                                label="PM Owner"
+                                status={
+                                  !(isSmartWallet && status.isDeployed) &&
+                                  !status.isEOA7702Delegated
+                                    ? 'na'
+                                    : status.hasPermissionManagerAsOwner
+                                      ? 'yes'
+                                      : 'no'
+                                }
+                              />
+                            </Grid>
+                          </Box>
+                        );
+                      })}
+                    </VStack>
+                  )}
+                </Box>
+              </Collapse>
+            </CardBody>
+          </Card>
+        )}
+
+        {/* Network Switcher */}
+        {connected && (
+          <NetworkSwitcher
+            currentChainId={currentChainId}
+            onSwitchNetwork={handleSwitchNetwork}
+            isSwitching={isSwitchingNetwork}
+            formatUsd={formatUsd}
+            connectedBalance={connectedBalance}
+            isLoadingBalance={isLoadingBalance}
+          />
+        )}
+
+        {/* ==================== SECTION 2: SPENDER SETUP ==================== */}
+        {connected && (
+          <Flex align="center" gap={2}>
+            <Box w={1} h={6} bg="orange.500" borderRadius="full" />
+            <Heading size="sm" color="gray.600" _dark={{ color: 'gray.400' }}>
+              2. Spender Setup
+            </Heading>
+          </Flex>
+        )}
+
+        {connected && (
+          <LocalSpenderCard
+            address={localSpenderAddress}
+            privateKey={localSpenderPrivateKey}
+            onGenerateNew={generateNewSpender}
+          />
+        )}
+
+        {connected && localSpenderAddress && (
+          <FundSpenderCard
+            spenderBalances={spenderBalances}
+            isFetchingBalances={isFetchingBalances}
+            onRefreshBalances={fetchSpenderBalances}
+            selectedChainId={fundChainId}
+            onSelectChain={setFundChainId}
+            fundAmount={fundAmount}
+            onFundAmountChange={setFundAmount}
+            onFundSpender={handleFundSpender}
+            isFunding={isFundingSpender}
+            formatUsd={formatUsd}
+          />
+        )}
+
+        {/* ==================== SECTION 3: SPEND PERMISSIONS ==================== */}
+        {connected && (
+          <Flex align="center" gap={2}>
+            <Box w={1} h={6} bg="green.500" borderRadius="full" />
+            <Heading size="sm" color="gray.600" _dark={{ color: 'gray.400' }}>
+              3. Spend Permissions
+            </Heading>
+          </Flex>
+        )}
+
+        {/* Request Permission Card */}
+        {connected && (
+          <Card
+            variant="outline"
+            borderRadius="xl"
+            shadow="sm"
+            bg="green.50"
+            borderColor="green.200"
+            _dark={{ bg: 'green.900', borderColor: 'green.700' }}
+          >
+            <CardBody p={{ base: 4, md: 6 }}>
+              <Flex justify="space-between" align="center" mb={4}>
+                <Heading size={{ base: 'sm', md: 'md' }}>Request Spend Permission</Heading>
+                <Link
+                  href="https://docs.base.org/base-account/reference/spend-permission-utilities/requestSpendPermission"
+                  isExternal
+                  color="blue.500"
+                  fontSize="sm"
+                >
+                  Docs <ExternalLinkIcon mx="2px" />
+                </Link>
+              </Flex>
+
+              {/* Quick Summary */}
+              <Grid templateColumns={{ base: '1fr', sm: 'repeat(2, 1fr)' }} gap={3} mb={4}>
+                <Flex justify="space-between" align="center">
+                  <Text fontSize="xs" color="gray.500">
+                    Chain
+                  </Text>
+                  <Badge colorScheme={getNetworkByChainId(currentChainId || 0)?.color || 'gray'}>
+                    {getNetworkByChainId(currentChainId || 0)?.name || 'Select Chain'}
+                  </Badge>
+                </Flex>
+                <Flex justify="space-between" align="center">
+                  <Text fontSize="xs" color="gray.500">
+                    Allowance
+                  </Text>
+                  <Text fontSize="xs" fontWeight="medium">
+                    {spAllowance} {getNativeTokenSymbol(currentChainId)}
+                    {formatUsd(spAllowance, currentChainId) && (
+                      <Text as="span" color="gray.500" fontWeight="normal" ml={1}>
+                        ({formatUsd(spAllowance, currentChainId)})
+                      </Text>
+                    )}
+                  </Text>
+                </Flex>
+              </Grid>
+
+              {/* Toggle Advanced Settings */}
+              <Button
+                size="xs"
+                variant="ghost"
+                onClick={() => setIsRequestSettingsExpanded(!isRequestSettingsExpanded)}
+                mb={4}
+                rightIcon={isRequestSettingsExpanded ? <ChevronUpIcon /> : <ChevronDownIcon />}
+              >
+                {isRequestSettingsExpanded ? 'Hide' : 'Show'} Advanced Settings
+              </Button>
+
+              <Collapse in={isRequestSettingsExpanded} animateOpacity>
+                <VStack spacing={4} align="stretch" mb={4}>
+                  <Grid templateColumns={{ base: '1fr', sm: '1fr 1fr' }} gap={4}>
+                    <FormControl>
+                      <FormLabel fontSize="sm">
+                        Allowance ({getNativeTokenSymbol(currentChainId)})
+                      </FormLabel>
+                      <NumberInput
+                        value={spAllowance}
+                        onChange={(valueString) => setSpAllowance(valueString)}
+                        min={0}
+                        precision={6}
+                        size="sm"
+                      >
+                        <NumberInputField borderRadius="md" />
+                      </NumberInput>
+                    </FormControl>
+                    <FormControl>
+                      <FormLabel fontSize="sm">Period (days)</FormLabel>
+                      <NumberInput
+                        value={spPeriodInDays}
+                        onChange={(_, valueNumber) => setSpPeriodInDays(valueNumber)}
+                        min={1}
+                        max={365}
+                        size="sm"
+                      >
+                        <NumberInputField borderRadius="md" />
+                      </NumberInput>
+                    </FormControl>
+                  </Grid>
+                </VStack>
+              </Collapse>
+
+              <Button
+                colorScheme="green"
+                onClick={handleRequestSpendPermission}
+                isLoading={isRequestingPermission}
+                loadingText="Requesting..."
+                size="md"
+                borderRadius="lg"
+                w="full"
+              >
+                Request Spend Permission
+              </Button>
+            </CardBody>
+          </Card>
+        )}
+
+        {/* Use Spend Permission Card */}
+        {connected && (
+          <Card
+            variant="outline"
+            borderRadius="xl"
+            shadow="sm"
+            _dark={{ bg: 'gray.800', borderColor: 'gray.700' }}
+          >
+            <CardBody p={{ base: 4, md: 6 }}>
+              <Flex align="center" justify="space-between" mb={4}>
+                <Heading size={{ base: 'sm', md: 'md' }}>Use Spend Permission</Heading>
+                <Button
+                  size="xs"
+                  variant="ghost"
+                  colorScheme="blue"
+                  onClick={() => handleFetchAllPermissions()}
+                  isLoading={isFetchingPermissions}
+                  leftIcon={<RepeatIcon />}
+                >
+                  Refresh
+                </Button>
+              </Flex>
+
+              {isFetchingPermissions ? (
+                <VStack spacing={2}>
+                  <Skeleton height="80px" w="full" borderRadius="md" />
+                </VStack>
+              ) : fetchedPermissions.length === 0 ? (
+                <Text color="gray.500" textAlign="center" py={8}>
+                  No permissions found. Request one above.
+                </Text>
+              ) : (
+                <VStack spacing={4} align="stretch">
+                  {/* Selected Permission */}
+                  {selectedPermission && (
+                    <Box
+                      p={4}
+                      borderRadius="lg"
+                      bg="green.50"
+                      borderWidth="2px"
+                      borderColor="green.400"
+                      _dark={{ bg: 'green.900', borderColor: 'green.600' }}
+                    >
+                      <Flex justify="space-between" align="center" mb={2}>
+                        <Badge colorScheme="green">Latest Permission</Badge>
+                        <Text fontSize="xs" color="gray.500">
+                          {formatDateTime(selectedPermission.createdAt)}
+                        </Text>
+                      </Flex>
+                      <Grid templateColumns="repeat(2, 1fr)" gap={2}>
+                        <Flex justify="space-between" align="center">
+                          <Text fontSize="xs" color="gray.500">
+                            Chain
+                          </Text>
+                          <Badge
+                            colorScheme={
+                              getNetworkByChainId(selectedPermission.chainId)?.color || 'gray'
+                            }
+                          >
+                            {selectedPermission.chainName}
+                          </Badge>
+                        </Flex>
+                        <Flex justify="space-between" align="center">
+                          <Text fontSize="xs" color="gray.500">
+                            Allowance
+                          </Text>
+                          <Text fontSize="xs" fontWeight="semibold">
+                            {formatAllowance(
+                              selectedPermission.allowance,
+                              selectedPermission.chainId
+                            )}
+                          </Text>
+                        </Flex>
+                        <Flex justify="space-between" align="center">
+                          <Text fontSize="xs" color="gray.500">
+                            Valid Until
+                          </Text>
+                          <Text fontSize="xs">{formatTimestamp(selectedPermission.end)}</Text>
+                        </Flex>
+                        <Flex justify="space-between" align="center">
+                          <Text fontSize="xs" color="gray.500">
+                            Hash
+                          </Text>
+                          {selectedPermission.permissionHash && (
+                            <CopyableText
+                              value={selectedPermission.permissionHash}
+                              displayText={truncateHash(selectedPermission.permissionHash)}
+                              fontSize="xs"
+                              tooltipLabel="Click to copy hash"
+                            />
+                          )}
+                        </Flex>
+                      </Grid>
+                    </Box>
+                  )}
+
+                  {/* Permission History */}
+                  <Button
+                    size="xs"
+                    variant="ghost"
+                    onClick={() => setIsPermissionHistoryExpanded(!isPermissionHistoryExpanded)}
+                    rightIcon={
+                      isPermissionHistoryExpanded ? <ChevronUpIcon /> : <ChevronDownIcon />
+                    }
+                  >
+                    Permission History ({fetchedPermissions.length})
+                  </Button>
+
+                  <Collapse in={isPermissionHistoryExpanded} animateOpacity>
+                    <Box overflowX="auto">
+                      <Table size="sm" variant="simple">
+                        <Thead>
+                          <Tr>
+                            <Th px={2}>Chain</Th>
+                            <Th px={2}>Hash</Th>
+                            <Th px={2}>Allowance</Th>
+                            <Th px={2}>Requested</Th>
+                            <Th px={2}>Select</Th>
+                          </Tr>
+                        </Thead>
+                        <Tbody>
+                          {latestPermissions.map((perm, index) => (
+                            <Tr
+                              key={perm.permissionHash || index}
+                              bg={
+                                selectedPermission?.permissionHash === perm.permissionHash
+                                  ? 'green.50'
+                                  : undefined
+                              }
+                              _dark={{
+                                bg:
+                                  selectedPermission?.permissionHash === perm.permissionHash
+                                    ? 'green.900'
+                                    : undefined,
+                              }}
+                            >
+                              <Td px={2}>
+                                <Badge
+                                  colorScheme={getNetworkByChainId(perm.chainId)?.color || 'gray'}
+                                  fontSize="2xs"
+                                >
+                                  {perm.chainName}
+                                </Badge>
+                              </Td>
+                              <Td px={2}>
+                                {perm.permissionHash && (
+                                  <CopyableText
+                                    value={perm.permissionHash}
+                                    displayText={truncateHash(perm.permissionHash)}
+                                    fontSize="xs"
+                                    whiteSpace="nowrap"
+                                    tooltipLabel="Click to copy hash"
+                                  />
+                                )}
+                              </Td>
+                              <Td px={2}>
+                                <Text fontSize="xs" whiteSpace="nowrap">
+                                  {formatAllowance(perm.allowance, perm.chainId)}
+                                </Text>
+                              </Td>
+                              <Td px={2}>
+                                <Text fontSize="xs" whiteSpace="nowrap">
+                                  {formatDateTime(perm.createdAt)}
+                                </Text>
+                              </Td>
+                              <Td px={2}>
+                                <Button
+                                  size="xs"
+                                  colorScheme={
+                                    selectedPermission?.permissionHash === perm.permissionHash
+                                      ? 'green'
+                                      : 'gray'
+                                  }
+                                  onClick={() => setSelectedPermission(perm)}
+                                >
+                                  {selectedPermission?.permissionHash === perm.permissionHash
+                                    ? '✓'
+                                    : 'Use'}
+                                </Button>
+                              </Td>
+                            </Tr>
+                          ))}
+                        </Tbody>
+                      </Table>
+                    </Box>
+                  </Collapse>
+
+                  {/* Spend Form */}
+                  {selectedPermission && (
+                    <Box
+                      p={4}
+                      borderRadius="lg"
+                      bg="gray.50"
+                      borderWidth="1px"
+                      borderColor="gray.200"
+                      _dark={{ bg: 'gray.900', borderColor: 'gray.700' }}
+                    >
+                      <Text fontSize="sm" fontWeight="medium" mb={3}>
+                        Spend from this permission
+                      </Text>
+
+                      <VStack spacing={3} align="stretch">
+                        <FormControl>
+                          <FormLabel fontSize="xs">
+                            Amount to Spend (
+                            {selectedPermission
+                              ? getNativeTokenSymbol(selectedPermission.chainId)
+                              : 'Native'}
+                            )
+                          </FormLabel>
+                          <NumberInput
+                            value={spendAmount}
+                            onChange={(valueString) => setSpendAmount(valueString)}
+                            min={0}
+                            step={0.000001}
+                            precision={18}
+                            size="sm"
+                          >
+                            <NumberInputField
+                              borderRadius="md"
+                              bg="white"
+                              _dark={{ bg: 'gray.800' }}
+                            />
+                          </NumberInput>
+                          <Text fontSize="xs" color="gray.500" mt={1}>
+                            Supports up to 18 decimals
+                          </Text>
+                        </FormControl>
+
+                        <Button
+                          colorScheme={
+                            getNetworkByChainId(selectedPermission.chainId)?.color || 'blue'
+                          }
+                          onClick={handleSpend}
+                          isLoading={isSpending}
+                          loadingText="Spending..."
+                          size="md"
+                          borderRadius="lg"
+                          w="full"
+                        >
+                          Spend {spendAmount}{' '}
+                          {selectedPermission
+                            ? getNativeTokenSymbol(selectedPermission.chainId)
+                            : 'Native'}
+                          {selectedPermission &&
+                            formatUsd(spendAmount, selectedPermission.chainId) &&
+                            ` (${formatUsd(spendAmount, selectedPermission.chainId)})`}
+                        </Button>
+                      </VStack>
+                    </Box>
+                  )}
+
+                  {/* Spend Result */}
+                  {spendResult && (
+                    <Box
+                      p={4}
+                      borderRadius="lg"
+                      bg={spendResult.success ? 'green.50' : 'red.50'}
+                      borderWidth="1px"
+                      borderColor={spendResult.success ? 'green.200' : 'red.200'}
+                      _dark={{
+                        bg: spendResult.success ? 'green.900' : 'red.900',
+                        borderColor: spendResult.success ? 'green.700' : 'red.700',
+                      }}
+                    >
+                      <Flex align="center" gap={2} mb={2}>
+                        <Box
+                          w={2}
+                          h={2}
+                          borderRadius="full"
+                          bg={spendResult.success ? 'green.500' : 'red.500'}
+                        />
+                        <Text
+                          fontSize="sm"
+                          fontWeight="semibold"
+                          color={spendResult.success ? 'green.700' : 'red.700'}
+                          _dark={{
+                            color: spendResult.success ? 'green.300' : 'red.300',
+                          }}
+                        >
+                          {spendResult.success ? 'Transaction Successful!' : 'Transaction Failed'}
+                        </Text>
+                      </Flex>
+
+                      {spendResult.success && spendResult.txHashes && spendResult.chainId && (
+                        <VStack spacing={2} align="stretch">
+                          {spendResult.txHashes.map((txHash, index) => {
+                            const network = getNetworkByChainId(spendResult.chainId!);
+                            const explorerUrl = network ? `${network.explorer}/tx/${txHash}` : null;
+                            return (
+                              <Flex
+                                key={txHash}
+                                align="center"
+                                justify="space-between"
+                                gap={2}
+                                p={2}
+                                bg="white"
+                                borderRadius="md"
+                                _dark={{ bg: 'gray.800' }}
+                              >
+                                <Box flex="1" minW={0}>
+                                  <Text fontSize="xs" color="gray.500" mb={1}>
+                                    {spendResult.txHashes.length > 1
+                                      ? `Transaction ${index + 1}`
+                                      : 'Transaction Hash'}
+                                  </Text>
+                                  <CopyableText
+                                    value={txHash}
+                                    displayText={truncateAddress(txHash, 10, 8)}
+                                    fontSize="xs"
+                                    color="gray.700"
+                                    _dark={{ color: 'gray.300' }}
+                                    tooltipLabel="Click to copy tx hash"
+                                  />
+                                </Box>
+                                {explorerUrl && (
+                                  <Link href={explorerUrl} isExternal>
+                                    <Button
+                                      size="sm"
+                                      colorScheme={network?.color || 'blue'}
+                                      variant="solid"
+                                      rightIcon={<ExternalLinkIcon />}
+                                    >
+                                      View on {network?.name || 'Explorer'}
+                                    </Button>
+                                  </Link>
+                                )}
+                              </Flex>
+                            );
+                          })}
+                        </VStack>
+                      )}
+
+                      {!spendResult.success && (
+                        <Text
+                          fontSize="xs"
+                          fontFamily="mono"
+                          color="red.600"
+                          _dark={{ color: 'red.400' }}
+                          whiteSpace="pre-wrap"
+                          wordBreak="break-word"
+                        >
+                          {spendResult.message}
+                        </Text>
+                      )}
+                    </Box>
+                  )}
+                </VStack>
+              )}
+            </CardBody>
+          </Card>
+        )}
+      </VStack>
+    </Container>
+  );
+}
diff --git a/examples/testapp/src/pages/spend-permission/types.ts b/examples/testapp/src/pages/spend-permission/types.ts
new file mode 100644
index 000000000..ffd222eb6
--- /dev/null
+++ b/examples/testapp/src/pages/spend-permission/types.ts
@@ -0,0 +1,50 @@
+import type { Hex } from 'viem';
+
+export type AccountType = 'EOA' | 'Smart Wallet';
+
+export type ChainStatus = {
+  chainId: number;
+  chainName: string;
+  accountType: AccountType;
+  isEOA7702Delegated: boolean;
+  hasPendingOwnershipChange: boolean;
+  isDeployed: boolean;
+  hasPermissionManagerAsOwner: boolean;
+  bytecode: Hex | undefined;
+  error?: string;
+};
+
+export type AllChainsStatus = Record<number, ChainStatus>;
+
+export type TokenPrices = Record<string, number>;
+
+export type FetchedPermission = {
+  chainId: number;
+  chainName: string;
+  permissionHash?: string;
+  account: string;
+  token: string;
+  allowance: string;
+  period: number;
+  start: number;
+  end: number;
+  spender: string;
+  salt: string;
+  extraData: string;
+  signature: string;
+  createdAt?: number;
+};
+
+export type SpenderBalance = {
+  chainId: number;
+  chainName: string;
+  balance: string;
+  color: string;
+};
+
+export type SpendResult = {
+  success: boolean;
+  message: string;
+  txHashes?: string[];
+  chainId?: number;
+};
diff --git a/examples/testapp/src/pages/spend-permission/utils.ts b/examples/testapp/src/pages/spend-permission/utils.ts
new file mode 100644
index 000000000..a58a8b82c
--- /dev/null
+++ b/examples/testapp/src/pages/spend-permission/utils.ts
@@ -0,0 +1,68 @@
+import { formatUnits } from 'viem';
+
+import { getNativeTokenSymbol } from './constants';
+
+// Helper to parse chain ID from hex string
+export const parseChainIdHex = (chainIdHex: string): number => {
+  return Number.parseInt(chainIdHex, 16);
+};
+
+// Helper to format allowance with optional USD
+export const formatAllowance = (
+  allowance: string,
+  chainId?: number,
+  formatUsd?: (amount: string | number, chainId?: number | null) => string | null
+): string => {
+  try {
+    const amount = formatUnits(BigInt(allowance), 18);
+    const usdAmount = formatUsd?.(amount, chainId);
+    const base = `${amount} ${getNativeTokenSymbol(chainId)}`;
+    return usdAmount ? `${base} (${usdAmount})` : base;
+  } catch {
+    return allowance;
+  }
+};
+
+// Helper to format timestamp
+export const formatTimestamp = (timestamp: number): string => {
+  const date = new Date(timestamp * 1000);
+  return date.toLocaleString();
+};
+
+// Helper to format period in days
+export const formatPeriod = (periodInSeconds: number): string => {
+  const days = periodInSeconds / 86400;
+  if (days === 1) return '1 day';
+  if (days < 1) {
+    const hours = periodInSeconds / 3600;
+    if (hours < 1) {
+      const minutes = periodInSeconds / 60;
+      return `${minutes} min`;
+    }
+    return `${hours.toFixed(1)} hours`;
+  }
+  return `${days} days`;
+};
+
+// Helper to format date time
+export const formatDateTime = (timestamp: number): string => {
+  const date = new Date(timestamp * 1000);
+  return date.toLocaleDateString('en-US', {
+    month: 'short',
+    day: 'numeric',
+    hour: 'numeric',
+    minute: '2-digit',
+    hour12: true,
+  });
+};
+
+// Helper to truncate address
+export const truncateAddress = (address: string): string => {
+  return `${address.slice(0, 6)}...${address.slice(-4)}`;
+};
+
+// Helper to truncate hash
+export const truncateHash = (hash: string, length = 8): string => {
+  if (hash.length <= length * 2 + 3) return hash;
+  return `${hash.slice(0, length)}...${hash.slice(-length)}`;
+};
diff --git a/examples/testapp/src/pages/subscribe-playground/components/CodeEditor.module.css b/examples/testapp/src/pages/subscribe-playground/components/CodeEditor.module.css
new file mode 100644
index 000000000..013d1fef6
--- /dev/null
+++ b/examples/testapp/src/pages/subscribe-playground/components/CodeEditor.module.css
@@ -0,0 +1,272 @@
+.editorPanel {
+  background: white;
+  border-radius: 12px;
+  box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.06);
+  overflow: hidden;
+  display: flex;
+  flex-direction: column;
+  height: fit-content;
+}
+
+.panelHeader {
+  padding: 1.5rem;
+  border-bottom: 1px solid #e2e8f0;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.panelTitle {
+  margin: 0;
+  font-size: 1.125rem;
+  font-weight: 600;
+  color: #0f172a;
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+}
+
+.icon {
+  width: 20px;
+  height: 20px;
+  color: #64748b;
+}
+
+.checkboxContainer {
+  padding: 1rem 1.5rem;
+  border-bottom: 1px solid #e2e8f0;
+  background: #f8fafc;
+}
+
+.checkboxLabel {
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+  cursor: pointer;
+  font-size: 0.875rem;
+  color: #475569;
+}
+
+.checkbox {
+  width: 16px;
+  height: 16px;
+  border: 2px solid #cbd5e1;
+  border-radius: 4px;
+  background: white;
+  cursor: pointer;
+  transition: all 0.2s;
+}
+
+.checkbox:checked {
+  background: #0052ff;
+  border-color: #0052ff;
+}
+
+.checkbox:disabled {
+  opacity: 0.5;
+  cursor: not-allowed;
+}
+
+.checkboxText {
+  font-weight: 500;
+  user-select: none;
+}
+
+.editorWrapper {
+  position: relative;
+  height: 390px;
+}
+
+.codeEditor {
+  width: 100%;
+  height: 100%;
+  padding: 1.5rem;
+  font-family: "SF Mono", Monaco, "Cascadia Code", "Roboto Mono", Consolas, "Courier New", monospace;
+  font-size: 14px;
+  line-height: 1.6;
+  background: #0f172a;
+  color: #e2e8f0;
+  border: none;
+  resize: none;
+  outline: none;
+}
+
+.codeEditor::placeholder {
+  color: #475569;
+}
+
+.codeEditor:disabled {
+  opacity: 0.7;
+}
+
+.editorOverlay {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: linear-gradient(to bottom, transparent 90%, rgba(15, 23, 42, 0.1));
+  pointer-events: none;
+}
+
+.resetButton {
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+  padding: 0.5rem 1rem;
+  background: #f1f5f9;
+  color: #475569;
+  border: 1px solid #e2e8f0;
+  border-radius: 8px;
+  font-size: 0.875rem;
+  font-weight: 500;
+  cursor: pointer;
+  transition: all 0.2s;
+}
+
+.resetButton:hover:not(:disabled) {
+  background: #e2e8f0;
+  color: #334155;
+  transform: translateY(-1px);
+}
+
+.resetButton:disabled {
+  opacity: 0.5;
+  cursor: not-allowed;
+}
+
+.securityDisclaimer {
+  display: flex;
+  align-items: flex-start;
+  gap: 0.75rem;
+  padding: 1rem 1.5rem;
+  background: #fef3c7;
+  border-top: 1px solid #fde68a;
+  border-bottom: 1px solid #fde68a;
+}
+
+.warningIcon {
+  width: 20px;
+  height: 20px;
+  color: #d97706;
+  flex-shrink: 0;
+  margin-top: 2px;
+}
+
+.disclaimerText {
+  font-size: 0.8125rem;
+  line-height: 1.5;
+  color: #92400e;
+}
+
+.disclaimerText strong {
+  font-weight: 600;
+  color: #78350f;
+}
+
+.executeButton {
+  margin: 1.5rem;
+  padding: 1rem 2rem;
+  background: #0052ff;
+  color: white;
+  border: none;
+  border-radius: 8px;
+  font-size: 1rem;
+  font-weight: 600;
+  cursor: pointer;
+  transition: all 0.2s;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 0.75rem;
+  width: calc(100% - 3rem);
+}
+
+.executeButton:hover:not(:disabled) {
+  background: #0041d0;
+  transform: translateY(-2px);
+  box-shadow: 0 10px 25px -5px rgba(0, 82, 255, 0.25);
+}
+
+.executeButton:active:not(:disabled) {
+  transform: translateY(0);
+}
+
+.executeButton:disabled {
+  opacity: 0.7;
+  cursor: not-allowed;
+  transform: none;
+}
+
+.buttonIcon {
+  width: 18px;
+  height: 18px;
+}
+
+.spinner {
+  width: 18px;
+  height: 18px;
+  border: 2px solid rgba(255, 255, 255, 0.3);
+  border-top-color: white;
+  border-radius: 50%;
+  animation: spin 0.8s linear infinite;
+}
+
+@keyframes spin {
+  to {
+    transform: rotate(360deg);
+  }
+}
+
+/* Responsive design */
+@media (max-width: 1600px) {
+  .editorWrapper {
+    height: 260px;
+  }
+}
+
+@media (max-width: 768px) {
+  .panelHeader {
+    padding: 1rem;
+  }
+
+  .panelTitle {
+    font-size: 1rem;
+  }
+
+  .codeEditor {
+    padding: 1rem;
+    font-size: 13px;
+  }
+
+  .executeButton {
+    margin: 1rem;
+    padding: 0.875rem 1.5rem;
+    width: calc(100% - 2rem);
+    font-size: 0.875rem;
+  }
+}
+
+@media (max-width: 480px) {
+  .resetButton {
+    padding: 0.375rem 0.75rem;
+    font-size: 0.75rem;
+  }
+
+  .buttonIcon {
+    width: 16px;
+    height: 16px;
+  }
+
+  .editorWrapper {
+    height: 195px;
+  }
+
+  .codeEditor {
+    font-size: 12px;
+  }
+
+  .executeButton {
+    padding: 0.75rem 1.25rem;
+  }
+}
diff --git a/examples/testapp/src/pages/subscribe-playground/components/CodeEditor.tsx b/examples/testapp/src/pages/subscribe-playground/components/CodeEditor.tsx
new file mode 100644
index 000000000..65f0398cc
--- /dev/null
+++ b/examples/testapp/src/pages/subscribe-playground/components/CodeEditor.tsx
@@ -0,0 +1,99 @@
+import styles from './CodeEditor.module.css';
+
+interface CodeEditorProps {
+  code: string;
+  onChange: (code: string) => void;
+  onExecute: () => void;
+  onReset: () => void;
+  isLoading: boolean;
+}
+
+export const CodeEditor = ({ code, onChange, onExecute, onReset, isLoading }: CodeEditorProps) => {
+  return (
+    <div className={styles.editorPanel}>
+      <div className={styles.panelHeader}>
+        <h2 className={styles.panelTitle}>
+          <svg
+            className={styles.icon}
+            viewBox="0 0 24 24"
+            fill="none"
+            stroke="currentColor"
+            strokeWidth="2"
+          >
+            <path d="M14 2l6 6v12a2 2 0 01-2 2H6a2 2 0 01-2-2V4a2 2 0 012-2h8z" />
+            <path d="M14 2v6h6" />
+            <path d="M16 13H8" />
+            <path d="M16 17H8" />
+            <path d="M10 9H8" />
+          </svg>
+          Code Editor
+        </h2>
+        <button onClick={onReset} className={styles.resetButton} disabled={isLoading}>
+          <svg
+            className={styles.buttonIcon}
+            viewBox="0 0 24 24"
+            fill="none"
+            stroke="currentColor"
+            strokeWidth="2"
+          >
+            <path d="M1 4v6h6" />
+            <path d="M3.51 15a9 9 0 102.13-9.36L1 10" />
+          </svg>
+          Reset
+        </button>
+      </div>
+
+      <div className={styles.editorWrapper}>
+        <textarea
+          value={code}
+          onChange={(e) => onChange(e.target.value)}
+          className={styles.codeEditor}
+          spellCheck={false}
+          disabled={isLoading}
+          placeholder="Enter your code here..."
+        />
+        <div className={styles.editorOverlay}></div>
+      </div>
+
+      <div className={styles.securityDisclaimer}>
+        <svg
+          className={styles.warningIcon}
+          viewBox="0 0 24 24"
+          fill="none"
+          stroke="currentColor"
+          strokeWidth="2"
+        >
+          <path d="M10.29 3.86L1.82 18a2 2 0 001.71 3h16.94a2 2 0 001.71-3L13.71 3.86a2 2 0 00-3.42 0z" />
+          <line x1="12" y1="9" x2="12" y2="13" />
+          <line x1="12" y1="17" x2="12.01" y2="17" />
+        </svg>
+        <div className={styles.disclaimerText}>
+          Intended for testing purposes only. Never paste code from untrusted sources. Coinbase is
+          not responsible for any loss of funds that you incur. Testnet funds hold no real value.
+        </div>
+      </div>
+
+      <button onClick={onExecute} disabled={isLoading} className={styles.executeButton}>
+        {isLoading ? (
+          <>
+            <span className={styles.spinner}></span>
+            Executing...
+          </>
+        ) : (
+          <>
+            <svg
+              className={styles.buttonIcon}
+              viewBox="0 0 24 24"
+              fill="none"
+              stroke="currentColor"
+              strokeWidth="2"
+            >
+              <polygon points="5 3 19 12 5 21 5 3" />
+            </svg>
+            Execute Code
+          </>
+        )}
+      </button>
+    </div>
+  );
+};
diff --git a/examples/testapp/src/pages/subscribe-playground/components/Header.module.css b/examples/testapp/src/pages/subscribe-playground/components/Header.module.css
new file mode 100644
index 000000000..a81e0c927
--- /dev/null
+++ b/examples/testapp/src/pages/subscribe-playground/components/Header.module.css
@@ -0,0 +1,81 @@
+.header {
+  background: white;
+  border-bottom: 1px solid #e2e8f0;
+  padding: 2rem 0;
+  margin-bottom: 2rem;
+  box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.1);
+}
+
+.headerContent {
+  width: 100%;
+  margin: 0 auto;
+  padding: 0 3rem;
+}
+
+.title {
+  margin: 0;
+  font-size: 2.5rem;
+  font-weight: 800;
+  color: #0f172a;
+  display: flex;
+  align-items: center;
+  gap: 0.75rem;
+}
+
+.titleIcon {
+  font-size: 2.5rem;
+}
+
+.subtitle {
+  margin: 0.5rem 0 0;
+  font-size: 1.125rem;
+  color: #64748b;
+}
+
+.docsLink {
+  color: #3b82f6;
+  text-decoration: none;
+  transition: color 0.2s ease;
+}
+
+.docsLink:hover {
+  color: #2563eb;
+  text-decoration: underline;
+}
+
+/* Responsive design */
+@media (max-width: 768px) {
+  .header {
+    padding: 1.5rem 0;
+  }
+
+  .headerContent {
+    padding: 0 1rem;
+  }
+
+  .title {
+    font-size: 2rem;
+  }
+
+  .titleIcon {
+    font-size: 2rem;
+  }
+
+  .subtitle {
+    font-size: 1rem;
+  }
+}
+
+@media (max-width: 480px) {
+  .title {
+    font-size: 1.5rem;
+  }
+
+  .titleIcon {
+    font-size: 1.5rem;
+  }
+
+  .subtitle {
+    font-size: 0.875rem;
+  }
+}
diff --git a/examples/testapp/src/pages/subscribe-playground/components/Header.tsx b/examples/testapp/src/pages/subscribe-playground/components/Header.tsx
new file mode 100644
index 000000000..86c650cc4
--- /dev/null
+++ b/examples/testapp/src/pages/subscribe-playground/components/Header.tsx
@@ -0,0 +1,14 @@
+import styles from './Header.module.css';
+
+export const Header = () => {
+  return (
+    <header className={styles.header}>
+      <div className={styles.headerContent}>
+        <h1 className={styles.title}>Base Subscribe SDK Playground</h1>
+        <p className={styles.subtitle}>
+          Test and explore subscription functionality in a safe environment
+        </p>
+      </div>
+    </header>
+  );
+};
diff --git a/examples/testapp/src/pages/subscribe-playground/components/Output.module.css b/examples/testapp/src/pages/subscribe-playground/components/Output.module.css
new file mode 100644
index 000000000..d489cb268
--- /dev/null
+++ b/examples/testapp/src/pages/subscribe-playground/components/Output.module.css
@@ -0,0 +1,409 @@
+.outputPanel {
+  background: white;
+  border-radius: 12px;
+  box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.06);
+  overflow: hidden;
+  display: flex;
+  flex-direction: column;
+}
+
+.panelHeader {
+  padding: 1.5rem;
+  border-bottom: 1px solid #e2e8f0;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.panelTitle {
+  margin: 0;
+  font-size: 1.125rem;
+  font-weight: 600;
+  color: #0f172a;
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+}
+
+.icon {
+  width: 20px;
+  height: 20px;
+  color: #64748b;
+}
+
+.outputContent {
+  padding: 1.5rem;
+  min-height: 800px;
+  max-height: 90vh;
+  overflow-y: auto;
+  display: flex;
+  flex-direction: column;
+  gap: 1rem;
+}
+
+/* Result cards */
+.resultCard {
+  border-radius: 8px;
+  overflow: hidden;
+  border: 1px solid;
+  animation: slideIn 0.3s ease-out;
+}
+
+@keyframes slideIn {
+  from {
+    opacity: 0;
+    transform: translateY(10px);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
+
+.resultCard.success {
+  background: #f0fdf4;
+  border-color: #86efac;
+}
+
+.resultCard.error {
+  background: #fef2f2;
+  border-color: #fca5a5;
+}
+
+.resultCard.pending {
+  background: #fef3c7;
+  border-color: #fcd34d;
+}
+
+.resultCard.notFound {
+  background: #f3f4f6;
+  border-color: #d1d5db;
+}
+
+.resultCard.info {
+  background: #f0f9ff;
+  border-color: #93c5fd;
+}
+
+.resultHeader {
+  padding: 1rem 1.5rem;
+  display: flex;
+  align-items: center;
+  gap: 0.75rem;
+  font-weight: 600;
+}
+
+.resultCard.success .resultHeader {
+  background: #dcfce7;
+  color: #166534;
+}
+
+.resultCard.error .resultHeader {
+  background: #fee2e2;
+  color: #991b1b;
+}
+
+.resultCard.pending .resultHeader {
+  background: #fde68a;
+  color: #92400e;
+}
+
+.resultCard.notFound .resultHeader {
+  background: #e5e7eb;
+  color: #374151;
+}
+
+.resultCard.info .resultHeader {
+  background: #dbeafe;
+  color: #1e40af;
+}
+
+.resultIcon {
+  width: 20px;
+  height: 20px;
+}
+
+.resultTitle {
+  font-size: 1rem;
+}
+
+.resultBody {
+  padding: 1.5rem;
+  display: flex;
+  flex-direction: column;
+  gap: 1rem;
+}
+
+.resultRow {
+  display: flex;
+  flex-direction: column;
+  gap: 0.25rem;
+}
+
+.resultLabel {
+  font-size: 0.875rem;
+  color: #64748b;
+  font-weight: 500;
+}
+
+.resultValue {
+  font-size: 0.875rem;
+  color: #0f172a;
+  word-break: break-all;
+}
+
+code.resultValue {
+  font-family: "SF Mono", Monaco, "Cascadia Code", "Roboto Mono", Consolas, "Courier New", monospace;
+  background: #f1f5f9;
+  padding: 0.25rem 0.5rem;
+  border-radius: 4px;
+  display: inline-block;
+}
+
+.errorMessage {
+  color: #dc2626;
+  font-size: 0.875rem;
+}
+
+/* Stack trace for debugging */
+.stackTrace {
+  margin-top: 0.75rem;
+  border-top: 1px solid #e2e8f0;
+  padding-top: 0.75rem;
+}
+
+.stackTrace summary {
+  cursor: pointer;
+  user-select: none;
+  font-size: 0.875rem;
+  color: #64748b;
+  font-weight: 500;
+}
+
+.stackTrace summary:hover {
+  color: #475569;
+}
+
+.stackContent {
+  margin-top: 0.5rem;
+  padding: 0.75rem;
+  background: #f8fafc;
+  border-radius: 4px;
+  font-family: "SF Mono", Monaco, "Cascadia Code", "Roboto Mono", Consolas, "Courier New", monospace;
+  font-size: 0.75rem;
+  line-height: 1.4;
+  color: #475569;
+  overflow-x: auto;
+  white-space: pre-wrap;
+  word-break: break-word;
+}
+
+/* User data section */
+.userDataSection {
+  border-top: 1px solid #e2e8f0;
+  background: #f8fafc;
+}
+
+.userDataHeader {
+  padding: 1rem 1.5rem;
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+  font-weight: 600;
+  font-size: 0.875rem;
+  color: #475569;
+  background: #f1f5f9;
+}
+
+.userDataIcon {
+  width: 18px;
+  height: 18px;
+  color: #64748b;
+}
+
+.userDataBody {
+  padding: 1.5rem;
+  display: flex;
+  flex-direction: column;
+  gap: 0.75rem;
+}
+
+.userDataRow {
+  display: grid;
+  grid-template-columns: 120px 1fr;
+  gap: 1rem;
+  align-items: start;
+}
+
+.userDataLabel {
+  font-size: 0.875rem;
+  color: #64748b;
+  font-weight: 500;
+}
+
+.userDataValue {
+  font-size: 0.875rem;
+  color: #0f172a;
+  word-break: break-word;
+}
+
+code.userDataValue {
+  font-family: "SF Mono", Monaco, "Cascadia Code", "Roboto Mono", Consolas, "Courier New", monospace;
+  background: white;
+  padding: 0.25rem 0.5rem;
+  border-radius: 4px;
+  display: inline-block;
+  border: 1px solid #e2e8f0;
+}
+
+/* Console output */
+.consoleCard {
+  background: #1e293b;
+  border-radius: 8px;
+  overflow: hidden;
+  animation: slideIn 0.3s ease-out;
+  display: flex;
+  flex-direction: column;
+  max-height: 400px;
+}
+
+.consoleHeader {
+  padding: 1rem 1.5rem;
+  background: #0f172a;
+  color: #e2e8f0;
+  font-weight: 600;
+  font-size: 0.875rem;
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+  flex-shrink: 0;
+}
+
+.consoleHeader .icon {
+  color: #94a3b8;
+}
+
+.consoleBody {
+  margin: 0;
+  padding: 1.5rem;
+  color: #e2e8f0;
+  font-family: "SF Mono", Monaco, "Cascadia Code", "Roboto Mono", Consolas, "Courier New", monospace;
+  font-size: 13px;
+  line-height: 1.6;
+  white-space: pre-wrap;
+  word-break: break-word;
+  overflow-y: auto;
+  flex: 1;
+  min-height: 100px;
+}
+
+/* Empty state */
+.emptyState {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  gap: 1rem;
+  color: #94a3b8;
+  text-align: center;
+}
+
+.emptyIcon {
+  width: 48px;
+  height: 48px;
+  color: #cbd5e1;
+}
+
+.emptyState p {
+  margin: 0;
+  font-size: 0.875rem;
+}
+
+/* Responsive design */
+@media (max-width: 1600px) {
+  .outputContent {
+    min-height: 350px;
+    max-height: 60vh;
+  }
+
+  .consoleCard {
+    max-height: 300px;
+  }
+}
+
+@media (max-width: 768px) {
+  .panelHeader {
+    padding: 1rem;
+  }
+
+  .panelTitle {
+    font-size: 1rem;
+  }
+
+  .outputContent {
+    padding: 1rem;
+    min-height: 300px;
+  }
+
+  .resultHeader {
+    padding: 0.75rem 1rem;
+  }
+
+  .resultBody {
+    padding: 1rem;
+  }
+
+  .userDataHeader {
+    padding: 0.75rem 1rem;
+  }
+
+  .userDataBody {
+    padding: 1rem;
+  }
+
+  .userDataRow {
+    grid-template-columns: 100px 1fr;
+  }
+
+  .consoleCard {
+    max-height: 250px;
+  }
+
+  .consoleHeader {
+    padding: 0.75rem 1rem;
+  }
+
+  .consoleBody {
+    padding: 1rem;
+    font-size: 12px;
+    min-height: 80px;
+  }
+}
+
+@media (max-width: 480px) {
+  .resultRow {
+    font-size: 0.75rem;
+  }
+
+  .resultLabel {
+    font-size: 0.75rem;
+  }
+
+  .resultValue {
+    font-size: 0.75rem;
+  }
+
+  .userDataRow {
+    grid-template-columns: 1fr;
+    gap: 0.25rem;
+  }
+
+  .userDataLabel {
+    font-size: 0.75rem;
+  }
+
+  .userDataValue {
+    font-size: 0.75rem;
+  }
+}
diff --git a/examples/testapp/src/pages/subscribe-playground/components/Output.tsx b/examples/testapp/src/pages/subscribe-playground/components/Output.tsx
new file mode 100644
index 000000000..f6477d5e1
--- /dev/null
+++ b/examples/testapp/src/pages/subscribe-playground/components/Output.tsx
@@ -0,0 +1,571 @@
+import type {
+  PaymentResult,
+  PaymentStatus,
+  SubscriptionResult,
+  SubscriptionStatus,
+} from '@base-org/account';
+import styles from './Output.module.css';
+
+interface OutputProps {
+  result: PaymentResult | PaymentStatus | SubscriptionResult | SubscriptionStatus | null;
+  error: string | null;
+  consoleOutput: string[];
+  isLoading: boolean;
+}
+
+// Type guard to check if result is PaymentResult
+const isPaymentResult = (result: unknown): result is PaymentResult => {
+  return result !== null && typeof result === 'object' && 'success' in result;
+};
+
+// Type guard to check if result is PaymentStatus
+const isPaymentStatus = (result: unknown): result is PaymentStatus => {
+  return result !== null && typeof result === 'object' && 'status' in result && 'id' in result;
+};
+
+// Type guard to check if result is SubscriptionResult
+const isSubscriptionResult = (result: unknown): result is SubscriptionResult => {
+  return (
+    result !== null &&
+    typeof result === 'object' &&
+    'subscriptionOwner' in result &&
+    'subscriptionPayer' in result
+  );
+};
+
+// Type guard to check if result is SubscriptionStatus
+const isSubscriptionStatus = (result: unknown): result is SubscriptionStatus => {
+  return (
+    result !== null &&
+    typeof result === 'object' &&
+    'isSubscribed' in result &&
+    'recurringCharge' in result
+  );
+};
+
+export const Output = ({ result, error, consoleOutput, isLoading }: OutputProps) => {
+  return (
+    <div className={styles.outputPanel}>
+      <div className={styles.panelHeader}>
+        <h2 className={styles.panelTitle}>
+          <svg
+            className={styles.icon}
+            viewBox="0 0 24 24"
+            fill="none"
+            stroke="currentColor"
+            strokeWidth="2"
+          >
+            <rect x="3" y="3" width="18" height="18" rx="2" ry="2" />
+            <path d="M9 9l6 6" />
+            <path d="M15 9l-6 6" />
+          </svg>
+          Output
+        </h2>
+      </div>
+
+      <div className={styles.outputContent}>
+        {result && isPaymentResult(result) && (
+          <div className={`${styles.resultCard} ${result.success ? styles.success : styles.error}`}>
+            <div className={styles.resultHeader}>
+              {result.success ? (
+                <>
+                  <svg
+                    className={styles.resultIcon}
+                    viewBox="0 0 24 24"
+                    fill="none"
+                    stroke="currentColor"
+                    strokeWidth="2"
+                  >
+                    <path d="M22 11.08V12a10 10 0 11-5.93-9.14" />
+                    <polyline points="22 4 12 14.01 9 11.01" />
+                  </svg>
+                  <span className={styles.resultTitle}>Payment Successful!</span>
+                </>
+              ) : (
+                <>
+                  <svg
+                    className={styles.resultIcon}
+                    viewBox="0 0 24 24"
+                    fill="none"
+                    stroke="currentColor"
+                    strokeWidth="2"
+                  >
+                    <circle cx="12" cy="12" r="10" />
+                    <line x1="15" y1="9" x2="9" y2="15" />
+                    <line x1="9" y1="9" x2="15" y2="15" />
+                  </svg>
+                  <span className={styles.resultTitle}>Payment Failed</span>
+                </>
+              )}
+            </div>
+
+            <div className={styles.resultBody}>
+              <div className={styles.resultRow}>
+                <span className={styles.resultLabel}>Amount</span>
+                <span className={styles.resultValue}>{result.amount} USDC</span>
+              </div>
+              <div className={styles.resultRow}>
+                <span className={styles.resultLabel}>Recipient</span>
+                <code className={styles.resultValue}>{result.to}</code>
+              </div>
+              {result.success && result.id && (
+                <div className={styles.resultRow}>
+                  <span className={styles.resultLabel}>Transaction ID</span>
+                  <code className={styles.resultValue}>{result.id}</code>
+                </div>
+              )}
+              {!result.success && 'error' in result && (result as { error?: string }).error && (
+                <div className={styles.resultRow}>
+                  <span className={styles.resultLabel}>Error</span>
+                  <span className={styles.errorMessage}>
+                    {(result as { error?: string }).error}
+                  </span>
+                </div>
+              )}
+            </div>
+
+            {result.success && result.payerInfoResponses && (
+              <div className={styles.userDataSection}>
+                <div className={styles.userDataHeader}>
+                  <svg
+                    className={styles.userDataIcon}
+                    viewBox="0 0 24 24"
+                    fill="none"
+                    stroke="currentColor"
+                    strokeWidth="2"
+                  >
+                    <path d="M20 21v-2a4 4 0 0 0-4-4H8a4 4 0 0 0-4 4v2" />
+                    <circle cx="12" cy="7" r="4" />
+                  </svg>
+                  <span>User Info</span>
+                </div>
+                <div className={styles.userDataBody}>
+                  {result.payerInfoResponses.name && (
+                    <div className={styles.userDataRow}>
+                      <span className={styles.userDataLabel}>Name</span>
+                      <span className={styles.userDataValue}>
+                        {(() => {
+                          const name = result.payerInfoResponses.name as unknown as {
+                            firstName: string;
+                            familyName: string;
+                          };
+                          return `${name.firstName} ${name.familyName}`;
+                        })()}
+                      </span>
+                    </div>
+                  )}
+                  {result.payerInfoResponses.email && (
+                    <div className={styles.userDataRow}>
+                      <span className={styles.userDataLabel}>Email</span>
+                      <span className={styles.userDataValue}>
+                        {result.payerInfoResponses.email}
+                      </span>
+                    </div>
+                  )}
+                  {result.payerInfoResponses.phoneNumber && (
+                    <div className={styles.userDataRow}>
+                      <span className={styles.userDataLabel}>Phone</span>
+                      <span className={styles.userDataValue}>
+                        {result.payerInfoResponses.phoneNumber.number} (
+                        {result.payerInfoResponses.phoneNumber.country})
+                      </span>
+                    </div>
+                  )}
+                  {result.payerInfoResponses.physicalAddress && (
+                    <div className={styles.userDataRow}>
+                      <span className={styles.userDataLabel}>Address</span>
+                      <span className={styles.userDataValue}>
+                        {(() => {
+                          const addr = result.payerInfoResponses.physicalAddress as unknown as {
+                            address1: string;
+                            address2?: string;
+                            city: string;
+                            state: string;
+                            postalCode: string;
+                            countryCode: string;
+                            name?: {
+                              firstName: string;
+                              familyName: string;
+                            };
+                          };
+                          const parts = [
+                            addr.name ? `${addr.name.firstName} ${addr.name.familyName}` : null,
+                            addr.address1,
+                            addr.address2,
+                            `${addr.city}, ${addr.state} ${addr.postalCode}`,
+                            addr.countryCode,
+                          ].filter(Boolean);
+                          return parts.join(', ');
+                        })()}
+                      </span>
+                    </div>
+                  )}
+                  {result.payerInfoResponses.onchainAddress && (
+                    <div className={styles.userDataRow}>
+                      <span className={styles.userDataLabel}>On-chain Address</span>
+                      <span className={styles.userDataValue}>
+                        {result.payerInfoResponses.onchainAddress}
+                      </span>
+                    </div>
+                  )}
+                </div>
+              </div>
+            )}
+          </div>
+        )}
+
+        {result && isPaymentStatus(result) && (
+          <div
+            className={`${styles.resultCard} ${
+              result.status === 'completed'
+                ? styles.success
+                : result.status === 'pending'
+                  ? styles.pending
+                  : result.status === 'failed'
+                    ? styles.error
+                    : styles.notFound
+            }`}
+          >
+            <div className={styles.resultHeader}>
+              {result.status === 'completed' && (
+                <>
+                  <svg
+                    className={styles.resultIcon}
+                    viewBox="0 0 24 24"
+                    fill="none"
+                    stroke="currentColor"
+                    strokeWidth="2"
+                  >
+                    <path d="M22 11.08V12a10 10 0 11-5.93-9.14" />
+                    <polyline points="22 4 12 14.01 9 11.01" />
+                  </svg>
+                  <span className={styles.resultTitle}>Payment Completed</span>
+                </>
+              )}
+              {result.status === 'pending' && (
+                <>
+                  <svg
+                    className={styles.resultIcon}
+                    viewBox="0 0 24 24"
+                    fill="none"
+                    stroke="currentColor"
+                    strokeWidth="2"
+                  >
+                    <circle cx="12" cy="12" r="10" />
+                    <polyline points="12 6 12 12 16 14" />
+                  </svg>
+                  <span className={styles.resultTitle}>Payment Pending</span>
+                </>
+              )}
+              {result.status === 'failed' && (
+                <>
+                  <svg
+                    className={styles.resultIcon}
+                    viewBox="0 0 24 24"
+                    fill="none"
+                    stroke="currentColor"
+                    strokeWidth="2"
+                  >
+                    <circle cx="12" cy="12" r="10" />
+                    <line x1="15" y1="9" x2="9" y2="15" />
+                    <line x1="9" y1="9" x2="15" y2="15" />
+                  </svg>
+                  <span className={styles.resultTitle}>Payment Failed</span>
+                </>
+              )}
+              {result.status === 'not_found' && (
+                <>
+                  <svg
+                    className={styles.resultIcon}
+                    viewBox="0 0 24 24"
+                    fill="none"
+                    stroke="currentColor"
+                    strokeWidth="2"
+                  >
+                    <circle cx="12" cy="12" r="10" />
+                    <line x1="12" y1="8" x2="12" y2="12" />
+                    <line x1="12" y1="16" x2="12.01" y2="16" />
+                  </svg>
+                  <span className={styles.resultTitle}>Payment Not Found</span>
+                </>
+              )}
+            </div>
+
+            <div className={styles.resultBody}>
+              <div className={styles.resultRow}>
+                <span className={styles.resultLabel}>Status</span>
+                <span className={styles.resultValue}>{result.status}</span>
+              </div>
+              <div className={styles.resultRow}>
+                <span className={styles.resultLabel}>Transaction ID</span>
+                <code className={styles.resultValue}>{result.id}</code>
+              </div>
+              <div className={styles.resultRow}>
+                <span className={styles.resultLabel}>Message</span>
+                <span className={styles.resultValue}>{result.message}</span>
+              </div>
+              {result.sender && (
+                <div className={styles.resultRow}>
+                  <span className={styles.resultLabel}>Sender</span>
+                  <code className={styles.resultValue}>{result.sender}</code>
+                </div>
+              )}
+              {result.amount && (
+                <div className={styles.resultRow}>
+                  <span className={styles.resultLabel}>Amount</span>
+                  <span className={styles.resultValue}>{result.amount} USDC</span>
+                </div>
+              )}
+              {result.recipient && (
+                <div className={styles.resultRow}>
+                  <span className={styles.resultLabel}>Recipient</span>
+                  <code className={styles.resultValue}>{result.recipient}</code>
+                </div>
+              )}
+              {'error' in result && (result as { error?: string }).error && (
+                <div className={styles.resultRow}>
+                  <span className={styles.resultLabel}>Error</span>
+                  <span className={styles.errorMessage}>
+                    {(result as { error?: string }).error}
+                  </span>
+                </div>
+              )}
+            </div>
+          </div>
+        )}
+
+        {result && isSubscriptionResult(result) && (
+          <div className={`${styles.resultCard} ${styles.success}`}>
+            <div className={styles.resultHeader}>
+              <svg
+                className={styles.resultIcon}
+                viewBox="0 0 24 24"
+                fill="none"
+                stroke="currentColor"
+                strokeWidth="2"
+              >
+                <path d="M22 11.08V12a10 10 0 11-5.93-9.14" />
+                <polyline points="22 4 12 14.01 9 11.01" />
+              </svg>
+              <span className={styles.resultTitle}>Subscription Created!</span>
+            </div>
+
+            <div className={styles.resultBody}>
+              <div className={styles.resultRow}>
+                <span className={styles.resultLabel}>Subscription ID</span>
+                <code className={styles.resultValue}>{result.id}</code>
+              </div>
+              <div className={styles.resultRow}>
+                <span className={styles.resultLabel}>Recurring Charge</span>
+                <span className={styles.resultValue}>${result.recurringCharge} USD</span>
+              </div>
+              <div className={styles.resultRow}>
+                <span className={styles.resultLabel}>Period</span>
+                <span className={styles.resultValue}>{result.periodInDays} days</span>
+              </div>
+              <div className={styles.resultRow}>
+                <span className={styles.resultLabel}>Subscription Owner</span>
+                <code className={styles.resultValue}>{result.subscriptionOwner}</code>
+              </div>
+              <div className={styles.resultRow}>
+                <span className={styles.resultLabel}>Subscription Payer</span>
+                <code className={styles.resultValue}>{result.subscriptionPayer}</code>
+              </div>
+            </div>
+          </div>
+        )}
+
+        {result && isSubscriptionStatus(result) && (
+          <div
+            className={`${styles.resultCard} ${result.isSubscribed ? styles.success : styles.info}`}
+          >
+            <div className={styles.resultHeader}>
+              {result.isSubscribed ? (
+                <>
+                  <svg
+                    className={styles.resultIcon}
+                    viewBox="0 0 24 24"
+                    fill="none"
+                    stroke="currentColor"
+                    strokeWidth="2"
+                  >
+                    <path d="M22 11.08V12a10 10 0 11-5.93-9.14" />
+                    <polyline points="22 4 12 14.01 9 11.01" />
+                  </svg>
+                  <span className={styles.resultTitle}>Active Subscription</span>
+                </>
+              ) : (
+                <>
+                  <svg
+                    className={styles.resultIcon}
+                    viewBox="0 0 24 24"
+                    fill="none"
+                    stroke="currentColor"
+                    strokeWidth="2"
+                  >
+                    <circle cx="12" cy="12" r="10" />
+                    <line x1="12" y1="8" x2="12" y2="12" />
+                    <line x1="12" y1="16" x2="12.01" y2="16" />
+                  </svg>
+                  <span className={styles.resultTitle}>No Active Subscription</span>
+                </>
+              )}
+            </div>
+
+            <div className={styles.resultBody}>
+              <div className={styles.resultRow}>
+                <span className={styles.resultLabel}>Status</span>
+                <span className={styles.resultValue}>
+                  {result.isSubscribed ? 'Active' : 'Inactive'}
+                </span>
+              </div>
+              <div className={styles.resultRow}>
+                <span className={styles.resultLabel}>Recurring Charge</span>
+                <span className={styles.resultValue}>${result.recurringCharge} USD</span>
+              </div>
+              {result.remainingChargeInPeriod && (
+                <div className={styles.resultRow}>
+                  <span className={styles.resultLabel}>Remaining in Period</span>
+                  <span className={styles.resultValue}>${result.remainingChargeInPeriod} USD</span>
+                </div>
+              )}
+              {result.currentPeriodStart && (
+                <div className={styles.resultRow}>
+                  <span className={styles.resultLabel}>Current Period Start</span>
+                  <span className={styles.resultValue}>
+                    {new Date(result.currentPeriodStart).toLocaleDateString()}
+                  </span>
+                </div>
+              )}
+              {result.nextPeriodStart && (
+                <div className={styles.resultRow}>
+                  <span className={styles.resultLabel}>Next Period Start</span>
+                  <span className={styles.resultValue}>
+                    {new Date(result.nextPeriodStart).toLocaleDateString()}
+                  </span>
+                </div>
+              )}
+            </div>
+          </div>
+        )}
+
+        {error && (
+          <div className={`${styles.resultCard} ${styles.error}`}>
+            <div className={styles.resultHeader}>
+              <svg
+                className={styles.resultIcon}
+                viewBox="0 0 24 24"
+                fill="none"
+                stroke="currentColor"
+                strokeWidth="2"
+              >
+                <path d="M10.29 3.86L1.82 18a2 2 0 001.71 3h16.94a2 2 0 001.71-3L13.71 3.86a2 2 0 00-3.42 0z" />
+                <line x1="12" y1="9" x2="12" y2="13" />
+                <line x1="12" y1="17" x2="12.01" y2="17" />
+              </svg>
+              <span className={styles.resultTitle}>Execution Error</span>
+            </div>
+            <div className={styles.resultBody}>
+              {(() => {
+                try {
+                  // Try to parse the error as JSON for structured display
+                  const errorDetails = JSON.parse(error);
+                  return (
+                    <>
+                      <div className={styles.resultRow}>
+                        <span className={styles.resultLabel}>Error</span>
+                        <span className={styles.errorMessage}>{errorDetails.message}</span>
+                      </div>
+                      {errorDetails.type && errorDetails.type !== 'unknown' && (
+                        <div className={styles.resultRow}>
+                          <span className={styles.resultLabel}>Type</span>
+                          <span className={styles.resultValue}>{errorDetails.type}</span>
+                        </div>
+                      )}
+                      {errorDetails.code && (
+                        <div className={styles.resultRow}>
+                          <span className={styles.resultLabel}>Code</span>
+                          <span className={styles.resultValue}>{errorDetails.code}</span>
+                        </div>
+                      )}
+                      {errorDetails.statusCode && (
+                        <div className={styles.resultRow}>
+                          <span className={styles.resultLabel}>Status Code</span>
+                          <span className={styles.resultValue}>{errorDetails.statusCode}</span>
+                        </div>
+                      )}
+                      {errorDetails.details && (
+                        <div className={styles.resultRow}>
+                          <span className={styles.resultLabel}>Details</span>
+                          <span className={styles.resultValue}>
+                            {typeof errorDetails.details === 'string'
+                              ? errorDetails.details
+                              : JSON.stringify(errorDetails.details, null, 2)}
+                          </span>
+                        </div>
+                      )}
+                      {errorDetails.response && (
+                        <div className={styles.resultRow}>
+                          <span className={styles.resultLabel}>Response</span>
+                          <span className={styles.resultValue}>
+                            {typeof errorDetails.response === 'string'
+                              ? errorDetails.response
+                              : JSON.stringify(errorDetails.response, null, 2)}
+                          </span>
+                        </div>
+                      )}
+                      {process.env.NODE_ENV === 'development' && errorDetails.stack && (
+                        <details className={styles.stackTrace}>
+                          <summary className={styles.resultLabel}>Stack Trace</summary>
+                          <pre className={styles.stackContent}>{errorDetails.stack}</pre>
+                        </details>
+                      )}
+                    </>
+                  );
+                } catch (_parseError) {
+                  // If parsing fails, display as plain text (backward compatibility)
+                  return <div className={styles.errorMessage}>{error}</div>;
+                }
+              })()}
+            </div>
+          </div>
+        )}
+
+        {consoleOutput.length > 0 && (
+          <div className={styles.consoleCard}>
+            <div className={styles.consoleHeader}>
+              <svg
+                className={styles.icon}
+                viewBox="0 0 24 24"
+                fill="none"
+                stroke="currentColor"
+                strokeWidth="2"
+              >
+                <polyline points="4 17 10 11 4 5" />
+                <line x1="12" y1="19" x2="20" y2="19" />
+              </svg>
+              Console Output
+            </div>
+            <pre className={styles.consoleBody}>{consoleOutput.join('\n')}</pre>
+          </div>
+        )}
+
+        {!result && !error && !isLoading && consoleOutput.length === 0 && (
+          <div className={styles.emptyState}>
+            <svg
+              className={styles.emptyIcon}
+              viewBox="0 0 24 24"
+              fill="none"
+              stroke="currentColor"
+              strokeWidth="2"
+            >
+              <rect x="3" y="3" width="18" height="18" rx="2" ry="2" />
+              <path d="M9 9h6v6H9z" />
+            </svg>
+            <p>Click &quot;Execute Code&quot; to run your code</p>
+          </div>
+        )}
+      </div>
+    </div>
+  );
+};
diff --git a/examples/testapp/src/pages/subscribe-playground/components/QuickTips.module.css b/examples/testapp/src/pages/subscribe-playground/components/QuickTips.module.css
new file mode 100644
index 000000000..713dea982
--- /dev/null
+++ b/examples/testapp/src/pages/subscribe-playground/components/QuickTips.module.css
@@ -0,0 +1,67 @@
+.quickTips {
+  margin-top: 1.5rem;
+  background: white;
+  border-radius: 12px;
+  padding: 2rem;
+  box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.06);
+}
+
+.tipsTitle {
+  margin: 0 0 1.5rem;
+  font-size: 1.25rem;
+  font-weight: 600;
+  color: #0f172a;
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+}
+
+.tipsIcon {
+  width: 20px;
+  height: 20px;
+  color: #64748b;
+  flex-shrink: 0;
+}
+
+.tipsList {
+  margin: 0;
+  padding-left: 1.75rem;
+  display: flex;
+  flex-direction: column;
+  gap: 0.75rem;
+}
+
+.tipItem {
+  color: #475569;
+  line-height: 1.6;
+}
+
+.tipItem :global(code) {
+  background: #f1f5f9;
+  padding: 0.125rem 0.375rem;
+  border-radius: 4px;
+  font-size: 0.875rem;
+  font-family: "SF Mono", Monaco, "Cascadia Code", "Roboto Mono", Consolas, "Courier New", monospace;
+  color: #0f172a;
+}
+
+/* Responsive design */
+@media (max-width: 768px) {
+  .quickTips {
+    padding: 1.5rem;
+  }
+
+  .tipsTitle {
+    font-size: 1.125rem;
+    margin-bottom: 1rem;
+  }
+
+  .tipsList {
+    padding-left: 1.5rem;
+    gap: 0.5rem;
+  }
+
+  .tipItem {
+    font-size: 0.875rem;
+  }
+}
diff --git a/examples/testapp/src/pages/subscribe-playground/components/QuickTips.tsx b/examples/testapp/src/pages/subscribe-playground/components/QuickTips.tsx
new file mode 100644
index 000000000..1539216cb
--- /dev/null
+++ b/examples/testapp/src/pages/subscribe-playground/components/QuickTips.tsx
@@ -0,0 +1,56 @@
+import styles from './QuickTips.module.css';
+
+interface QuickTipsProps {
+  tips: string[];
+}
+
+// Helper function to safely render tips with links
+const renderTip = (tip: string) => {
+  // Check if the tip contains an HTML link
+  const linkMatch = tip.match(/<a href="([^"]+)"[^>]*>([^<]+)<\/a>/);
+
+  if (linkMatch) {
+    const [fullMatch, href, text] = linkMatch;
+    const parts = tip.split(fullMatch);
+
+    return (
+      <>
+        {parts[0]}
+        <a href={href} target="_blank" rel="noopener noreferrer">
+          {text}
+        </a>
+        {parts[1]}
+      </>
+    );
+  }
+
+  return tip;
+};
+
+export const QuickTips = ({ tips }: QuickTipsProps) => {
+  return (
+    <div className={styles.quickTips}>
+      <h3 className={styles.tipsTitle}>
+        <svg
+          className={styles.tipsIcon}
+          viewBox="0 0 24 24"
+          fill="none"
+          stroke="currentColor"
+          strokeWidth="2"
+        >
+          <circle cx="12" cy="12" r="10" />
+          <path d="M12 16v-4" />
+          <path d="M12 8h.01" />
+        </svg>
+        Quick Tips
+      </h3>
+      <ul className={styles.tipsList}>
+        {tips.map((tip, index) => (
+          <li key={index} className={styles.tipItem}>
+            {renderTip(tip)}
+          </li>
+        ))}
+      </ul>
+    </div>
+  );
+};
diff --git a/examples/testapp/src/pages/subscribe-playground/components/index.ts b/examples/testapp/src/pages/subscribe-playground/components/index.ts
new file mode 100644
index 000000000..74ed57a36
--- /dev/null
+++ b/examples/testapp/src/pages/subscribe-playground/components/index.ts
@@ -0,0 +1,7 @@
+// Re-export components without using export *
+import { CodeEditor } from './CodeEditor';
+import { Header } from './Header';
+import { Output } from './Output';
+import { QuickTips } from './QuickTips';
+
+export { CodeEditor, Header, Output, QuickTips };
diff --git a/examples/testapp/src/pages/subscribe-playground/constants/index.ts b/examples/testapp/src/pages/subscribe-playground/constants/index.ts
new file mode 100644
index 000000000..8c5bb0a30
--- /dev/null
+++ b/examples/testapp/src/pages/subscribe-playground/constants/index.ts
@@ -0,0 +1,8 @@
+export {
+  DEFAULT_GET_SUBSCRIPTION_STATUS_CODE,
+  DEFAULT_SUBSCRIBE_CODE,
+  GET_SUBSCRIPTION_STATUS_QUICK_TIPS,
+  SUBSCRIBE_CODE_WITH_MINIMUM_BALANCE_FALSE,
+  SUBSCRIBE_CODE_WITH_TEST_PERIOD,
+  SUBSCRIBE_QUICK_TIPS,
+} from './playground';
diff --git a/examples/testapp/src/pages/subscribe-playground/constants/playground.ts b/examples/testapp/src/pages/subscribe-playground/constants/playground.ts
new file mode 100644
index 000000000..69dd721e3
--- /dev/null
+++ b/examples/testapp/src/pages/subscribe-playground/constants/playground.ts
@@ -0,0 +1,77 @@
+export const DEFAULT_SUBSCRIBE_CODE = `import { base } from '@base-org/account'
+
+try {
+  const subscription = await base.subscription.subscribe({
+    recurringCharge: "10.50",
+    subscriptionOwner: "0xFe21034794A5a574B94fE4fDfD16e005F1C96e51", // Your app's address
+    periodInDays: 30,
+    testnet: true
+  })
+  
+  return subscription;
+} catch (error) {
+  console.error('Subscription failed:', error.message);
+  throw error;
+}`;
+
+export const SUBSCRIBE_CODE_WITH_TEST_PERIOD = `import { base } from '@base-org/account'
+
+try {
+  const subscription = await base.subscription.subscribe({
+    recurringCharge: "0.01",
+    subscriptionOwner: "0xFe21034794A5a574B94fE4fDfD16e005F1C96e51", // Your app's address
+    overridePeriodInSecondsForTestnet: 300, // 5 minutes for testing - (only works on testnet)
+    testnet: true
+  })
+  
+  return subscription;
+} catch (error) {
+  console.error('Subscription failed:', error.message);
+  throw error;
+}`;
+
+export const SUBSCRIBE_CODE_WITH_MINIMUM_BALANCE_FALSE = `import { base } from '@base-org/account'
+
+try {
+  const subscription = await base.subscription.subscribe({
+    recurringCharge: "10.50",
+    subscriptionOwner: "0xFe21034794A5a574B94fE4fDfD16e005F1C96e51", // Your app's address
+    periodInDays: 30,
+    minimumBalance: false, // Don't require minimum balance check
+    testnet: true
+  })
+  
+  return subscription;
+} catch (error) {
+  console.error('Subscription failed:', error.message);
+  throw error;
+}`;
+
+export const DEFAULT_GET_SUBSCRIPTION_STATUS_CODE = `import { base } from '@base-org/account'
+
+try {
+  const result = await base.subscription.getStatus({
+    id: '0x...', // Replace with a subscription ID
+    testnet: true
+  })
+  
+  return result;
+} catch (error) {
+  console.error('Failed to check subscription status:', error.message);
+  throw error;
+}`;
+
+export const SUBSCRIBE_QUICK_TIPS = [
+  'Get testnet USDC at <a href="https://faucet.circle.com/" target="_blank" rel="noopener noreferrer">https://faucet.circle.com/</a> - select "Base Sepolia" as the network',
+  "subscriptionOwner is your application's address that will control the subscription",
+  'recurringCharge is the amount of USDC to charge per period (e.g., "10.50" = $10.50)',
+  'periodInDays sets the billing cycle (default: 30 days)',
+  'overridePeriodInSecondsForTestnet allows faster testing cycles on testnet only',
+  'The user can revoke the subscription at any time through their wallet',
+];
+
+export const GET_SUBSCRIPTION_STATUS_QUICK_TIPS = [
+  'Use the subscription ID returned from the subscribe function',
+  'remainingChargeInPeriod shows how much can still be charged this period',
+  'Make sure to use the same testnet setting as the original subscription',
+];
diff --git a/examples/testapp/src/pages/subscribe-playground/hooks/index.ts b/examples/testapp/src/pages/subscribe-playground/hooks/index.ts
new file mode 100644
index 000000000..7e0fa995f
--- /dev/null
+++ b/examples/testapp/src/pages/subscribe-playground/hooks/index.ts
@@ -0,0 +1,2 @@
+export { useCodeExecution } from './useCodeExecution';
+export { useConsoleCapture } from './useConsoleCapture';
diff --git a/examples/testapp/src/pages/subscribe-playground/hooks/useCodeExecution.ts b/examples/testapp/src/pages/subscribe-playground/hooks/useCodeExecution.ts
new file mode 100644
index 000000000..108c82560
--- /dev/null
+++ b/examples/testapp/src/pages/subscribe-playground/hooks/useCodeExecution.ts
@@ -0,0 +1,170 @@
+import type {
+  PaymentResult,
+  PaymentStatus,
+  SubscriptionResult,
+  SubscriptionStatus,
+} from '@base-org/account';
+import { getPaymentStatus, getSubscriptionStatus, pay, subscribe } from '@base-org/account';
+import { useCallback, useState } from 'react';
+import { transformAndSanitizeCode } from '../utils/codeTransform';
+import { useConsoleCapture } from './useConsoleCapture';
+
+export const useCodeExecution = () => {
+  const [isLoading, setIsLoading] = useState(false);
+  const [result, setResult] = useState<
+    PaymentResult | PaymentStatus | SubscriptionResult | SubscriptionStatus | null
+  >(null);
+  const [error, setError] = useState<string | null>(null);
+  const [consoleOutput, setConsoleOutput] = useState<string[]>([]);
+  const { captureConsole } = useConsoleCapture();
+
+  const executeCode = useCallback(
+    async (code: string) => {
+      setIsLoading(true);
+      setResult(null);
+      setError(null);
+      setConsoleOutput([]);
+
+      const logs: string[] = [];
+      const restoreConsole = captureConsole((message) => logs.push(message));
+
+      try {
+        // Sanitize and validate the code first
+        const sanitizationResult = transformAndSanitizeCode(code);
+
+        if (!sanitizationResult.isValid) {
+          // Format validation errors for display
+          const errorMessages = sanitizationResult.errors
+            .map((err) => {
+              if (err.line) {
+                return `Line ${err.line}: ${err.message}`;
+              }
+              return err.message;
+            })
+            .join('\n');
+
+          setError(`Code validation failed:\n${errorMessages}`);
+          setConsoleOutput(logs);
+          return;
+        }
+
+        // Create a function from the sanitized code with additional context
+        const AsyncFunction = Object.getPrototypeOf(async () => {}).constructor;
+
+        // Create a context object with commonly used utilities
+        const context = {
+          // Individual functions for direct access
+          pay,
+          getPaymentStatus,
+          subscribe,
+          getSubscriptionStatus,
+          // Namespaced access via base object (matching SDK structure)
+          base: {
+            pay,
+            getPaymentStatus,
+            subscribe,
+            subscription: {
+              subscribe,
+              getStatus: getSubscriptionStatus,
+            },
+          },
+        };
+
+        // Use the sanitized code
+        const sanitizedCode = sanitizationResult.code;
+
+        // Create function with destructured context
+        const userFunction = new AsyncFunction(...Object.keys(context), sanitizedCode);
+
+        const executionResult = await userFunction(...Object.values(context));
+
+        // biome-ignore lint/suspicious/noConsole: Useful for debugging execution results
+        console.log('Execution result:', executionResult);
+
+        setResult(executionResult);
+        setConsoleOutput(logs);
+      } catch (error) {
+        console.error('Execution error:', error);
+
+        // Create a more detailed error object/message
+        interface ErrorDetails {
+          message: string;
+          type: string;
+          details?: unknown;
+          code?: string | number;
+          response?: unknown;
+          statusCode?: number;
+          stack?: string;
+        }
+        let errorDetails: ErrorDetails = {
+          message: 'Unknown error occurred',
+          type: 'unknown',
+          details: null,
+        };
+
+        if (error instanceof Error) {
+          errorDetails.message = error.message;
+          errorDetails.type = error.name || 'Error';
+
+          // Check if the error has additional properties (common in SDK errors)
+          const errorObj = error as {
+            code?: string | number;
+            details?: unknown;
+            response?: unknown;
+            statusCode?: number;
+          };
+          if (errorObj.code) {
+            errorDetails.code = errorObj.code;
+          }
+          if (errorObj.details) {
+            errorDetails.details = errorObj.details;
+          }
+          if (errorObj.response) {
+            errorDetails.response = errorObj.response;
+          }
+          if (errorObj.statusCode) {
+            errorDetails.statusCode = errorObj.statusCode;
+          }
+
+          // For stack traces in development
+          if (process.env.NODE_ENV === 'development' && error.stack) {
+            errorDetails.stack = error.stack;
+          }
+        } else if (typeof error === 'string') {
+          errorDetails.message = error;
+          errorDetails.type = 'string';
+        } else if (error && typeof error === 'object') {
+          // Handle plain objects that might be thrown
+          errorDetails = {
+            ...errorDetails,
+            ...error,
+            message: (error as { message?: string }).message || JSON.stringify(error),
+          };
+        }
+
+        // Set error as JSON string to preserve structure
+        setError(JSON.stringify(errorDetails));
+        setConsoleOutput(logs);
+      } finally {
+        restoreConsole();
+        setIsLoading(false);
+      }
+    },
+    [captureConsole]
+  );
+
+  const reset = useCallback(() => {
+    setResult(null);
+    setError(null);
+    setConsoleOutput([]);
+  }, []);
+
+  return {
+    isLoading,
+    result,
+    error,
+    consoleOutput,
+    executeCode,
+    reset,
+  };
+};
diff --git a/examples/testapp/src/pages/subscribe-playground/hooks/useConsoleCapture.ts b/examples/testapp/src/pages/subscribe-playground/hooks/useConsoleCapture.ts
new file mode 100644
index 000000000..8b58bb391
--- /dev/null
+++ b/examples/testapp/src/pages/subscribe-playground/hooks/useConsoleCapture.ts
@@ -0,0 +1,42 @@
+import { useCallback } from 'react';
+import { safeStringify } from '../utils/codeTransform';
+
+export const useConsoleCapture = () => {
+  const captureConsole = useCallback((onLog: (message: string) => void) => {
+    const originalLog = console.log;
+    const originalError = console.error;
+
+    const formatArgs = (args: unknown[]) => {
+      return args
+        .map((arg) => {
+          if (typeof arg === 'object' && arg !== null) {
+            try {
+              return safeStringify(arg);
+            } catch (_e) {
+              return '[Object with circular reference]';
+            }
+          }
+          return String(arg);
+        })
+        .join(' ');
+    };
+
+    console.log = (...args) => {
+      onLog(formatArgs(args));
+      originalLog(...args);
+    };
+
+    console.error = (...args) => {
+      onLog(`ERROR: ${formatArgs(args)}`);
+      originalError(...args);
+    };
+
+    // Return cleanup function
+    return () => {
+      console.log = originalLog;
+      console.error = originalError;
+    };
+  }, []);
+
+  return { captureConsole };
+};
diff --git a/examples/testapp/src/pages/subscribe-playground/index.page.tsx b/examples/testapp/src/pages/subscribe-playground/index.page.tsx
new file mode 100644
index 000000000..bba12815a
--- /dev/null
+++ b/examples/testapp/src/pages/subscribe-playground/index.page.tsx
@@ -0,0 +1,205 @@
+import { useEffect, useState } from 'react';
+import { CodeEditor, Header, Output, QuickTips } from './components';
+import {
+  DEFAULT_GET_SUBSCRIPTION_STATUS_CODE,
+  DEFAULT_SUBSCRIBE_CODE,
+  GET_SUBSCRIPTION_STATUS_QUICK_TIPS,
+  SUBSCRIBE_CODE_WITH_MINIMUM_BALANCE_FALSE,
+  SUBSCRIBE_CODE_WITH_TEST_PERIOD,
+  SUBSCRIBE_QUICK_TIPS,
+} from './constants';
+import { useCodeExecution } from './hooks';
+import styles from './styles/Home.module.css';
+
+function SubscribePlayground() {
+  const [subscribeVariant, setSubscribeVariant] = useState<'default' | 'test' | 'minimumBalance'>(
+    'default'
+  );
+  const [subscribeCode, setSubscribeCode] = useState(DEFAULT_SUBSCRIBE_CODE);
+  const [getSubscriptionStatusCode, setGetSubscriptionStatusCode] = useState(
+    DEFAULT_GET_SUBSCRIPTION_STATUS_CODE
+  );
+
+  const subscribeExecution = useCodeExecution();
+  const getSubscriptionStatusExecution = useCodeExecution();
+
+  const handleSubscribeExecute = () => {
+    subscribeExecution.executeCode(subscribeCode);
+  };
+
+  const handleSubscribeReset = () => {
+    setSubscribeVariant('default');
+    setSubscribeCode(DEFAULT_SUBSCRIBE_CODE);
+    subscribeExecution.reset();
+  };
+
+  const handleSubscribeVariantChange = (variant: 'default' | 'test' | 'minimumBalance') => {
+    setSubscribeVariant(variant);
+    let newCode = DEFAULT_SUBSCRIBE_CODE;
+    if (variant === 'test') {
+      newCode = SUBSCRIBE_CODE_WITH_TEST_PERIOD;
+    } else if (variant === 'minimumBalance') {
+      newCode = SUBSCRIBE_CODE_WITH_MINIMUM_BALANCE_FALSE;
+    }
+    setSubscribeCode(newCode);
+    subscribeExecution.reset();
+  };
+
+  const handleGetSubscriptionStatusExecute = () => {
+    getSubscriptionStatusExecution.executeCode(getSubscriptionStatusCode);
+  };
+
+  const handleGetSubscriptionStatusReset = () => {
+    setGetSubscriptionStatusCode(DEFAULT_GET_SUBSCRIPTION_STATUS_CODE);
+    getSubscriptionStatusExecution.reset();
+  };
+
+  // Watch for successful subscription results and update getSubscriptionStatus code with the subscription ID
+  useEffect(() => {
+    if (
+      subscribeExecution.result &&
+      'id' in subscribeExecution.result &&
+      subscribeExecution.result.id
+    ) {
+      const subscriptionId = subscribeExecution.result.id;
+      const updatedCode = `import { base } from '@base-org/account'
+
+try {
+  const result = await base.subscription.getStatus({
+    id: '${subscriptionId}', // Automatically filled with your recent subscription
+    testnet: true
+  })
+  
+  return result;
+} catch (error) {
+  console.error('Failed to check subscription status:', error.message);
+  throw error;
+}`;
+      setGetSubscriptionStatusCode(updatedCode);
+    }
+  }, [subscribeExecution.result]);
+
+  return (
+    <div className={styles.container}>
+      <Header />
+
+      <main className={styles.main}>
+        {/* subscribe Section */}
+        <section className={styles.section}>
+          <div className={styles.sectionHeader}>
+            <h2 className={styles.sectionTitle}>subscription.subscribe</h2>
+            <a
+              href="https://docs.base.org/base-account/reference/base-pay/subscribe"
+              target="_blank"
+              rel="noopener noreferrer"
+              className={styles.docsLink}
+            >
+              Docs ↗
+            </a>
+          </div>
+          <p className={styles.sectionDescription}>Create recurring USDC subscriptions on Base</p>
+
+          <div className={styles.variantSelector}>
+            <label>
+              <input
+                type="radio"
+                name="subscribeVariant"
+                value="default"
+                checked={subscribeVariant === 'default'}
+                onChange={() => handleSubscribeVariantChange('default')}
+              />
+              Default (30-day period)
+            </label>
+            <label>
+              <input
+                type="radio"
+                name="subscribeVariant"
+                value="test"
+                checked={subscribeVariant === 'test'}
+                onChange={() => handleSubscribeVariantChange('test')}
+              />
+              Test Mode (5-minute period)
+            </label>
+            <label>
+              <input
+                type="radio"
+                name="subscribeVariant"
+                value="minimumBalance"
+                checked={subscribeVariant === 'minimumBalance'}
+                onChange={() => handleSubscribeVariantChange('minimumBalance')}
+              />
+              No Balance Check
+            </label>
+          </div>
+
+          <div className={styles.playground}>
+            <div className={styles.leftColumn}>
+              <CodeEditor
+                code={subscribeCode}
+                onChange={setSubscribeCode}
+                onExecute={handleSubscribeExecute}
+                onReset={handleSubscribeReset}
+                isLoading={subscribeExecution.isLoading}
+              />
+              <QuickTips tips={SUBSCRIBE_QUICK_TIPS} />
+            </div>
+
+            <div className={styles.rightColumn}>
+              <Output
+                result={subscribeExecution.result}
+                error={subscribeExecution.error}
+                consoleOutput={subscribeExecution.consoleOutput}
+                isLoading={subscribeExecution.isLoading}
+              />
+            </div>
+          </div>
+        </section>
+
+        {/* getSubscriptionStatus Section */}
+        <section className={styles.section}>
+          <div className={styles.sectionHeader}>
+            <h2 className={styles.sectionTitle}>subscription.getStatus</h2>
+            <a
+              href="https://docs.base.org/base-account/reference/base-pay/getStatus"
+              target="_blank"
+              rel="noopener noreferrer"
+              className={styles.docsLink}
+            >
+              Docs ↗
+            </a>
+          </div>
+          <p className={styles.sectionDescription}>Check the status of a subscription</p>
+
+          <div className={styles.playground}>
+            <div className={styles.leftColumn}>
+              <CodeEditor
+                code={getSubscriptionStatusCode}
+                onChange={setGetSubscriptionStatusCode}
+                onExecute={handleGetSubscriptionStatusExecute}
+                onReset={handleGetSubscriptionStatusReset}
+                isLoading={getSubscriptionStatusExecution.isLoading}
+              />
+              <QuickTips tips={GET_SUBSCRIPTION_STATUS_QUICK_TIPS} />
+            </div>
+
+            <div className={styles.rightColumn}>
+              <Output
+                result={getSubscriptionStatusExecution.result}
+                error={getSubscriptionStatusExecution.error}
+                consoleOutput={getSubscriptionStatusExecution.consoleOutput}
+                isLoading={getSubscriptionStatusExecution.isLoading}
+              />
+            </div>
+          </div>
+        </section>
+      </main>
+    </div>
+  );
+}
+
+// Custom layout for this page - no app header
+SubscribePlayground.getLayout = function getLayout(page) {
+  return page;
+};
+
+export default SubscribePlayground;
diff --git a/examples/testapp/src/pages/subscribe-playground/styles/Home.module.css b/examples/testapp/src/pages/subscribe-playground/styles/Home.module.css
new file mode 100644
index 000000000..bab83bbbc
--- /dev/null
+++ b/examples/testapp/src/pages/subscribe-playground/styles/Home.module.css
@@ -0,0 +1,123 @@
+.container {
+  min-height: 100vh;
+  background: #f8fafc;
+  color: #1e293b;
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial,
+    sans-serif;
+}
+
+.variantSelector {
+  display: flex;
+  gap: 1.5rem;
+  margin-bottom: 1.5rem;
+  padding: 1rem;
+  background: rgba(59, 130, 246, 0.05);
+  border-radius: 8px;
+  border: 1px solid rgba(59, 130, 246, 0.1);
+}
+
+.variantSelector label {
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+  color: #475569;
+  cursor: pointer;
+  font-size: 0.95rem;
+}
+
+.variantSelector input[type="radio"] {
+  cursor: pointer;
+}
+
+.main {
+  width: 100%;
+  margin: 0 auto;
+  padding: 0 3rem 4rem;
+}
+
+.section {
+  margin-bottom: 4rem;
+}
+
+.sectionHeader {
+  display: flex;
+  align-items: center;
+  gap: 1rem;
+}
+
+.sectionTitle {
+  font-size: 2rem;
+  font-weight: 700;
+  color: #1e293b;
+  margin-bottom: 0.5rem;
+}
+
+.docsLink {
+  color: #3b82f6;
+  text-decoration: none;
+  font-size: 0.875rem;
+  transition: color 0.2s ease;
+}
+
+.docsLink:hover {
+  color: #2563eb;
+  text-decoration: underline;
+}
+
+.sectionDescription {
+  font-size: 1.125rem;
+  color: #64748b;
+  margin-bottom: 2rem;
+}
+
+.playground {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  gap: 3rem;
+  margin-bottom: 3rem;
+  align-items: start;
+}
+
+.leftColumn {
+  display: flex;
+  flex-direction: column;
+  gap: 0;
+}
+
+.rightColumn {
+  display: flex;
+  flex-direction: column;
+}
+
+/* Responsive design */
+@media (max-width: 1600px) {
+  .playground {
+    grid-template-columns: 1fr;
+  }
+
+  .leftColumn {
+    margin-bottom: 2rem;
+  }
+}
+
+@media (max-width: 768px) {
+  .main {
+    padding: 0 1rem 3rem;
+  }
+
+  .playground {
+    gap: 1.5rem;
+  }
+
+  .section {
+    margin-bottom: 3rem;
+  }
+
+  .sectionTitle {
+    font-size: 1.5rem;
+  }
+
+  .sectionDescription {
+    font-size: 1rem;
+  }
+}
diff --git a/examples/testapp/src/pages/subscribe-playground/utils/codeSanitizer.ts b/examples/testapp/src/pages/subscribe-playground/utils/codeSanitizer.ts
new file mode 100644
index 000000000..cca3836c9
--- /dev/null
+++ b/examples/testapp/src/pages/subscribe-playground/utils/codeSanitizer.ts
@@ -0,0 +1,414 @@
+import * as acorn from 'acorn';
+
+// Define the whitelist of allowed operations for subscribe playground
+export const WHITELIST = {
+  // Allowed SDK functions
+  allowedFunctions: ['subscribe', 'getSubscriptionStatus', 'pay', 'getPaymentStatus'],
+
+  // Allowed object properties and methods
+  allowedObjects: {
+    base: ['subscribe', 'getSubscriptionStatus', 'pay', 'getPaymentStatus', 'subscription'],
+    console: ['log', 'error', 'warn', 'info'],
+    Promise: ['resolve', 'reject', 'all', 'race'],
+    Object: ['keys', 'values', 'entries', 'assign'],
+    Array: ['isArray', 'from'],
+    JSON: ['stringify', 'parse'],
+    Math: ['floor', 'ceil', 'round', 'min', 'max', 'abs'],
+  } as Record<string, string[]>,
+
+  // Allowed keywords and statements
+  allowedStatements: [
+    'VariableDeclaration',
+    'VariableDeclarator', // Added: Part of variable declarations
+    'FunctionDeclaration',
+    'FunctionExpression',
+    'ArrowFunctionExpression',
+    'BlockStatement',
+    'ExpressionStatement',
+    'ReturnStatement',
+    'IfStatement',
+    'TryStatement',
+    'CatchClause',
+    'ThrowStatement',
+    'AwaitExpression',
+    'CallExpression',
+    'MemberExpression',
+    'Identifier',
+    'Literal',
+    'TemplateLiteral',
+    'TemplateElement', // Added: Part of template literals
+    'ObjectExpression',
+    'ArrayExpression',
+    'Property',
+    'AssignmentExpression',
+    'BinaryExpression',
+    'UnaryExpression',
+    'ConditionalExpression',
+    'LogicalExpression',
+    'UpdateExpression',
+    'SpreadElement',
+    'ForStatement', // Added: For loops
+    'ForInStatement', // Added: For-in loops
+    'ForOfStatement', // Added: For-of loops
+    'WhileStatement', // Added: While loops
+    'DoWhileStatement', // Added: Do-while loops
+    'BreakStatement', // Added: Break statements
+    'ContinueStatement', // Added: Continue statements
+    'SwitchStatement', // Added: Switch statements
+    'SwitchCase', // Added: Switch cases
+    'AssignmentPattern', // Added: Destructuring assignments
+    'ObjectPattern', // Added: Object destructuring
+    'ArrayPattern', // Added: Array destructuring
+    'RestElement', // Added: Rest parameters
+    'ThisExpression', // Added: 'this' keyword
+    'ChainExpression', // Added: Optional chaining
+    'OptionalMemberExpression', // Added: Optional member access
+    'OptionalCallExpression', // Added: Optional function calls
+    'SequenceExpression', // Added: Comma operator
+  ],
+
+  // Disallowed global objects and functions
+  disallowedGlobals: [
+    'eval',
+    'Function',
+    'AsyncFunction',
+    'GeneratorFunction',
+    'AsyncGeneratorFunction',
+    'require',
+    'import',
+    'export',
+    'process',
+    'global',
+    'window',
+    'document',
+    'XMLHttpRequest',
+    'fetch',
+    'WebSocket',
+    'Worker',
+    'SharedWorker',
+    'ServiceWorker',
+    'localStorage',
+    'sessionStorage',
+    'indexedDB',
+    'crypto',
+    'location',
+    'history',
+    'navigator',
+    '__dirname',
+    '__filename',
+    'module',
+    'exports',
+    'Buffer',
+    'setInterval',
+    'setTimeout',
+    'setImmediate',
+    'clearInterval',
+    'clearTimeout',
+    'clearImmediate',
+  ],
+};
+
+interface ValidationError {
+  message: string;
+  line?: number;
+  column?: number;
+}
+
+interface ASTNode {
+  body?: ASTNode[];
+  type?: string;
+  loc?: { start: { line: number; column: number } };
+  callee?: ASTNode;
+  object?: ASTNode;
+  property?: ASTNode;
+  name?: string;
+  value?: unknown;
+  computed?: boolean;
+  [key: string]: unknown;
+}
+
+export class CodeSanitizer {
+  private errors: ValidationError[] = [];
+
+  /**
+   * Sanitize and validate the code based on whitelist
+   */
+  sanitize(code: string): {
+    isValid: boolean;
+    sanitizedCode: string;
+    errors: ValidationError[];
+  } {
+    this.errors = [];
+
+    try {
+      // First, apply basic sanitization (remove imports, etc.)
+      const preSanitized = this.applySanitization(code);
+
+      // Wrap the code in an async function for parsing
+      // This allows return statements and await expressions at the top level
+      const wrappedCode = `async function __userCode__() {\n${preSanitized}\n}`;
+
+      // Parse the wrapped code into an AST
+      const ast = acorn.parse(wrappedCode, {
+        ecmaVersion: 2020,
+        sourceType: 'module',
+        locations: true,
+      });
+
+      // Extract the function body for validation
+      // The AST structure will be: Program -> FunctionDeclaration -> BlockStatement
+      const program = ast as acorn.Program;
+      const functionNode = program.body[0] as unknown as ASTNode;
+      if (functionNode && functionNode.body) {
+        // Validate the function body
+        this.validateNode(functionNode.body as unknown as ASTNode);
+      }
+
+      // If validation passes, return the sanitized code
+      if (this.errors.length === 0) {
+        return {
+          isValid: true,
+          sanitizedCode: preSanitized,
+          errors: [],
+        };
+      }
+
+      return {
+        isValid: false,
+        sanitizedCode: '',
+        errors: this.errors,
+      };
+    } catch (error) {
+      // Parse error - try to extract meaningful line number
+      if (error instanceof SyntaxError) {
+        const match = error.message.match(/\((\d+):(\d+)\)/);
+        let line;
+        let column;
+
+        if (match) {
+          // Adjust line number since we wrapped the code
+          line = Number.parseInt(match[1]) - 1;
+          column = Number.parseInt(match[2]);
+        }
+
+        this.errors.push({
+          message: error.message.replace(/\(\d+:\d+\)/, line ? `(${line}:${column})` : ''),
+          line,
+          column,
+        });
+      } else {
+        this.errors.push({
+          message: `Unexpected error: ${error instanceof Error ? error.message : String(error)}`,
+        });
+      }
+
+      return {
+        isValid: false,
+        sanitizedCode: '',
+        errors: this.errors,
+      };
+    }
+  }
+
+  /**
+   * Recursively validate AST nodes
+   */
+  private validateNode(node: ASTNode): void {
+    if (!node) return;
+
+    // Skip nodes without a type property (these are typically values or other non-AST properties)
+    if (!node.type) return;
+
+    // Check if the node type is allowed
+    if (!WHITELIST.allowedStatements.includes(node.type)) {
+      this.errors.push({
+        message: `Disallowed statement type: ${node.type}`,
+        line: node.loc?.start.line ? node.loc.start.line - 1 : undefined,
+        column: node.loc?.start.column,
+      });
+      return;
+    }
+
+    // Special validation for specific node types
+    switch (node.type) {
+      case 'CallExpression':
+        this.validateCallExpression(node);
+        break;
+
+      case 'MemberExpression':
+        this.validateMemberExpression(node);
+        break;
+
+      case 'Identifier':
+        this.validateIdentifier(node);
+        break;
+
+      case 'NewExpression':
+        this.errors.push({
+          message: `Constructor calls are not allowed`,
+          line: node.loc?.start.line ? node.loc.start.line - 1 : undefined,
+          column: node.loc?.start.column,
+        });
+        return;
+    }
+
+    // Recursively validate child nodes
+    for (const key in node) {
+      if (key === 'loc' || key === 'range' || key === 'type') continue;
+
+      const child = node[key];
+      if (Array.isArray(child)) {
+        child.forEach((item) => {
+          if (typeof item === 'object' && item !== null) {
+            this.validateNode(item as ASTNode);
+          }
+        });
+      } else if (typeof child === 'object' && child !== null) {
+        this.validateNode(child as ASTNode);
+      }
+    }
+  }
+
+  /**
+   * Validate function calls
+   */
+  private validateCallExpression(node: ASTNode): void {
+    // Check if it's a direct function call
+    if (node.callee.type === 'Identifier') {
+      const funcName = node.callee.name;
+
+      // Check if it's an allowed SDK function
+      if (!WHITELIST.allowedFunctions.includes(funcName)) {
+        // Check if it's a disallowed global
+        if (WHITELIST.disallowedGlobals.includes(funcName)) {
+          this.errors.push({
+            message: `Function '${funcName}' is not allowed`,
+            line: node.loc?.start.line ? node.loc.start.line - 1 : undefined,
+            column: node.loc?.start.column,
+          });
+        }
+      }
+    }
+
+    // Check if it's a method call
+    if (node.callee.type === 'MemberExpression') {
+      this.validateMemberExpression(node.callee);
+    }
+  }
+
+  /**
+   * Validate member expressions (object.property)
+   */
+  private validateMemberExpression(node: ASTNode): void {
+    // For nested member expressions like base.subscription.subscribe
+    // We need to validate the chain properly
+
+    if (node.object.type === 'MemberExpression') {
+      // Handle nested member expressions (e.g., base.subscription.getStatus)
+      // First validate the parent member expression
+      this.validateMemberExpression(node.object);
+
+      // For base.subscription.*, we need special handling
+      if (
+        node.object.object?.type === 'Identifier' &&
+        node.object.object.name === 'base' &&
+        node.object.property?.type === 'Identifier' &&
+        node.object.property.name === 'subscription'
+      ) {
+        // This is base.subscription.something
+        const methodName = node.property?.type === 'Identifier' ? node.property.name : '';
+        const allowedSubscriptionMethods = ['subscribe', 'getStatus'];
+        if (methodName && !allowedSubscriptionMethods.includes(methodName)) {
+          this.errors.push({
+            message: `Method 'base.subscription.${methodName}' is not allowed`,
+            line: node.loc?.start.line ? node.loc.start.line - 1 : undefined,
+            column: node.loc?.start.column,
+          });
+        }
+        return;
+      }
+    }
+
+    // Handle simple member expressions (e.g., console.log, base.pay)
+    if (node.object.type === 'Identifier') {
+      const objectName = node.object.name;
+      const propertyName =
+        node.property?.type === 'Identifier' && !node.computed
+          ? node.property.name
+          : node.property?.type === 'Literal'
+            ? String(node.property.value)
+            : '';
+
+      // Only validate if the object is in our whitelist or disallowed list
+      if (objectName && objectName in WHITELIST.allowedObjects) {
+        const allowedProps = WHITELIST.allowedObjects[objectName];
+        if (propertyName && !allowedProps.includes(propertyName)) {
+          this.errors.push({
+            message: `Property '${objectName}.${propertyName}' is not allowed`,
+            line: node.loc?.start.line ? node.loc.start.line - 1 : undefined,
+            column: node.loc?.start.column,
+          });
+        }
+      } else if (objectName && WHITELIST.disallowedGlobals.includes(objectName)) {
+        this.errors.push({
+          message: `Object '${objectName}' is not allowed`,
+          line: node.loc?.start.line ? node.loc.start.line - 1 : undefined,
+          column: node.loc?.start.column,
+        });
+      }
+      // If objectName is not in whitelist or disallowed list, it's likely a local variable
+      // so we don't validate its properties
+    }
+  }
+
+  /**
+   * Validate identifiers
+   */
+  private validateIdentifier(node: ASTNode): void {
+    // Skip validation for allowed functions and objects
+    if (WHITELIST.allowedFunctions.includes(node.name)) return;
+    if (node.name in WHITELIST.allowedObjects) return;
+
+    // Check for disallowed globals
+    if (WHITELIST.disallowedGlobals.includes(node.name)) {
+      this.errors.push({
+        message: `Identifier '${node.name}' is not allowed`,
+        line: node.loc?.start.line ? node.loc.start.line - 1 : undefined,
+        column: node.loc?.start.column,
+      });
+    }
+  }
+
+  /**
+   * Apply sanitization transformations to the code
+   */
+  private applySanitization(code: string): string {
+    let sanitized = code;
+
+    // Remove import statements
+    sanitized = sanitized.replace(/^\s*import\s+.*?(?:from\s+['"][^'"]+['"])?[;\s]*$/gm, '');
+
+    // Remove multiline imports
+    sanitized = sanitized.replace(/^\s*import\s+[\s\S]*?from\s+['"][^'"]+['"]\s*;?\s*$/gm, '');
+
+    // Remove export statements
+    sanitized = sanitized.replace(/^\s*export\s+.*?[;\s]*$/gm, '');
+
+    // Clean up extra newlines
+    sanitized = sanitized.replace(/^\s*\n/gm, '');
+
+    return sanitized;
+  }
+}
+
+/**
+ * Convenience function to sanitize code
+ */
+export function sanitizeCode(code: string): {
+  isValid: boolean;
+  sanitizedCode: string;
+  errors: ValidationError[];
+} {
+  const sanitizer = new CodeSanitizer();
+  return sanitizer.sanitize(code);
+}
diff --git a/examples/testapp/src/pages/subscribe-playground/utils/codeTransform.ts b/examples/testapp/src/pages/subscribe-playground/utils/codeTransform.ts
new file mode 100644
index 000000000..1f0b45863
--- /dev/null
+++ b/examples/testapp/src/pages/subscribe-playground/utils/codeTransform.ts
@@ -0,0 +1,51 @@
+import { sanitizeCode } from './codeSanitizer';
+
+// Transform and sanitize code with whitelist validation
+export const transformAndSanitizeCode = (
+  code: string
+): {
+  isValid: boolean;
+  code: string;
+  errors: Array<{ message: string; line?: number; column?: number }>;
+} => {
+  // First, sanitize the code using whitelist validation
+  const sanitizationResult = sanitizeCode(code);
+
+  if (!sanitizationResult.isValid) {
+    return {
+      isValid: false,
+      code: '',
+      errors: sanitizationResult.errors,
+    };
+  }
+
+  return {
+    isValid: true,
+    code: sanitizationResult.sanitizedCode,
+    errors: [],
+  };
+};
+
+// Legacy function for backward compatibility (deprecated)
+export const transformImports = (code: string): string => {
+  const result = transformAndSanitizeCode(code);
+  return result.isValid ? result.code : code;
+};
+
+// Helper function to safely stringify objects with circular references
+export const safeStringify = (obj: unknown, indent = 2): string => {
+  const seen = new WeakSet();
+  return JSON.stringify(
+    obj,
+    (_key, value) => {
+      if (typeof value === 'object' && value !== null) {
+        if (seen.has(value)) {
+          return '[Circular]';
+        }
+        seen.add(value);
+      }
+      return value;
+    },
+    indent
+  );
+};
diff --git a/examples/testapp/src/pages/subscribe-playground/utils/index.ts b/examples/testapp/src/pages/subscribe-playground/utils/index.ts
new file mode 100644
index 000000000..9816937d8
--- /dev/null
+++ b/examples/testapp/src/pages/subscribe-playground/utils/index.ts
@@ -0,0 +1,2 @@
+export { CodeSanitizer, WHITELIST, sanitizeCode } from './codeSanitizer';
+export { safeStringify, transformAndSanitizeCode, transformImports } from './codeTransform';
diff --git a/examples/testapp/src/utils/unsafe_manageMultipleAccounts.ts b/examples/testapp/src/utils/unsafe_manageMultipleAccounts.ts
new file mode 100644
index 000000000..6de3177f0
--- /dev/null
+++ b/examples/testapp/src/utils/unsafe_manageMultipleAccounts.ts
@@ -0,0 +1,69 @@
+import { generatePrivateKey } from 'viem/accounts';
+import type { Hex } from 'viem';
+
+const STORAGE_KEY = 'base-acc-sdk.demo.sub-accounts.pks';
+
+export type StoredAccount = {
+  id: string;
+  privateKey: Hex;
+  label?: string;
+};
+
+/**
+ * Manage multiple private keys in local storage for testing sub accounts
+ *
+ * This is not safe, this is only for testing
+ * In a real app you should not store/expose private keys
+ */
+export function unsafe_manageMultipleAccounts() {
+  function getAll(): StoredAccount[] {
+    const stored = localStorage.getItem(STORAGE_KEY);
+    if (!stored) {
+      return [];
+    }
+    try {
+      return JSON.parse(stored);
+    } catch {
+      return [];
+    }
+  }
+
+  function add(label?: string): StoredAccount {
+    const accounts = getAll();
+    const newAccount: StoredAccount = {
+      id: crypto.randomUUID(),
+      privateKey: generatePrivateKey(),
+      label,
+    };
+    accounts.push(newAccount);
+    localStorage.setItem(STORAGE_KEY, JSON.stringify(accounts));
+    return newAccount;
+  }
+
+  function remove(id: string): void {
+    const accounts = getAll();
+    const filtered = accounts.filter((acc) => acc.id !== id);
+    localStorage.setItem(STORAGE_KEY, JSON.stringify(filtered));
+  }
+
+  function updateLabel(id: string, label: string): void {
+    const accounts = getAll();
+    const account = accounts.find((acc) => acc.id === id);
+    if (account) {
+      account.label = label;
+      localStorage.setItem(STORAGE_KEY, JSON.stringify(accounts));
+    }
+  }
+
+  function clear(): void {
+    localStorage.removeItem(STORAGE_KEY);
+  }
+
+  return {
+    getAll,
+    add,
+    remove,
+    updateLabel,
+    clear,
+  };
+}
diff --git a/packages/account-sdk/package.json b/packages/account-sdk/package.json
index 1a7788f0c..efdc99d9d 100644
--- a/packages/account-sdk/package.json
+++ b/packages/account-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@base-org/account",
-  "version": "2.2.0",
+  "version": "2.5.1",
   "description": "Base Account SDK",
   "keywords": [
     "base",
@@ -17,10 +17,27 @@
   "browser": "dist/base-account.min.js",
   "exports": {
     ".": {
+      "types": "./dist/index.d.ts",
+      "browser": {
+        "import": "./dist/index.js",
+        "require": "./dist/index.js"
+      },
+      "node": {
+        "import": "./dist/index.node.js",
+        "require": "./dist/index.node.js"
+      },
+      "default": "./dist/index.js"
+    },
+    "./browser": {
       "types": "./dist/index.d.ts",
       "import": "./dist/index.js",
       "require": "./dist/index.js"
     },
+    "./node": {
+      "types": "./dist/index.node.d.ts",
+      "import": "./dist/index.node.js",
+      "require": "./dist/index.node.js"
+    },
     "./payment/browser": {
       "types": "./dist/interface/payment/index.d.ts",
       "import": "./dist/interface/payment/index.js",
@@ -67,6 +84,24 @@
         "require": "./dist/interface/public-utilities/spend-permission/index.node.js"
       }
     },
+    "./prolink": {
+      "types": "./dist/interface/public-utilities/prolink/index.d.ts",
+      "browser": {
+        "types": "./dist/interface/public-utilities/prolink/index.d.ts",
+        "import": "./dist/interface/public-utilities/prolink/index.js",
+        "require": "./dist/interface/public-utilities/prolink/index.js"
+      },
+      "node": {
+        "types": "./dist/interface/public-utilities/prolink/index.node.d.ts",
+        "import": "./dist/interface/public-utilities/prolink/index.node.js",
+        "require": "./dist/interface/public-utilities/prolink/index.node.js"
+      },
+      "default": {
+        "types": "./dist/interface/public-utilities/prolink/index.d.ts",
+        "import": "./dist/interface/public-utilities/prolink/index.js",
+        "require": "./dist/interface/public-utilities/prolink/index.js"
+      }
+    },
     "./ui-assets": {
       "types": "./dist/ui/assets/index.d.ts",
       "import": "./dist/ui/assets/index.js",
@@ -100,7 +135,7 @@
   },
   "dependencies": {
     "@coinbase/cdp-sdk": "^1.0.0",
-    "@noble/hashes": "1.4.0",
+    "brotli-wasm": "^3.0.0",
     "clsx": "1.2.1",
     "eventemitter3": "5.0.1",
     "idb-keyval": "6.2.1",
diff --git a/packages/account-sdk/src/browser-entry.ts b/packages/account-sdk/src/browser-entry.ts
index 82d1920f2..f950f0fab 100644
--- a/packages/account-sdk/src/browser-entry.ts
+++ b/packages/account-sdk/src/browser-entry.ts
@@ -3,8 +3,9 @@
  * This file exposes the account interface to the global window object
  */
 
+import { PACKAGE_VERSION } from './core/constants.js';
 import { createBaseAccountSDK } from './interface/builder/core/createBaseAccountSDK.js';
-import { base } from './interface/payment/base.js';
+import { base } from './interface/payment/base.browser.js';
 import { CHAIN_IDS, TOKENS } from './interface/payment/constants.js';
 import { getPaymentStatus } from './interface/payment/getPaymentStatus.js';
 import { pay } from './interface/payment/pay.js';
@@ -20,10 +21,24 @@ import type {
   SubscriptionResult,
 } from './interface/payment/types.js';
 
+// Extend Window interface for global exports
+declare global {
+  interface Window {
+    base: typeof base;
+    createBaseAccountSDK: typeof createBaseAccountSDK;
+    BaseAccountSDK: {
+      VERSION: string;
+    };
+  }
+}
+
 // Expose to global window object
 if (typeof window !== 'undefined') {
-  (window as any).base = base;
-  (window as any).createBaseAccountSDK = createBaseAccountSDK;
+  window.base = base;
+  window.createBaseAccountSDK = createBaseAccountSDK;
+  window.BaseAccountSDK = {
+    VERSION: PACKAGE_VERSION,
+  };
 }
 
 // Export for module usage
@@ -32,6 +47,7 @@ export type {
   Preference,
   ProviderInterface,
 } from ':core/provider/interface.js';
+export { PACKAGE_VERSION as VERSION } from './core/constants.js';
 export { createBaseAccountSDK } from './interface/builder/core/createBaseAccountSDK.js';
 export { getCryptoKeyAccount, removeCryptoKey } from './kms/crypto-key/index.js';
 export { base, CHAIN_IDS, getPaymentStatus, pay, subscribe, TOKENS };
diff --git a/packages/account-sdk/src/core/provider/interface.ts b/packages/account-sdk/src/core/provider/interface.ts
index 3e308b4ba..2d712e9f7 100644
--- a/packages/account-sdk/src/core/provider/interface.ts
+++ b/packages/account-sdk/src/core/provider/interface.ts
@@ -85,19 +85,36 @@ export type Preference = {
   telemetry?: boolean;
 } & Record<string, unknown>;
 
+export type SubAccountCreationMode = 'on-connect' | 'manual';
+export type SubAccountDefaultAccount = 'sub' | 'universal';
+export type SubAccountFundingMode = 'spend-permissions' | 'manual';
+
 export type SubAccountOptions = {
-  /* Automatically create a subaccount for the user and use it for all transactions. */
-  enableAutoSubAccounts?: boolean;
   /**
-   * @returns The owner account that will be used to sign the subaccount transactions.
+   * Controls when sub accounts are created.
+   * - 'on-connect': Sub account is automatically created when connecting to the wallet
+   * - 'manual': Sub account must be manually created via wallet_addSubAccount
+   * @default 'manual'
    */
-  toOwnerAccount?: ToOwnerAccountFn;
+  creation?: SubAccountCreationMode;
   /**
-   * This is an unstable feature that may change or be removed in future versions.
-   * When true, enables automatic spend permission requests and insufficient balance error handling for sub accounts.
-   * @default true
+   * Controls which account is used by default when no account is specified.
+   * - 'sub': Sub account is the default (first in accounts list)
+   * - 'universal': Universal account is the default (first in accounts list)
+   * @default 'universal'
+   */
+  defaultAccount?: SubAccountDefaultAccount;
+  /**
+   * Controls how sub accounts are funded.
+   * - 'spend-permissions': Routes through global account if no spend permissions exist, handles insufficient balance errors
+   * - 'manual': Direct execution from sub account without automatic fallbacks
+   * @default 'spend-permissions'
    */
-  unstable_enableAutoSpendPermissions?: boolean;
+  funding?: SubAccountFundingMode;
+  /**
+   * @returns The owner account that will be used to sign the subaccount transactions.
+   */
+  toOwnerAccount?: ToOwnerAccountFn;
 };
 
 export interface ConstructorOptions {
diff --git a/packages/account-sdk/src/core/telemetry/events/provider.ts b/packages/account-sdk/src/core/telemetry/events/provider.ts
index 16112e784..5422c3046 100644
--- a/packages/account-sdk/src/core/telemetry/events/provider.ts
+++ b/packages/account-sdk/src/core/telemetry/events/provider.ts
@@ -62,3 +62,21 @@ export const logRequestResponded = ({
     AnalyticsEventImportance.high
   );
 };
+
+export const logGetInjectedProviderError = ({
+  errorMessage,
+}: {
+  errorMessage: string;
+}) => {
+  logEvent(
+    'provider.getInjectedProvider.error',
+    {
+      action: ActionType.error,
+      componentType: ComponentType.unknown,
+      method: 'getInjectedProvider',
+      signerType: 'base-account',
+      errorMessage,
+    },
+    AnalyticsEventImportance.high
+  );
+};
diff --git a/packages/account-sdk/src/core/telemetry/events/scw-signer.ts b/packages/account-sdk/src/core/telemetry/events/scw-signer.ts
index 26ea1a561..dc58d5170 100644
--- a/packages/account-sdk/src/core/telemetry/events/scw-signer.ts
+++ b/packages/account-sdk/src/core/telemetry/events/scw-signer.ts
@@ -8,6 +8,7 @@ export const logHandshakeStarted = ({
   method: string;
   correlationId: string | undefined;
 }) => {
+  const config = store.subAccountsConfig.get();
   logEvent(
     'scw_signer.handshake.started',
     {
@@ -15,7 +16,9 @@ export const logHandshakeStarted = ({
       componentType: ComponentType.unknown,
       method,
       correlationId,
-      enableAutoSubAccounts: store.subAccountsConfig.get()?.enableAutoSubAccounts,
+      subAccountCreation: config?.creation,
+      subAccountDefaultAccount: config?.defaultAccount,
+      subAccountFunding: config?.funding,
     },
     AnalyticsEventImportance.high
   );
@@ -30,6 +33,7 @@ export const logHandshakeError = ({
   correlationId: string | undefined;
   errorMessage: string;
 }) => {
+  const config = store.subAccountsConfig.get();
   logEvent(
     'scw_signer.handshake.error',
     {
@@ -38,7 +42,9 @@ export const logHandshakeError = ({
       method,
       correlationId,
       errorMessage,
-      enableAutoSubAccounts: store.subAccountsConfig.get()?.enableAutoSubAccounts,
+      subAccountCreation: config?.creation,
+      subAccountDefaultAccount: config?.defaultAccount,
+      subAccountFunding: config?.funding,
     },
     AnalyticsEventImportance.high
   );
@@ -51,6 +57,7 @@ export const logHandshakeCompleted = ({
   method: string;
   correlationId: string | undefined;
 }) => {
+  const config = store.subAccountsConfig.get();
   logEvent(
     'scw_signer.handshake.completed',
     {
@@ -58,7 +65,9 @@ export const logHandshakeCompleted = ({
       componentType: ComponentType.unknown,
       method,
       correlationId,
-      enableAutoSubAccounts: store.subAccountsConfig.get()?.enableAutoSubAccounts,
+      subAccountCreation: config?.creation,
+      subAccountDefaultAccount: config?.defaultAccount,
+      subAccountFunding: config?.funding,
     },
     AnalyticsEventImportance.high
   );
@@ -71,6 +80,7 @@ export const logRequestStarted = ({
   method: string;
   correlationId: string | undefined;
 }) => {
+  const config = store.subAccountsConfig.get();
   logEvent(
     'scw_signer.request.started',
     {
@@ -78,7 +88,9 @@ export const logRequestStarted = ({
       componentType: ComponentType.unknown,
       method,
       correlationId,
-      enableAutoSubAccounts: store.subAccountsConfig.get()?.enableAutoSubAccounts,
+      subAccountCreation: config?.creation,
+      subAccountDefaultAccount: config?.defaultAccount,
+      subAccountFunding: config?.funding,
     },
     AnalyticsEventImportance.high
   );
@@ -93,6 +105,7 @@ export const logRequestError = ({
   correlationId: string | undefined;
   errorMessage: string;
 }) => {
+  const config = store.subAccountsConfig.get();
   logEvent(
     'scw_signer.request.error',
     {
@@ -101,7 +114,9 @@ export const logRequestError = ({
       method,
       correlationId,
       errorMessage,
-      enableAutoSubAccounts: store.subAccountsConfig.get()?.enableAutoSubAccounts,
+      subAccountCreation: config?.creation,
+      subAccountDefaultAccount: config?.defaultAccount,
+      subAccountFunding: config?.funding,
     },
     AnalyticsEventImportance.high
   );
@@ -114,6 +129,7 @@ export const logRequestCompleted = ({
   method: string;
   correlationId: string | undefined;
 }) => {
+  const config = store.subAccountsConfig.get();
   logEvent(
     'scw_signer.request.completed',
     {
@@ -121,7 +137,9 @@ export const logRequestCompleted = ({
       componentType: ComponentType.unknown,
       method,
       correlationId,
-      enableAutoSubAccounts: store.subAccountsConfig.get()?.enableAutoSubAccounts,
+      subAccountCreation: config?.creation,
+      subAccountDefaultAccount: config?.defaultAccount,
+      subAccountFunding: config?.funding,
     },
     AnalyticsEventImportance.high
   );
diff --git a/packages/account-sdk/src/core/telemetry/events/scw-sub-account.ts b/packages/account-sdk/src/core/telemetry/events/scw-sub-account.ts
index 955e1138d..73bcb2c11 100644
--- a/packages/account-sdk/src/core/telemetry/events/scw-sub-account.ts
+++ b/packages/account-sdk/src/core/telemetry/events/scw-sub-account.ts
@@ -8,6 +8,7 @@ export const logSubAccountRequestStarted = ({
   method: string;
   correlationId: string | undefined;
 }) => {
+  const config = store.subAccountsConfig.get();
   logEvent(
     'scw_sub_account.request.started',
     {
@@ -15,7 +16,9 @@ export const logSubAccountRequestStarted = ({
       componentType: ComponentType.unknown,
       method,
       correlationId,
-      enableAutoSubAccounts: store.subAccountsConfig.get()?.enableAutoSubAccounts,
+      subAccountCreation: config?.creation,
+      subAccountDefaultAccount: config?.defaultAccount,
+      subAccountFunding: config?.funding,
     },
     AnalyticsEventImportance.high
   );
@@ -28,6 +31,7 @@ export const logSubAccountRequestCompleted = ({
   method: string;
   correlationId: string | undefined;
 }) => {
+  const config = store.subAccountsConfig.get();
   logEvent(
     'scw_sub_account.request.completed',
     {
@@ -35,7 +39,9 @@ export const logSubAccountRequestCompleted = ({
       componentType: ComponentType.unknown,
       method,
       correlationId,
-      enableAutoSubAccounts: store.subAccountsConfig.get()?.enableAutoSubAccounts,
+      subAccountCreation: config?.creation,
+      subAccountDefaultAccount: config?.defaultAccount,
+      subAccountFunding: config?.funding,
     },
     AnalyticsEventImportance.high
   );
@@ -50,6 +56,7 @@ export const logSubAccountRequestError = ({
   correlationId: string | undefined;
   errorMessage: string;
 }) => {
+  const config = store.subAccountsConfig.get();
   logEvent(
     'scw_sub_account.request.error',
     {
@@ -58,7 +65,9 @@ export const logSubAccountRequestError = ({
       method,
       correlationId,
       errorMessage,
-      enableAutoSubAccounts: store.subAccountsConfig.get()?.enableAutoSubAccounts,
+      subAccountCreation: config?.creation,
+      subAccountDefaultAccount: config?.defaultAccount,
+      subAccountFunding: config?.funding,
     },
     AnalyticsEventImportance.high
   );
@@ -71,6 +80,7 @@ export const logAddOwnerStarted = ({
   method: string;
   correlationId: string | undefined;
 }) => {
+  const config = store.subAccountsConfig.get();
   logEvent(
     'scw_sub_account.add_owner.started',
     {
@@ -78,7 +88,9 @@ export const logAddOwnerStarted = ({
       componentType: ComponentType.unknown,
       method,
       correlationId,
-      enableAutoSubAccounts: store.subAccountsConfig.get()?.enableAutoSubAccounts,
+      subAccountCreation: config?.creation,
+      subAccountDefaultAccount: config?.defaultAccount,
+      subAccountFunding: config?.funding,
     },
     AnalyticsEventImportance.high
   );
@@ -91,6 +103,7 @@ export const logAddOwnerCompleted = ({
   method: string;
   correlationId: string | undefined;
 }) => {
+  const config = store.subAccountsConfig.get();
   logEvent(
     'scw_sub_account.add_owner.completed',
     {
@@ -98,7 +111,9 @@ export const logAddOwnerCompleted = ({
       componentType: ComponentType.unknown,
       method,
       correlationId,
-      enableAutoSubAccounts: store.subAccountsConfig.get()?.enableAutoSubAccounts,
+      subAccountCreation: config?.creation,
+      subAccountDefaultAccount: config?.defaultAccount,
+      subAccountFunding: config?.funding,
     },
     AnalyticsEventImportance.high
   );
@@ -113,6 +128,7 @@ export const logAddOwnerError = ({
   correlationId: string | undefined;
   errorMessage: string;
 }) => {
+  const config = store.subAccountsConfig.get();
   logEvent(
     'scw_sub_account.add_owner.error',
     {
@@ -121,7 +137,9 @@ export const logAddOwnerError = ({
       method,
       correlationId,
       errorMessage,
-      enableAutoSubAccounts: store.subAccountsConfig.get()?.enableAutoSubAccounts,
+      subAccountCreation: config?.creation,
+      subAccountDefaultAccount: config?.defaultAccount,
+      subAccountFunding: config?.funding,
     },
     AnalyticsEventImportance.high
   );
@@ -134,6 +152,7 @@ export const logInsufficientBalanceErrorHandlingStarted = ({
   method: string;
   correlationId: string | undefined;
 }) => {
+  const config = store.subAccountsConfig.get();
   logEvent(
     'scw_sub_account.insufficient_balance.error_handling.started',
     {
@@ -141,7 +160,9 @@ export const logInsufficientBalanceErrorHandlingStarted = ({
       componentType: ComponentType.unknown,
       method,
       correlationId,
-      enableAutoSubAccounts: store.subAccountsConfig.get()?.enableAutoSubAccounts,
+      subAccountCreation: config?.creation,
+      subAccountDefaultAccount: config?.defaultAccount,
+      subAccountFunding: config?.funding,
     },
     AnalyticsEventImportance.high
   );
@@ -154,6 +175,7 @@ export const logInsufficientBalanceErrorHandlingCompleted = ({
   method: string;
   correlationId: string | undefined;
 }) => {
+  const config = store.subAccountsConfig.get();
   logEvent(
     'scw_sub_account.insufficient_balance.error_handling.completed',
     {
@@ -161,7 +183,9 @@ export const logInsufficientBalanceErrorHandlingCompleted = ({
       componentType: ComponentType.unknown,
       method,
       correlationId,
-      enableAutoSubAccounts: store.subAccountsConfig.get()?.enableAutoSubAccounts,
+      subAccountCreation: config?.creation,
+      subAccountDefaultAccount: config?.defaultAccount,
+      subAccountFunding: config?.funding,
     },
     AnalyticsEventImportance.high
   );
@@ -176,6 +200,7 @@ export const logInsufficientBalanceErrorHandlingError = ({
   correlationId: string | undefined;
   errorMessage: string;
 }) => {
+  const config = store.subAccountsConfig.get();
   logEvent(
     'scw_sub_account.insufficient_balance.error_handling.error',
     {
@@ -184,7 +209,9 @@ export const logInsufficientBalanceErrorHandlingError = ({
       method,
       correlationId,
       errorMessage,
-      enableAutoSubAccounts: store.subAccountsConfig.get()?.enableAutoSubAccounts,
+      subAccountCreation: config?.creation,
+      subAccountDefaultAccount: config?.defaultAccount,
+      subAccountFunding: config?.funding,
     },
     AnalyticsEventImportance.high
   );
diff --git a/packages/account-sdk/src/core/telemetry/events/subscription.ts b/packages/account-sdk/src/core/telemetry/events/subscription.ts
index d56318d82..56d3c7754 100644
--- a/packages/account-sdk/src/core/telemetry/events/subscription.ts
+++ b/packages/account-sdk/src/core/telemetry/events/subscription.ts
@@ -6,6 +6,7 @@ import { ActionType, AnalyticsEventImportance, ComponentType, logEvent } from '.
 export function logSubscriptionStarted(data: {
   recurringCharge: string;
   periodInDays: number;
+  periodInSeconds?: number; // Optional, only for testnet
   testnet: boolean;
   correlationId: string;
 }) {
@@ -20,6 +21,7 @@ export function logSubscriptionStarted(data: {
       amount: data.recurringCharge,
       testnet: data.testnet,
       periodInDays: data.periodInDays,
+      ...(data.periodInSeconds !== undefined && { periodInSeconds: data.periodInSeconds }),
     },
     AnalyticsEventImportance.high
   );
@@ -31,6 +33,7 @@ export function logSubscriptionStarted(data: {
 export function logSubscriptionCompleted(data: {
   recurringCharge: string;
   periodInDays: number;
+  periodInSeconds?: number; // Optional, only for testnet
   testnet: boolean;
   correlationId: string;
   permissionHash: string;
@@ -47,6 +50,7 @@ export function logSubscriptionCompleted(data: {
       testnet: data.testnet,
       periodInDays: data.periodInDays,
       status: data.permissionHash, // Using status field to store permission hash
+      ...(data.periodInSeconds !== undefined && { periodInSeconds: data.periodInSeconds }),
     },
     AnalyticsEventImportance.high
   );
@@ -58,6 +62,7 @@ export function logSubscriptionCompleted(data: {
 export function logSubscriptionError(data: {
   recurringCharge: string;
   periodInDays: number;
+  periodInSeconds?: number; // Optional, only for testnet
   testnet: boolean;
   correlationId: string;
   errorMessage: string;
@@ -74,6 +79,7 @@ export function logSubscriptionError(data: {
       testnet: data.testnet,
       periodInDays: data.periodInDays,
       errorMessage: data.errorMessage,
+      ...(data.periodInSeconds !== undefined && { periodInSeconds: data.periodInSeconds }),
     },
     AnalyticsEventImportance.high
   );
diff --git a/packages/account-sdk/src/core/telemetry/logEvent.ts b/packages/account-sdk/src/core/telemetry/logEvent.ts
index eed9da525..66b48423f 100644
--- a/packages/account-sdk/src/core/telemetry/logEvent.ts
+++ b/packages/account-sdk/src/core/telemetry/logEvent.ts
@@ -63,7 +63,9 @@ type CCAEventData = {
   errorMessage?: string;
   dialogContext?: string;
   dialogAction?: string;
-  enableAutoSubAccounts?: boolean;
+  subAccountCreation?: 'on-connect' | 'manual';
+  subAccountDefaultAccount?: 'sub' | 'universal';
+  subAccountFunding?: 'spend-permissions' | 'manual';
   // Payment-specific attributes
   amount?: string;
   testnet?: boolean;
diff --git a/packages/account-sdk/src/index.node.ts b/packages/account-sdk/src/index.node.ts
new file mode 100644
index 000000000..41c69bc8e
--- /dev/null
+++ b/packages/account-sdk/src/index.node.ts
@@ -0,0 +1,46 @@
+// Copyright (c) 2018-2025 Coinbase, Inc. <https://www.coinbase.com/>
+
+// Node.js-specific exports that include CDP SDK dependencies
+export type { AppMetadata, Preference, ProviderInterface } from ':core/provider/interface.js';
+
+export { createBaseAccountSDK } from './interface/builder/core/createBaseAccountSDK.js';
+
+export { getCryptoKeyAccount, removeCryptoKey } from './kms/crypto-key/index.js';
+
+export { PACKAGE_VERSION as VERSION } from './core/constants.js';
+
+// Payment interface exports - Node version with CDP SDK methods
+export {
+  CHAIN_IDS,
+  TOKENS,
+  base,
+  charge,
+  getOrCreateSubscriptionOwnerWallet,
+  getPaymentStatus,
+  getSubscriptionStatus,
+  pay,
+  prepareCharge,
+  subscribe,
+} from './interface/payment/index.node.js';
+export type {
+  ChargeOptions,
+  ChargeResult,
+  GetOrCreateSubscriptionOwnerWalletOptions,
+  GetOrCreateSubscriptionOwnerWalletResult,
+  InfoRequest,
+  PayerInfo,
+  PayerInfoResponses,
+  PaymentOptions,
+  PaymentResult,
+  PaymentStatus,
+  PaymentStatusOptions,
+  PaymentStatusType,
+  PaymentSuccess,
+  PrepareChargeCall,
+  PrepareChargeOptions,
+  PrepareChargeResult,
+  SubscriptionOptions,
+  SubscriptionResult,
+  SubscriptionStatus,
+  SubscriptionStatusOptions,
+} from './interface/payment/index.node.js';
diff --git a/packages/account-sdk/src/index.ts b/packages/account-sdk/src/index.ts
index a5ee76083..611749a7f 100644
--- a/packages/account-sdk/src/index.ts
+++ b/packages/account-sdk/src/index.ts
@@ -1,28 +1,34 @@
 // Copyright (c) 2018-2025 Coinbase, Inc. <https://www.coinbase.com/>
-export type { AppMetadata, Preference, ProviderInterface } from ':core/provider/interface.js';
+export type {
+  AppMetadata,
+  Preference,
+  ProviderInterface,
+} from ':core/provider/interface.js';
 
 export { createBaseAccountSDK } from './interface/builder/core/createBaseAccountSDK.js';
 
-export { getCryptoKeyAccount, removeCryptoKey } from './kms/crypto-key/index.js';
+export {
+  getCryptoKeyAccount,
+  removeCryptoKey,
+} from './kms/crypto-key/index.js';
+
+export { PACKAGE_VERSION as VERSION } from './core/constants.js';
 
-// Payment interface exports
 export {
-  CHAIN_IDS,
-  TOKENS,
   base,
-  charge,
+  CHAIN_IDS,
   getPaymentStatus,
-  getSubscriptionOwner,
   getSubscriptionStatus,
   pay,
   prepareCharge,
   subscribe,
+  TOKENS,
 } from './interface/payment/index.js';
 export type {
   ChargeOptions,
   ChargeResult,
-  GetSubscriptionOwnerOptions,
-  GetSubscriptionOwnerResult,
+  GetOrCreateSubscriptionOwnerWalletOptions,
+  GetOrCreateSubscriptionOwnerWalletResult,
   InfoRequest,
   PayerInfo,
   PayerInfoResponses,
@@ -40,3 +46,13 @@ export type {
   SubscriptionStatus,
   SubscriptionStatusOptions,
 } from './interface/payment/index.js';
+
+export {
+  createProlinkUrl,
+  decodeProlink,
+  encodeProlink,
+} from './interface/public-utilities/prolink/index.js';
+export type {
+  ProlinkDecoded,
+  ProlinkRequest,
+} from './interface/public-utilities/prolink/index.js';
diff --git a/packages/account-sdk/src/interface/builder/core/BaseAccountProvider.test.ts b/packages/account-sdk/src/interface/builder/core/BaseAccountProvider.test.ts
index ef5ff1b1a..6d855182f 100644
--- a/packages/account-sdk/src/interface/builder/core/BaseAccountProvider.test.ts
+++ b/packages/account-sdk/src/interface/builder/core/BaseAccountProvider.test.ts
@@ -116,9 +116,11 @@ describe('Ephemeral methods', () => {
 });
 
 describe('Auto sub account', () => {
-  it('call handshake without method when enableAutoSubAccounts is true', async () => {
+  it('call handshake without method when creation is on-connect', async () => {
     vi.spyOn(store.subAccountsConfig, 'get').mockReturnValue({
-      enableAutoSubAccounts: true,
+      creation: 'on-connect',
+      defaultAccount: 'sub',
+      funding: 'spend-permissions',
     });
 
     await provider.request({ method: 'eth_requestAccounts' });
diff --git a/packages/account-sdk/src/interface/builder/core/createBaseAccountSDK.test.ts b/packages/account-sdk/src/interface/builder/core/createBaseAccountSDK.test.ts
index eaefcd5b4..90854ed4f 100644
--- a/packages/account-sdk/src/interface/builder/core/createBaseAccountSDK.test.ts
+++ b/packages/account-sdk/src/interface/builder/core/createBaseAccountSDK.test.ts
@@ -147,8 +147,9 @@ describe('createProvider', () => {
       const params: CreateProviderOptions = {
         subAccounts: {
           toOwnerAccount: mockToOwnerAccount,
-          // @ts-expect-error - enableAutoSubAccounts is not officially supported yet
-          enableAutoSubAccounts: true,
+          creation: 'on-connect',
+          defaultAccount: 'sub',
+          funding: 'spend-permissions',
         },
       };
 
@@ -157,16 +158,16 @@ describe('createProvider', () => {
       expect(mockValidateSubAccount).toHaveBeenCalledWith(mockToOwnerAccount);
       expect(mockStore.subAccountsConfig.set).toHaveBeenCalledWith({
         toOwnerAccount: mockToOwnerAccount,
-        enableAutoSubAccounts: true,
-        unstable_enableAutoSpendPermissions: true,
+        creation: 'on-connect',
+        defaultAccount: 'sub',
+        funding: 'spend-permissions',
       });
     });
 
     it('should handle partial sub-account configuration', () => {
       const params: CreateProviderOptions = {
         subAccounts: {
-          // @ts-expect-error - enableAutoSubAccounts is not officially supported yet
-          enableAutoSubAccounts: true,
+          creation: 'on-connect',
         },
       };
 
@@ -175,8 +176,9 @@ describe('createProvider', () => {
       expect(mockValidateSubAccount).not.toHaveBeenCalled();
       expect(mockStore.subAccountsConfig.set).toHaveBeenCalledWith({
         toOwnerAccount: undefined,
-        enableAutoSubAccounts: true,
-        unstable_enableAutoSpendPermissions: true,
+        creation: 'on-connect',
+        defaultAccount: 'universal',
+        funding: 'spend-permissions',
       });
     });
 
@@ -189,19 +191,20 @@ describe('createProvider', () => {
 
       expect(mockStore.subAccountsConfig.set).toHaveBeenCalledWith({
         toOwnerAccount: undefined,
-        enableAutoSubAccounts: undefined,
-        unstable_enableAutoSpendPermissions: true,
+        creation: 'manual',
+        defaultAccount: 'universal',
+        funding: 'spend-permissions',
       });
     });
 
-    it('should set unstable_enableAutoSpendPermissions when provided', () => {
+    it('should set funding mode when provided', () => {
       const mockToOwnerAccount = vi.fn();
       const params: CreateProviderOptions = {
         subAccounts: {
           toOwnerAccount: mockToOwnerAccount,
-          // @ts-expect-error - enableAutoSubAccounts is not officially supported yet
-          enableAutoSubAccounts: true,
-          unstable_enableAutoSpendPermissions: true,
+          creation: 'on-connect',
+          defaultAccount: 'sub',
+          funding: 'manual',
         },
       };
 
@@ -210,12 +213,13 @@ describe('createProvider', () => {
       expect(mockValidateSubAccount).toHaveBeenCalledWith(mockToOwnerAccount);
       expect(mockStore.subAccountsConfig.set).toHaveBeenCalledWith({
         toOwnerAccount: mockToOwnerAccount,
-        enableAutoSubAccounts: true,
-        unstable_enableAutoSpendPermissions: true,
+        creation: 'on-connect',
+        defaultAccount: 'sub',
+        funding: 'manual',
       });
     });
 
-    it('should default unstable_enableAutoSpendPermissions to true when not provided', () => {
+    it('should apply default values when config options not provided', () => {
       const mockToOwnerAccount = vi.fn();
       const params: CreateProviderOptions = {
         subAccounts: {
@@ -227,17 +231,20 @@ describe('createProvider', () => {
 
       expect(mockStore.subAccountsConfig.set).toHaveBeenCalledWith({
         toOwnerAccount: mockToOwnerAccount,
-        enableAutoSubAccounts: undefined,
-        unstable_enableAutoSpendPermissions: true,
+        creation: 'manual',
+        defaultAccount: 'universal',
+        funding: 'spend-permissions',
       });
     });
 
-    it('should default unstable_enableAutoSpendPermissions to true when explicitly set to undefined', () => {
+    it('should use default values when explicitly set to undefined', () => {
       const mockToOwnerAccount = vi.fn();
       const params: CreateProviderOptions = {
         subAccounts: {
           toOwnerAccount: mockToOwnerAccount,
-          unstable_enableAutoSpendPermissions: undefined,
+          creation: undefined,
+          defaultAccount: undefined,
+          funding: undefined,
         },
       };
 
@@ -245,8 +252,9 @@ describe('createProvider', () => {
 
       expect(mockStore.subAccountsConfig.set).toHaveBeenCalledWith({
         toOwnerAccount: mockToOwnerAccount,
-        enableAutoSubAccounts: undefined,
-        unstable_enableAutoSpendPermissions: true,
+        creation: 'manual',
+        defaultAccount: 'universal',
+        funding: 'spend-permissions',
       });
     });
   });
@@ -390,8 +398,9 @@ describe('createProvider', () => {
         },
         subAccounts: {
           toOwnerAccount: mockToOwnerAccount,
-          // @ts-expect-error - enableAutoSubAccounts is not officially supported yet
-          enableAutoSubAccounts: true,
+          creation: 'on-connect',
+          defaultAccount: 'sub',
+          funding: 'spend-permissions',
         },
         paymasterUrls: {
           1: 'https://paymaster.example.com',
@@ -404,8 +413,9 @@ describe('createProvider', () => {
       expect(mockValidateSubAccount).toHaveBeenCalledWith(mockToOwnerAccount);
       expect(mockStore.subAccountsConfig.set).toHaveBeenCalledWith({
         toOwnerAccount: mockToOwnerAccount,
-        enableAutoSubAccounts: true,
-        unstable_enableAutoSpendPermissions: true,
+        creation: 'on-connect',
+        defaultAccount: 'sub',
+        funding: 'spend-permissions',
       });
 
       // Check store configuration
diff --git a/packages/account-sdk/src/interface/builder/core/createBaseAccountSDK.ts b/packages/account-sdk/src/interface/builder/core/createBaseAccountSDK.ts
index cfd277317..547186b26 100644
--- a/packages/account-sdk/src/interface/builder/core/createBaseAccountSDK.ts
+++ b/packages/account-sdk/src/interface/builder/core/createBaseAccountSDK.ts
@@ -19,7 +19,7 @@ import { getInjectedProvider } from './getInjectedProvider.js';
 
 export type CreateProviderOptions = Partial<AppMetadata> & {
   preference?: Preference;
-  subAccounts?: Omit<SubAccountOptions, 'enableAutoSubAccounts'>;
+  subAccounts?: SubAccountOptions;
   paymasterUrls?: Record<number, string>;
 };
 
@@ -49,10 +49,9 @@ export function createBaseAccountSDK(params: CreateProviderOptions) {
 
   store.subAccountsConfig.set({
     toOwnerAccount: params.subAccounts?.toOwnerAccount,
-    // @ts-expect-error - enableSubAccounts is not officially supported yet
-    enableAutoSubAccounts: params.subAccounts?.enableAutoSubAccounts,
-    unstable_enableAutoSpendPermissions:
-      params.subAccounts?.unstable_enableAutoSpendPermissions ?? true,
+    creation: params.subAccounts?.creation ?? 'manual',
+    defaultAccount: params.subAccounts?.defaultAccount ?? 'universal',
+    funding: params.subAccounts?.funding ?? 'spend-permissions',
   });
 
   //  ====================================================================
diff --git a/packages/account-sdk/src/interface/builder/core/getInjectedProvider.test.ts b/packages/account-sdk/src/interface/builder/core/getInjectedProvider.test.ts
index 65a69d662..fd0140deb 100644
--- a/packages/account-sdk/src/interface/builder/core/getInjectedProvider.test.ts
+++ b/packages/account-sdk/src/interface/builder/core/getInjectedProvider.test.ts
@@ -1,6 +1,11 @@
+import { logGetInjectedProviderError } from ':core/telemetry/events/provider.js';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import { getInjectedProvider } from './getInjectedProvider.js';
 
+vi.mock(':core/telemetry/events/provider.js', () => ({
+  logGetInjectedProviderError: vi.fn(),
+}));
+
 // Mock the global window object
 const mockWindow = {
   ethereum: undefined as any,
@@ -19,7 +24,9 @@ describe('getInjectedProvider', () => {
 
     // Reset the mock window state
     mockWindow.ethereum = undefined;
-    mockWindow.top.ethereum = undefined;
+    mockWindow.top = {
+      ethereum: undefined as any,
+    };
 
     // Set up the global window mock
     global.window = mockWindow as any;
@@ -192,4 +199,23 @@ describe('getInjectedProvider', () => {
       expect(result).toBeNull();
     });
   });
+
+  describe('error handling', () => {
+    it('should return null and log error when accessing window.ethereum throws', () => {
+      // Mock window.ethereum as a getter that throws
+      Object.defineProperty(mockWindow, 'ethereum', {
+        get: () => {
+          throw new Error('Access denied');
+        },
+        configurable: true,
+      });
+
+      const result = getInjectedProvider();
+
+      expect(result).toBeNull();
+      expect(vi.mocked(logGetInjectedProviderError)).toHaveBeenCalledWith({
+        errorMessage: 'Access denied',
+      });
+    });
+  });
 });
diff --git a/packages/account-sdk/src/interface/builder/core/getInjectedProvider.ts b/packages/account-sdk/src/interface/builder/core/getInjectedProvider.ts
index 395d1a836..e181b24c0 100644
--- a/packages/account-sdk/src/interface/builder/core/getInjectedProvider.ts
+++ b/packages/account-sdk/src/interface/builder/core/getInjectedProvider.ts
@@ -1,4 +1,6 @@
 import { ProviderInterface } from ':core/provider/interface.js';
+import { logGetInjectedProviderError } from ':core/telemetry/events/provider.js';
+import { parseErrorMessageFromAny } from ':core/telemetry/utils.js';
 
 declare global {
   interface Window {
@@ -13,11 +15,18 @@ type InjectedProvider = ProviderInterface & {
 };
 
 export function getInjectedProvider(): InjectedProvider | null {
-  const injectedProvider = window.top?.ethereum ?? window.ethereum;
+  try {
+    const injectedProvider = window.top?.ethereum ?? window.ethereum;
 
-  if (injectedProvider?.[TBA_PROVIDER_IDENTIFIER]) {
-    return injectedProvider;
-  }
+    if (injectedProvider?.[TBA_PROVIDER_IDENTIFIER]) {
+      return injectedProvider;
+    }
 
-  return null;
+    return null;
+  } catch (error) {
+    logGetInjectedProviderError({
+      errorMessage: parseErrorMessageFromAny(error),
+    });
+    return null;
+  }
 }
diff --git a/packages/account-sdk/src/interface/payment/base.browser.ts b/packages/account-sdk/src/interface/payment/base.browser.ts
new file mode 100644
index 000000000..ad7b7492d
--- /dev/null
+++ b/packages/account-sdk/src/interface/payment/base.browser.ts
@@ -0,0 +1,54 @@
+import { CHAIN_IDS, TOKENS } from './constants.js';
+import { getPaymentStatus } from './getPaymentStatus.js';
+import { getSubscriptionStatus } from './getSubscriptionStatus.js';
+import { pay } from './pay.js';
+import { prepareCharge } from './prepareCharge.js';
+import { prepareRevoke } from './prepareRevoke.js';
+import { subscribe } from './subscribe.js';
+import type {
+  PaymentOptions,
+  PaymentResult,
+  PaymentStatus,
+  PaymentStatusOptions,
+  PrepareChargeOptions,
+  PrepareChargeResult,
+  PrepareRevokeOptions,
+  PrepareRevokeResult,
+  SubscriptionOptions,
+  SubscriptionResult,
+  SubscriptionStatus,
+  SubscriptionStatusOptions,
+} from './types.js';
+
+/**
+ * Browser payment interface
+ */
+export const base = {
+  pay,
+  subscribe,
+  getPaymentStatus,
+  subscription: {
+    subscribe,
+    getStatus: getSubscriptionStatus,
+    prepareCharge,
+    prepareRevoke,
+  },
+  constants: {
+    CHAIN_IDS,
+    TOKENS,
+  },
+  types: {} as {
+    PaymentOptions: PaymentOptions;
+    PaymentResult: PaymentResult;
+    PaymentStatusOptions: PaymentStatusOptions;
+    PaymentStatus: PaymentStatus;
+    PrepareChargeOptions: PrepareChargeOptions;
+    PrepareChargeResult: PrepareChargeResult;
+    PrepareRevokeOptions: PrepareRevokeOptions;
+    PrepareRevokeResult: PrepareRevokeResult;
+    SubscriptionOptions: SubscriptionOptions;
+    SubscriptionResult: SubscriptionResult;
+    SubscriptionStatus: SubscriptionStatus;
+    SubscriptionStatusOptions: SubscriptionStatusOptions;
+  },
+};
diff --git a/packages/account-sdk/src/interface/payment/base.node.ts b/packages/account-sdk/src/interface/payment/base.node.ts
new file mode 100644
index 000000000..ba79de92e
--- /dev/null
+++ b/packages/account-sdk/src/interface/payment/base.node.ts
@@ -0,0 +1,72 @@
+import { charge } from './charge.js';
+import { CHAIN_IDS, TOKENS } from './constants.js';
+import { getOrCreateSubscriptionOwnerWallet } from './getOrCreateSubscriptionOwnerWallet.js';
+import { getPaymentStatus } from './getPaymentStatus.js';
+import { getSubscriptionStatus } from './getSubscriptionStatus.js';
+import { pay } from './pay.js';
+import { prepareCharge } from './prepareCharge.js';
+import { prepareRevoke } from './prepareRevoke.js';
+import { revoke } from './revoke.js';
+import { subscribe } from './subscribe.js';
+import type {
+  ChargeOptions,
+  ChargeResult,
+  GetOrCreateSubscriptionOwnerWalletOptions,
+  GetOrCreateSubscriptionOwnerWalletResult,
+  PaymentOptions,
+  PaymentResult,
+  PaymentStatus,
+  PaymentStatusOptions,
+  PrepareChargeOptions,
+  PrepareChargeResult,
+  PrepareRevokeOptions,
+  PrepareRevokeResult,
+  RevokeOptions,
+  RevokeResult,
+  SubscriptionOptions,
+  SubscriptionResult,
+  SubscriptionStatus,
+  SubscriptionStatusOptions,
+} from './types.js';
+
+/**
+ * Node.js payment interface
+ */
+export const base = {
+  pay,
+  subscribe,
+  getPaymentStatus,
+  subscription: {
+    subscribe,
+    getStatus: getSubscriptionStatus,
+    prepareCharge,
+    charge,
+    prepareRevoke,
+    revoke,
+    getOrCreateSubscriptionOwnerWallet,
+  },
+  constants: {
+    CHAIN_IDS,
+    TOKENS,
+  },
+  types: {} as {
+    PaymentOptions: PaymentOptions;
+    PaymentResult: PaymentResult;
+    PaymentStatusOptions: PaymentStatusOptions;
+    PaymentStatus: PaymentStatus;
+    PrepareChargeOptions: PrepareChargeOptions;
+    PrepareChargeResult: PrepareChargeResult;
+    ChargeOptions: ChargeOptions;
+    ChargeResult: ChargeResult;
+    PrepareRevokeOptions: PrepareRevokeOptions;
+    PrepareRevokeResult: PrepareRevokeResult;
+    RevokeOptions: RevokeOptions;
+    RevokeResult: RevokeResult;
+    SubscriptionOptions: SubscriptionOptions;
+    SubscriptionResult: SubscriptionResult;
+    SubscriptionStatus: SubscriptionStatus;
+    SubscriptionStatusOptions: SubscriptionStatusOptions;
+    GetOrCreateSubscriptionOwnerWalletOptions: GetOrCreateSubscriptionOwnerWalletOptions;
+    GetOrCreateSubscriptionOwnerWalletResult: GetOrCreateSubscriptionOwnerWalletResult;
+  },
+};
diff --git a/packages/account-sdk/src/interface/payment/base.ts b/packages/account-sdk/src/interface/payment/base.ts
index 183b1cd0f..04d9699d0 100644
--- a/packages/account-sdk/src/interface/payment/base.ts
+++ b/packages/account-sdk/src/interface/payment/base.ts
@@ -1,60 +1,4 @@
-import { charge } from './charge.js';
-import { CHAIN_IDS, TOKENS } from './constants.js';
-import { getPaymentStatus } from './getPaymentStatus.js';
-import { getSubscriptionOwner } from './getSubscriptionOwner.js';
-import { getSubscriptionStatus } from './getSubscriptionStatus.js';
-import { pay } from './pay.js';
-import { prepareCharge } from './prepareCharge.js';
-import { subscribe } from './subscribe.js';
-import type {
-  ChargeOptions,
-  ChargeResult,
-  GetSubscriptionOwnerOptions,
-  GetSubscriptionOwnerResult,
-  PaymentOptions,
-  PaymentResult,
-  PaymentStatus,
-  PaymentStatusOptions,
-  PrepareChargeOptions,
-  PrepareChargeResult,
-  SubscriptionOptions,
-  SubscriptionResult,
-  SubscriptionStatus,
-  SubscriptionStatusOptions,
-} from './types.js';
-
 /**
- * Base payment interface
+ * Base payment interface export
  */
-export const base = {
-  pay,
-  subscribe,
-  getPaymentStatus,
-  subscription: {
-    subscribe,
-    getStatus: getSubscriptionStatus,
-    prepareCharge,
-    charge,
-    getSubscriptionOwner,
-  },
-  constants: {
-    CHAIN_IDS,
-    TOKENS,
-  },
-  types: {} as {
-    PaymentOptions: PaymentOptions;
-    PaymentResult: PaymentResult;
-    PaymentStatusOptions: PaymentStatusOptions;
-    PaymentStatus: PaymentStatus;
-    PrepareChargeOptions: PrepareChargeOptions;
-    PrepareChargeResult: PrepareChargeResult;
-    ChargeOptions: ChargeOptions;
-    ChargeResult: ChargeResult;
-    SubscriptionOptions: SubscriptionOptions;
-    SubscriptionResult: SubscriptionResult;
-    SubscriptionStatus: SubscriptionStatus;
-    SubscriptionStatusOptions: SubscriptionStatusOptions;
-    GetSubscriptionOwnerOptions: GetSubscriptionOwnerOptions;
-    GetSubscriptionOwnerResult: GetSubscriptionOwnerResult;
-  },
-};
+export { base } from './base.node.js';
diff --git a/packages/account-sdk/src/interface/payment/charge.test.ts b/packages/account-sdk/src/interface/payment/charge.test.ts
index d3f6b1ec1..2885df508 100644
--- a/packages/account-sdk/src/interface/payment/charge.test.ts
+++ b/packages/account-sdk/src/interface/payment/charge.test.ts
@@ -32,8 +32,8 @@ describe('charge', () => {
 
   const mockCdpClient = {
     evm: {
-      getOrCreateAccount: vi.fn(),
-      getOrCreateSmartAccount: vi.fn(),
+      getAccount: vi.fn(),
+      getSmartAccount: vi.fn(),
       sendUserOperation: vi.fn(),
     },
   };
@@ -42,7 +42,7 @@ describe('charge', () => {
     {
       to: '0xabc123' as any,
       data: '0xdef456' as any,
-      value: '0x0' as any,
+      value: 0n,
     },
   ];
 
@@ -51,8 +51,8 @@ describe('charge', () => {
 
     // Setup default mocks
     (CdpClient as any).mockImplementation(() => mockCdpClient);
-    mockCdpClient.evm.getOrCreateAccount.mockResolvedValue(mockEoaAccount);
-    mockCdpClient.evm.getOrCreateSmartAccount.mockResolvedValue(mockSmartAccount);
+    mockCdpClient.evm.getAccount.mockResolvedValue(mockEoaAccount);
+    mockCdpClient.evm.getSmartAccount.mockResolvedValue(mockSmartAccount);
     mockSmartAccount.useNetwork.mockResolvedValue(mockNetworkSmartAccount);
     mockNetworkSmartAccount.sendUserOperation.mockResolvedValue({
       smartAccountAddress: mockSmartAccount.address,
@@ -93,14 +93,14 @@ describe('charge', () => {
         walletSecret: 'test-wallet-secret',
       });
 
-      // Verify EOA account creation
-      expect(mockCdpClient.evm.getOrCreateAccount).toHaveBeenCalledWith({
+      // Verify EOA account retrieval
+      expect(mockCdpClient.evm.getAccount).toHaveBeenCalledWith({
         name: 'subscription owner',
       });
 
-      // Verify smart account creation
-      expect(mockCdpClient.evm.getOrCreateSmartAccount).toHaveBeenCalledWith({
-        name: 'subscription owner-smart',
+      // Verify smart account retrieval
+      expect(mockCdpClient.evm.getSmartAccount).toHaveBeenCalledWith({
+        name: 'subscription owner',
         owner: mockEoaAccount,
       });
 
@@ -110,6 +110,7 @@ describe('charge', () => {
         amount: options.amount,
         testnet: options.testnet,
         recipient: undefined,
+        rpcUrl: undefined,
       });
 
       // Verify network selection
@@ -140,7 +141,7 @@ describe('charge', () => {
         id: '0xabcdef1234567890123456789012345678901234567890123456789012345678',
         subscriptionId: options.id,
         amount: options.amount,
-        chargedBy: mockSmartAccount.address,
+        subscriptionOwner: mockSmartAccount.address,
       });
     });
 
@@ -177,6 +178,7 @@ describe('charge', () => {
         amount: 'max-remaining-charge',
         testnet: options.testnet,
         recipient: undefined,
+        rpcUrl: undefined,
       });
 
       expect(result.amount).toBe('max');
@@ -195,7 +197,7 @@ describe('charge', () => {
 
       await charge(options);
 
-      expect(mockCdpClient.evm.getOrCreateAccount).toHaveBeenCalledWith({
+      expect(mockCdpClient.evm.getAccount).toHaveBeenCalledWith({
         name: 'my-custom-wallet',
       });
     });
@@ -205,12 +207,12 @@ describe('charge', () => {
         {
           to: '0xabc123' as any,
           data: '0xdef456' as any,
-          value: '0x0' as any,
+          value: 0n,
         },
         {
           to: '0xfed321' as any,
           data: '0xcba987' as any,
-          value: '0x0' as any,
+          value: 0n,
         },
       ];
 
@@ -252,7 +254,7 @@ describe('charge', () => {
         {
           to: '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913' as any, // USDC address
           data: '0xtransferData' as any,
-          value: '0x0' as any,
+          value: 0n,
         },
       ];
 
@@ -277,6 +279,7 @@ describe('charge', () => {
         amount: options.amount,
         testnet: options.testnet,
         recipient: recipientAddress,
+        rpcUrl: undefined,
       });
 
       // Verify that sendUserOperation was called with all calls from prepareCharge
@@ -294,7 +297,7 @@ describe('charge', () => {
         id: '0xabcdef1234567890123456789012345678901234567890123456789012345678',
         subscriptionId: options.id,
         amount: options.amount,
-        chargedBy: mockSmartAccount.address,
+        subscriptionOwner: mockSmartAccount.address,
         recipient: recipientAddress,
       });
     });
@@ -306,7 +309,7 @@ describe('charge', () => {
         {
           to: '0x036CbD53842c5426634e7929541eC2318f3dCF7e' as any, // USDC testnet address
           data: '0xtransferData' as any,
-          value: '0x0' as any,
+          value: 0n,
         },
       ];
 
@@ -331,6 +334,7 @@ describe('charge', () => {
         amount: options.amount,
         testnet: options.testnet,
         recipient: recipientAddress,
+        rpcUrl: undefined,
       });
 
       // Verify testnet network selection
@@ -344,7 +348,7 @@ describe('charge', () => {
         {
           to: '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913' as any, // USDC address
           data: '0xtransferData' as any,
-          value: '0x0' as any,
+          value: 0n,
         },
       ];
 
@@ -369,6 +373,7 @@ describe('charge', () => {
         amount: 'max-remaining-charge',
         testnet: options.testnet,
         recipient: recipientAddress,
+        rpcUrl: undefined,
       });
 
       // Verify result
@@ -377,10 +382,40 @@ describe('charge', () => {
         id: '0xabcdef1234567890123456789012345678901234567890123456789012345678',
         subscriptionId: options.id,
         amount: 'max',
-        chargedBy: mockSmartAccount.address,
+        subscriptionOwner: mockSmartAccount.address,
         recipient: recipientAddress,
       });
     });
+
+    it('should pass rpcUrl to prepareCharge when provided', async () => {
+      const customRpcUrl = 'https://my-custom-rpc.example.com';
+      const options = {
+        id: '0x71319cd488f8e4f24687711ec5c95d9e0c1bacbf5c1064942937eba4c7cf2984',
+        amount: '9.99',
+        testnet: false,
+        rpcUrl: customRpcUrl,
+      };
+
+      const result = await charge(options);
+
+      // Verify prepareCharge was called with custom rpcUrl
+      expect(prepareChargeModule.prepareCharge).toHaveBeenCalledWith({
+        id: options.id,
+        amount: options.amount,
+        testnet: options.testnet,
+        recipient: undefined,
+        rpcUrl: customRpcUrl,
+      });
+
+      // Verify result
+      expect(result).toEqual({
+        success: true,
+        id: '0xabcdef1234567890123456789012345678901234567890123456789012345678',
+        subscriptionId: options.id,
+        amount: options.amount,
+        subscriptionOwner: mockSmartAccount.address,
+      });
+    });
   });
 
   describe('error handling', () => {
@@ -400,8 +435,23 @@ describe('charge', () => {
       );
     });
 
-    it('should throw error when wallet creation fails', async () => {
-      mockCdpClient.evm.getOrCreateAccount.mockRejectedValue(new Error('Failed to create wallet'));
+    it('should throw error when wallet not found', async () => {
+      mockCdpClient.evm.getAccount.mockResolvedValue(null);
+
+      const options = {
+        id: '0x71319cd488f8e4f24687711ec5c95d9e0c1bacbf5c1064942937eba4c7cf2984',
+        amount: '9.99',
+        testnet: false,
+        cdpApiKeyId: 'test-api-key',
+        cdpApiKeySecret: 'test-api-secret',
+        cdpWalletSecret: 'test-wallet-secret',
+      };
+
+      await expect(charge(options)).rejects.toThrow('EOA wallet "subscription owner" not found');
+    });
+
+    it('should throw error when smart wallet not found', async () => {
+      mockCdpClient.evm.getSmartAccount.mockResolvedValue(null);
 
       const options = {
         id: '0x71319cd488f8e4f24687711ec5c95d9e0c1bacbf5c1064942937eba4c7cf2984',
@@ -412,7 +462,7 @@ describe('charge', () => {
         cdpWalletSecret: 'test-wallet-secret',
       };
 
-      await expect(charge(options)).rejects.toThrow('Failed to get or create charge smart wallet');
+      await expect(charge(options)).rejects.toThrow('Smart wallet "subscription owner" not found');
     });
 
     it('should throw error when charge preparation fails', async () => {
diff --git a/packages/account-sdk/src/interface/payment/charge.ts b/packages/account-sdk/src/interface/payment/charge.ts
index c2cf02414..ce0876c5a 100644
--- a/packages/account-sdk/src/interface/payment/charge.ts
+++ b/packages/account-sdk/src/interface/payment/charge.ts
@@ -1,20 +1,22 @@
-import { CdpClient } from '@coinbase/cdp-sdk';
 import { type Address } from 'viem';
 import { prepareCharge } from './prepareCharge.js';
 import type { ChargeOptions, ChargeResult } from './types.js';
+import { createCdpClientOrThrow } from './utils/createCdpClientOrThrow.js';
+import { getExistingSmartWalletOrThrow } from './utils/getExistingSmartWalletOrThrow.js';
+import { sendUserOpAndWait } from './utils/sendUserOpAndWait.js';
 
 /**
  * Prepares and executes a charge for a given spend permission.
  *
  * Note: This function relies on Node.js APIs and is only available in Node.js environments.
  *
- * This function combines the functionality of getSubscriptionOwner and prepareCharge,
+ * This function combines the functionality of getOrCreateSubscriptionOwnerWallet and prepareCharge,
  * then executes the charge using a CDP smart wallet. The smart wallet is controlled
  * by an EVM account and can leverage paymasters for gas sponsorship.
  *
  * The function will:
  * - Use the provided CDP credentials or fall back to environment variables
- * - Create or retrieve a smart wallet to act as the subscription owner
+ * - Get the existing smart wallet that acts as the subscription owner
  * - Prepare the charge call data using the subscription ID
  * - Execute the charge transaction using the smart wallet
  * - Optionally use a paymaster for transaction sponsorship
@@ -29,6 +31,7 @@ import type { ChargeOptions, ChargeResult } from './types.js';
  * @param options.walletName - Custom wallet name. Defaults to "subscription owner"
  * @param options.paymasterUrl - Paymaster URL for sponsorship. Falls back to PAYMASTER_URL env var
  * @param options.recipient - Optional recipient address to receive the charged USDC
+ * @param options.rpcUrl - Optional custom RPC URL to use for blockchain queries. Useful for avoiding rate limits on public endpoints.
  * @returns Promise<ChargeResult> - Result of the charge transaction
  * @throws Error if CDP credentials are missing, subscription not found, or charge fails
  *
@@ -70,6 +73,14 @@ import type { ChargeOptions, ChargeResult } from './types.js';
  *   recipient: '0x742d35Cc6634C0532925a3b844Bc9e7595f0bEb8',
  *   testnet: false
  * });
+ *
+ * // With custom RPC URL to avoid rate limits
+ * const charge = await base.subscription.charge({
+ *   id: '0x71319cd488f8e4f24687711ec5c95d9e0c1bacbf5c1064942937eba4c7cf2984',
+ *   amount: '9.99',
+ *   testnet: false,
+ *   rpcUrl: 'https://my-custom-rpc.example.com'
+ * });
  * ```
  */
 export async function charge(options: ChargeOptions): Promise<ChargeResult> {
@@ -83,99 +94,38 @@ export async function charge(options: ChargeOptions): Promise<ChargeResult> {
     walletName = 'subscription owner',
     paymasterUrl = process.env.PAYMASTER_URL,
     recipient,
+    rpcUrl,
   } = options;
 
   // Step 1: Initialize CDP client with provided credentials or environment variables
-  let cdpClient: CdpClient;
-
-  try {
-    cdpClient = new CdpClient({
-      apiKeyId: cdpApiKeyId,
-      apiKeySecret: cdpApiKeySecret,
-      walletSecret: cdpWalletSecret,
-    });
-  } catch (error) {
-    // Re-throw with more context about what credentials are missing
-    const errorMessage = error instanceof Error ? error.message : String(error);
-    throw new Error(
-      `Failed to initialize CDP client for subscription charge. ${errorMessage}\n\nPlease ensure you have set the required CDP credentials either:\n1. As environment variables: CDP_API_KEY_ID, CDP_API_KEY_SECRET, CDP_WALLET_SECRET\n2. As function parameters: cdpApiKeyId, cdpApiKeySecret, cdpWalletSecret\n\nYou can get these credentials from https://portal.cdp.coinbase.com/`
-    );
-  }
-
-  // Step 2: Get or create the EVM account and smart wallet
-  let smartWallet;
-  try {
-    // First get or create the EOA that will own the smart wallet
-    const eoaAccount = await cdpClient.evm.getOrCreateAccount({ name: walletName });
+  const cdpClient = createCdpClientOrThrow(
+    { cdpApiKeyId, cdpApiKeySecret, cdpWalletSecret },
+    'subscription charge'
+  );
 
-    // Get or create a smart wallet with the EOA as owner
-    // Using getOrCreateSmartAccount ensures idempotency
-    const smartWalletName = `${walletName}-smart`;
-    smartWallet = await cdpClient.evm.getOrCreateSmartAccount({
-      name: smartWalletName,
-      owner: eoaAccount,
-      // Note: We don't set enableSpendPermissions since this wallet will use
-      // spend permissions, not grant them to others
-    });
-  } catch (error) {
-    const errorMessage = error instanceof Error ? error.message : String(error);
-    throw new Error(`Failed to get or create charge smart wallet "${walletName}": ${errorMessage}`);
-  }
+  // Step 2: Get the existing EVM account and smart wallet
+  // NOTE: We use get() instead of getOrCreate() to ensure the wallet already exists.
+  // The wallet should have been created prior to executing a charge on it.
+  const smartWallet = await getExistingSmartWalletOrThrow(cdpClient, walletName, 'charge');
 
-  // Step 3: Prepare the charge call data (including optional recipient transfer)
-  const chargeCalls = await prepareCharge({ id, amount, testnet, recipient });
+  // Step 3: Prepare the charge call data (including optional recipient transfer and custom RPC URL)
+  const chargeCalls = await prepareCharge({ id, amount, testnet, recipient, rpcUrl });
 
   // Step 4: Get the network-scoped smart wallet
   const network = testnet ? 'base-sepolia' : 'base';
-  // biome-ignore lint/correctness/useHookAtTopLevel: useNetwork is not a React hook, it's a CDP SDK method
   const networkSmartWallet = await smartWallet.useNetwork(network);
 
   // Step 5: Execute the charge transaction(s) using the smart wallet
   // Smart wallets can batch multiple calls and use paymasters for gas sponsorship
-  let transactionHash: string | undefined;
-
-  try {
-    // Build the calls array for the smart wallet
-    // Convert value from hex string to bigint if needed
-    const calls = chargeCalls.map((call) => ({
-      to: call.to,
-      data: call.data,
-      value: BigInt(call.value || '0x0'),
-    }));
-
-    // For smart wallets, we can send all calls in a single user operation
-    // This is more efficient and allows for better paymaster integration
-
-    // Send the user operation
-    const userOpResult = await networkSmartWallet.sendUserOperation({
-      calls,
-      ...(paymasterUrl && { paymasterUrl }),
-    });
-
-    // The sendUserOperation returns { smartAccountAddress, status: "broadcast", userOpHash }
-    // We need to wait for the operation to complete to get the transaction hash
-    const completedOp = await networkSmartWallet.waitForUserOperation({
-      userOpHash: userOpResult.userOpHash,
-      waitOptions: {
-        timeoutSeconds: 60, // Wait up to 60 seconds for the operation to complete
-      },
-    });
-
-    // Check if the operation was successful
-    if (completedOp.status === 'failed') {
-      throw new Error(`User operation failed: ${userOpResult.userOpHash}`);
-    }
-
-    // For completed operations, we have the transaction hash
-    transactionHash = completedOp.transactionHash;
-  } catch (error) {
-    const errorMessage = error instanceof Error ? error.message : String(error);
-    throw new Error(`Failed to execute charge transaction with smart wallet: ${errorMessage}`);
-  }
-
-  if (!transactionHash) {
-    throw new Error('No transaction hash received from charge execution');
-  }
+  // For smart wallets, we can send all calls in a single user operation
+  // This is more efficient and allows for better paymaster integration
+  const transactionHash = await sendUserOpAndWait(
+    networkSmartWallet,
+    chargeCalls,
+    paymasterUrl,
+    60, // Wait up to 60 seconds for the operation to complete
+    'charge'
+  );
 
   // Return success result
   return {
@@ -183,7 +133,7 @@ export async function charge(options: ChargeOptions): Promise<ChargeResult> {
     id: transactionHash,
     subscriptionId: id,
     amount: amount === 'max-remaining-charge' ? 'max' : amount,
-    chargedBy: smartWallet.address as Address,
+    subscriptionOwner: smartWallet.address as Address,
     ...(recipient && { recipient }),
   };
 }
diff --git a/packages/account-sdk/src/interface/payment/getSubscriptionOwner.test.ts b/packages/account-sdk/src/interface/payment/getOrCreateSubscriptionOwnerWallet.test.ts
similarity index 85%
rename from packages/account-sdk/src/interface/payment/getSubscriptionOwner.test.ts
rename to packages/account-sdk/src/interface/payment/getOrCreateSubscriptionOwnerWallet.test.ts
index ff9585933..a22f550c8 100644
--- a/packages/account-sdk/src/interface/payment/getSubscriptionOwner.test.ts
+++ b/packages/account-sdk/src/interface/payment/getOrCreateSubscriptionOwnerWallet.test.ts
@@ -1,14 +1,14 @@
 import { CdpClient } from '@coinbase/cdp-sdk';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-import { getSubscriptionOwner } from './getSubscriptionOwner.js';
-import type { GetSubscriptionOwnerOptions } from './types.js';
+import { getOrCreateSubscriptionOwnerWallet } from './getOrCreateSubscriptionOwnerWallet.js';
+import type { GetOrCreateSubscriptionOwnerWalletOptions } from './types.js';
 
 // Mock the CDP SDK
 vi.mock('@coinbase/cdp-sdk', () => ({
   CdpClient: vi.fn(),
 }));
 
-describe('getSubscriptionOwner', () => {
+describe('getOrCreateSubscriptionOwnerWallet', () => {
   let mockCdpClient: any;
   let mockEoaAccount: any;
   let mockSmartAccount: any;
@@ -48,7 +48,7 @@ describe('getSubscriptionOwner', () => {
 
   describe('successful smart wallet creation/retrieval', () => {
     it('should create a smart wallet with default name', async () => {
-      const result = await getSubscriptionOwner({
+      const result = await getOrCreateSubscriptionOwnerWallet({
         cdpApiKeyId: 'test-key-id',
         cdpApiKeySecret: 'test-key-secret',
         cdpWalletSecret: 'test-wallet-secret',
@@ -56,7 +56,7 @@ describe('getSubscriptionOwner', () => {
 
       expect(result).toEqual({
         address: '0xabcdef1234567890123456789012345678901234',
-        walletName: 'subscription owner-smart',
+        walletName: 'subscription owner',
         eoaAddress: '0x1234567890123456789012345678901234567890',
       });
 
@@ -71,13 +71,13 @@ describe('getSubscriptionOwner', () => {
       });
 
       expect(mockCdpClient.evm.getOrCreateSmartAccount).toHaveBeenCalledWith({
-        name: 'subscription owner-smart',
+        name: 'subscription owner',
         owner: mockEoaAccount,
       });
     });
 
     it('should retrieve an existing smart wallet', async () => {
-      const result = await getSubscriptionOwner({
+      const result = await getOrCreateSubscriptionOwnerWallet({
         cdpApiKeyId: 'test-key-id',
         cdpApiKeySecret: 'test-key-secret',
         cdpWalletSecret: 'test-wallet-secret',
@@ -85,13 +85,13 @@ describe('getSubscriptionOwner', () => {
 
       expect(result).toEqual({
         address: '0xabcdef1234567890123456789012345678901234',
-        walletName: 'subscription owner-smart',
+        walletName: 'subscription owner',
         eoaAddress: '0x1234567890123456789012345678901234567890',
       });
     });
 
     it('should use custom wallet name', async () => {
-      const result = await getSubscriptionOwner({
+      const result = await getOrCreateSubscriptionOwnerWallet({
         cdpApiKeyId: 'test-key-id',
         cdpApiKeySecret: 'test-key-secret',
         cdpWalletSecret: 'test-wallet-secret',
@@ -100,7 +100,7 @@ describe('getSubscriptionOwner', () => {
 
       expect(result).toEqual({
         address: '0xabcdef1234567890123456789012345678901234',
-        walletName: 'custom-wallet-name-smart',
+        walletName: 'custom-wallet-name',
         eoaAddress: '0x1234567890123456789012345678901234567890',
       });
 
@@ -109,7 +109,7 @@ describe('getSubscriptionOwner', () => {
       });
 
       expect(mockCdpClient.evm.getOrCreateSmartAccount).toHaveBeenCalledWith({
-        name: 'custom-wallet-name-smart',
+        name: 'custom-wallet-name',
         owner: mockEoaAccount,
       });
     });
@@ -121,11 +121,11 @@ describe('getSubscriptionOwner', () => {
 
       mockCdpClient.evm.getOrCreateAccount.mockResolvedValue(mockEoaAccount);
 
-      const result = await getSubscriptionOwner();
+      const result = await getOrCreateSubscriptionOwnerWallet();
 
       expect(result).toEqual({
         address: '0xabcdef1234567890123456789012345678901234',
-        walletName: 'subscription owner-smart',
+        walletName: 'subscription owner',
         eoaAddress: '0x1234567890123456789012345678901234567890',
       });
 
@@ -145,7 +145,7 @@ describe('getSubscriptionOwner', () => {
 
       mockCdpClient.evm.getOrCreateAccount.mockResolvedValue(mockEoaAccount);
 
-      await getSubscriptionOwner({
+      await getOrCreateSubscriptionOwnerWallet({
         cdpApiKeyId: 'explicit-key-id',
         cdpApiKeySecret: 'explicit-key-secret',
         cdpWalletSecret: 'explicit-wallet-secret',
@@ -167,7 +167,7 @@ describe('getSubscriptionOwner', () => {
       });
 
       await expect(
-        getSubscriptionOwner({
+        getOrCreateSubscriptionOwnerWallet({
           // Missing credentials
         })
       ).rejects.toThrow(/Failed to initialize CDP client/);
@@ -178,7 +178,7 @@ describe('getSubscriptionOwner', () => {
       mockCdpClient.evm.getOrCreateAccount.mockRejectedValue(createError);
 
       await expect(
-        getSubscriptionOwner({
+        getOrCreateSubscriptionOwnerWallet({
           cdpApiKeyId: 'test-key-id',
           cdpApiKeySecret: 'test-key-secret',
           cdpWalletSecret: 'test-wallet-secret',
@@ -191,7 +191,7 @@ describe('getSubscriptionOwner', () => {
       mockCdpClient.evm.getOrCreateAccount.mockRejectedValue(apiError);
 
       await expect(
-        getSubscriptionOwner({
+        getOrCreateSubscriptionOwnerWallet({
           cdpApiKeyId: 'test-key-id',
           cdpApiKeySecret: 'test-key-secret',
           cdpWalletSecret: 'test-wallet-secret',
@@ -207,14 +207,14 @@ describe('getSubscriptionOwner', () => {
     it('should return the same wallet when called multiple times', async () => {
       mockCdpClient.evm.getOrCreateAccount.mockResolvedValue(mockEoaAccount);
 
-      const options: GetSubscriptionOwnerOptions = {
+      const options: GetOrCreateSubscriptionOwnerWalletOptions = {
         cdpApiKeyId: 'test-key-id',
         cdpApiKeySecret: 'test-key-secret',
         cdpWalletSecret: 'test-wallet-secret',
       };
 
-      const result1 = await getSubscriptionOwner(options);
-      const result2 = await getSubscriptionOwner(options);
+      const result1 = await getOrCreateSubscriptionOwnerWallet(options);
+      const result2 = await getOrCreateSubscriptionOwnerWallet(options);
 
       expect(result1.address).toBe(result2.address);
       expect(result1.walletName).toBe(result2.walletName);
diff --git a/packages/account-sdk/src/interface/payment/getSubscriptionOwner.ts b/packages/account-sdk/src/interface/payment/getOrCreateSubscriptionOwnerWallet.ts
similarity index 82%
rename from packages/account-sdk/src/interface/payment/getSubscriptionOwner.ts
rename to packages/account-sdk/src/interface/payment/getOrCreateSubscriptionOwnerWallet.ts
index 41ecd515d..db57ccc84 100644
--- a/packages/account-sdk/src/interface/payment/getSubscriptionOwner.ts
+++ b/packages/account-sdk/src/interface/payment/getOrCreateSubscriptionOwnerWallet.ts
@@ -1,5 +1,8 @@
 import { CdpClient } from '@coinbase/cdp-sdk';
-import type { GetSubscriptionOwnerOptions, GetSubscriptionOwnerResult } from './types.js';
+import type {
+  GetOrCreateSubscriptionOwnerWalletOptions,
+  GetOrCreateSubscriptionOwnerWalletResult,
+} from './types.js';
 
 /**
  * Gets or creates a CDP smart wallet to act as the subscription owner (spender).
@@ -21,7 +24,7 @@ import type { GetSubscriptionOwnerOptions, GetSubscriptionOwnerResult } from './
  * @param options.cdpApiKeySecret - CDP API key secret. Falls back to CDP_API_KEY_SECRET env var
  * @param options.cdpWalletSecret - CDP wallet secret. Falls back to CDP_WALLET_SECRET env var
  * @param options.walletName - Custom wallet name. Defaults to "subscription owner"
- * @returns Promise<GetSubscriptionOwnerResult> - The smart wallet address and metadata
+ * @returns Promise<GetOrCreateSubscriptionOwnerWalletResult> - The smart wallet address and metadata
  * @throws Error if CDP credentials are missing or invalid
  *
  * @example
@@ -29,11 +32,11 @@ import type { GetSubscriptionOwnerOptions, GetSubscriptionOwnerResult } from './
  * import { base } from '@base-org/account/payment';
  *
  * // Using environment variables (CDP_API_KEY_ID, CDP_API_KEY_SECRET, CDP_WALLET_SECRET)
- * const owner = await base.subscription.getSubscriptionOwner();
+ * const owner = await base.subscription.getOrCreateSubscriptionOwnerWallet();
  * console.log(`Subscription owner smart wallet: ${owner.address}`);
  *
  * // Using explicit credentials
- * const owner = await base.subscription.getSubscriptionOwner({
+ * const owner = await base.subscription.getOrCreateSubscriptionOwnerWallet({
  *   cdpApiKeyId: 'your-api-key-id',
  *   cdpApiKeySecret: 'your-api-key-secret',
  *   cdpWalletSecret: 'your-wallet-secret'
@@ -48,14 +51,14 @@ import type { GetSubscriptionOwnerOptions, GetSubscriptionOwnerResult } from './
  * });
  *
  * // Using a custom wallet name
- * const customOwner = await base.subscription.getSubscriptionOwner({
+ * const customOwner = await base.subscription.getOrCreateSubscriptionOwnerWallet({
  *   walletName: 'my-app-subscription-wallet'
  * });
  * ```
  */
-export async function getSubscriptionOwner(
-  options: GetSubscriptionOwnerOptions = {}
-): Promise<GetSubscriptionOwnerResult> {
+export async function getOrCreateSubscriptionOwnerWallet(
+  options: GetOrCreateSubscriptionOwnerWalletOptions = {}
+): Promise<GetOrCreateSubscriptionOwnerWalletResult> {
   const {
     cdpApiKeyId,
     cdpApiKeySecret,
@@ -88,9 +91,10 @@ export async function getSubscriptionOwner(
     // Step 2: Get or create a smart wallet with the EVM account as the owner
     // Using getOrCreateSmartAccount ensures idempotency - the same name and owner
     // will always return the same smart wallet
-    const smartWalletName = `${walletName}-smart`;
+    // NOTE: Both the EOA wallet and smart wallet are given the same name intentionally.
+    // This simplifies wallet management and ensures consistency across the system.
     const smartWallet = await cdpClient.evm.getOrCreateSmartAccount({
-      name: smartWalletName,
+      name: walletName, // Same name as the EOA wallet
       owner: eoaAccount,
       // Note: We don't set enableSpendPermissions since this wallet will own/use
       // spend permissions, not grant them to others
@@ -98,7 +102,7 @@ export async function getSubscriptionOwner(
 
     return {
       address: smartWallet.address,
-      walletName: smartWalletName,
+      walletName: walletName,
       eoaAddress: eoaAccount.address, // Include EOA address for reference
     };
   } catch (error) {
diff --git a/packages/account-sdk/src/interface/payment/getPaymentStatus.test.ts b/packages/account-sdk/src/interface/payment/getPaymentStatus.test.ts
index 50996a9d5..dae63bbac 100644
--- a/packages/account-sdk/src/interface/payment/getPaymentStatus.test.ts
+++ b/packages/account-sdk/src/interface/payment/getPaymentStatus.test.ts
@@ -564,4 +564,146 @@ describe('getPaymentStatus', () => {
       });
     });
   });
+
+  describe('custom bundlerUrl', () => {
+    it('should use custom bundler URL when provided', async () => {
+      const customBundlerUrl = 'https://my-custom-bundler.example.com/rpc';
+      const mockReceipt = {
+        jsonrpc: '2.0',
+        id: 1,
+        result: {
+          success: true,
+          receipt: {
+            transactionHash: '0xabc123',
+            logs: [
+              {
+                address: '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913',
+                data: '0x0000000000000000000000000000000000000000000000000000000000989680',
+                topics: [
+                  '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',
+                  '0x0000000000000000000000004a7c6899cdcb379e284fbfd045462e751da4c7ce',
+                  '0x000000000000000000000000f1ddf1fc0310cb11f0ca87508207012f4a9cb336',
+                ],
+              },
+            ],
+          },
+          sender: '0x4A7c6899cdcB379e284fBFd045462e751da4C7ce',
+        },
+      };
+
+      vi.mocked(fetch).mockResolvedValueOnce({
+        json: async () => mockReceipt,
+      } as Response);
+
+      const status = await getPaymentStatus({
+        id: '0x123456',
+        testnet: false,
+        bundlerUrl: customBundlerUrl,
+      });
+
+      expect(status.status).toBe('completed');
+
+      // Verify that custom bundler URL was used instead of default
+      expect(fetch).toHaveBeenCalledWith(
+        customBundlerUrl,
+        expect.objectContaining({
+          method: 'POST',
+          headers: { 'Content-Type': 'application/json' },
+          body: JSON.stringify({
+            jsonrpc: '2.0',
+            id: 1,
+            method: 'eth_getUserOperationReceipt',
+            params: ['0x123456'],
+          }),
+        })
+      );
+
+      // Verify default bundler URL was NOT used
+      expect(fetch).not.toHaveBeenCalledWith(
+        'https://api.developer.coinbase.com/rpc/v1/base/S-fOd2n2Oi4fl4e1Crm83XeDXZ7tkg8O',
+        expect.anything()
+      );
+    });
+
+    it('should use custom bundler URL for both receipt and pending checks', async () => {
+      const customBundlerUrl = 'https://my-custom-bundler.example.com/rpc';
+      const mockReceiptNotFound = {
+        jsonrpc: '2.0',
+        id: 1,
+        result: null,
+      };
+      const mockUserOp = {
+        jsonrpc: '2.0',
+        id: 2,
+        result: {
+          sender: '0x4A7c6899cdcB379e284fBFd045462e751da4C7ce',
+        },
+      };
+
+      vi.mocked(fetch)
+        .mockResolvedValueOnce({
+          json: async () => mockReceiptNotFound,
+        } as Response)
+        .mockResolvedValueOnce({
+          json: async () => mockUserOp,
+        } as Response);
+
+      const status = await getPaymentStatus({
+        id: '0x123456',
+        testnet: false,
+        bundlerUrl: customBundlerUrl,
+      });
+
+      expect(status.status).toBe('pending');
+
+      // Verify custom bundler URL was used for both calls
+      expect(fetch).toHaveBeenCalledTimes(2);
+      expect(fetch).toHaveBeenNthCalledWith(
+        1,
+        customBundlerUrl,
+        expect.objectContaining({
+          method: 'POST',
+          body: expect.stringContaining('eth_getUserOperationReceipt'),
+        })
+      );
+      expect(fetch).toHaveBeenNthCalledWith(
+        2,
+        customBundlerUrl,
+        expect.objectContaining({
+          method: 'POST',
+          body: expect.stringContaining('eth_getUserOperationByHash'),
+        })
+      );
+    });
+
+    it('should fallback to default bundler URL when custom URL is not provided', async () => {
+      const mockReceipt = {
+        jsonrpc: '2.0',
+        id: 1,
+        result: {
+          success: true,
+          receipt: {
+            transactionHash: '0xabc123',
+            logs: [],
+          },
+          sender: '0x4A7c6899cdcB379e284fBFd045462e751da4C7ce',
+        },
+      };
+
+      vi.mocked(fetch).mockResolvedValueOnce({
+        json: async () => mockReceipt,
+      } as Response);
+
+      await getPaymentStatus({
+        id: '0x123456',
+        testnet: true,
+      });
+
+      // Verify default testnet bundler URL was used
+      expect(fetch).toHaveBeenCalledWith(
+        'https://api.developer.coinbase.com/rpc/v1/base-sepolia/S-fOd2n2Oi4fl4e1Crm83XeDXZ7tkg8O',
+        expect.anything()
+      );
+    });
+  });
 });
diff --git a/packages/account-sdk/src/interface/payment/getPaymentStatus.ts b/packages/account-sdk/src/interface/payment/getPaymentStatus.ts
index a887b4269..c2bc100be 100644
--- a/packages/account-sdk/src/interface/payment/getPaymentStatus.ts
+++ b/packages/account-sdk/src/interface/payment/getPaymentStatus.ts
@@ -13,6 +13,10 @@ import type { PaymentStatus, PaymentStatusOptions } from './types.js';
  * Check the status of a payment transaction using its transaction ID (userOp hash)
  *
  * @param options - Payment status check options
+ * @param options.id - Transaction ID (userOp hash) to check status for
+ * @param options.testnet - Whether to check on testnet (Base Sepolia). Defaults to false (mainnet)
+ * @param options.telemetry - Whether to enable telemetry logging. Defaults to true
+ * @param options.bundlerUrl - Optional custom bundler URL to use for status checks. Useful for avoiding rate limits on public endpoints.
  * @returns Promise<PaymentStatus> - Status information about the payment
  * @throws Error if unable to connect to the RPC endpoint or if the RPC request fails
  *
@@ -24,6 +28,13 @@ import type { PaymentStatus, PaymentStatusOptions } from './types.js';
  *     testnet: true
  *   })
  *
+ *   // With custom bundler URL to avoid rate limits
+ *   const status = await getPaymentStatus({
+ *     id: "0x1234...5678",
+ *     testnet: false,
+ *     bundlerUrl: 'https://my-bundler.example.com/rpc'
+ *   })
+ *
  *   if (status.status === 'failed') {
  *     console.log(`Payment failed: ${status.reason}`)
  *   }
@@ -35,7 +46,7 @@ import type { PaymentStatus, PaymentStatusOptions } from './types.js';
  * @note The id is the userOp hash returned from the pay function
  */
 export async function getPaymentStatus(options: PaymentStatusOptions): Promise<PaymentStatus> {
-  const { id, testnet = false, telemetry = true } = options;
+  const { id, testnet = false, telemetry = true, bundlerUrl } = options;
 
   // Generate correlation ID for this status check
   const correlationId = crypto.randomUUID();
@@ -46,13 +57,15 @@ export async function getPaymentStatus(options: PaymentStatusOptions): Promise<P
   }
 
   try {
-    // Get the bundler URL based on network
-    const bundlerUrl = testnet
-      ? 'https://api.developer.coinbase.com/rpc/v1/base-sepolia/S-fOd2n2Oi4fl4e1Crm83XeDXZ7tkg8O'
-      : 'https://api.developer.coinbase.com/rpc/v1/base/S-fOd2n2Oi4fl4e1Crm83XeDXZ7tkg8O';
+    // Get the bundler URL - use custom URL if provided, otherwise use default based on network
+    const effectiveBundlerUrl =
+      bundlerUrl ||
+      (testnet
+        ? 'https://api.developer.coinbase.com/rpc/v1/base-sepolia/S-fOd2n2Oi4fl4e1Crm83XeDXZ7tkg8O'
+        : 'https://api.developer.coinbase.com/rpc/v1/base/S-fOd2n2Oi4fl4e1Crm83XeDXZ7tkg8O');
 
     // Call eth_getUserOperationReceipt via the bundler
-    const receipt = await fetch(bundlerUrl, {
+    const receipt = await fetch(effectiveBundlerUrl, {
       method: 'POST',
       headers: {
         'Content-Type': 'application/json',
@@ -79,7 +92,7 @@ export async function getPaymentStatus(options: PaymentStatusOptions): Promise<P
     // If no result, payment is still pending or not found
     if (!receipt.result) {
       // Try eth_getUserOperationByHash to see if it's in mempool
-      const userOpResponse = await fetch(bundlerUrl, {
+      const userOpResponse = await fetch(effectiveBundlerUrl, {
         method: 'POST',
         headers: {
           'Content-Type': 'application/json',
diff --git a/packages/account-sdk/src/interface/payment/getSubscriptionStatus.test.ts b/packages/account-sdk/src/interface/payment/getSubscriptionStatus.test.ts
new file mode 100644
index 000000000..fcc416440
--- /dev/null
+++ b/packages/account-sdk/src/interface/payment/getSubscriptionStatus.test.ts
@@ -0,0 +1,689 @@
+import type { SpendPermission } from ':core/rpc/coinbase_fetchSpendPermissions.js';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { CHAIN_IDS, TOKENS } from './constants.js';
+import { getSubscriptionStatus } from './getSubscriptionStatus.js';
+import type { SubscriptionStatus } from './types.js';
+
+// Mock dependencies
+vi.mock('viem', () => ({
+  formatUnits: vi.fn((value: bigint, decimals: number) => {
+    return (Number(value) / Math.pow(10, decimals)).toString();
+  }),
+}));
+
+vi.mock('../../store/chain-clients/utils.js', () => ({
+  createClients: vi.fn(),
+  getClient: vi.fn(),
+}));
+
+vi.mock('../public-utilities/spend-permission/index.js', () => ({
+  fetchPermission: vi.fn(),
+  getPermissionStatus: vi.fn(),
+}));
+
+vi.mock('../public-utilities/spend-permission/utils.js', () => ({
+  timestampInSecondsToDate: vi.fn((timestamp: number) => new Date(timestamp * 1000)),
+}));
+
+describe('getSubscriptionStatus', () => {
+  const mockPermissionHash = '0x71319cd488f8e4f24687711ec5c95d9e0c1bacbf5c1064942937eba4c7cf2984';
+  const mockClient = { transport: { url: 'http://localhost:8545' } } as any;
+
+  const createMockPermission = (overrides?: Partial<SpendPermission>): SpendPermission => {
+    const defaultPermission = {
+      account: '0xAccount0000000000000000000000000000000000', // The account that owns the subscription
+      token: TOKENS.USDC.addresses.base,
+      spender: '0xSpender0000000000000000000000000000000000', // The spender (should be returned as subscriptionOwner)
+      allowance: '10000000', // 10 USDC (10 * 10^6)
+      period: 2592000, // 30 days in seconds
+      start: Math.floor(Date.now() / 1000) - 86400, // Started yesterday
+      end: Math.floor(Date.now() / 1000) + 31536000, // Ends in 1 year
+      salt: '0',
+      extraData: '0x',
+    };
+
+    return {
+      chainId: overrides?.chainId ?? CHAIN_IDS.base,
+      permission: {
+        ...defaultPermission,
+        ...(overrides?.permission || {}),
+      },
+      signature: overrides?.signature ?? '0xmocksignature',
+    } as SpendPermission;
+  };
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  describe('successful status retrieval', () => {
+    it('should return active subscription status with on-chain state', async () => {
+      const mockPermission = createMockPermission();
+      const currentTime = Math.floor(Date.now() / 1000);
+      const mockCurrentPeriod = {
+        start: currentTime - 86400, // Started yesterday
+        end: currentTime + 2505600, // Ends in 29 days
+        spend: 2000000n, // 2 USDC spent
+      };
+
+      const { fetchPermission } = await import('../public-utilities/spend-permission/index.js');
+      const { getPermissionStatus } = await import('../public-utilities/spend-permission/index.js');
+      const { getClient } = await import('../../store/chain-clients/utils.js');
+      const { timestampInSecondsToDate } = await import(
+        '../public-utilities/spend-permission/utils.js'
+      );
+
+      vi.mocked(fetchPermission).mockResolvedValue(mockPermission);
+
+      // Add a spy to see what the implementation actually receives
+      vi.mocked(fetchPermission).mockImplementation(async () => {
+        return mockPermission;
+      });
+      vi.mocked(getClient).mockReturnValue(mockClient);
+      vi.mocked(getPermissionStatus).mockResolvedValue({
+        isActive: true,
+        isRevoked: false,
+        isExpired: false,
+        remainingSpend: 8000000n, // 8 USDC remaining
+        nextPeriodStart: new Date((currentTime + 2505600) * 1000),
+        currentPeriod: mockCurrentPeriod,
+      } as any);
+      vi.mocked(timestampInSecondsToDate).mockImplementation(
+        (timestamp: number) => new Date(timestamp * 1000)
+      );
+
+      const result = await getSubscriptionStatus({
+        id: mockPermissionHash,
+        testnet: false,
+      });
+
+      expect(result).toEqual<SubscriptionStatus>({
+        isSubscribed: true,
+        recurringCharge: '10',
+        remainingChargeInPeriod: '8',
+        currentPeriodStart: new Date((currentTime - 86400) * 1000),
+        nextPeriodStart: new Date((currentTime + 2505600) * 1000),
+        periodInDays: 30,
+        subscriptionOwner: '0xSpender0000000000000000000000000000000000', // Should be the spender field
+      });
+
+      expect(fetchPermission).toHaveBeenCalledWith({ permissionHash: mockPermissionHash });
+      expect(getPermissionStatus).toHaveBeenCalledWith(mockPermission, { rpcUrl: undefined });
+    });
+
+    it('should return subscription status based on isActive from getPermissionStatus', async () => {
+      const mockPermission = createMockPermission();
+      const currentTime = Math.floor(Date.now() / 1000);
+      const mockCurrentPeriod = {
+        start: currentTime - 86400,
+        end: currentTime + 2505600,
+        spend: 0n, // No spend yet
+      };
+
+      const { fetchPermission } = await import('../public-utilities/spend-permission/index.js');
+      const { getPermissionStatus } = await import('../public-utilities/spend-permission/index.js');
+      const { getClient } = await import('../../store/chain-clients/utils.js');
+
+      vi.mocked(fetchPermission).mockResolvedValue(mockPermission);
+      vi.mocked(getClient).mockReturnValue(mockClient);
+      vi.mocked(getPermissionStatus).mockResolvedValue({
+        isActive: false, // Not active
+        isRevoked: false,
+        isExpired: false,
+        remainingSpend: 10000000n, // Full amount available
+        nextPeriodStart: new Date((currentTime + 2505600) * 1000),
+        currentPeriod: mockCurrentPeriod,
+      } as any);
+
+      const result = await getSubscriptionStatus({
+        id: mockPermissionHash,
+        testnet: false,
+      });
+
+      // Now isSubscribed directly reflects isActive from getPermissionStatus
+      expect(result.isSubscribed).toBe(false);
+      expect(result.recurringCharge).toBe('10');
+      expect(result.remainingChargeInPeriod).toBe('10');
+    });
+
+    it('should handle testnet subscriptions', async () => {
+      const mockPermission = createMockPermission({
+        chainId: CHAIN_IDS.baseSepolia,
+        permission: {
+          account: '0xAccount0000000000000000000000000000000000',
+          token: TOKENS.USDC.addresses.baseSepolia,
+          spender: '0xSpender0000000000000000000000000000000000',
+          allowance: '5000000', // 5 USDC
+          period: 86400, // 1 day
+          start: Math.floor(Date.now() / 1000) - 3600,
+          end: Math.floor(Date.now() / 1000) + 86400,
+          salt: '0',
+          extraData: '0x',
+        },
+      });
+
+      const { fetchPermission } = await import('../public-utilities/spend-permission/index.js');
+      const { getPermissionStatus } = await import('../public-utilities/spend-permission/index.js');
+      const { getClient } = await import('../../store/chain-clients/utils.js');
+
+      vi.mocked(fetchPermission).mockResolvedValue(mockPermission);
+      vi.mocked(getClient).mockReturnValue(mockClient);
+      vi.mocked(getPermissionStatus).mockResolvedValue({
+        isActive: true,
+        isRevoked: false,
+        isExpired: false,
+        remainingSpend: 4000000n,
+        nextPeriodStart: new Date((Math.floor(Date.now() / 1000) + 82800) * 1000),
+        currentPeriod: {
+          start: Math.floor(Date.now() / 1000) - 3600,
+          end: Math.floor(Date.now() / 1000) + 82800,
+          spend: 1000000n,
+        },
+      } as any);
+
+      const result = await getSubscriptionStatus({
+        id: mockPermissionHash,
+        testnet: true,
+      });
+
+      expect(result).toMatchObject({
+        isSubscribed: true,
+        recurringCharge: '5',
+        remainingChargeInPeriod: '4',
+        periodInDays: 1,
+      });
+    });
+
+    it('should get period from getPermissionStatus when client is not available', async () => {
+      const mockPermission = createMockPermission();
+      const currentTime = Math.floor(Date.now() / 1000);
+
+      const { fetchPermission } = await import('../public-utilities/spend-permission/index.js');
+      const { getPermissionStatus } = await import('../public-utilities/spend-permission/index.js');
+      const { getClient } = await import('../../store/chain-clients/utils.js');
+
+      vi.mocked(fetchPermission).mockResolvedValue(mockPermission);
+      vi.mocked(getClient).mockReturnValue(null as any); // No client available
+      vi.mocked(getPermissionStatus).mockResolvedValue({
+        isActive: true,
+        isRevoked: false,
+        isExpired: false,
+        remainingSpend: 10000000n,
+        nextPeriodStart: new Date((currentTime + 2505600) * 1000),
+        currentPeriod: {
+          start: currentTime - 86400,
+          end: currentTime + 2505600,
+          spend: 0n,
+        },
+      } as any);
+
+      const result = await getSubscriptionStatus({
+        id: mockPermissionHash,
+        testnet: false,
+      });
+
+      expect(result.isSubscribed).toBe(true);
+    });
+
+    it('should get period from getPermissionStatus even if readContract would fail', async () => {
+      const mockPermission = createMockPermission();
+      const currentTime = Math.floor(Date.now() / 1000);
+
+      const { fetchPermission } = await import('../public-utilities/spend-permission/index.js');
+      const { getPermissionStatus } = await import('../public-utilities/spend-permission/index.js');
+      const { getClient } = await import('../../store/chain-clients/utils.js');
+
+      vi.mocked(fetchPermission).mockResolvedValue(mockPermission);
+      vi.mocked(getClient).mockReturnValue(mockClient);
+      // Note: readContract is no longer called directly in getSubscriptionStatus
+      vi.mocked(getPermissionStatus).mockResolvedValue({
+        isActive: true,
+        isRevoked: false,
+        isExpired: false,
+        remainingSpend: 10000000n,
+        nextPeriodStart: new Date((currentTime + 2505600) * 1000),
+        currentPeriod: {
+          start: currentTime - 86400,
+          end: currentTime + 2505600,
+          spend: 0n,
+        },
+      } as any);
+
+      const result = await getSubscriptionStatus({
+        id: mockPermissionHash,
+        testnet: false,
+      });
+
+      // Now gets period from getPermissionStatus directly
+      expect(result.isSubscribed).toBe(true);
+    });
+  });
+
+  describe('subscription not found', () => {
+    it('should return not subscribed when permission is not found', async () => {
+      const { fetchPermission } = await import('../public-utilities/spend-permission/index.js');
+      vi.mocked(fetchPermission).mockResolvedValue(null as any);
+
+      const result = await getSubscriptionStatus({
+        id: mockPermissionHash,
+        testnet: false,
+      });
+
+      expect(result).toEqual<SubscriptionStatus>({
+        isSubscribed: false,
+        recurringCharge: '0',
+      });
+    });
+  });
+
+  describe('expired subscriptions', () => {
+    it('should return not subscribed for expired subscription', async () => {
+      const mockPermission = createMockPermission({
+        permission: {
+          account: '0xAccount0000000000000000000000000000000000',
+          token: TOKENS.USDC.addresses.base,
+          spender: '0xSpender0000000000000000000000000000000000',
+          allowance: '10000000',
+          period: 2592000,
+          start: Math.floor(Date.now() / 1000) - 31536000, // Started 1 year ago
+          end: Math.floor(Date.now() / 1000) - 86400, // Ended yesterday
+          salt: '0',
+          extraData: '0x',
+        },
+      });
+
+      const { fetchPermission } = await import('../public-utilities/spend-permission/index.js');
+      const { getPermissionStatus } = await import('../public-utilities/spend-permission/index.js');
+      const { getClient } = await import('../../store/chain-clients/utils.js');
+
+      vi.mocked(fetchPermission).mockResolvedValue(mockPermission);
+      vi.mocked(getClient).mockReturnValue(mockClient);
+      vi.mocked(getPermissionStatus).mockResolvedValue({
+        isActive: false, // Not active because expired
+        isRevoked: false,
+        isExpired: true, // Expired
+        remainingSpend: 10000000n,
+        nextPeriodStart: undefined,
+        currentPeriod: {
+          start: Math.floor(Date.now() / 1000) - 31536000,
+          end: Math.floor(Date.now() / 1000) - 86400,
+          spend: 0n,
+        },
+      } as any);
+
+      const result = await getSubscriptionStatus({
+        id: mockPermissionHash,
+        testnet: false,
+      });
+
+      expect(result.isSubscribed).toBe(false); // Should not be subscribed because isActive is false
+    });
+  });
+
+  describe('revoked subscriptions', () => {
+    it('should return not subscribed for revoked subscription', async () => {
+      const mockPermission = createMockPermission();
+      const currentTime = Math.floor(Date.now() / 1000);
+
+      const { fetchPermission } = await import('../public-utilities/spend-permission/index.js');
+      const { getPermissionStatus } = await import('../public-utilities/spend-permission/index.js');
+      const { getClient } = await import('../../store/chain-clients/utils.js');
+
+      vi.mocked(fetchPermission).mockResolvedValue(mockPermission);
+      vi.mocked(getClient).mockReturnValue(mockClient);
+      vi.mocked(getPermissionStatus).mockResolvedValue({
+        isActive: false, // Not active because revoked
+        isRevoked: true, // Revoked
+        isExpired: false,
+        remainingSpend: 0n,
+        nextPeriodStart: undefined,
+        currentPeriod: {
+          start: currentTime - 86400,
+          end: currentTime + 2505600,
+          spend: 1000000n, // Has been used (not 0)
+        },
+      } as any);
+
+      const result = await getSubscriptionStatus({
+        id: mockPermissionHash,
+        testnet: false,
+      });
+
+      expect(result.isSubscribed).toBe(false); // Should not be subscribed due to revocation
+    });
+
+    it('should return not subscribed for revoked subscription with no on-chain spending', async () => {
+      // This tests the specific bug fix: a revoked subscription that has never been used
+      // should NOT be considered active just because it has no on-chain state
+      const mockPermission = createMockPermission();
+      const currentTime = Math.floor(Date.now() / 1000);
+
+      const { fetchPermission } = await import('../public-utilities/spend-permission/index.js');
+      const { getPermissionStatus } = await import('../public-utilities/spend-permission/index.js');
+      const { getClient } = await import('../../store/chain-clients/utils.js');
+
+      vi.mocked(fetchPermission).mockResolvedValue(mockPermission);
+      vi.mocked(getClient).mockReturnValue(mockClient);
+      vi.mocked(getPermissionStatus).mockResolvedValue({
+        isActive: false, // Not active because revoked
+        isRevoked: true, // Revoked
+        isExpired: false,
+        remainingSpend: 10000000n, // Full amount still available (never used)
+        nextPeriodStart: undefined,
+        currentPeriod: {
+          start: currentTime - 86400,
+          end: currentTime + 2505600,
+          spend: 0n, // Never been used - no on-chain spending
+        },
+      } as any);
+
+      const result = await getSubscriptionStatus({
+        id: mockPermissionHash,
+        testnet: false,
+      });
+
+      // Now correctly returns false because isActive is false (no hasNoOnChainState logic)
+      expect(result.isSubscribed).toBe(false);
+      expect(result.recurringCharge).toBe('10');
+      expect(result.remainingChargeInPeriod).toBe('10');
+    });
+  });
+
+  describe('chain validation', () => {
+    it('should throw error when testnet requested but subscription is on mainnet', async () => {
+      const mockPermission = createMockPermission({
+        chainId: CHAIN_IDS.base, // Mainnet
+      });
+
+      const { fetchPermission } = await import('../public-utilities/spend-permission/index.js');
+      vi.mocked(fetchPermission).mockResolvedValue(mockPermission);
+
+      await expect(
+        getSubscriptionStatus({
+          id: mockPermissionHash,
+          testnet: true, // Requesting testnet
+        })
+      ).rejects.toThrow(
+        'The subscription was requested on testnet but is actually a mainnet subscription'
+      );
+    });
+
+    it('should throw error when mainnet requested but subscription is on testnet', async () => {
+      const mockPermission = createMockPermission({
+        chainId: CHAIN_IDS.baseSepolia, // Testnet
+        permission: {
+          account: '0xAccount0000000000000000000000000000000000',
+          token: TOKENS.USDC.addresses.baseSepolia,
+          spender: '0xSpender0000000000000000000000000000000000',
+          allowance: '10000000',
+          period: 2592000,
+          start: Math.floor(Date.now() / 1000) - 86400,
+          end: Math.floor(Date.now() / 1000) + 31536000,
+          salt: '0',
+          extraData: '0x',
+        },
+      });
+
+      const { fetchPermission } = await import('../public-utilities/spend-permission/index.js');
+      vi.mocked(fetchPermission).mockResolvedValue(mockPermission);
+
+      await expect(
+        getSubscriptionStatus({
+          id: mockPermissionHash,
+          testnet: false, // Requesting mainnet
+        })
+      ).rejects.toThrow(
+        'The subscription was requested on mainnet but is actually a testnet subscription'
+      );
+    });
+
+    it('should throw error for unexpected chain ID', async () => {
+      const mockPermission = createMockPermission({
+        chainId: 1, // Ethereum mainnet (not Base)
+      });
+
+      const { fetchPermission } = await import('../public-utilities/spend-permission/index.js');
+      vi.mocked(fetchPermission).mockResolvedValue(mockPermission);
+
+      await expect(
+        getSubscriptionStatus({
+          id: mockPermissionHash,
+          testnet: false,
+        })
+      ).rejects.toThrow('Subscription is on chain 1, expected 8453 (Base)');
+    });
+  });
+
+  describe('token validation', () => {
+    it('should throw error when subscription is not for USDC', async () => {
+      const mockPermission = createMockPermission({
+        permission: {
+          account: '0xAccount0000000000000000000000000000000000',
+          token: '0x0000000000000000000000000000000000000000', // Not USDC
+          spender: '0xSpender0000000000000000000000000000000000',
+          allowance: '10000000',
+          period: 2592000,
+          start: Math.floor(Date.now() / 1000) - 86400,
+          end: Math.floor(Date.now() / 1000) + 31536000,
+          salt: '0',
+          extraData: '0x',
+        },
+      });
+
+      const { fetchPermission } = await import('../public-utilities/spend-permission/index.js');
+      vi.mocked(fetchPermission).mockResolvedValue(mockPermission);
+
+      await expect(
+        getSubscriptionStatus({
+          id: mockPermissionHash,
+          testnet: false,
+        })
+      ).rejects.toThrow(/Subscription is not for USDC token/);
+    });
+  });
+
+  describe('timing validation', () => {
+    it('should throw error when subscription has not started yet', async () => {
+      const futureStart = Math.floor(Date.now() / 1000) + 86400; // Starts tomorrow
+      const mockPermission = createMockPermission({
+        permission: {
+          account: '0xAccount0000000000000000000000000000000000',
+          token: TOKENS.USDC.addresses.base,
+          spender: '0xSpender0000000000000000000000000000000000',
+          allowance: '10000000',
+          period: 2592000,
+          start: futureStart,
+          end: futureStart + 31536000,
+          salt: '0',
+          extraData: '0x',
+        },
+      });
+
+      const { fetchPermission } = await import('../public-utilities/spend-permission/index.js');
+      vi.mocked(fetchPermission).mockResolvedValue(mockPermission);
+
+      await expect(
+        getSubscriptionStatus({
+          id: mockPermissionHash,
+          testnet: false,
+        })
+      ).rejects.toThrow(/Subscription has not started yet/);
+    });
+  });
+
+  describe('chain client initialization', () => {
+    it('should work with supported fallback client creation', async () => {
+      const mockPermission = createMockPermission();
+
+      const { fetchPermission } = await import('../public-utilities/spend-permission/index.js');
+      const { getPermissionStatus } = await import('../public-utilities/spend-permission/index.js');
+      const { getClient } = await import('../../store/chain-clients/utils.js');
+
+      vi.mocked(fetchPermission).mockResolvedValue(mockPermission);
+      // getClient now automatically creates fallback clients for chains in the supported list
+      vi.mocked(getClient).mockReturnValue(mockClient);
+      vi.mocked(getPermissionStatus).mockResolvedValue({
+        isActive: true,
+        remainingSpend: 10000000n,
+        nextPeriodStart: new Date(),
+        currentPeriod: {
+          start: Math.floor(Date.now() / 1000) - 86400,
+          end: Math.floor(Date.now() / 1000) + 2505600,
+          spend: 0n,
+        },
+      } as any);
+
+      const result = await getSubscriptionStatus({
+        id: mockPermissionHash,
+        testnet: false,
+      });
+
+      // The function should work correctly with the automatic supported fallback client
+      expect(result.isSubscribed).toBe(true);
+    });
+  });
+
+  describe('period calculation', () => {
+    it('should calculate period in days correctly', async () => {
+      const testCases = [
+        { periodSeconds: 86400, expectedDays: 1 },
+        { periodSeconds: 604800, expectedDays: 7 },
+        { periodSeconds: 2592000, expectedDays: 30 },
+        { periodSeconds: 31536000, expectedDays: 365 },
+      ];
+
+      for (const { periodSeconds, expectedDays } of testCases) {
+        vi.clearAllMocks();
+
+        const mockPermission = createMockPermission({
+          permission: {
+            account: '0xAccount0000000000000000000000000000000000',
+            token: TOKENS.USDC.addresses.base,
+            spender: '0xSpender0000000000000000000000000000000000',
+            allowance: '10000000',
+            period: periodSeconds,
+            start: Math.floor(Date.now() / 1000) - 86400,
+            end: Math.floor(Date.now() / 1000) + 31536000,
+            salt: '0',
+            extraData: '0x',
+          },
+        });
+
+        const { fetchPermission } = await import('../public-utilities/spend-permission/index.js');
+        const { getPermissionStatus } = await import(
+          '../public-utilities/spend-permission/index.js'
+        );
+        const { getClient } = await import('../../store/chain-clients/utils.js');
+
+        vi.mocked(fetchPermission).mockResolvedValue(mockPermission);
+        vi.mocked(getClient).mockReturnValue(mockClient);
+        vi.mocked(getPermissionStatus).mockResolvedValue({
+          isActive: true,
+          remainingSpend: 10000000n,
+          nextPeriodStart: new Date(),
+          currentPeriod: {
+            start: Math.floor(Date.now() / 1000) - 86400,
+            end: Math.floor(Date.now() / 1000) + periodSeconds - 86400,
+            spend: 0n,
+          },
+        } as any);
+
+        const result = await getSubscriptionStatus({
+          id: mockPermissionHash,
+          testnet: false,
+        });
+
+        expect(result.periodInDays).toBe(expectedDays);
+      }
+    });
+  });
+
+  describe('amount formatting', () => {
+    it('should format USDC amounts correctly', async () => {
+      const testCases = [
+        { allowance: '1000000', expectedRecurring: '1' }, // 1 USDC
+        { allowance: '10000000', expectedRecurring: '10' }, // 10 USDC
+        { allowance: '999000', expectedRecurring: '0.999' }, // 0.999 USDC
+        { allowance: '12500000', expectedRecurring: '12.5' }, // 12.5 USDC
+      ];
+
+      for (const { allowance, expectedRecurring } of testCases) {
+        vi.clearAllMocks();
+
+        const mockPermission = createMockPermission({
+          permission: {
+            account: '0xAccount0000000000000000000000000000000000',
+            token: TOKENS.USDC.addresses.base,
+            spender: '0xSpender0000000000000000000000000000000000',
+            allowance,
+            period: 2592000,
+            start: Math.floor(Date.now() / 1000) - 86400,
+            end: Math.floor(Date.now() / 1000) + 31536000,
+            salt: '0',
+            extraData: '0x',
+          },
+        });
+
+        const { fetchPermission } = await import('../public-utilities/spend-permission/index.js');
+        const { getPermissionStatus } = await import(
+          '../public-utilities/spend-permission/index.js'
+        );
+        const { getClient } = await import('../../store/chain-clients/utils.js');
+
+        vi.mocked(fetchPermission).mockResolvedValue(mockPermission);
+        vi.mocked(getClient).mockReturnValue(mockClient);
+        vi.mocked(getPermissionStatus).mockResolvedValue({
+          isActive: true,
+          remainingSpend: BigInt(allowance),
+          nextPeriodStart: new Date(),
+          currentPeriod: {
+            start: Math.floor(Date.now() / 1000) - 86400,
+            end: Math.floor(Date.now() / 1000) + 2505600,
+            spend: 0n,
+          },
+        } as any);
+
+        const result = await getSubscriptionStatus({
+          id: mockPermissionHash,
+          testnet: false,
+        });
+
+        expect(result.recurringCharge).toBe(expectedRecurring);
+      }
+    });
+
+    it('should pass custom RPC URL to getPermissionStatus when provided', async () => {
+      const customRpcUrl = 'https://custom-rpc.example.com';
+      const mockPermission = createMockPermission();
+      const currentTime = Math.floor(Date.now() / 1000);
+      const mockCurrentPeriod = {
+        start: currentTime - 86400,
+        end: currentTime + 2505600,
+        spend: 0n,
+      };
+
+      const { fetchPermission } = await import('../public-utilities/spend-permission/index.js');
+      const { getPermissionStatus } = await import('../public-utilities/spend-permission/index.js');
+
+      vi.mocked(fetchPermission).mockResolvedValue(mockPermission);
+      vi.mocked(getPermissionStatus).mockResolvedValue({
+        isActive: true,
+        isRevoked: false,
+        isExpired: false,
+        remainingSpend: 8000000n,
+        nextPeriodStart: new Date((currentTime + 2505600) * 1000),
+        isApprovedOnchain: true,
+        currentPeriod: mockCurrentPeriod,
+      } as any);
+
+      await getSubscriptionStatus({
+        id: mockPermissionHash,
+        testnet: false,
+        rpcUrl: customRpcUrl,
+      });
+
+      // Verify that getPermissionStatus was called with the custom rpcUrl
+      expect(getPermissionStatus).toHaveBeenCalledWith(mockPermission, { rpcUrl: customRpcUrl });
+    });
+  });
+});
diff --git a/packages/account-sdk/src/interface/payment/getSubscriptionStatus.ts b/packages/account-sdk/src/interface/payment/getSubscriptionStatus.ts
index bd442ed75..1caa13e54 100644
--- a/packages/account-sdk/src/interface/payment/getSubscriptionStatus.ts
+++ b/packages/account-sdk/src/interface/payment/getSubscriptionStatus.ts
@@ -1,19 +1,9 @@
 import { formatUnits } from 'viem';
-import { readContract } from 'viem/actions';
-import {
-  spendPermissionManagerAbi,
-  spendPermissionManagerAddress,
-} from '../../sign/base-account/utils/constants.js';
-import { createClients, FALLBACK_CHAINS, getClient } from '../../store/chain-clients/utils.js';
 import {
   fetchPermission,
   getPermissionStatus,
 } from '../public-utilities/spend-permission/index.js';
-import {
-  calculateCurrentPeriod,
-  timestampInSecondsToDate,
-  toSpendPermissionArgs,
-} from '../public-utilities/spend-permission/utils.js';
+import { timestampInSecondsToDate } from '../public-utilities/spend-permission/utils.js';
 import { CHAIN_IDS, TOKENS } from './constants.js';
 import type { SubscriptionStatus, SubscriptionStatusOptions } from './types.js';
 
@@ -21,13 +11,12 @@ import type { SubscriptionStatus, SubscriptionStatusOptions } from './types.js';
  * Gets the current status and details of a subscription.
  *
  * This function fetches the subscription (spend permission) details using its ID (permission hash)
- * and returns status information about the subscription. If there's no on-chain state for the
- * subscription (e.g., it has never been used), the function will infer that the subscription
- * is unrevoked and the full recurring amount is available to spend.
+ * and returns status information about the subscription.
  *
  * @param options - Options for checking subscription status
  * @param options.id - The subscription ID (permission hash) returned from subscribe()
  * @param options.testnet - Whether to check on testnet (Base Sepolia). Defaults to false (mainnet)
+ * @param options.rpcUrl - Optional custom RPC URL to use for blockchain queries. Useful for avoiding rate limits on public endpoints.
  * @returns Promise<SubscriptionStatus> - Subscription status information
  * @throws Error if the subscription cannot be found or if fetching fails
  *
@@ -41,15 +30,23 @@ import type { SubscriptionStatus, SubscriptionStatusOptions } from './types.js';
  *   testnet: false
  * });
  *
+ * // With custom RPC URL to avoid rate limits
+ * const status = await getSubscriptionStatus({
+ *   id: '0x71319cd488f8e4f24687711ec5c95d9e0c1bacbf5c1064942937eba4c7cf2984',
+ *   testnet: false,
+ *   rpcUrl: 'https://my-custom-rpc.example.com'
+ * });
+ *
  * console.log(`Subscribed: ${status.isSubscribed}`);
  * console.log(`Next payment: ${status.nextPeriodStart}`);
- * console.log(`Recurring amount: $${status.recurringAmount}`);
+ * console.log(`Recurring amount: $${status.recurringCharge}`);
+ * console.log(`Owner address: ${status.subscriptionOwner}`);
  * ```
  */
 export async function getSubscriptionStatus(
   options: SubscriptionStatusOptions
 ): Promise<SubscriptionStatus> {
-  const { id, testnet = false } = options;
+  const { id, testnet = false, rpcUrl } = options;
 
   // First, try to fetch the permission details using the hash
   const permission = await fetchPermission({
@@ -97,38 +94,8 @@ export async function getSubscriptionStatus(
     );
   }
 
-  // Ensure chain client is initialized for the permission's chain
-  if (permission.chainId && !getClient(permission.chainId)) {
-    const fallbackChain = FALLBACK_CHAINS.find((chain) => chain.id === permission.chainId);
-    if (fallbackChain) {
-      createClients([fallbackChain]);
-    }
-  }
-
   // Get the current permission status (includes period info and active state)
-  const status = await getPermissionStatus(permission);
-
-  // Get the current period info directly to get spend amount
-  let currentPeriod: { start: number; end: number; spend: bigint };
-
-  const client = getClient(permission.chainId!);
-  if (client) {
-    try {
-      const spendPermissionArgs = toSpendPermissionArgs(permission);
-      currentPeriod = (await readContract(client, {
-        address: spendPermissionManagerAddress,
-        abi: spendPermissionManagerAbi,
-        functionName: 'getCurrentPeriod',
-        args: [spendPermissionArgs],
-      })) as { start: number; end: number; spend: bigint };
-    } catch {
-      // If we can't read on-chain state, calculate from permission parameters
-      currentPeriod = calculateCurrentPeriod(permission);
-    }
-  } else {
-    // No client available, calculate from permission parameters
-    currentPeriod = calculateCurrentPeriod(permission);
-  }
+  const status = await getPermissionStatus(permission, { rpcUrl });
 
   // Format the allowance amount from wei to USD string (USDC has 6 decimals)
   const recurringCharge = formatUnits(BigInt(permission.permission.allowance), 6);
@@ -139,7 +106,6 @@ export async function getSubscriptionStatus(
   // Check if the subscription period has started
   const currentTime = Math.floor(Date.now() / 1000);
   const permissionStart = Number(permission.permission.start);
-  const permissionEnd = Number(permission.permission.end);
 
   if (currentTime < permissionStart) {
     throw new Error(
@@ -147,23 +113,15 @@ export async function getSubscriptionStatus(
     );
   }
 
-  // Check if the subscription has expired
-  const hasNotExpired = currentTime <= permissionEnd;
-
-  // A subscription is considered active if we're within the valid time bounds
-  // and the permission hasn't been revoked.
-  const hasNoOnChainState = currentPeriod.spend === BigInt(0);
-  const isSubscribed = hasNotExpired && (status.isActive || hasNoOnChainState);
-
-  // Build the result with data from getCurrentPeriod and other on-chain functions
+  // Build the result with data from getPermissionStatus
   const result: SubscriptionStatus = {
-    isSubscribed,
+    isSubscribed: status.isActive,
     recurringCharge,
     remainingChargeInPeriod: formatUnits(status.remainingSpend, 6),
-    currentPeriodStart: timestampInSecondsToDate(currentPeriod.start),
+    currentPeriodStart: timestampInSecondsToDate(status.currentPeriod.start),
     nextPeriodStart: status.nextPeriodStart,
     periodInDays,
+    subscriptionOwner: permission.permission.spender,
   };
-
   return result;
 }
diff --git a/packages/account-sdk/src/interface/payment/index.node.ts b/packages/account-sdk/src/interface/payment/index.node.ts
index be0d8cb7d..3b72c629e 100644
--- a/packages/account-sdk/src/interface/payment/index.node.ts
+++ b/packages/account-sdk/src/interface/payment/index.node.ts
@@ -2,21 +2,23 @@
  * Payment interface exports for Node.js environment
  * Includes all browser exports plus Node-only functions that rely on CDP SDK
  */
-export { base } from './base.js';
+export { base } from './base.node.js';
 export { charge } from './charge.js';
+export { getOrCreateSubscriptionOwnerWallet } from './getOrCreateSubscriptionOwnerWallet.js';
 export { getPaymentStatus } from './getPaymentStatus.js';
-export { getSubscriptionOwner } from './getSubscriptionOwner.js';
 export { getSubscriptionStatus } from './getSubscriptionStatus.js';
 export { pay } from './pay.js';
 export { prepareCharge } from './prepareCharge.js';
+export { prepareRevoke } from './prepareRevoke.js';
+export { revoke } from './revoke.js';
 export { subscribe } from './subscribe.js';
 
 // Export types
 export type {
   ChargeOptions,
   ChargeResult,
-  GetSubscriptionOwnerOptions,
-  GetSubscriptionOwnerResult,
+  GetOrCreateSubscriptionOwnerWalletOptions,
+  GetOrCreateSubscriptionOwnerWalletResult,
   InfoRequest,
   PayerInfo,
   PayerInfoResponses,
@@ -29,6 +31,11 @@ export type {
   PrepareChargeCall,
   PrepareChargeOptions,
   PrepareChargeResult,
+  PrepareRevokeCall,
+  PrepareRevokeOptions,
+  PrepareRevokeResult,
+  RevokeOptions,
+  RevokeResult,
   SubscriptionOptions,
   SubscriptionResult,
   SubscriptionStatus,
diff --git a/packages/account-sdk/src/interface/payment/index.ts b/packages/account-sdk/src/interface/payment/index.ts
index 7b0a20948..9ee3a3680 100644
--- a/packages/account-sdk/src/interface/payment/index.ts
+++ b/packages/account-sdk/src/interface/payment/index.ts
@@ -1,16 +1,16 @@
-export { base } from './base.js';
-export { charge } from './charge.js';
+// Browser-safe exports only - no CDP SDK dependencies
+export { base } from './base.browser.js';
 export { getPaymentStatus } from './getPaymentStatus.js';
-export { getSubscriptionOwner } from './getSubscriptionOwner.js';
 export { getSubscriptionStatus } from './getSubscriptionStatus.js';
 export { pay } from './pay.js';
 export { prepareCharge } from './prepareCharge.js';
+export { prepareRevoke } from './prepareRevoke.js';
 export { subscribe } from './subscribe.js';
 export type {
   ChargeOptions,
   ChargeResult,
-  GetSubscriptionOwnerOptions,
-  GetSubscriptionOwnerResult,
+  GetOrCreateSubscriptionOwnerWalletOptions,
+  GetOrCreateSubscriptionOwnerWalletResult,
   InfoRequest,
   PayerInfo,
   PayerInfoResponses,
@@ -23,6 +23,11 @@ export type {
   PrepareChargeCall,
   PrepareChargeOptions,
   PrepareChargeResult,
+  PrepareRevokeCall,
+  PrepareRevokeOptions,
+  PrepareRevokeResult,
+  RevokeOptions,
+  RevokeResult,
   SubscriptionOptions,
   SubscriptionResult,
   SubscriptionStatus,
diff --git a/packages/account-sdk/src/interface/payment/prepareCharge.test.ts b/packages/account-sdk/src/interface/payment/prepareCharge.test.ts
index eea61cdb2..0286c97b1 100644
--- a/packages/account-sdk/src/interface/payment/prepareCharge.test.ts
+++ b/packages/account-sdk/src/interface/payment/prepareCharge.test.ts
@@ -22,8 +22,8 @@ describe('prepareCharge', () => {
   } as SpendPermission;
 
   const mockCallData: PrepareChargeResult = [
-    { to: '0xmock', data: '0xapprove', value: '0x0' },
-    { to: '0xmock', data: '0xspend', value: '0x0' },
+    { to: '0xmock', data: '0xapprove', value: 0n },
+    { to: '0xmock', data: '0xspend', value: 0n },
   ];
 
   it('should prepare charge for specific amount', async () => {
@@ -40,7 +40,9 @@ describe('prepareCharge', () => {
     });
 
     expect(fetchPermission).toHaveBeenCalledWith({ permissionHash: '0xhash123' });
-    expect(prepareSpendCallData).toHaveBeenCalledWith(mockPermission, 10500000n, undefined);
+    expect(prepareSpendCallData).toHaveBeenCalledWith(mockPermission, 10500000n, undefined, {
+      rpcUrl: undefined,
+    });
     expect(result).toEqual(mockCallData);
   });
 
@@ -60,7 +62,8 @@ describe('prepareCharge', () => {
     expect(prepareSpendCallData).toHaveBeenCalledWith(
       mockPermission,
       'max-remaining-allowance',
-      undefined
+      undefined,
+      { rpcUrl: undefined }
     );
     expect(result).toEqual(mockCallData);
   });
@@ -83,7 +86,9 @@ describe('prepareCharge', () => {
       testnet: true,
     });
 
-    expect(prepareSpendCallData).toHaveBeenCalledWith(testnetPermission, 5000000n, undefined);
+    expect(prepareSpendCallData).toHaveBeenCalledWith(testnetPermission, 5000000n, undefined, {
+      rpcUrl: undefined,
+    });
   });
 
   it('should throw error for network mismatch', async () => {
@@ -127,7 +132,9 @@ describe('prepareCharge', () => {
 
     expect(fetchPermission).toHaveBeenCalledWith({ permissionHash: '0xhash123' });
     // Now prepareSpendCallData handles the recipient and transfer logic
-    expect(prepareSpendCallData).toHaveBeenCalledWith(mockPermission, 10500000n, recipient);
+    expect(prepareSpendCallData).toHaveBeenCalledWith(mockPermission, 10500000n, recipient, {
+      rpcUrl: undefined,
+    });
     expect(result).toEqual(mockCallData);
   });
 
@@ -154,7 +161,9 @@ describe('prepareCharge', () => {
     });
 
     // Now prepareSpendCallData handles the recipient and transfer logic
-    expect(prepareSpendCallData).toHaveBeenCalledWith(testnetPermission, 5000000n, recipient);
+    expect(prepareSpendCallData).toHaveBeenCalledWith(testnetPermission, 5000000n, recipient, {
+      rpcUrl: undefined,
+    });
     expect(result).toEqual(mockCallData);
   });
 
@@ -178,8 +187,31 @@ describe('prepareCharge', () => {
     expect(prepareSpendCallData).toHaveBeenCalledWith(
       mockPermission,
       'max-remaining-allowance',
-      recipient
+      recipient,
+      { rpcUrl: undefined }
     );
     expect(result).toEqual(mockCallData);
   });
+
+  it('should pass rpcUrl to prepareSpendCallData when provided', async () => {
+    const { fetchPermission, prepareSpendCallData } = await import(
+      '../public-utilities/spend-permission/index.js'
+    );
+    vi.mocked(fetchPermission).mockResolvedValue(mockPermission);
+    vi.mocked(prepareSpendCallData).mockResolvedValue(mockCallData);
+
+    const customRpcUrl = 'https://my-custom-rpc.example.com';
+    const result = await prepareCharge({
+      id: '0xhash123',
+      amount: '10.50',
+      testnet: false,
+      rpcUrl: customRpcUrl,
+    });
+
+    expect(fetchPermission).toHaveBeenCalledWith({ permissionHash: '0xhash123' });
+    expect(prepareSpendCallData).toHaveBeenCalledWith(mockPermission, 10500000n, undefined, {
+      rpcUrl: customRpcUrl,
+    });
+    expect(result).toEqual(mockCallData);
+  });
 });
diff --git a/packages/account-sdk/src/interface/payment/prepareCharge.ts b/packages/account-sdk/src/interface/payment/prepareCharge.ts
index 8ca38b749..5960bb9a6 100644
--- a/packages/account-sdk/src/interface/payment/prepareCharge.ts
+++ b/packages/account-sdk/src/interface/payment/prepareCharge.ts
@@ -3,8 +3,9 @@ import {
   fetchPermission,
   prepareSpendCallData,
 } from '../public-utilities/spend-permission/index.js';
-import { CHAIN_IDS, TOKENS } from './constants.js';
+import { TOKENS } from './constants.js';
 import type { PrepareChargeOptions, PrepareChargeResult } from './types.js';
+import { validateUSDCBasePermission } from './utils/validateUSDCBasePermission.js';
 
 /**
  * Prepares call data for charging a subscription.
@@ -22,6 +23,7 @@ import type { PrepareChargeOptions, PrepareChargeResult } from './types.js';
  * @param options.amount - Amount to charge as a string (e.g., "10.50") or 'max-remaining-charge'
  * @param options.testnet - Whether this permission is on testnet (Base Sepolia). Defaults to false (mainnet)
  * @param options.recipient - Optional recipient address to receive the charged USDC
+ * @param options.rpcUrl - Optional custom RPC URL to use for blockchain queries. Useful for avoiding rate limits on public endpoints.
  * @returns Promise<PrepareChargeResult> - Array of call data for the charge
  * @throws Error if the subscription cannot be found or if the amount exceeds remaining allowance
  *
@@ -49,6 +51,14 @@ import type { PrepareChargeOptions, PrepareChargeResult } from './types.js';
  *   recipient: '0x0000000000000000000000000000000000000001'
  * });
  *
+ * // With custom RPC URL to avoid rate limits
+ * const chargeWithCustomRpc = await base.subscription.prepareCharge({
+ *   id: '0x71319cd488f8e4f24687711ec5c95d9e0c1bacbf5c1064942937eba4c7cf2984',
+ *   amount: '9.99',
+ *   testnet: false,
+ *   rpcUrl: 'https://my-custom-rpc.example.com'
+ * });
+ *
  * // Send the calls using your app's spender account
  * await provider.request({
  *   method: 'wallet_sendCalls',
@@ -63,7 +73,7 @@ import type { PrepareChargeOptions, PrepareChargeResult } from './types.js';
  * ```
  */
 export async function prepareCharge(options: PrepareChargeOptions): Promise<PrepareChargeResult> {
-  const { id, amount, testnet = false, recipient } = options;
+  const { id, amount, testnet = false, recipient, rpcUrl } = options;
 
   // Fetch the permission using the subscription ID (permission hash)
   const permission = await fetchPermission({
@@ -76,36 +86,7 @@ export async function prepareCharge(options: PrepareChargeOptions): Promise<Prep
   }
 
   // Validate this is a USDC permission on the correct network
-  const expectedChainId = testnet ? CHAIN_IDS.baseSepolia : CHAIN_IDS.base;
-  const expectedTokenAddress = testnet
-    ? TOKENS.USDC.addresses.baseSepolia.toLowerCase()
-    : TOKENS.USDC.addresses.base.toLowerCase();
-
-  if (permission.chainId !== expectedChainId) {
-    // Determine if the subscription is on mainnet or testnet
-    const isSubscriptionOnMainnet = permission.chainId === CHAIN_IDS.base;
-    const isSubscriptionOnTestnet = permission.chainId === CHAIN_IDS.baseSepolia;
-
-    let errorMessage: string;
-    if (testnet && isSubscriptionOnMainnet) {
-      errorMessage =
-        'The subscription was requested on testnet but is actually a mainnet subscription';
-    } else if (!testnet && isSubscriptionOnTestnet) {
-      errorMessage =
-        'The subscription was requested on mainnet but is actually a testnet subscription';
-    } else {
-      // Fallback for unexpected chain IDs
-      errorMessage = `Subscription is on chain ${permission.chainId}, expected ${expectedChainId} (${testnet ? 'Base Sepolia' : 'Base'})`;
-    }
-
-    throw new Error(errorMessage);
-  }
-
-  if (permission.permission.token.toLowerCase() !== expectedTokenAddress) {
-    throw new Error(
-      `Subscription is not for USDC token. Got ${permission.permission.token}, expected ${expectedTokenAddress}`
-    );
-  }
+  validateUSDCBasePermission(permission, testnet);
 
   // Determine the amount to pass to prepareSpendCallData
   let spendAmount: bigint | 'max-remaining-allowance';
@@ -120,8 +101,8 @@ export async function prepareCharge(options: PrepareChargeOptions): Promise<Prep
     spendAmount = parseUnits(amount, TOKENS.USDC.decimals);
   }
 
-  // Call the existing prepareSpendCallData utility with the optional recipient
-  const callData = await prepareSpendCallData(permission, spendAmount, recipient);
+  // Call the existing prepareSpendCallData utility with the optional recipient and rpcUrl
+  const callData = await prepareSpendCallData(permission, spendAmount, recipient, { rpcUrl });
 
   return callData;
 }
diff --git a/packages/account-sdk/src/interface/payment/prepareRevoke.ts b/packages/account-sdk/src/interface/payment/prepareRevoke.ts
new file mode 100644
index 000000000..24d7430c4
--- /dev/null
+++ b/packages/account-sdk/src/interface/payment/prepareRevoke.ts
@@ -0,0 +1,65 @@
+import {
+  fetchPermission,
+  prepareRevokeCallData,
+} from '../public-utilities/spend-permission/index.js';
+import type { PrepareRevokeOptions, PrepareRevokeResult } from './types.js';
+import { validateUSDCBasePermission } from './utils/validateUSDCBasePermission.js';
+
+/**
+ * Prepares call data for revoking a subscription.
+ *
+ * This function fetches the subscription (spend permission) details using its ID (permission hash)
+ * and prepares the necessary call data to revoke the subscription. It wraps the lower-level
+ * prepareRevokeCallData function with subscription-specific logic.
+ *
+ * The resulting call data includes the encoded transaction to revoke the spend permission.
+ *
+ * @param options - Options for preparing the revoke
+ * @param options.id - The subscription ID (permission hash) returned from subscribe()
+ * @param options.testnet - Whether this permission is on testnet (Base Sepolia). Defaults to false (mainnet)
+ * @returns Promise<PrepareRevokeResult> - Call data for the revoke
+ * @throws Error if the subscription cannot be found
+ *
+ * @example
+ * ```typescript
+ * import { base } from '@base-org/account/payment';
+ *
+ * // Prepare to revoke a subscription
+ * const revokeCall = await base.subscription.prepareRevoke({
+ *   id: '0x71319cd488f8e4f24687711ec5c95d9e0c1bacbf5c1064942937eba4c7cf2984',
+ *   testnet: false
+ * });
+ *
+ * // Send the call using your app's subscription owner account
+ * await provider.request({
+ *   method: 'wallet_sendCalls',
+ *   params: [{
+ *     version: '2.0.0',
+ *     from: subscriptionOwner, // Must be the spender/subscription owner!
+ *     chainId: testnet ? '0x14a34' : '0x2105',
+ *     calls: [revokeCall],
+ *   }],
+ * });
+ * ```
+ */
+export async function prepareRevoke(options: PrepareRevokeOptions): Promise<PrepareRevokeResult> {
+  const { id, testnet = false } = options;
+
+  // Fetch the permission using the subscription ID (permission hash)
+  const permission = await fetchPermission({
+    permissionHash: id,
+  });
+
+  // If no permission found, throw an error
+  if (!permission) {
+    throw new Error(`Subscription with ID ${id} not found`);
+  }
+
+  // Validate this is a USDC permission on the correct network
+  validateUSDCBasePermission(permission, testnet);
+
+  // Call the existing prepareRevokeCallData utility
+  const callData = await prepareRevokeCallData(permission);
+
+  return callData;
+}
diff --git a/packages/account-sdk/src/interface/payment/revoke.ts b/packages/account-sdk/src/interface/payment/revoke.ts
new file mode 100644
index 000000000..5663018c3
--- /dev/null
+++ b/packages/account-sdk/src/interface/payment/revoke.ts
@@ -0,0 +1,110 @@
+import { type Address } from 'viem';
+import { prepareRevoke } from './prepareRevoke.js';
+import type { RevokeOptions, RevokeResult } from './types.js';
+import { createCdpClientOrThrow } from './utils/createCdpClientOrThrow.js';
+import { getExistingSmartWalletOrThrow } from './utils/getExistingSmartWalletOrThrow.js';
+import { sendUserOpAndWait } from './utils/sendUserOpAndWait.js';
+
+/**
+ * Prepares and executes a revoke for a given spend permission.
+ *
+ * Note: This function relies on Node.js APIs and is only available in Node.js environments.
+ *
+ * This function combines the functionality of getOrCreateSubscriptionOwnerWallet and prepareRevoke,
+ * then executes the revoke using a CDP smart wallet. The smart wallet is controlled
+ * by an EVM account and can leverage paymasters for gas sponsorship.
+ *
+ * The function will:
+ * - Use the provided CDP credentials or fall back to environment variables
+ * - Get the existing smart wallet that acts as the subscription owner
+ * - Prepare the revoke call data using the subscription ID
+ * - Execute the revoke transaction using the smart wallet
+ * - Optionally use a paymaster for transaction sponsorship
+ *
+ * @param options - Options for revoking the subscription
+ * @param options.id - The subscription ID (permission hash) to revoke
+ * @param options.testnet - Whether this is on testnet (Base Sepolia). Defaults to false (mainnet)
+ * @param options.cdpApiKeyId - CDP API key ID. Falls back to CDP_API_KEY_ID env var
+ * @param options.cdpApiKeySecret - CDP API key secret. Falls back to CDP_API_KEY_SECRET env var
+ * @param options.cdpWalletSecret - CDP wallet secret. Falls back to CDP_WALLET_SECRET env var
+ * @param options.walletName - Custom wallet name. Defaults to "subscription owner"
+ * @param options.paymasterUrl - Paymaster URL for sponsorship. Falls back to PAYMASTER_URL env var
+ * @returns Promise<RevokeResult> - Result of the revoke transaction
+ * @throws Error if CDP credentials are missing, subscription not found, or revoke fails
+ *
+ * @example
+ * ```typescript
+ * import { base } from '@base-org/account/payment';
+ *
+ * // Using environment variables for credentials and paymaster
+ * const result = await base.subscription.revoke({
+ *   id: '0x71319cd488f8e4f24687711ec5c95d9e0c1bacbf5c1064942937eba4c7cf2984',
+ *   testnet: false
+ * });
+ * console.log(`Revoked subscription - Transaction: ${result.id}`);
+ *
+ * // Using explicit credentials and paymaster URL
+ * const result = await base.subscription.revoke({
+ *   id: '0x71319cd488f8e4f24687711ec5c95d9e0c1bacbf5c1064942937eba4c7cf2984',
+ *   cdpApiKeyId: 'your-api-key-id',
+ *   cdpApiKeySecret: 'your-api-key-secret',
+ *   cdpWalletSecret: 'your-wallet-secret',
+ *   paymasterUrl: 'https://your-paymaster.com',
+ *   testnet: false
+ * });
+ *
+ * // Using a custom wallet name
+ * const result = await base.subscription.revoke({
+ *   id: '0x71319cd488f8e4f24687711ec5c95d9e0c1bacbf5c1064942937eba4c7cf2984',
+ *   walletName: 'my-app-charge-wallet',
+ *   testnet: true
+ * });
+ * ```
+ */
+export async function revoke(options: RevokeOptions): Promise<RevokeResult> {
+  const {
+    id,
+    testnet = false,
+    cdpApiKeyId,
+    cdpApiKeySecret,
+    cdpWalletSecret,
+    walletName = 'subscription owner',
+    paymasterUrl = process.env.PAYMASTER_URL,
+  } = options;
+
+  // Step 1: Initialize CDP client with provided credentials or environment variables
+  const cdpClient = createCdpClientOrThrow(
+    { cdpApiKeyId, cdpApiKeySecret, cdpWalletSecret },
+    'subscription revoke'
+  );
+
+  // Step 2: Get the existing EVM account and smart wallet
+  // NOTE: We use get() instead of getOrCreate() to ensure the wallet already exists.
+  // The wallet should have been created prior to executing a revoke on it.
+  const smartWallet = await getExistingSmartWalletOrThrow(cdpClient, walletName, 'revoke');
+
+  // Step 3: Prepare the revoke call data
+  const revokeCall = await prepareRevoke({ id, testnet });
+
+  // Step 4: Get the network-scoped smart wallet
+  const network = testnet ? 'base-sepolia' : 'base';
+  const networkSmartWallet = await smartWallet.useNetwork(network);
+
+  // Step 5: Execute the revoke transaction using the smart wallet
+  // Smart wallets can batch multiple calls and use paymasters for gas sponsorship
+  const transactionHash = await sendUserOpAndWait(
+    networkSmartWallet,
+    [revokeCall],
+    paymasterUrl,
+    60, // Wait up to 60 seconds for the operation to complete
+    'revoke'
+  );
+
+  // Return success result
+  return {
+    success: true,
+    id: transactionHash,
+    subscriptionId: id,
+    subscriptionOwner: smartWallet.address as Address,
+  };
+}
diff --git a/packages/account-sdk/src/interface/payment/subscribe.test.ts b/packages/account-sdk/src/interface/payment/subscribe.test.ts
new file mode 100644
index 000000000..f8598e796
--- /dev/null
+++ b/packages/account-sdk/src/interface/payment/subscribe.test.ts
@@ -0,0 +1,357 @@
+import { describe, expect, it, vi } from 'vitest';
+import { subscribe } from './subscribe.js';
+import type { SubscriptionOptions } from './types.js';
+
+// Mock the dependencies
+vi.mock(':core/telemetry/events/subscription.js', () => ({
+  logSubscriptionStarted: vi.fn(),
+  logSubscriptionCompleted: vi.fn(),
+  logSubscriptionError: vi.fn(),
+}));
+
+vi.mock('./utils/sdkManager.js', () => ({
+  createEphemeralSDK: vi.fn(() => ({
+    getProvider: vi.fn(() => ({
+      request: vi.fn(),
+      disconnect: vi.fn(),
+    })),
+  })),
+}));
+
+vi.mock('../public-utilities/spend-permission/index.js', () => ({
+  getHash: vi.fn(() => Promise.resolve('0xmockhash')),
+}));
+
+describe('subscribe with requireBalance capability', () => {
+  it('should include capabilities when requireBalance is true', async () => {
+    const options: SubscriptionOptions = {
+      recurringCharge: '10.00',
+      subscriptionOwner: '0x1234567890123456789012345678901234567890',
+      periodInDays: 30,
+      testnet: true,
+      requireBalance: true, // Enable balance check
+    };
+
+    // Mock the provider response
+    const mockProvider = {
+      request: vi.fn().mockResolvedValue({
+        signature: '0xsignature',
+        signedData: {
+          message: {
+            account: '0xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+            spender: '0x1234567890123456789012345678901234567890',
+            token: '0xtoken',
+            allowance: '10000000',
+            period: 2592000, // 30 days in seconds
+            start: 1234567890,
+            end: 999999999,
+            salt: '0xsalt',
+            extraData: '0x',
+          },
+        },
+      }),
+      disconnect: vi.fn(),
+    };
+
+    const { createEphemeralSDK } = await import('./utils/sdkManager.js');
+    vi.mocked(createEphemeralSDK).mockReturnValue({
+      getProvider: () => mockProvider as any,
+    } as any);
+
+    await subscribe(options);
+
+    // Verify wallet_sign was called with capabilities
+    expect(mockProvider.request).toHaveBeenCalledWith({
+      method: 'wallet_sign',
+      params: [
+        expect.objectContaining({
+          version: '1.0',
+          request: expect.any(Object),
+          mutableData: expect.any(Object),
+          capabilities: {
+            spendPermissions: {
+              requireBalance: true,
+            },
+          },
+        }),
+      ],
+    });
+  });
+
+  it('should not include capabilities when requireBalance is false', async () => {
+    const options: SubscriptionOptions = {
+      recurringCharge: '10.00',
+      subscriptionOwner: '0x1234567890123456789012345678901234567890',
+      periodInDays: 30,
+      testnet: true,
+      requireBalance: false, // Explicitly disable
+    };
+
+    // Mock the provider response
+    const mockProvider = {
+      request: vi.fn().mockResolvedValue({
+        signature: '0xsignature',
+        signedData: {
+          message: {
+            account: '0xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+            spender: '0x1234567890123456789012345678901234567890',
+            token: '0xtoken',
+            allowance: '10000000',
+            period: 2592000, // 30 days in seconds
+            start: 1234567890,
+            end: 999999999,
+            salt: '0xsalt',
+            extraData: '0x',
+          },
+        },
+      }),
+      disconnect: vi.fn(),
+    };
+
+    const { createEphemeralSDK } = await import('./utils/sdkManager.js');
+    vi.mocked(createEphemeralSDK).mockReturnValue({
+      getProvider: () => mockProvider as any,
+    } as any);
+
+    await subscribe(options);
+
+    // Verify wallet_sign was called without capabilities
+    expect(mockProvider.request).toHaveBeenCalledWith({
+      method: 'wallet_sign',
+      params: [
+        expect.not.objectContaining({
+          capabilities: expect.anything(),
+        }),
+      ],
+    });
+  });
+
+  it('should include capabilities by default when requireBalance is undefined', async () => {
+    const options: SubscriptionOptions = {
+      recurringCharge: '10.00',
+      subscriptionOwner: '0x1234567890123456789012345678901234567890',
+      periodInDays: 30,
+      testnet: true,
+      // requireBalance not specified - should default to true
+    };
+
+    // Mock the provider response
+    const mockProvider = {
+      request: vi.fn().mockResolvedValue({
+        signature: '0xsignature',
+        signedData: {
+          message: {
+            account: '0xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+            spender: '0x1234567890123456789012345678901234567890',
+            token: '0xtoken',
+            allowance: '10000000',
+            period: 2592000, // 30 days in seconds
+            start: 1234567890,
+            end: 999999999,
+            salt: '0xsalt',
+            extraData: '0x',
+          },
+        },
+      }),
+      disconnect: vi.fn(),
+    };
+
+    const { createEphemeralSDK } = await import('./utils/sdkManager.js');
+    vi.mocked(createEphemeralSDK).mockReturnValue({
+      getProvider: () => mockProvider as any,
+    } as any);
+
+    await subscribe(options);
+
+    // Verify wallet_sign was called with capabilities (default behavior)
+    expect(mockProvider.request).toHaveBeenCalledWith({
+      method: 'wallet_sign',
+      params: [
+        expect.objectContaining({
+          version: '1.0',
+          request: expect.any(Object),
+          mutableData: expect.any(Object),
+          capabilities: {
+            spendPermissions: {
+              requireBalance: true,
+            },
+          },
+        }),
+      ],
+    });
+  });
+});
+
+describe('subscribe with overridePeriodInSecondsForTestnet', () => {
+  it('should throw error when overridePeriodInSecondsForTestnet is used without testnet', async () => {
+    const options = {
+      recurringCharge: '10.00',
+      subscriptionOwner: '0x1234567890123456789012345678901234567890',
+      overridePeriodInSecondsForTestnet: 300, // 5 minutes
+      testnet: false, // This should cause an error
+    } as any; // Use 'as any' to bypass TypeScript's discriminated union check for testing
+
+    await expect(subscribe(options)).rejects.toThrow(
+      'overridePeriodInSecondsForTestnet is only available for testing on testnet'
+    );
+  });
+
+  it('should accept overridePeriodInSecondsForTestnet when testnet is true and include it in result', async () => {
+    const options: SubscriptionOptions = {
+      recurringCharge: '0.01',
+      subscriptionOwner: '0x1234567890123456789012345678901234567890',
+      overridePeriodInSecondsForTestnet: 300, // 5 minutes for testing
+      testnet: true, // Required for overridePeriodInSecondsForTestnet
+    };
+
+    // Mock the provider response
+    const mockProvider = {
+      request: vi.fn().mockResolvedValue({
+        signature: '0xsignature',
+        signedData: {
+          message: {
+            account: '0xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+            spender: '0x1234567890123456789012345678901234567890',
+            token: '0xtoken',
+            allowance: '10000',
+            period: 300, // Should be 300 seconds, not converted to days
+            start: 1234567890,
+            end: 999999999,
+            salt: '0xsalt',
+            extraData: '0x',
+          },
+        },
+      }),
+      disconnect: vi.fn(),
+    };
+
+    const { createEphemeralSDK } = await import('./utils/sdkManager.js');
+    vi.mocked(createEphemeralSDK).mockReturnValue({
+      getProvider: () => mockProvider as any,
+    } as any);
+
+    const result = await subscribe(options);
+
+    // Verify the result includes overridePeriodInSecondsForTestnet
+    expect(result).toBeDefined();
+    expect(result.overridePeriodInSecondsForTestnet).toBe(300);
+    expect(result.periodInDays).toBe(1); // 300 seconds = 5 minutes = ceil(300/86400) = 1 day
+  });
+
+  it('should use periodInDays when overridePeriodInSecondsForTestnet is not provided on testnet', async () => {
+    const options: SubscriptionOptions = {
+      recurringCharge: '10.00',
+      subscriptionOwner: '0x1234567890123456789012345678901234567890',
+      periodInDays: 7, // Weekly subscription
+      testnet: true,
+    };
+
+    // Mock the provider response
+    const mockProvider = {
+      request: vi.fn().mockResolvedValue({
+        signature: '0xsignature',
+        signedData: {
+          message: {
+            account: '0xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+            spender: '0x1234567890123456789012345678901234567890',
+            token: '0xtoken',
+            allowance: '10000000',
+            period: 604800, // 7 days in seconds
+            start: 1234567890,
+            end: 999999999,
+            salt: '0xsalt',
+            extraData: '0x',
+          },
+        },
+      }),
+      disconnect: vi.fn(),
+    };
+
+    const { createEphemeralSDK } = await import('./utils/sdkManager.js');
+    vi.mocked(createEphemeralSDK).mockReturnValue({
+      getProvider: () => mockProvider as any,
+    } as any);
+
+    const result = await subscribe(options);
+    expect(result.periodInDays).toBe(7);
+    expect(result.overridePeriodInSecondsForTestnet).toBeUndefined(); // Should not have overridePeriodInSecondsForTestnet when not provided
+  });
+
+  it('should include overridePeriodInSecondsForTestnet in result and calculate periodInDays correctly', async () => {
+    const options: SubscriptionOptions = {
+      recurringCharge: '0.01',
+      subscriptionOwner: '0x1234567890123456789012345678901234567890',
+      overridePeriodInSecondsForTestnet: 172800, // Exactly 2 days
+      testnet: true,
+    };
+
+    // Mock the provider response
+    const mockProvider = {
+      request: vi.fn().mockResolvedValue({
+        signature: '0xsignature',
+        signedData: {
+          message: {
+            account: '0xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+            spender: '0x1234567890123456789012345678901234567890',
+            token: '0xtoken',
+            allowance: '10000',
+            period: 172800, // 2 days in seconds
+            start: 1234567890,
+            end: 999999999,
+            salt: '0xsalt',
+            extraData: '0x',
+          },
+        },
+      }),
+      disconnect: vi.fn(),
+    };
+
+    const { createEphemeralSDK } = await import('./utils/sdkManager.js');
+    vi.mocked(createEphemeralSDK).mockReturnValue({
+      getProvider: () => mockProvider as any,
+    } as any);
+
+    const result = await subscribe(options);
+    expect(result.overridePeriodInSecondsForTestnet).toBe(172800); // Should include the exact overridePeriodInSecondsForTestnet
+    expect(result.periodInDays).toBe(2); // Should be exactly 2 days
+  });
+
+  it('should not include overridePeriodInSecondsForTestnet when using mainnet', async () => {
+    const options: SubscriptionOptions = {
+      recurringCharge: '10.00',
+      subscriptionOwner: '0x1234567890123456789012345678901234567890',
+      periodInDays: 30, // Monthly subscription
+      testnet: false, // Mainnet
+    };
+
+    // Mock the provider response
+    const mockProvider = {
+      request: vi.fn().mockResolvedValue({
+        signature: '0xsignature',
+        signedData: {
+          message: {
+            account: '0xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+            spender: '0x1234567890123456789012345678901234567890',
+            token: '0xtoken',
+            allowance: '10000000',
+            period: 2592000, // 30 days in seconds
+            start: 1234567890,
+            end: 999999999,
+            salt: '0xsalt',
+            extraData: '0x',
+          },
+        },
+      }),
+      disconnect: vi.fn(),
+    };
+
+    const { createEphemeralSDK } = await import('./utils/sdkManager.js');
+    vi.mocked(createEphemeralSDK).mockReturnValue({
+      getProvider: () => mockProvider as any,
+    } as any);
+
+    const result = await subscribe(options);
+    expect(result.periodInDays).toBe(30);
+    expect(result.overridePeriodInSecondsForTestnet).toBeUndefined(); // Should not have overridePeriodInSecondsForTestnet on mainnet
+  });
+});
diff --git a/packages/account-sdk/src/interface/payment/subscribe.ts b/packages/account-sdk/src/interface/payment/subscribe.ts
index 50bbb8fbc..68e1032c8 100644
--- a/packages/account-sdk/src/interface/payment/subscribe.ts
+++ b/packages/account-sdk/src/interface/payment/subscribe.ts
@@ -8,6 +8,7 @@ import { parseUnits } from 'viem';
 import { getHash } from '../public-utilities/spend-permission/index.js';
 import {
   createSpendPermissionTypedData,
+  createSpendPermissionTypedDataWithSeconds,
   type SpendPermissionTypedData,
 } from '../public-utilities/spend-permission/utils.js';
 import { CHAIN_IDS, TOKENS } from './constants.js';
@@ -25,9 +26,11 @@ const PLACEHOLDER_ADDRESS = '0xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' as cons
  * @param options.recurringCharge - Amount of USDC to charge per period as a string (e.g., "10.50")
  * @param options.subscriptionOwner - Ethereum address that will be the spender (your application's address)
  * @param options.periodInDays - The period in days for the subscription (default: 30)
+ * @param options.overridePeriodInSecondsForTestnet - TEST ONLY: Override period in seconds (only works when testnet=true)
  * @param options.testnet - Whether to use Base Sepolia testnet (default: false)
  * @param options.walletUrl - Optional wallet URL to use
  * @param options.telemetry - Whether to enable telemetry logging (default: true)
+ * @param options.requireBalance - Whether to require the user has sufficient balance before creating the subscription (default: true)
  * @returns Promise<SubscriptionResult> - Simplified result with subscription details
  * @throws Error if the subscription fails
  *
@@ -50,6 +53,23 @@ const PLACEHOLDER_ADDRESS = '0xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' as cons
  *   console.error(`Subscription failed: ${error.message}`);
  * }
  * ```
+ *
+ * @example
+ * ```typescript
+ * // TEST ONLY: Using overridePeriodInSecondsForTestnet for faster testing
+ * try {
+ *   const subscription = await subscribe({
+ *     recurringCharge: "0.01",
+ *     subscriptionOwner: "0xFe21034794A5a574B94fE4fDfD16e005F1C96e51",
+ *     overridePeriodInSecondsForTestnet: 300, // 5 minutes for testing - ONLY WORKS ON TESTNET
+ *     testnet: true // REQUIRED when using overridePeriodInSecondsForTestnet
+ *   });
+ *
+ *   console.log(`Test subscription created with 5-minute period`);
+ * } catch (error) {
+ *   console.error(`Subscription failed: ${error.message}`);
+ * }
+ * ```
  */
 export async function subscribe(options: SubscriptionOptions): Promise<SubscriptionResult> {
   const {
@@ -59,14 +79,39 @@ export async function subscribe(options: SubscriptionOptions): Promise<Subscript
     testnet = false,
     walletUrl,
     telemetry = true,
+    requireBalance = true,
   } = options;
 
+  // Check if overridePeriodInSecondsForTestnet is present in options
+  const hasOverridePeriod = 'overridePeriodInSecondsForTestnet' in options;
+
+  // Runtime validation: overridePeriodInSecondsForTestnet requires testnet: true
+  if (hasOverridePeriod && !testnet) {
+    throw new Error(
+      'overridePeriodInSecondsForTestnet is only available for testing on testnet. ' +
+        'Set testnet: true to use overridePeriodInSecondsForTestnet, or use periodInDays for production.'
+    );
+  }
+
+  // Extract the overridePeriodInSecondsForTestnet if present and valid
+  const overridePeriodInSecondsForTestnet =
+    testnet && hasOverridePeriod ? (options as any).overridePeriodInSecondsForTestnet : undefined;
+
   // Generate correlation ID for this subscription request
   const correlationId = crypto.randomUUID();
 
   // Log subscription started
   if (telemetry) {
-    logSubscriptionStarted({ recurringCharge, periodInDays, testnet, correlationId });
+    logSubscriptionStarted({
+      recurringCharge,
+      periodInDays:
+        testnet && overridePeriodInSecondsForTestnet !== undefined
+          ? Math.ceil(overridePeriodInSecondsForTestnet / 86400)
+          : periodInDays,
+      testnet,
+      correlationId,
+      periodInSeconds: testnet ? overridePeriodInSecondsForTestnet : undefined,
+    });
   }
 
   try {
@@ -88,20 +133,35 @@ export async function subscribe(options: SubscriptionOptions): Promise<Subscript
     // - Auto-generation of salt and extraData
     // - Proper formatting of all fields
     // We use PLACEHOLDER_ADDRESS which will be replaced by wallet with actual account
-    const typedData = createSpendPermissionTypedData({
-      account: PLACEHOLDER_ADDRESS,
-      spender: spenderAddress,
-      token: tokenAddress,
-      chainId: chainId,
-      allowance: allowanceInWei,
-      periodInDays: periodInDays,
-    });
+    const typedData =
+      testnet && overridePeriodInSecondsForTestnet !== undefined
+        ? createSpendPermissionTypedDataWithSeconds({
+            account: PLACEHOLDER_ADDRESS,
+            spender: spenderAddress,
+            token: tokenAddress,
+            chainId: chainId,
+            allowance: allowanceInWei,
+            periodInSeconds: overridePeriodInSecondsForTestnet,
+          })
+        : createSpendPermissionTypedData({
+            account: PLACEHOLDER_ADDRESS,
+            spender: spenderAddress,
+            token: tokenAddress,
+            chainId: chainId,
+            allowance: allowanceInWei,
+            periodInDays: periodInDays,
+          });
 
     // Create SDK instance
     const sdk = createEphemeralSDK(chainId, walletUrl, telemetry);
     const provider = sdk.getProvider();
 
     try {
+      // Build capabilities if requireBalance is set
+      const capabilities = requireBalance
+        ? { spendPermissions: { requireBalance: true } }
+        : undefined;
+
       // Define the wallet_sign parameters with mutable data
       // This allows the wallet to replace PLACEHOLDER_ADDRESS with the actual account
       const signParams = {
@@ -113,6 +173,7 @@ export async function subscribe(options: SubscriptionOptions): Promise<Subscript
         mutableData: {
           fields: ['message.account'],
         },
+        ...(capabilities && { capabilities }),
       };
 
       // Request signature from wallet
@@ -164,7 +225,11 @@ export async function subscribe(options: SubscriptionOptions): Promise<Subscript
       if (telemetry) {
         logSubscriptionCompleted({
           recurringCharge,
-          periodInDays,
+          periodInDays:
+            testnet && overridePeriodInSecondsForTestnet !== undefined
+              ? Math.ceil(overridePeriodInSecondsForTestnet / 86400)
+              : periodInDays,
+          periodInSeconds: testnet ? overridePeriodInSecondsForTestnet : undefined,
           testnet,
           correlationId,
           permissionHash,
@@ -177,7 +242,14 @@ export async function subscribe(options: SubscriptionOptions): Promise<Subscript
         subscriptionOwner: message.spender,
         subscriptionPayer: message.account,
         recurringCharge: recurringCharge, // The amount in USD as provided by the user
-        periodInDays,
+        periodInDays:
+          testnet && overridePeriodInSecondsForTestnet !== undefined
+            ? Math.ceil(overridePeriodInSecondsForTestnet / 86400)
+            : periodInDays,
+        ...(testnet &&
+          overridePeriodInSecondsForTestnet !== undefined && {
+            overridePeriodInSecondsForTestnet,
+          }),
       };
     } finally {
       // Clean up provider state
@@ -191,7 +263,11 @@ export async function subscribe(options: SubscriptionOptions): Promise<Subscript
     if (telemetry) {
       logSubscriptionError({
         recurringCharge,
-        periodInDays,
+        periodInDays:
+          testnet && overridePeriodInSecondsForTestnet !== undefined
+            ? Math.ceil(overridePeriodInSecondsForTestnet / 86400)
+            : periodInDays,
+        periodInSeconds: testnet ? overridePeriodInSecondsForTestnet : undefined,
         testnet,
         correlationId,
         errorMessage,
diff --git a/packages/account-sdk/src/interface/payment/types.ts b/packages/account-sdk/src/interface/payment/types.ts
index 41888a91e..d8678e483 100644
--- a/packages/account-sdk/src/interface/payment/types.ts
+++ b/packages/account-sdk/src/interface/payment/types.ts
@@ -100,6 +100,8 @@ export interface PaymentStatusOptions {
   testnet?: boolean;
   /** Whether to enable telemetry logging. Defaults to true */
   telemetry?: boolean;
+  /** Optional custom bundler URL to use for status checks. Useful for avoiding rate limits on public endpoints. */
+  bundlerUrl?: string;
 }
 
 /**
@@ -130,23 +132,102 @@ export interface PaymentStatus {
 }
 
 /**
- * Options for creating a subscription
+ * Base subscription options shared across all subscription types
  */
-export interface SubscriptionOptions {
+interface BaseSubscriptionOptions {
   /** Amount of USDC to charge per period as a string (e.g., "10.50") */
   recurringCharge: string;
   /** Ethereum address that will be the spender (your application's address) */
   subscriptionOwner: string;
-  /** The period in days for the subscription (e.g., 30 for monthly) */
-  periodInDays?: number;
-  /** Whether to use testnet (Base Sepolia). Defaults to false (mainnet) */
-  testnet?: boolean;
   /** Optional wallet URL to use */
   walletUrl?: string;
   /** Whether to enable telemetry logging. Defaults to true */
   telemetry?: boolean;
+  /** Whether to require the user has sufficient balance before creating the subscription. Defaults to true */
+  requireBalance?: boolean;
 }
 
+/**
+ * Mainnet subscription options with period in days
+ */
+interface MainnetSubscriptionOptions extends BaseSubscriptionOptions {
+  /** The period in days for the subscription (e.g., 30 for monthly) */
+  periodInDays?: number;
+  /** Mainnet mode (production) */
+  testnet?: false;
+}
+
+/**
+ * Testnet subscription options with period in days
+ */
+interface TestnetSubscriptionWithDays extends BaseSubscriptionOptions {
+  /** The period in days for the subscription (e.g., 30 for monthly) */
+  periodInDays?: number;
+  /** Testnet mode (Base Sepolia) */
+  testnet: true;
+  /**
+   * Optional override for testing: period in seconds.
+   * When provided, this overrides periodInDays for faster testing cycles.
+   * ⚠️ WARNING: Only works on testnet.
+   * @testOnly
+   */
+  overridePeriodInSecondsForTestnet?: never;
+}
+
+/**
+ * Testnet subscription options with period in seconds for testing
+ */
+interface TestnetSubscriptionWithSeconds extends BaseSubscriptionOptions {
+  /**
+   * Required when using seconds: ignored but kept for API consistency.
+   * The actual period will be determined by overridePeriodInSecondsForTestnet.
+   */
+  periodInDays?: number;
+  /** Testnet mode (Base Sepolia) - required when using period in seconds */
+  testnet: true;
+  /**
+   * Override period in seconds for faster testing cycles on testnet.
+   * ⚠️ WARNING: Only works on testnet. When provided, this overrides periodInDays.
+   * @testOnly
+   */
+  overridePeriodInSecondsForTestnet: number;
+}
+
+/**
+ * Options for creating a subscription.
+ *
+ * @example
+ * ```typescript
+ * // Mainnet subscription (30-day period)
+ * await subscribe({
+ *   recurringCharge: "10.50",
+ *   subscriptionOwner: "0x...",
+ *   periodInDays: 30
+ * });
+ *
+ * // Testnet subscription with days
+ * await subscribe({
+ *   recurringCharge: "10.50",
+ *   subscriptionOwner: "0x...",
+ *   periodInDays: 30,
+ *   testnet: true
+ * });
+ *
+ * // Testnet subscription with seconds override for testing
+ * await subscribe({
+ *   recurringCharge: "0.01",
+ *   subscriptionOwner: "0x...",
+ *   periodInDays: 30, // ignored but can be provided for consistency
+ *   testnet: true,
+ *   overridePeriodInSecondsForTestnet: 300 // 5 minutes
+ * });
+ * ```
+ */
+export type SubscriptionOptions =
+  | MainnetSubscriptionOptions
+  | TestnetSubscriptionWithDays
+  | TestnetSubscriptionWithSeconds;
+
 /**
  * Successful subscription result
  */
@@ -161,6 +242,11 @@ export interface SubscriptionResult {
   recurringCharge: string;
   /** The period in days for the subscription */
   periodInDays: number;
+  /**
+   * TEST ONLY: The actual period in seconds if overridden on testnet
+   * Only present when using overridePeriodInSecondsForTestnet on testnet
+   */
+  overridePeriodInSecondsForTestnet?: number;
 }
 
 /**
@@ -171,6 +257,8 @@ export interface SubscriptionStatusOptions {
   id: string;
   /** Whether to check on testnet (Base Sepolia). Defaults to false (mainnet) */
   testnet?: boolean;
+  /** Optional custom RPC URL to use for blockchain queries. Useful for avoiding rate limits on public endpoints. */
+  rpcUrl?: string;
 }
 
 /**
@@ -189,6 +277,8 @@ export interface SubscriptionStatus {
   nextPeriodStart?: Date;
   /** The subscription period in days */
   periodInDays?: number;
+  /** The wallet address of the account that owns this subscription */
+  subscriptionOwner?: string;
 }
 
 /**
@@ -203,6 +293,8 @@ export interface PrepareChargeOptions {
   testnet?: boolean;
   /** Optional recipient address to receive the charged USDC */
   recipient?: Address;
+  /** Optional custom RPC URL to use for blockchain queries. Useful for avoiding rate limits on public endpoints. */
+  rpcUrl?: string;
 }
 
 /**
@@ -213,8 +305,8 @@ export interface PrepareChargeCall {
   to: Address;
   /** The encoded call data */
   data: Hex;
-  /** The value to send (always 0x0 for spend permissions) */
-  value: '0x0';
+  /** The value to send (always 0n for spend permissions) */
+  value: bigint;
 }
 
 /**
@@ -225,7 +317,7 @@ export type PrepareChargeResult = PrepareChargeCall[];
 /**
  * Options for getting or creating a subscription owner smart account
  */
-export interface GetSubscriptionOwnerOptions {
+export interface GetOrCreateSubscriptionOwnerWalletOptions {
   /** CDP API key ID. Falls back to CDP_API_KEY_ID env var */
   cdpApiKeyId?: string;
   /** CDP API key secret. Falls back to CDP_API_KEY_SECRET env var */
@@ -241,7 +333,7 @@ export interface GetSubscriptionOwnerOptions {
 /**
  * Result from getting or creating a subscription owner smart account
  */
-export interface GetSubscriptionOwnerResult {
+export interface GetOrCreateSubscriptionOwnerWalletResult {
   /** The Ethereum address of the subscription owner smart account */
   address: Address;
   /** The name of the wallet */
@@ -279,11 +371,68 @@ export interface ChargeResult {
   /** The amount that was charged */
   amount: string;
   /** The address that executed the charge (subscription owner) */
-  chargedBy: Address;
+  subscriptionOwner: Address;
   /** The recipient address that received the USDC (if specified) */
   recipient?: Address;
 }
 
+/**
+ * Options for preparing subscription revoke call data
+ */
+export interface PrepareRevokeOptions {
+  /** The subscription ID (permission hash) */
+  id: string;
+  /** Whether to use testnet (Base Sepolia). Defaults to false (mainnet) */
+  testnet?: boolean;
+}
+
+/**
+ * Call data for revoking a subscription
+ */
+export interface PrepareRevokeCall {
+  /** The address to call */
+  to: Address;
+  /** The encoded call data */
+  data: Hex;
+  /** The value to send (always 0n for spend permissions) */
+  value: bigint;
+}
+
+/**
+ * Result of preparing subscription revoke call data
+ */
+export type PrepareRevokeResult = PrepareRevokeCall;
+
+/**
+ * Options for revoking a subscription
+ */
+export interface RevokeOptions extends PrepareRevokeOptions {
+  /** CDP API key ID. Falls back to CDP_API_KEY_ID env var */
+  cdpApiKeyId?: string;
+  /** CDP API key secret. Falls back to CDP_API_KEY_SECRET env var */
+  cdpApiKeySecret?: string;
+  /** CDP wallet secret. Falls back to CDP_WALLET_SECRET env var */
+  cdpWalletSecret?: string;
+  /** Custom wallet name. Defaults to "subscription owner" */
+  walletName?: string;
+  /** Paymaster URL for transaction sponsorship. Falls back to PAYMASTER_URL env var */
+  paymasterUrl?: string;
+}
+
+/**
+ * Result of revoking a subscription
+ */
+export interface RevokeResult {
+  /** Whether the revoke was successful */
+  success: true;
+  /** Transaction ID (hash) of the revoke */
+  id: string;
+  /** The subscription ID that was revoked */
+  subscriptionId: string;
+  /** The address that executed the revoke (subscription owner) */
+  subscriptionOwner: Address;
+}
+
 /**
  * Internal type for payment execution result
  */
diff --git a/packages/account-sdk/src/interface/payment/utils/createCdpClientOrThrow.test.ts b/packages/account-sdk/src/interface/payment/utils/createCdpClientOrThrow.test.ts
new file mode 100644
index 000000000..e12effae6
--- /dev/null
+++ b/packages/account-sdk/src/interface/payment/utils/createCdpClientOrThrow.test.ts
@@ -0,0 +1,107 @@
+import { CdpClient } from '@coinbase/cdp-sdk';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { createCdpClientOrThrow } from './createCdpClientOrThrow.js';
+
+// Mock the CdpClient
+vi.mock('@coinbase/cdp-sdk', () => ({
+  CdpClient: vi.fn(),
+}));
+
+describe('createCdpClientOrThrow', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('should create CDP client with provided options', () => {
+    const mockCdpClient = {} as CdpClient;
+    vi.mocked(CdpClient).mockReturnValue(mockCdpClient);
+
+    const options = {
+      cdpApiKeyId: 'test-key-id',
+      cdpApiKeySecret: 'test-key-secret',
+      cdpWalletSecret: 'test-wallet-secret',
+    };
+
+    const result = createCdpClientOrThrow(options, 'test context');
+
+    expect(result).toBe(mockCdpClient);
+    expect(CdpClient).toHaveBeenCalledWith({
+      apiKeyId: 'test-key-id',
+      apiKeySecret: 'test-key-secret',
+      walletSecret: 'test-wallet-secret',
+    });
+  });
+
+  it('should create CDP client with partial options', () => {
+    const mockCdpClient = {} as CdpClient;
+    vi.mocked(CdpClient).mockReturnValue(mockCdpClient);
+
+    const options = {
+      cdpApiKeyId: 'test-key-id',
+    };
+
+    const result = createCdpClientOrThrow(options, 'test context');
+
+    expect(result).toBe(mockCdpClient);
+    expect(CdpClient).toHaveBeenCalledWith({
+      apiKeyId: 'test-key-id',
+      apiKeySecret: undefined,
+      walletSecret: undefined,
+    });
+  });
+
+  it('should create CDP client with empty options', () => {
+    const mockCdpClient = {} as CdpClient;
+    vi.mocked(CdpClient).mockReturnValue(mockCdpClient);
+
+    const result = createCdpClientOrThrow({}, 'test context');
+
+    expect(result).toBe(mockCdpClient);
+    expect(CdpClient).toHaveBeenCalledWith({
+      apiKeyId: undefined,
+      apiKeySecret: undefined,
+      walletSecret: undefined,
+    });
+  });
+
+  it('should throw detailed error when CDP client creation fails with Error', () => {
+    const originalError = new Error('Missing API credentials');
+    vi.mocked(CdpClient).mockImplementation(() => {
+      throw originalError;
+    });
+
+    expect(() => createCdpClientOrThrow({}, 'subscription charge')).toThrow(
+      'Failed to initialize CDP client for subscription charge. Missing API credentials\n\nPlease ensure you have set the required CDP credentials either:\n1. As environment variables: CDP_API_KEY_ID, CDP_API_KEY_SECRET, CDP_WALLET_SECRET\n2. As function parameters: cdpApiKeyId, cdpApiKeySecret, cdpWalletSecret\n\nYou can get these credentials from https://portal.cdp.coinbase.com/'
+    );
+  });
+
+  it('should throw detailed error when CDP client creation fails with string', () => {
+    vi.mocked(CdpClient).mockImplementation(() => {
+      throw 'String error';
+    });
+
+    expect(() => createCdpClientOrThrow({}, 'subscription revoke')).toThrow(
+      'Failed to initialize CDP client for subscription revoke. String error\n\nPlease ensure you have set the required CDP credentials either:\n1. As environment variables: CDP_API_KEY_ID, CDP_API_KEY_SECRET, CDP_WALLET_SECRET\n2. As function parameters: cdpApiKeyId, cdpApiKeySecret, cdpWalletSecret\n\nYou can get these credentials from https://portal.cdp.coinbase.com/'
+    );
+  });
+
+  it('should throw detailed error when CDP client creation fails with non-Error object', () => {
+    vi.mocked(CdpClient).mockImplementation(() => {
+      throw { code: 'INVALID_CREDENTIALS' };
+    });
+
+    expect(() => createCdpClientOrThrow({}, 'test context')).toThrow(
+      'Failed to initialize CDP client for test context. [object Object]\n\nPlease ensure you have set the required CDP credentials either:\n1. As environment variables: CDP_API_KEY_ID, CDP_API_KEY_SECRET, CDP_WALLET_SECRET\n2. As function parameters: cdpApiKeyId, cdpApiKeySecret, cdpWalletSecret\n\nYou can get these credentials from https://portal.cdp.coinbase.com/'
+    );
+  });
+
+  it('should include context in error message', () => {
+    vi.mocked(CdpClient).mockImplementation(() => {
+      throw new Error('Test error');
+    });
+
+    expect(() => createCdpClientOrThrow({}, 'payment processing')).toThrow(
+      'Failed to initialize CDP client for payment processing'
+    );
+  });
+});
diff --git a/packages/account-sdk/src/interface/payment/utils/createCdpClientOrThrow.ts b/packages/account-sdk/src/interface/payment/utils/createCdpClientOrThrow.ts
new file mode 100644
index 000000000..41b0669de
--- /dev/null
+++ b/packages/account-sdk/src/interface/payment/utils/createCdpClientOrThrow.ts
@@ -0,0 +1,37 @@
+import { CdpClient } from '@coinbase/cdp-sdk';
+
+/**
+ * Options for creating a CDP client
+ */
+export interface CreateCdpClientOptions {
+  cdpApiKeyId?: string;
+  cdpApiKeySecret?: string;
+  cdpWalletSecret?: string;
+}
+
+/**
+ * Creates and initializes a CDP client with provided credentials or environment variables.
+ * Throws a detailed error if credentials are missing or invalid.
+ *
+ * @param options - CDP credential options
+ * @param context - Context string for error messages (e.g., "subscription charge", "subscription revoke")
+ * @returns Initialized CdpClient instance
+ * @throws Error if credentials are missing or invalid
+ */
+export function createCdpClientOrThrow(
+  options: CreateCdpClientOptions,
+  context: string
+): CdpClient {
+  try {
+    return new CdpClient({
+      apiKeyId: options.cdpApiKeyId,
+      apiKeySecret: options.cdpApiKeySecret,
+      walletSecret: options.cdpWalletSecret,
+    });
+  } catch (error) {
+    const errorMessage = error instanceof Error ? error.message : String(error);
+    throw new Error(
+      `Failed to initialize CDP client for ${context}. ${errorMessage}\n\nPlease ensure you have set the required CDP credentials either:\n1. As environment variables: CDP_API_KEY_ID, CDP_API_KEY_SECRET, CDP_WALLET_SECRET\n2. As function parameters: cdpApiKeyId, cdpApiKeySecret, cdpWalletSecret\n\nYou can get these credentials from https://portal.cdp.coinbase.com/`
+    );
+  }
+}
diff --git a/packages/account-sdk/src/interface/payment/utils/getExistingSmartWalletOrThrow.test.ts b/packages/account-sdk/src/interface/payment/utils/getExistingSmartWalletOrThrow.test.ts
new file mode 100644
index 000000000..aa9e4f609
--- /dev/null
+++ b/packages/account-sdk/src/interface/payment/utils/getExistingSmartWalletOrThrow.test.ts
@@ -0,0 +1,153 @@
+import type { CdpClient, EvmSmartAccount } from '@coinbase/cdp-sdk';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { getExistingSmartWalletOrThrow } from './getExistingSmartWalletOrThrow.js';
+
+describe('getExistingSmartWalletOrThrow', () => {
+  let mockCdpClient: CdpClient;
+  let mockEoaAccount: any;
+  let mockSmartWallet: EvmSmartAccount;
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+
+    mockEoaAccount = {
+      address: '0x1234567890123456789012345678901234567890',
+    };
+
+    mockSmartWallet = {
+      address: '0xabcdefabcdefabcdefabcdefabcdefabcdefabcd',
+    } as unknown as EvmSmartAccount;
+
+    mockCdpClient = {
+      evm: {
+        getAccount: vi.fn(),
+        getSmartAccount: vi.fn(),
+      },
+    } as unknown as CdpClient;
+  });
+
+  it('should successfully retrieve existing smart wallet', async () => {
+    vi.mocked(mockCdpClient.evm.getAccount).mockResolvedValue(mockEoaAccount);
+    vi.mocked(mockCdpClient.evm.getSmartAccount).mockResolvedValue(mockSmartWallet);
+
+    const result = await getExistingSmartWalletOrThrow(mockCdpClient, 'test-wallet', 'charge');
+
+    expect(result).toBe(mockSmartWallet);
+    expect(mockCdpClient.evm.getAccount).toHaveBeenCalledWith({ name: 'test-wallet' });
+    expect(mockCdpClient.evm.getSmartAccount).toHaveBeenCalledWith({
+      name: 'test-wallet',
+      owner: mockEoaAccount,
+    });
+  });
+
+  it('should throw error when EOA wallet is not found (returns null)', async () => {
+    vi.mocked(mockCdpClient.evm.getAccount).mockResolvedValue(null as any);
+
+    await expect(
+      getExistingSmartWalletOrThrow(mockCdpClient, 'test-wallet', 'charge')
+    ).rejects.toThrow(
+      'EOA wallet "test-wallet" not found. The wallet must be created before executing a charge. Use getOrCreateSubscriptionOwnerWallet() to create the wallet first.'
+    );
+
+    expect(mockCdpClient.evm.getSmartAccount).not.toHaveBeenCalled();
+  });
+
+  it('should throw error when EOA wallet is not found (returns undefined)', async () => {
+    vi.mocked(mockCdpClient.evm.getAccount).mockResolvedValue(undefined as any);
+
+    await expect(
+      getExistingSmartWalletOrThrow(mockCdpClient, 'my-wallet', 'revoke')
+    ).rejects.toThrow(
+      'EOA wallet "my-wallet" not found. The wallet must be created before executing a revoke. Use getOrCreateSubscriptionOwnerWallet() to create the wallet first.'
+    );
+  });
+
+  it('should throw error when smart wallet is not found (returns null)', async () => {
+    vi.mocked(mockCdpClient.evm.getAccount).mockResolvedValue(mockEoaAccount);
+    vi.mocked(mockCdpClient.evm.getSmartAccount).mockResolvedValue(null as any);
+
+    await expect(
+      getExistingSmartWalletOrThrow(mockCdpClient, 'test-wallet', 'charge')
+    ).rejects.toThrow(
+      'Smart wallet "test-wallet" not found. The wallet must be created before executing a charge. Use getOrCreateSubscriptionOwnerWallet() to create the wallet first.'
+    );
+
+    expect(mockCdpClient.evm.getAccount).toHaveBeenCalledWith({ name: 'test-wallet' });
+    expect(mockCdpClient.evm.getSmartAccount).toHaveBeenCalledWith({
+      name: 'test-wallet',
+      owner: mockEoaAccount,
+    });
+  });
+
+  it('should throw error when smart wallet is not found (returns undefined)', async () => {
+    vi.mocked(mockCdpClient.evm.getAccount).mockResolvedValue(mockEoaAccount);
+    vi.mocked(mockCdpClient.evm.getSmartAccount).mockResolvedValue(undefined as any);
+
+    await expect(
+      getExistingSmartWalletOrThrow(mockCdpClient, 'another-wallet', 'revoke')
+    ).rejects.toThrow(
+      'Smart wallet "another-wallet" not found. The wallet must be created before executing a revoke. Use getOrCreateSubscriptionOwnerWallet() to create the wallet first.'
+    );
+  });
+
+  it('should re-throw custom "not found" errors', async () => {
+    const customError = new Error('Custom wallet "test" not found');
+    vi.mocked(mockCdpClient.evm.getAccount).mockRejectedValue(customError);
+
+    await expect(
+      getExistingSmartWalletOrThrow(mockCdpClient, 'test-wallet', 'charge')
+    ).rejects.toThrow('Custom wallet "test" not found');
+  });
+
+  it('should wrap generic errors with context', async () => {
+    const genericError = new Error('Network timeout');
+    vi.mocked(mockCdpClient.evm.getAccount).mockRejectedValue(genericError);
+
+    await expect(
+      getExistingSmartWalletOrThrow(mockCdpClient, 'test-wallet', 'charge')
+    ).rejects.toThrow('Failed to get charge smart wallet "test-wallet": Network timeout');
+  });
+
+  it('should wrap non-Error exceptions with context', async () => {
+    vi.mocked(mockCdpClient.evm.getAccount).mockRejectedValue('String error');
+
+    await expect(
+      getExistingSmartWalletOrThrow(mockCdpClient, 'test-wallet', 'revoke')
+    ).rejects.toThrow('Failed to get revoke smart wallet "test-wallet": String error');
+  });
+
+  it('should wrap object exceptions with context', async () => {
+    vi.mocked(mockCdpClient.evm.getAccount).mockRejectedValue({ code: 'ERR_UNKNOWN' });
+
+    await expect(
+      getExistingSmartWalletOrThrow(mockCdpClient, 'test-wallet', 'charge')
+    ).rejects.toThrow('Failed to get charge smart wallet "test-wallet": [object Object]');
+  });
+
+  it('should handle errors during smart wallet retrieval', async () => {
+    vi.mocked(mockCdpClient.evm.getAccount).mockResolvedValue(mockEoaAccount);
+    vi.mocked(mockCdpClient.evm.getSmartAccount).mockRejectedValue(
+      new Error('Smart wallet retrieval failed')
+    );
+
+    await expect(
+      getExistingSmartWalletOrThrow(mockCdpClient, 'test-wallet', 'charge')
+    ).rejects.toThrow(
+      'Failed to get charge smart wallet "test-wallet": Smart wallet retrieval failed'
+    );
+  });
+
+  it('should use the same wallet name for both EOA and smart wallet', async () => {
+    vi.mocked(mockCdpClient.evm.getAccount).mockResolvedValue(mockEoaAccount);
+    vi.mocked(mockCdpClient.evm.getSmartAccount).mockResolvedValue(mockSmartWallet);
+
+    const walletName = 'my-subscription-wallet';
+    await getExistingSmartWalletOrThrow(mockCdpClient, walletName, 'charge');
+
+    expect(mockCdpClient.evm.getAccount).toHaveBeenCalledWith({ name: walletName });
+    expect(mockCdpClient.evm.getSmartAccount).toHaveBeenCalledWith({
+      name: walletName, // Same name as EOA
+      owner: mockEoaAccount,
+    });
+  });
+});
diff --git a/packages/account-sdk/src/interface/payment/utils/getExistingSmartWalletOrThrow.ts b/packages/account-sdk/src/interface/payment/utils/getExistingSmartWalletOrThrow.ts
new file mode 100644
index 000000000..eed223264
--- /dev/null
+++ b/packages/account-sdk/src/interface/payment/utils/getExistingSmartWalletOrThrow.ts
@@ -0,0 +1,52 @@
+import type { EvmSmartAccount } from '@coinbase/cdp-sdk';
+import { CdpClient } from '@coinbase/cdp-sdk';
+
+/**
+ * Retrieves an existing smart wallet from CDP by name.
+ * Throws detailed errors if the EOA or smart wallet doesn't exist.
+ *
+ * @param cdpClient - Initialized CDP client
+ * @param walletName - Name of the wallet to retrieve
+ * @param context - Context string for error messages (e.g., "charge", "revoke")
+ * @returns The smart wallet instance
+ * @throws Error if EOA or smart wallet not found
+ */
+export async function getExistingSmartWalletOrThrow(
+  cdpClient: CdpClient,
+  walletName: string,
+  context: string
+): Promise<EvmSmartAccount> {
+  try {
+    // First get the existing EOA that owns the smart wallet
+    const eoaAccount = await cdpClient.evm.getAccount({ name: walletName });
+
+    if (!eoaAccount) {
+      throw new Error(
+        `EOA wallet "${walletName}" not found. The wallet must be created before executing a ${context}. Use getOrCreateSubscriptionOwnerWallet() to create the wallet first.`
+      );
+    }
+
+    // Get the existing smart wallet with the EOA as owner
+    // NOTE: Both the EOA wallet and smart wallet are given the same name intentionally.
+    // This simplifies wallet management and ensures consistency across the system.
+    const smartWallet = await cdpClient.evm.getSmartAccount({
+      name: walletName, // Same name as the EOA wallet
+      owner: eoaAccount,
+    });
+
+    if (!smartWallet) {
+      throw new Error(
+        `Smart wallet "${walletName}" not found. The wallet must be created before executing a ${context}. Use getOrCreateSubscriptionOwnerWallet() to create the wallet first.`
+      );
+    }
+
+    return smartWallet;
+  } catch (error) {
+    // If the error is already our custom error, re-throw it
+    if (error instanceof Error && error.message.includes('not found')) {
+      throw error;
+    }
+    const errorMessage = error instanceof Error ? error.message : String(error);
+    throw new Error(`Failed to get ${context} smart wallet "${walletName}": ${errorMessage}`);
+  }
+}
diff --git a/packages/account-sdk/src/interface/payment/utils/sdkManager.ts b/packages/account-sdk/src/interface/payment/utils/sdkManager.ts
index 7cecc3ed8..d020d8d83 100644
--- a/packages/account-sdk/src/interface/payment/utils/sdkManager.ts
+++ b/packages/account-sdk/src/interface/payment/utils/sdkManager.ts
@@ -1,5 +1,4 @@
 import type { Hex } from 'viem';
-import { createClients, FALLBACK_CHAINS } from '../../../store/chain-clients/utils.js';
 import { createBaseAccountSDK } from '../../builder/core/createBaseAccountSDK.js';
 import { CHAIN_IDS } from '../constants.js';
 import type { PayerInfoResponses } from '../types.js';
@@ -56,13 +55,9 @@ export function createEphemeralSDK(chainId: number, walletUrl?: string, telemetr
     },
   });
 
-  // Initialize chain clients for the specified chain using FALLBACK_CHAINS
+  // Chain clients will be automatically created when needed by getClient
   // This ensures that the chain client is available for operations like getHash
   // even when the wallet hasn't been connected yet
-  const fallbackChain = FALLBACK_CHAINS.find((chain) => chain.id === chainId);
-  if (fallbackChain) {
-    createClients([fallbackChain]);
-  }
 
   return sdk;
 }
diff --git a/packages/account-sdk/src/interface/payment/utils/sendUserOpAndWait.test.ts b/packages/account-sdk/src/interface/payment/utils/sendUserOpAndWait.test.ts
new file mode 100644
index 000000000..e7e148980
--- /dev/null
+++ b/packages/account-sdk/src/interface/payment/utils/sendUserOpAndWait.test.ts
@@ -0,0 +1,275 @@
+import type { EvmSmartAccount } from '@coinbase/cdp-sdk';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import type { PrepareChargeCall } from '../types.js';
+import { sendUserOpAndWait } from './sendUserOpAndWait.js';
+
+describe('sendUserOpAndWait', () => {
+  let mockNetworkSmartWallet: Awaited<ReturnType<EvmSmartAccount['useNetwork']>>;
+  let mockCalls: PrepareChargeCall[];
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+
+    mockNetworkSmartWallet = {
+      sendUserOperation: vi.fn(),
+      waitForUserOperation: vi.fn(),
+    } as any;
+
+    mockCalls = [
+      {
+        to: '0x1234567890123456789012345678901234567890' as `0x${string}`,
+        data: '0xabcd' as `0x${string}`,
+        value: BigInt(0),
+      },
+    ];
+  });
+
+  it('should successfully send user operation and return transaction hash', async () => {
+    const mockUserOpHash = '0xUserOpHash123';
+    const mockTransactionHash = '0xTxHash456';
+
+    vi.mocked(mockNetworkSmartWallet.sendUserOperation).mockResolvedValue({
+      smartAccountAddress: '0xSmartAccount',
+      status: 'broadcast',
+      userOpHash: mockUserOpHash,
+    });
+
+    vi.mocked(mockNetworkSmartWallet.waitForUserOperation).mockResolvedValue({
+      status: 'completed',
+      transactionHash: mockTransactionHash,
+      userOpHash: mockUserOpHash,
+    } as any);
+
+    const result = await sendUserOpAndWait(
+      mockNetworkSmartWallet,
+      mockCalls,
+      undefined,
+      60,
+      'charge'
+    );
+
+    expect(result).toBe(mockTransactionHash);
+    expect(mockNetworkSmartWallet.sendUserOperation).toHaveBeenCalledWith({
+      calls: mockCalls,
+    });
+    expect(mockNetworkSmartWallet.waitForUserOperation).toHaveBeenCalledWith({
+      userOpHash: mockUserOpHash,
+      waitOptions: {
+        timeoutSeconds: 60,
+      },
+    });
+  });
+
+  it('should send user operation with paymaster URL when provided', async () => {
+    const mockUserOpHash = '0xUserOpHash123';
+    const mockTransactionHash = '0xTxHash456';
+    const paymasterUrl = 'https://paymaster.example.com';
+
+    vi.mocked(mockNetworkSmartWallet.sendUserOperation).mockResolvedValue({
+      smartAccountAddress: '0xSmartAccount',
+      status: 'broadcast',
+      userOpHash: mockUserOpHash,
+    });
+
+    vi.mocked(mockNetworkSmartWallet.waitForUserOperation).mockResolvedValue({
+      status: 'completed',
+      transactionHash: mockTransactionHash,
+      userOpHash: mockUserOpHash,
+    } as any);
+
+    const result = await sendUserOpAndWait(
+      mockNetworkSmartWallet,
+      mockCalls,
+      paymasterUrl,
+      60,
+      'charge'
+    );
+
+    expect(result).toBe(mockTransactionHash);
+    expect(mockNetworkSmartWallet.sendUserOperation).toHaveBeenCalledWith({
+      calls: mockCalls,
+      paymasterUrl,
+    });
+  });
+
+  it('should use custom timeout when specified', async () => {
+    const mockUserOpHash = '0xUserOpHash123';
+    const mockTransactionHash = '0xTxHash456';
+    const customTimeout = 120;
+
+    vi.mocked(mockNetworkSmartWallet.sendUserOperation).mockResolvedValue({
+      smartAccountAddress: '0xSmartAccount',
+      status: 'broadcast',
+      userOpHash: mockUserOpHash,
+    });
+
+    vi.mocked(mockNetworkSmartWallet.waitForUserOperation).mockResolvedValue({
+      status: 'completed',
+      transactionHash: mockTransactionHash,
+      userOpHash: mockUserOpHash,
+    } as any);
+
+    await sendUserOpAndWait(mockNetworkSmartWallet, mockCalls, undefined, customTimeout, 'revoke');
+
+    expect(mockNetworkSmartWallet.waitForUserOperation).toHaveBeenCalledWith({
+      userOpHash: mockUserOpHash,
+      waitOptions: {
+        timeoutSeconds: customTimeout,
+      },
+    });
+  });
+
+  it('should throw error when user operation fails', async () => {
+    const mockUserOpHash = '0xUserOpHash123';
+
+    vi.mocked(mockNetworkSmartWallet.sendUserOperation).mockResolvedValue({
+      smartAccountAddress: '0xSmartAccount',
+      status: 'broadcast',
+      userOpHash: mockUserOpHash,
+    });
+
+    vi.mocked(mockNetworkSmartWallet.waitForUserOperation).mockResolvedValue({
+      status: 'failed',
+      userOpHash: mockUserOpHash,
+    } as any);
+
+    await expect(
+      sendUserOpAndWait(mockNetworkSmartWallet, mockCalls, undefined, 60, 'charge')
+    ).rejects.toThrow(
+      'Failed to execute charge transaction with smart wallet: User operation failed: 0xUserOpHash123'
+    );
+  });
+
+  it('should throw error when transaction hash is missing', async () => {
+    const mockUserOpHash = '0xUserOpHash123';
+
+    vi.mocked(mockNetworkSmartWallet.sendUserOperation).mockResolvedValue({
+      smartAccountAddress: '0xSmartAccount',
+      status: 'broadcast',
+      userOpHash: mockUserOpHash,
+    });
+
+    vi.mocked(mockNetworkSmartWallet.waitForUserOperation).mockResolvedValue({
+      status: 'completed',
+      userOpHash: mockUserOpHash,
+      // transactionHash is missing
+    } as any);
+
+    await expect(
+      sendUserOpAndWait(mockNetworkSmartWallet, mockCalls, undefined, 60, 'revoke')
+    ).rejects.toThrow(
+      'Failed to execute revoke transaction with smart wallet: No transaction hash received from operation'
+    );
+  });
+
+  it('should throw error when transaction hash is null', async () => {
+    const mockUserOpHash = '0xUserOpHash123';
+
+    vi.mocked(mockNetworkSmartWallet.sendUserOperation).mockResolvedValue({
+      smartAccountAddress: '0xSmartAccount',
+      status: 'broadcast',
+      userOpHash: mockUserOpHash,
+    });
+
+    vi.mocked(mockNetworkSmartWallet.waitForUserOperation).mockResolvedValue({
+      status: 'completed',
+      userOpHash: mockUserOpHash,
+      transactionHash: null,
+    } as any);
+
+    await expect(
+      sendUserOpAndWait(mockNetworkSmartWallet, mockCalls, undefined, 60, 'charge')
+    ).rejects.toThrow(
+      'Failed to execute charge transaction with smart wallet: No transaction hash received from operation'
+    );
+  });
+
+  it('should wrap errors from sendUserOperation', async () => {
+    vi.mocked(mockNetworkSmartWallet.sendUserOperation).mockRejectedValue(
+      new Error('Network error')
+    );
+
+    await expect(
+      sendUserOpAndWait(mockNetworkSmartWallet, mockCalls, undefined, 60, 'charge')
+    ).rejects.toThrow('Failed to execute charge transaction with smart wallet: Network error');
+  });
+
+  it('should wrap errors from waitForUserOperation', async () => {
+    const mockUserOpHash = '0xUserOpHash123';
+
+    vi.mocked(mockNetworkSmartWallet.sendUserOperation).mockResolvedValue({
+      smartAccountAddress: '0xSmartAccount',
+      status: 'broadcast',
+      userOpHash: mockUserOpHash,
+    });
+
+    vi.mocked(mockNetworkSmartWallet.waitForUserOperation).mockRejectedValue(
+      new Error('Timeout waiting for operation')
+    );
+
+    await expect(
+      sendUserOpAndWait(mockNetworkSmartWallet, mockCalls, undefined, 60, 'revoke')
+    ).rejects.toThrow(
+      'Failed to execute revoke transaction with smart wallet: Timeout waiting for operation'
+    );
+  });
+
+  it('should wrap non-Error exceptions', async () => {
+    vi.mocked(mockNetworkSmartWallet.sendUserOperation).mockRejectedValue('String error');
+
+    await expect(
+      sendUserOpAndWait(mockNetworkSmartWallet, mockCalls, undefined, 60, 'charge')
+    ).rejects.toThrow('Failed to execute charge transaction with smart wallet: String error');
+  });
+
+  it('should handle multiple calls', async () => {
+    const multipleCalls: PrepareChargeCall[] = [
+      {
+        to: '0x1111111111111111111111111111111111111111' as `0x${string}`,
+        data: '0xaaaa' as `0x${string}`,
+        value: BigInt(0),
+      },
+      {
+        to: '0x2222222222222222222222222222222222222222' as `0x${string}`,
+        data: '0xbbbb' as `0x${string}`,
+        value: BigInt(100),
+      },
+    ];
+
+    const mockUserOpHash = '0xUserOpHash123';
+    const mockTransactionHash = '0xTxHash456';
+
+    vi.mocked(mockNetworkSmartWallet.sendUserOperation).mockResolvedValue({
+      smartAccountAddress: '0xSmartAccount',
+      status: 'broadcast',
+      userOpHash: mockUserOpHash,
+    });
+
+    vi.mocked(mockNetworkSmartWallet.waitForUserOperation).mockResolvedValue({
+      status: 'completed',
+      transactionHash: mockTransactionHash,
+      userOpHash: mockUserOpHash,
+    } as any);
+
+    const result = await sendUserOpAndWait(
+      mockNetworkSmartWallet,
+      multipleCalls,
+      undefined,
+      60,
+      'charge'
+    );
+
+    expect(result).toBe(mockTransactionHash);
+    expect(mockNetworkSmartWallet.sendUserOperation).toHaveBeenCalledWith({
+      calls: multipleCalls,
+    });
+  });
+
+  it('should include context in error messages', async () => {
+    vi.mocked(mockNetworkSmartWallet.sendUserOperation).mockRejectedValue(new Error('Test error'));
+
+    await expect(
+      sendUserOpAndWait(mockNetworkSmartWallet, mockCalls, undefined, 60, 'payment processing')
+    ).rejects.toThrow('Failed to execute payment processing transaction with smart wallet');
+  });
+});
diff --git a/packages/account-sdk/src/interface/payment/utils/sendUserOpAndWait.ts b/packages/account-sdk/src/interface/payment/utils/sendUserOpAndWait.ts
new file mode 100644
index 000000000..1b71ff8bd
--- /dev/null
+++ b/packages/account-sdk/src/interface/payment/utils/sendUserOpAndWait.ts
@@ -0,0 +1,56 @@
+import type { EvmSmartAccount } from '@coinbase/cdp-sdk';
+import type { PrepareChargeCall } from '../types.js';
+
+/**
+ * Sends a user operation and waits for it to complete.
+ * Handles error cases and provides consistent error messages.
+ *
+ * @param networkSmartWallet - Network-scoped smart wallet instance
+ * @param calls - Array of calls to execute
+ * @param paymasterUrl - Optional paymaster URL for gas sponsorship
+ * @param timeoutSeconds - Timeout in seconds (default: 60)
+ * @param context - Context string for error messages (e.g., "charge", "revoke")
+ * @returns Transaction hash of the completed operation
+ * @throws Error if operation fails or times out
+ */
+export async function sendUserOpAndWait(
+  networkSmartWallet: Awaited<ReturnType<EvmSmartAccount['useNetwork']>>,
+  calls: PrepareChargeCall[],
+  paymasterUrl: string | undefined,
+  timeoutSeconds: number,
+  context: string
+): Promise<string> {
+  try {
+    // Send the user operation
+    const userOpResult = await networkSmartWallet.sendUserOperation({
+      calls,
+      ...(paymasterUrl && { paymasterUrl }),
+    });
+
+    // The sendUserOperation returns { smartAccountAddress, status: "broadcast", userOpHash }
+    // We need to wait for the operation to complete to get the transaction hash
+    const completedOp = await networkSmartWallet.waitForUserOperation({
+      userOpHash: userOpResult.userOpHash,
+      waitOptions: {
+        timeoutSeconds,
+      },
+    });
+
+    // Check if the operation was successful
+    if (completedOp.status === 'failed') {
+      throw new Error(`User operation failed: ${userOpResult.userOpHash}`);
+    }
+
+    // For completed operations, we have the transaction hash
+    const transactionHash = completedOp.transactionHash;
+
+    if (!transactionHash) {
+      throw new Error('No transaction hash received from operation');
+    }
+
+    return transactionHash;
+  } catch (error) {
+    const errorMessage = error instanceof Error ? error.message : String(error);
+    throw new Error(`Failed to execute ${context} transaction with smart wallet: ${errorMessage}`);
+  }
+}
diff --git a/packages/account-sdk/src/interface/payment/utils/translatePayment.ts b/packages/account-sdk/src/interface/payment/utils/translatePayment.ts
index 41fd06877..a578fd517 100644
--- a/packages/account-sdk/src/interface/payment/utils/translatePayment.ts
+++ b/packages/account-sdk/src/interface/payment/utils/translatePayment.ts
@@ -1,4 +1,4 @@
-import { encodeFunctionData, parseUnits, type Address, type Hex } from 'viem';
+import { encodeFunctionData, parseUnits, toHex, type Address, type Hex } from 'viem';
 import { CHAIN_IDS, ERC20_TRANSFER_ABI, TOKENS } from '../constants.js';
 import type { PayerInfo } from '../types.js';
 
@@ -35,7 +35,7 @@ export function buildSendCallsRequest(transferData: Hex, testnet: boolean, payer
   const call = {
     to: usdcAddress as Address,
     data: transferData,
-    value: '0x0' as Hex, // No ETH value for ERC20 transfer
+    value: toHex(0n), // No ETH value for ERC20 transfer
   };
 
   // Build the capabilities object
diff --git a/packages/account-sdk/src/interface/payment/utils/validateUSDCBasePermission.test.ts b/packages/account-sdk/src/interface/payment/utils/validateUSDCBasePermission.test.ts
new file mode 100644
index 000000000..634701791
--- /dev/null
+++ b/packages/account-sdk/src/interface/payment/utils/validateUSDCBasePermission.test.ts
@@ -0,0 +1,303 @@
+import { describe, expect, it } from 'vitest';
+import type { SpendPermission } from ':core/rpc/coinbase_fetchSpendPermissions.js';
+import { CHAIN_IDS, TOKENS } from '../constants.js';
+import { validateUSDCBasePermission } from './validateUSDCBasePermission.js';
+
+describe('validateUSDCBasePermission', () => {
+  const mockPermission: SpendPermission = {
+    chainId: CHAIN_IDS.base,
+    signature: '0x',
+    permission: {
+      token: TOKENS.USDC.addresses.base,
+      account: '0x1234567890123456789012345678901234567890',
+      spender: '0xabcdefabcdefabcdefabcdefabcdefabcdefabcd',
+      start: 0,
+      end: 0,
+      period: 0,
+      allowance: '0',
+      salt: '0',
+      extraData: '0x',
+    },
+  };
+
+  describe('mainnet validation (testnet=false)', () => {
+    it('should pass validation for correct mainnet USDC permission', () => {
+      const permission = {
+        ...mockPermission,
+        chainId: CHAIN_IDS.base,
+        permission: {
+          ...mockPermission.permission,
+          token: TOKENS.USDC.addresses.base,
+        },
+      };
+
+      expect(() => validateUSDCBasePermission(permission, false)).not.toThrow();
+    });
+
+    it('should pass validation with lowercase token address on mainnet', () => {
+      const permission = {
+        ...mockPermission,
+        chainId: CHAIN_IDS.base,
+        permission: {
+          ...mockPermission.permission,
+          token: TOKENS.USDC.addresses.base.toLowerCase(),
+        },
+      };
+
+      expect(() => validateUSDCBasePermission(permission, false)).not.toThrow();
+    });
+
+    it('should pass validation with uppercase token address on mainnet', () => {
+      const permission = {
+        ...mockPermission,
+        chainId: CHAIN_IDS.base,
+        permission: {
+          ...mockPermission.permission,
+          token: TOKENS.USDC.addresses.base.toUpperCase(),
+        },
+      };
+
+      expect(() => validateUSDCBasePermission(permission, false)).not.toThrow();
+    });
+
+    it('should throw error when using testnet chainId on mainnet', () => {
+      const permission = {
+        ...mockPermission,
+        chainId: CHAIN_IDS.baseSepolia,
+        permission: {
+          ...mockPermission.permission,
+          token: TOKENS.USDC.addresses.base,
+        },
+      };
+
+      expect(() => validateUSDCBasePermission(permission, false)).toThrow(
+        'The subscription was requested on mainnet but is actually a testnet subscription'
+      );
+    });
+
+    it('should throw error when using wrong token on mainnet', () => {
+      const wrongToken = '0x0000000000000000000000000000000000000001';
+      const permission = {
+        ...mockPermission,
+        chainId: CHAIN_IDS.base,
+        permission: {
+          ...mockPermission.permission,
+          token: wrongToken,
+        },
+      };
+
+      expect(() => validateUSDCBasePermission(permission, false)).toThrow(
+        `Subscription is not for USDC token. Got ${wrongToken}, expected ${TOKENS.USDC.addresses.base.toLowerCase()}`
+      );
+    });
+
+    it('should throw error when using testnet USDC token on mainnet', () => {
+      const permission = {
+        ...mockPermission,
+        chainId: CHAIN_IDS.base,
+        permission: {
+          ...mockPermission.permission,
+          token: TOKENS.USDC.addresses.baseSepolia,
+        },
+      };
+
+      expect(() => validateUSDCBasePermission(permission, false)).toThrow(
+        `Subscription is not for USDC token. Got ${TOKENS.USDC.addresses.baseSepolia}, expected ${TOKENS.USDC.addresses.base.toLowerCase()}`
+      );
+    });
+
+    it('should throw error for unknown chainId on mainnet', () => {
+      const unknownChainId = 1; // Ethereum mainnet
+      const permission = {
+        ...mockPermission,
+        chainId: unknownChainId,
+        permission: {
+          ...mockPermission.permission,
+          token: TOKENS.USDC.addresses.base,
+        },
+      };
+
+      expect(() => validateUSDCBasePermission(permission, false)).toThrow(
+        `Subscription is on chain ${unknownChainId}, expected ${CHAIN_IDS.base} (Base)`
+      );
+    });
+  });
+
+  describe('testnet validation (testnet=true)', () => {
+    it('should pass validation for correct testnet USDC permission', () => {
+      const permission = {
+        ...mockPermission,
+        chainId: CHAIN_IDS.baseSepolia,
+        permission: {
+          ...mockPermission.permission,
+          token: TOKENS.USDC.addresses.baseSepolia,
+        },
+      };
+
+      expect(() => validateUSDCBasePermission(permission, true)).not.toThrow();
+    });
+
+    it('should pass validation with lowercase token address on testnet', () => {
+      const permission = {
+        ...mockPermission,
+        chainId: CHAIN_IDS.baseSepolia,
+        permission: {
+          ...mockPermission.permission,
+          token: TOKENS.USDC.addresses.baseSepolia.toLowerCase(),
+        },
+      };
+
+      expect(() => validateUSDCBasePermission(permission, true)).not.toThrow();
+    });
+
+    it('should pass validation with uppercase token address on testnet', () => {
+      const permission = {
+        ...mockPermission,
+        chainId: CHAIN_IDS.baseSepolia,
+        permission: {
+          ...mockPermission.permission,
+          token: TOKENS.USDC.addresses.baseSepolia.toUpperCase(),
+        },
+      };
+
+      expect(() => validateUSDCBasePermission(permission, true)).not.toThrow();
+    });
+
+    it('should throw error when using mainnet chainId on testnet', () => {
+      const permission = {
+        ...mockPermission,
+        chainId: CHAIN_IDS.base,
+        permission: {
+          ...mockPermission.permission,
+          token: TOKENS.USDC.addresses.baseSepolia,
+        },
+      };
+
+      expect(() => validateUSDCBasePermission(permission, true)).toThrow(
+        'The subscription was requested on testnet but is actually a mainnet subscription'
+      );
+    });
+
+    it('should throw error when using wrong token on testnet', () => {
+      const wrongToken = '0x0000000000000000000000000000000000000001';
+      const permission = {
+        ...mockPermission,
+        chainId: CHAIN_IDS.baseSepolia,
+        permission: {
+          ...mockPermission.permission,
+          token: wrongToken,
+        },
+      };
+
+      expect(() => validateUSDCBasePermission(permission, true)).toThrow(
+        `Subscription is not for USDC token. Got ${wrongToken}, expected ${TOKENS.USDC.addresses.baseSepolia.toLowerCase()}`
+      );
+    });
+
+    it('should throw error when using mainnet USDC token on testnet', () => {
+      const permission = {
+        ...mockPermission,
+        chainId: CHAIN_IDS.baseSepolia,
+        permission: {
+          ...mockPermission.permission,
+          token: TOKENS.USDC.addresses.base,
+        },
+      };
+
+      expect(() => validateUSDCBasePermission(permission, true)).toThrow(
+        `Subscription is not for USDC token. Got ${TOKENS.USDC.addresses.base}, expected ${TOKENS.USDC.addresses.baseSepolia.toLowerCase()}`
+      );
+    });
+
+    it('should throw error for unknown chainId on testnet', () => {
+      const unknownChainId = 11155111; // Ethereum Sepolia
+      const permission = {
+        ...mockPermission,
+        chainId: unknownChainId,
+        permission: {
+          ...mockPermission.permission,
+          token: TOKENS.USDC.addresses.baseSepolia,
+        },
+      };
+
+      expect(() => validateUSDCBasePermission(permission, true)).toThrow(
+        `Subscription is on chain ${unknownChainId}, expected ${CHAIN_IDS.baseSepolia} (Base Sepolia)`
+      );
+    });
+  });
+
+  describe('case-insensitive token address comparison', () => {
+    it('should handle mixed case addresses on mainnet', () => {
+      const mixedCaseAddress = '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913'; // Mixed case
+      const permission = {
+        ...mockPermission,
+        chainId: CHAIN_IDS.base,
+        permission: {
+          ...mockPermission.permission,
+          token: mixedCaseAddress,
+        },
+      };
+
+      expect(() => validateUSDCBasePermission(permission, false)).not.toThrow();
+    });
+
+    it('should handle mixed case addresses on testnet', () => {
+      const mixedCaseAddress = '0x036CbD53842c5426634e7929541eC2318f3dCF7e'; // Mixed case
+      const permission = {
+        ...mockPermission,
+        chainId: CHAIN_IDS.baseSepolia,
+        permission: {
+          ...mockPermission.permission,
+          token: mixedCaseAddress,
+        },
+      };
+
+      expect(() => validateUSDCBasePermission(permission, true)).not.toThrow();
+    });
+  });
+
+  describe('edge cases', () => {
+    it('should handle all lowercase USDC mainnet address', () => {
+      const permission = {
+        ...mockPermission,
+        chainId: CHAIN_IDS.base,
+        permission: {
+          ...mockPermission.permission,
+          token: '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913',
+        },
+      };
+
+      expect(() => validateUSDCBasePermission(permission, false)).not.toThrow();
+    });
+
+    it('should handle all uppercase USDC mainnet address', () => {
+      const permission = {
+        ...mockPermission,
+        chainId: CHAIN_IDS.base,
+        permission: {
+          ...mockPermission.permission,
+          token: '0X833589FCD6EDB6E08F4C7C32D4F71B54BDA02913',
+        },
+      };
+
+      expect(() => validateUSDCBasePermission(permission, false)).not.toThrow();
+    });
+
+    it('should handle address without 0x prefix validation', () => {
+      // Note: This test checks what happens if someone passes an invalid address format
+      // The function compares lowercase versions, so this would fail
+      const permission = {
+        ...mockPermission,
+        chainId: CHAIN_IDS.base,
+        permission: {
+          ...mockPermission.permission,
+          token: '833589fcd6edb6e08f4c7c32d4f71b54bda02913', // No 0x prefix
+        },
+      };
+
+      expect(() => validateUSDCBasePermission(permission, false)).toThrow(
+        'Subscription is not for USDC token'
+      );
+    });
+  });
+});
diff --git a/packages/account-sdk/src/interface/payment/utils/validateUSDCBasePermission.ts b/packages/account-sdk/src/interface/payment/utils/validateUSDCBasePermission.ts
new file mode 100644
index 000000000..c13604b63
--- /dev/null
+++ b/packages/account-sdk/src/interface/payment/utils/validateUSDCBasePermission.ts
@@ -0,0 +1,44 @@
+import type { SpendPermission } from ':core/rpc/coinbase_fetchSpendPermissions.js';
+import { CHAIN_IDS, TOKENS } from '../constants.js';
+
+/**
+ * Validates that a permission is for USDC on the expected Base network.
+ * Throws detailed errors if validation fails.
+ *
+ * @param permission - The permission to validate
+ * @param testnet - Whether this should be testnet (Base Sepolia) or mainnet (Base)
+ * @throws Error if chainId or token address doesn't match expected values
+ */
+export function validateUSDCBasePermission(permission: SpendPermission, testnet: boolean): void {
+  // Validate this is a USDC permission on the correct network
+  const expectedChainId = testnet ? CHAIN_IDS.baseSepolia : CHAIN_IDS.base;
+  const expectedTokenAddress = testnet
+    ? TOKENS.USDC.addresses.baseSepolia.toLowerCase()
+    : TOKENS.USDC.addresses.base.toLowerCase();
+
+  if (permission.chainId !== expectedChainId) {
+    // Determine if the subscription is on mainnet or testnet
+    const isSubscriptionOnMainnet = permission.chainId === CHAIN_IDS.base;
+    const isSubscriptionOnTestnet = permission.chainId === CHAIN_IDS.baseSepolia;
+
+    let errorMessage: string;
+    if (testnet && isSubscriptionOnMainnet) {
+      errorMessage =
+        'The subscription was requested on testnet but is actually a mainnet subscription';
+    } else if (!testnet && isSubscriptionOnTestnet) {
+      errorMessage =
+        'The subscription was requested on mainnet but is actually a testnet subscription';
+    } else {
+      // Fallback for unexpected chain IDs
+      errorMessage = `Subscription is on chain ${permission.chainId}, expected ${expectedChainId} (${testnet ? 'Base Sepolia' : 'Base'})`;
+    }
+
+    throw new Error(errorMessage);
+  }
+
+  if (permission.permission.token.toLowerCase() !== expectedTokenAddress) {
+    throw new Error(
+      `Subscription is not for USDC token. Got ${permission.permission.token}, expected ${expectedTokenAddress}`
+    );
+  }
+}
diff --git a/packages/account-sdk/src/interface/public-utilities/multicall/index.test.ts b/packages/account-sdk/src/interface/public-utilities/multicall/index.test.ts
new file mode 100644
index 000000000..e10ecb38e
--- /dev/null
+++ b/packages/account-sdk/src/interface/public-utilities/multicall/index.test.ts
@@ -0,0 +1,340 @@
+import { type PublicClient, createPublicClient, http } from 'viem';
+import { multicall as viemMulticall } from 'viem/actions';
+import { base } from 'viem/chains';
+import { Mock, beforeEach, describe, expect, it, vi } from 'vitest';
+import {
+  isMulticallFailure,
+  isMulticallSuccess,
+  multicall,
+  unwrapMulticallResults,
+} from './index.js';
+
+vi.mock('viem/actions', () => ({
+  multicall: vi.fn(),
+}));
+
+describe('multicall', () => {
+  let mockClient: PublicClient;
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+    mockClient = createPublicClient({
+      chain: base,
+      transport: http(),
+    }) as PublicClient;
+  });
+
+  describe('basic functionality', () => {
+    it('should successfully execute multiple contract calls', async () => {
+      const mockResults = [
+        { status: 'success' as const, result: BigInt(1000) },
+        { status: 'success' as const, result: true },
+        { status: 'success' as const, result: '0x123' },
+      ];
+
+      (viemMulticall as Mock).mockResolvedValue(mockResults);
+
+      const contracts = [
+        {
+          address: '0x1234567890123456789012345678901234567890' as const,
+          abi: [],
+          functionName: 'balanceOf',
+          args: ['0xabc'],
+        },
+        {
+          address: '0x1234567890123456789012345678901234567890' as const,
+          abi: [],
+          functionName: 'isActive',
+        },
+        {
+          address: '0x1234567890123456789012345678901234567890' as const,
+          abi: [],
+          functionName: 'getAddress',
+        },
+      ];
+
+      const results = await multicall(mockClient, { contracts });
+
+      expect(results).toHaveLength(3);
+      expect(results[0]).toEqual({ status: 'success', result: BigInt(1000) });
+      expect(results[1]).toEqual({ status: 'success', result: true });
+      expect(results[2]).toEqual({ status: 'success', result: '0x123' });
+      expect(viemMulticall).toHaveBeenCalledWith(mockClient, { contracts });
+    });
+
+    it('should batch all calls into a single multicall', async () => {
+      const mockResults = [
+        { status: 'success' as const, result: 'result1' },
+        { status: 'success' as const, result: 'result2' },
+      ];
+
+      (viemMulticall as Mock).mockResolvedValue(mockResults);
+
+      const contracts = [
+        {
+          address: '0x1234567890123456789012345678901234567890' as const,
+          abi: [],
+          functionName: 'func1',
+        },
+        {
+          address: '0x1234567890123456789012345678901234567890' as const,
+          abi: [],
+          functionName: 'func2',
+        },
+      ];
+
+      await multicall(mockClient, { contracts });
+
+      // Verify only one call to viem multicall
+      expect(viemMulticall).toHaveBeenCalledTimes(1);
+    });
+  });
+
+  describe('error handling', () => {
+    it('should throw when client is not provided', async () => {
+      await expect(
+        multicall(null as any, {
+          contracts: [
+            {
+              address: '0x1234567890123456789012345678901234567890' as const,
+              abi: [],
+              functionName: 'test',
+            },
+          ],
+        })
+      ).rejects.toThrow('Public client is required for multicall');
+    });
+
+    it('should throw when contracts array is empty', async () => {
+      await expect(multicall(mockClient, { contracts: [] })).rejects.toThrow(
+        'At least one contract call is required'
+      );
+    });
+
+    it('should throw when contracts is not provided', async () => {
+      await expect(multicall(mockClient, { contracts: undefined as any })).rejects.toThrow(
+        'At least one contract call is required'
+      );
+    });
+
+    it('should throw by default when a call fails', async () => {
+      const mockResults = [
+        { status: 'success' as const, result: 'success1' },
+        { status: 'failure' as const, error: new Error('Call failed') },
+      ];
+
+      (viemMulticall as Mock).mockResolvedValue(mockResults);
+
+      const contracts = [
+        {
+          address: '0x1234567890123456789012345678901234567890' as const,
+          abi: [],
+          functionName: 'func1',
+        },
+        {
+          address: '0x1234567890123456789012345678901234567890' as const,
+          abi: [],
+          functionName: 'func2',
+        },
+      ];
+
+      await expect(multicall(mockClient, { contracts })).rejects.toThrow('Contract call 1 failed');
+    });
+
+    it('should use custom error messages when provided', async () => {
+      const mockResults = [{ status: 'failure' as const, error: new Error('Call failed') }];
+
+      (viemMulticall as Mock).mockResolvedValue(mockResults);
+
+      const contracts = [
+        {
+          address: '0x1234567890123456789012345678901234567890' as const,
+          abi: [],
+          functionName: 'func1',
+        },
+      ];
+
+      await expect(
+        multicall(mockClient, {
+          contracts,
+          errorMessages: ['Custom error message'],
+        })
+      ).rejects.toThrow('Custom error message');
+    });
+
+    it('should wrap unexpected errors', async () => {
+      (viemMulticall as Mock).mockRejectedValue(new Error('Network error'));
+
+      const contracts = [
+        {
+          address: '0x1234567890123456789012345678901234567890' as const,
+          abi: [],
+          functionName: 'func1',
+        },
+      ];
+
+      await expect(multicall(mockClient, { contracts })).rejects.toThrow(
+        'Multicall execution failed: Network error'
+      );
+    });
+  });
+
+  describe('partial failure handling', () => {
+    it('should return failure results when allowPartialFailure is true', async () => {
+      const mockResults = [
+        { status: 'success' as const, result: 'success1' },
+        { status: 'failure' as const, error: new Error('Call failed') },
+        { status: 'success' as const, result: 'success2' },
+      ];
+
+      (viemMulticall as Mock).mockResolvedValue(mockResults);
+
+      const contracts = [
+        {
+          address: '0x1234567890123456789012345678901234567890' as const,
+          abi: [],
+          functionName: 'func1',
+        },
+        {
+          address: '0x1234567890123456789012345678901234567890' as const,
+          abi: [],
+          functionName: 'func2',
+        },
+        {
+          address: '0x1234567890123456789012345678901234567890' as const,
+          abi: [],
+          functionName: 'func3',
+        },
+      ];
+
+      const results = await multicall(mockClient, {
+        contracts,
+        allowPartialFailure: true,
+      });
+
+      expect(results).toHaveLength(3);
+      expect(results[0]).toEqual({ status: 'success', result: 'success1' });
+      expect(results[1].status).toBe('failure');
+      expect((results[1] as any).error).toBeInstanceOf(Error);
+      expect(results[2]).toEqual({ status: 'success', result: 'success2' });
+    });
+
+    it('should use custom error messages with partial failures', async () => {
+      const mockResults = [{ status: 'failure' as const, error: new Error('Call failed') }];
+
+      (viemMulticall as Mock).mockResolvedValue(mockResults);
+
+      const contracts = [
+        {
+          address: '0x1234567890123456789012345678901234567890' as const,
+          abi: [],
+          functionName: 'func1',
+        },
+      ];
+
+      const results = await multicall(mockClient, {
+        contracts,
+        allowPartialFailure: true,
+        errorMessages: ['Failed to fetch data'],
+      });
+
+      expect(results[0].status).toBe('failure');
+      expect((results[0] as any).error.message).toBe('Failed to fetch data');
+    });
+  });
+});
+
+describe('unwrapMulticallResults', () => {
+  it('should unwrap successful results', () => {
+    const results = [
+      { status: 'success' as const, result: BigInt(100) },
+      { status: 'success' as const, result: true },
+      { status: 'success' as const, result: '0xabc' },
+    ];
+
+    const unwrapped = unwrapMulticallResults(results);
+
+    expect(unwrapped).toEqual([BigInt(100), true, '0xabc']);
+  });
+
+  it('should throw when encountering a failure', () => {
+    const results = [
+      { status: 'success' as const, result: 'success' },
+      { status: 'failure' as const, error: new Error('Failed') },
+    ];
+
+    expect(() => unwrapMulticallResults(results)).toThrow('Failed');
+  });
+
+  it('should use custom error messages', () => {
+    const results = [{ status: 'failure' as const, error: new Error('Original error') }];
+
+    expect(() => unwrapMulticallResults(results, ['Custom error message'])).toThrow(
+      'Custom error message'
+    );
+  });
+
+  it('should handle missing error messages', () => {
+    const results = [{ status: 'failure' as const, error: new Error('Original error') }];
+
+    expect(() => unwrapMulticallResults(results)).toThrow('Original error');
+  });
+
+  it('should handle empty results', () => {
+    const results: any[] = [];
+    const unwrapped = unwrapMulticallResults(results);
+    expect(unwrapped).toEqual([]);
+  });
+});
+
+describe('type guards', () => {
+  describe('isMulticallSuccess', () => {
+    it('should return true for successful results', () => {
+      const result = { status: 'success' as const, result: 'test' };
+      expect(isMulticallSuccess(result)).toBe(true);
+    });
+
+    it('should return false for failed results', () => {
+      const result = { status: 'failure' as const, error: new Error('Failed') };
+      expect(isMulticallSuccess(result)).toBe(false);
+    });
+
+    it('should work with filter', () => {
+      const results = [
+        { status: 'success' as const, result: 'success1' },
+        { status: 'failure' as const, error: new Error('Failed') },
+        { status: 'success' as const, result: 'success2' },
+      ];
+
+      const successes = results.filter(isMulticallSuccess);
+      expect(successes).toHaveLength(2);
+      expect(successes[0].result).toBe('success1');
+      expect(successes[1].result).toBe('success2');
+    });
+  });
+
+  describe('isMulticallFailure', () => {
+    it('should return true for failed results', () => {
+      const result = { status: 'failure' as const, error: new Error('Failed') };
+      expect(isMulticallFailure(result)).toBe(true);
+    });
+
+    it('should return false for successful results', () => {
+      const result = { status: 'success' as const, result: 'test' };
+      expect(isMulticallFailure(result)).toBe(false);
+    });
+
+    it('should work with filter', () => {
+      const results = [
+        { status: 'success' as const, result: 'success1' },
+        { status: 'failure' as const, error: new Error('Failed1') },
+        { status: 'failure' as const, error: new Error('Failed2') },
+      ];
+
+      const failures = results.filter(isMulticallFailure);
+      expect(failures).toHaveLength(2);
+      expect(failures[0].error.message).toBe('Failed1');
+      expect(failures[1].error.message).toBe('Failed2');
+    });
+  });
+});
diff --git a/packages/account-sdk/src/interface/public-utilities/multicall/index.ts b/packages/account-sdk/src/interface/public-utilities/multicall/index.ts
new file mode 100644
index 000000000..59db784bf
--- /dev/null
+++ b/packages/account-sdk/src/interface/public-utilities/multicall/index.ts
@@ -0,0 +1,204 @@
+import type { PublicClient } from 'viem';
+import { multicall as viemMulticall } from 'viem/actions';
+import type { ContractCall, MulticallFailure, MulticallResult, MulticallSuccess } from './types.js';
+
+/**
+ * Executes multiple contract read calls in a single RPC request using multicall3.
+ *
+ * This utility batches multiple contract read operations into a single network request,
+ * significantly improving performance and reducing RPC costs when fetching data from
+ * multiple contracts or making multiple calls to the same contract.
+ *
+ * @example
+ * ```typescript
+ * import { multicall } from '@base-org/account';
+ * import { createPublicClient, http } from 'viem';
+ * import { base } from 'viem/chains';
+ *
+ * const client = createPublicClient({
+ *   chain: base,
+ *   transport: http(),
+ * });
+ *
+ * const results = await multicall(client, {
+ *   contracts: [
+ *     {
+ *       address: '0x...',
+ *       abi: myAbi,
+ *       functionName: 'balanceOf',
+ *       args: ['0x...'],
+ *     },
+ *     {
+ *       address: '0x...',
+ *       abi: myAbi,
+ *       functionName: 'totalSupply',
+ *     },
+ *   ],
+ * });
+ *
+ * if (results[0].status === 'success') {
+ *   console.log('Balance:', results[0].result);
+ * }
+ * ```
+ *
+ * @param client - Viem public client configured for the target chain
+ * @param config - Configuration object containing contracts array and options
+ * @param config.contracts - Array of contract calls to execute
+ * @param config.allowPartialFailure - If true, returns failures in results; if false, throws on any failure
+ * @param config.errorMessages - Custom error messages for each call
+ * @returns Promise resolving to array of results, one for each contract call
+ * @throws Error if allowPartialFailure is false and any call fails
+ *
+ * @public
+ */
+export async function multicall(
+  client: PublicClient,
+  config: {
+    contracts: readonly ContractCall[];
+    allowPartialFailure?: boolean;
+    errorMessages?: string[];
+  }
+): Promise<MulticallResult[]> {
+  const { contracts, allowPartialFailure = false, errorMessages = [] } = config;
+
+  if (!client) {
+    throw new Error('Public client is required for multicall');
+  }
+
+  if (!contracts || contracts.length === 0) {
+    throw new Error('At least one contract call is required');
+  }
+
+  try {
+    // biome-ignore lint/suspicious/noExplicitAny: viem's multicall requires specific contract type structure
+    const results = await viemMulticall(client as any, {
+      // biome-ignore lint/suspicious/noExplicitAny: viem's multicall requires specific ABI type
+      contracts: contracts as any,
+    });
+
+    return results.map((result, index): MulticallResult => {
+      if (result.status === 'success') {
+        return {
+          status: 'success',
+          result: result.result,
+        } as MulticallSuccess;
+      }
+
+      const failureError =
+        result.status === 'failure' && 'error' in result
+          ? (result.error as Error)
+          : new Error('Unknown error');
+
+      const error = new Error(
+        errorMessages[index] ||
+          `Contract call ${index} failed: ${failureError.message || 'Unknown error'}`
+      );
+
+      if (!allowPartialFailure) {
+        throw error;
+      }
+
+      return {
+        status: 'failure',
+        error,
+      } as MulticallFailure;
+    });
+  } catch (error) {
+    // Re-throw if it's already our error or if allowPartialFailure is false
+    if (
+      error instanceof Error &&
+      (error.message.includes('Contract call') || error.message.includes('required'))
+    ) {
+      throw error;
+    }
+
+    // Wrap unexpected errors
+    throw new Error(
+      `Multicall execution failed: ${error instanceof Error ? error.message : String(error)}`
+    );
+  }
+}
+
+/**
+ * Unwraps multicall results, throwing an error if any call failed.
+ * Use this helper when you want to ensure all calls succeeded and extract
+ * the result values in a type-safe way.
+ *
+ * @example
+ * ```typescript
+ * const results = await multicall(client, { contracts: [...] });
+ * const [balance, supply] = unwrapMulticallResults(results, [
+ *   'Failed to fetch balance',
+ *   'Failed to fetch supply',
+ * ]);
+ * ```
+ *
+ * @param results - Array of multicall results
+ * @param errorMessages - Custom error messages for each result
+ * @returns Array of unwrapped result values
+ * @throws Error if any result has status 'failure'
+ *
+ * @public
+ */
+export function unwrapMulticallResults<T = unknown>(
+  results: MulticallResult[],
+  errorMessages: string[] = []
+): T[] {
+  return results.map((result, index): T => {
+    if (result.status === 'success') {
+      return result.result as T;
+    }
+
+    throw new Error(
+      errorMessages[index] || result.error.message || `Call ${index} failed: Unknown error`
+    );
+  });
+}
+
+/**
+ * Type guard to check if a multicall result is successful
+ *
+ * @example
+ * ```typescript
+ * const results = await multicall(client, { contracts: [...], allowPartialFailure: true });
+ * const successfulResults = results.filter(isMulticallSuccess);
+ * ```
+ *
+ * @param result - Multicall result to check
+ * @returns True if result is successful
+ *
+ * @public
+ */
+export function isMulticallSuccess<T = unknown>(
+  result: MulticallResult<T>
+): result is MulticallSuccess<T> {
+  return result.status === 'success';
+}
+
+/**
+ * Type guard to check if a multicall result is a failure
+ *
+ * @example
+ * ```typescript
+ * const results = await multicall(client, { contracts: [...], allowPartialFailure: true });
+ * const failures = results.filter(isMulticallFailure);
+ * failures.forEach(f => console.error(f.error));
+ * ```
+ *
+ * @param result - Multicall result to check
+ * @returns True if result is a failure
+ *
+ * @public
+ */
+export function isMulticallFailure(result: MulticallResult): result is MulticallFailure {
+  return result.status === 'failure';
+}
+
+// Re-export types
+export type {
+  ContractCall,
+  MulticallFailure,
+  MulticallOptions,
+  MulticallResult,
+  MulticallSuccess,
+} from './types.js';
diff --git a/packages/account-sdk/src/interface/public-utilities/multicall/types.ts b/packages/account-sdk/src/interface/public-utilities/multicall/types.ts
new file mode 100644
index 000000000..15bd463a7
--- /dev/null
+++ b/packages/account-sdk/src/interface/public-utilities/multicall/types.ts
@@ -0,0 +1,60 @@
+import type { Abi } from 'viem';
+
+/**
+ * A single contract call configuration for multicall
+ */
+export type ContractCall = {
+  /** Contract address */
+  address: `0x${string}`;
+  /** Contract ABI */
+  abi: Abi;
+  /** Function name to call */
+  functionName: string;
+  /** Function arguments */
+  args?: readonly unknown[];
+};
+
+/**
+ * Result of a successful multicall operation
+ */
+export type MulticallSuccess<T = unknown> = {
+  status: 'success';
+  result: T;
+};
+
+/**
+ * Result of a failed multicall operation
+ */
+export type MulticallFailure = {
+  status: 'failure';
+  error: Error;
+};
+
+/**
+ * Union type for multicall results
+ */
+export type MulticallResult<T = unknown> = MulticallSuccess<T> | MulticallFailure;
+
+/**
+ * Options for multicall execution
+ */
+export type MulticallOptions = {
+  /**
+   * Whether to allow partial failures. If false, the entire operation
+   * will throw if any call fails. If true, individual failures will be
+   * returned in the results array.
+   * @default false
+   */
+  allowPartialFailure?: boolean;
+  /**
+   * Custom error messages for each call (indexed)
+   */
+  errorMessages?: string[];
+};
+
+/**
+ * Typed multicall result extractor
+ */
+export type ExtractMulticallResults<T extends readonly ContractCall[]> = {
+  [K in keyof T]: unknown;
+};
diff --git a/packages/account-sdk/src/interface/public-utilities/prolink/createProlinkUrl.test.ts b/packages/account-sdk/src/interface/public-utilities/prolink/createProlinkUrl.test.ts
new file mode 100644
index 000000000..16772bb58
--- /dev/null
+++ b/packages/account-sdk/src/interface/public-utilities/prolink/createProlinkUrl.test.ts
@@ -0,0 +1,255 @@
+// Copyright (c) 2018-2025 Coinbase, Inc. <https://www.coinbase.com/>
+
+import { describe, expect, it } from 'vitest';
+import { createProlinkUrl } from './createProlinkUrl.js';
+import { encodeProlink } from './index.node.js';
+
+describe('createProlinkUrl', () => {
+  const EXAMPLE_PROLINK = 'CAEQhUIgAigFcn0KFKqqqqqqqqqqqqqqqqqqqqqqqqqqEhQxlx8zf';
+
+  describe('basic functionality', () => {
+    it('should create URL with default base URL', () => {
+      const result = createProlinkUrl(EXAMPLE_PROLINK);
+      expect(result).toBe(`https://base.app/base-pay?p=${EXAMPLE_PROLINK}`);
+    });
+
+    it('should create URL with custom base URL', () => {
+      const result = createProlinkUrl(EXAMPLE_PROLINK, 'https://custom.com/pay');
+      expect(result).toBe(`https://custom.com/pay?p=${EXAMPLE_PROLINK}`);
+    });
+
+    it('should work with deeplink URLs', () => {
+      const result = createProlinkUrl(EXAMPLE_PROLINK, 'myapp://pay');
+      expect(result).toBe(`myapp://pay?p=${EXAMPLE_PROLINK}`);
+    });
+  });
+
+  describe('additional query parameters', () => {
+    it('should add additional query parameters', () => {
+      const result = createProlinkUrl(EXAMPLE_PROLINK, undefined, {
+        ref: 'promo',
+        utm_source: 'email',
+      });
+      const url = new URL(result);
+      expect(url.searchParams.get('p')).toBe(EXAMPLE_PROLINK);
+      expect(url.searchParams.get('ref')).toBe('promo');
+      expect(url.searchParams.get('utm_source')).toBe('email');
+    });
+
+    it('should work with custom base URL and additional params', () => {
+      const result = createProlinkUrl(EXAMPLE_PROLINK, 'https://custom.com/pay', {
+        campaign: 'summer',
+      });
+      const url = new URL(result);
+      expect(url.hostname).toBe('custom.com');
+      expect(url.searchParams.get('p')).toBe(EXAMPLE_PROLINK);
+      expect(url.searchParams.get('campaign')).toBe('summer');
+    });
+
+    it('should handle empty additional params object', () => {
+      const result = createProlinkUrl(EXAMPLE_PROLINK, undefined, {});
+      expect(result).toBe(`https://base.app/base-pay?p=${EXAMPLE_PROLINK}`);
+    });
+  });
+
+  describe('URL encoding', () => {
+    it('should handle prolinks with special base64url characters', () => {
+      // Base64url uses A-Z, a-z, 0-9, -, _
+      const prolinkWithSpecialChars =
+        'CAEQ-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+      const result = createProlinkUrl(prolinkWithSpecialChars);
+      expect(result).toBe(`https://base.app/base-pay?p=${prolinkWithSpecialChars}`);
+      // Verify it's a valid URL
+      expect(() => new URL(result)).not.toThrow();
+    });
+
+    it('should create valid URL object', () => {
+      const result = createProlinkUrl(EXAMPLE_PROLINK);
+      const url = new URL(result);
+      expect(url.protocol).toBe('https:');
+      expect(url.hostname).toBe('base.app');
+      expect(url.pathname).toBe('/base-pay');
+      expect(url.searchParams.get('p')).toBe(EXAMPLE_PROLINK);
+    });
+
+    it('should properly encode query parameter values', () => {
+      const result = createProlinkUrl(EXAMPLE_PROLINK, undefined, {
+        message: 'hello world',
+        special: 'a&b=c',
+      });
+      const url = new URL(result);
+      expect(url.searchParams.get('message')).toBe('hello world');
+      expect(url.searchParams.get('special')).toBe('a&b=c');
+    });
+  });
+
+  describe('integration with encodeProlink', () => {
+    it('should create URL from encoded wallet_sendCalls', async () => {
+      const request = {
+        method: 'wallet_sendCalls',
+        params: [
+          {
+            version: '1.0',
+            chainId: '0x2105',
+            calls: [
+              {
+                to: '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913',
+                data: '0xa9059cbb000000000000000000000000fe21034794a5a574b94fe4fdfd16e005f1c96e5100000000000000000000000000000000000000000000000000000000004c4b40',
+                value: '0x0',
+              },
+            ],
+          },
+        ],
+      };
+
+      const prolink = await encodeProlink(request);
+      const result = createProlinkUrl(prolink);
+
+      expect(result).toContain('https://base.app/base-pay?p=');
+      expect(result).toContain(prolink);
+
+      // Verify the URL is valid
+      const url = new URL(result);
+      expect(url.searchParams.get('p')).toBe(prolink);
+    });
+
+    it('should create URL from encoded wallet_sign', async () => {
+      const request = {
+        method: 'wallet_sign',
+        params: [
+          {
+            version: '1',
+            chainId: '0x14a34',
+            type: '0x01',
+            data: {
+              types: {
+                SpendPermission: [
+                  { name: 'account', type: 'address' },
+                  { name: 'spender', type: 'address' },
+                  { name: 'token', type: 'address' },
+                  { name: 'allowance', type: 'uint160' },
+                  { name: 'period', type: 'uint48' },
+                  { name: 'start', type: 'uint48' },
+                  { name: 'end', type: 'uint48' },
+                  { name: 'salt', type: 'uint256' },
+                  { name: 'extraData', type: 'bytes' },
+                ],
+              },
+              domain: {
+                name: 'Spend Permission Manager',
+                version: '1',
+                chainId: 84532,
+                verifyingContract: '0xf85210b21cc50302f477ba56686d2019dc9b67ad',
+              },
+              primaryType: 'SpendPermission',
+              message: {
+                account: '0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
+                spender: '0x8d9F34934dc9619e5DC3Df27D0A40b4A744E7eAa',
+                token: '0x036CbD53842c5426634e7929541eC2318f3dCF7e',
+                allowance: '0x2710',
+                period: 281474976710655,
+                start: 0,
+                end: 1914749767655,
+                salt: '0x2d6688aae9435fb91ab0a1fe7ea54ec3ffd86e8e18a0c17e1923c467dea4b75f',
+                extraData: '0x',
+              },
+            },
+          },
+        ],
+      };
+
+      const prolink = await encodeProlink(request);
+      const result = createProlinkUrl(prolink, 'https://base-staging.coinbase.com/base-pay');
+
+      expect(result).toContain('https://base-staging.coinbase.com/base-pay?p=');
+      expect(result).toContain(prolink);
+    });
+
+    it('should create URL from encoded generic RPC', async () => {
+      const request = {
+        method: 'eth_sendTransaction',
+        params: [
+          {
+            from: '0x1111111111111111111111111111111111111111',
+            to: '0x2222222222222222222222222222222222222222',
+            value: '0x100',
+            data: '0x',
+          },
+        ],
+        chainId: 1,
+      };
+
+      const prolink = await encodeProlink(request);
+      const result = createProlinkUrl(prolink);
+
+      expect(result).toContain('https://base.app/base-pay?p=');
+      expect(result).toContain(prolink);
+    });
+  });
+
+  describe('error handling', () => {
+    it('should throw on empty prolink string', () => {
+      expect(() => createProlinkUrl('')).toThrow('prolink cannot be empty');
+    });
+
+    it('should throw on whitespace-only prolink string', () => {
+      expect(() => createProlinkUrl('   ')).toThrow('prolink cannot be empty');
+    });
+
+    it('should throw on empty url', () => {
+      expect(() => createProlinkUrl(EXAMPLE_PROLINK, '')).toThrow('url cannot be empty');
+    });
+
+    it('should throw on whitespace-only url', () => {
+      expect(() => createProlinkUrl(EXAMPLE_PROLINK, '   ')).toThrow('url cannot be empty');
+    });
+
+    it('should throw on invalid url', () => {
+      expect(() => createProlinkUrl(EXAMPLE_PROLINK, 'not a url')).toThrow();
+    });
+  });
+
+  describe('edge cases', () => {
+    it('should handle very long prolinks', () => {
+      // Simulate a very long prolink (e.g., from a large transaction)
+      const longProlink = 'A'.repeat(1000);
+      const result = createProlinkUrl(longProlink);
+      expect(result).toContain('https://base.app/base-pay?p=');
+      expect(result).toContain(longProlink);
+      // Verify it's still a valid URL
+      expect(() => new URL(result)).not.toThrow();
+    });
+
+    it('should preserve exact prolink value in query param', () => {
+      const testCases = [
+        'CAEQhUIgAigF',
+        'simple',
+        'with-dashes',
+        'with_underscores',
+        '123456789',
+        'MixedCase123',
+      ];
+
+      for (const prolink of testCases) {
+        const result = createProlinkUrl(prolink);
+        const url = new URL(result);
+        expect(url.searchParams.get('p')).toBe(prolink);
+      }
+    });
+
+    it('should handle base URLs with existing query params', () => {
+      const result = createProlinkUrl(EXAMPLE_PROLINK, 'https://base.app/base-pay?existing=param');
+      const url = new URL(result);
+      expect(url.searchParams.get('existing')).toBe('param');
+      expect(url.searchParams.get('p')).toBe(EXAMPLE_PROLINK);
+    });
+
+    it('should handle base URLs with paths and fragments', () => {
+      const result = createProlinkUrl(EXAMPLE_PROLINK, 'https://example.com/path/to/pay#section');
+      const url = new URL(result);
+      expect(url.pathname).toBe('/path/to/pay');
+      expect(url.hash).toBe('#section');
+      expect(url.searchParams.get('p')).toBe(EXAMPLE_PROLINK);
+    });
+  });
+});
diff --git a/packages/account-sdk/src/interface/public-utilities/prolink/createProlinkUrl.ts b/packages/account-sdk/src/interface/public-utilities/prolink/createProlinkUrl.ts
new file mode 100644
index 000000000..9972e7d71
--- /dev/null
+++ b/packages/account-sdk/src/interface/public-utilities/prolink/createProlinkUrl.ts
@@ -0,0 +1,47 @@
+// Copyright (c) 2018-2025 Coinbase, Inc. <https://www.coinbase.com/>
+
+/**
+ * Base App universal link utilities for prolinks
+ */
+
+/**
+ * Create a link with an encoded prolink query parameter and additional query parameters
+ *
+ * @param prolink - Base64url-encoded prolink payload
+ * @param url - URL to use for the link, defaults to https://base.app/base-pay
+ * @param additionalQueryParams - Additional query parameters to add to the link
+ * @returns string - The full link
+ *
+ * @example
+ * ```typescript
+ * const prolink = await encodeProlink(request);
+ * const link = createProlinkUrl(prolink);
+ * // Returns: 'https://base.app/base-pay?p=CAEQ...'
+ *
+ * const linkWithAdditionalParams = createProlinkUrl(prolink, 'https://base.app/base-pay', {
+ *   foo: 'bar',
+ *   baz: 'qux',
+ * });
+ * // Returns: 'https://base.app/base-pay?p=CAEQ...&foo=bar&baz=qux'
+ * ```
+ */
+export function createProlinkUrl(
+  prolink: string,
+  url: string = 'https://base.app/base-pay',
+  additionalQueryParams?: Record<string, string>
+): string {
+  if (!prolink || prolink.trim().length === 0) {
+    throw new Error('prolink cannot be empty');
+  }
+  if (!url || url.trim().length === 0) {
+    throw new Error('url cannot be empty');
+  }
+
+  const link = new URL(url);
+  link.searchParams.set('p', prolink);
+  Object.entries(additionalQueryParams ?? {}).forEach(([key, value]) => {
+    link.searchParams.set(key, value);
+  });
+
+  return link.toString();
+}
diff --git a/packages/account-sdk/src/interface/public-utilities/prolink/index.node.ts b/packages/account-sdk/src/interface/public-utilities/prolink/index.node.ts
new file mode 100644
index 000000000..5fd8e6e3b
--- /dev/null
+++ b/packages/account-sdk/src/interface/public-utilities/prolink/index.node.ts
@@ -0,0 +1,209 @@
+// Copyright (c) 2018-2025 Coinbase, Inc. <https://www.coinbase.com/>
+
+/**
+ * Prolink URI encoding/decoding - Node.js version
+ * Implements the Compressed RPC Link Format ERC specification
+ * Uses Node.js zlib for compression
+ */
+
+import { decodeGenericRpc, encodeGenericRpc } from './shortcuts/generic.js';
+import { decodeWalletSendCalls, encodeWalletSendCalls } from './shortcuts/sendCalls.js';
+import { decodeWalletSign, encodeWalletSign } from './shortcuts/sign.js';
+import type { ProlinkDecoded, ProlinkRequest, RpcLinkPayload } from './types.js';
+import { decodeBase64url, encodeBase64url } from './utils/base64url.js';
+import { compressPayload, decompressPayload } from './utils/compression.node.js';
+import { decodeCapabilities, encodeCapabilities } from './utils/encoding.js';
+import { decodeRpcLinkPayload, encodeRpcLinkPayload } from './utils/protobuf.js';
+
+const PROTOCOL_VERSION = 1;
+const SHORTCUT_VERSION = 0;
+
+const SHORTCUT_GENERIC = 0;
+const SHORTCUT_WALLET_SEND_CALLS = 1;
+const SHORTCUT_WALLET_SIGN = 2;
+
+/**
+ * Encode a JSON-RPC request to prolink format
+ * @param request - JSON-RPC request with method, params, optional chainId and capabilities
+ * @returns Base64url-encoded prolink payload
+ */
+export async function encodeProlink(request: ProlinkRequest): Promise<string> {
+  let payload: RpcLinkPayload;
+
+  // Auto-detect shortcut based on method
+  if (request.method === 'wallet_sendCalls') {
+    // Validate params structure
+    if (!Array.isArray(request.params) || request.params.length === 0) {
+      throw new Error('wallet_sendCalls requires params array with at least one element');
+    }
+
+    const params = request.params[0];
+    if (typeof params !== 'object' || !params) {
+      throw new Error('wallet_sendCalls params[0] must be an object');
+    }
+
+    // Extract chainId from params
+    const chainIdHex = (params as { chainId?: string }).chainId;
+    if (!chainIdHex) {
+      throw new Error('wallet_sendCalls requires chainId in params');
+    }
+    const chainId = Number.parseInt(chainIdHex, 16);
+
+    const walletSendCalls = encodeWalletSendCalls(
+      params as Parameters<typeof encodeWalletSendCalls>[0]
+    );
+
+    payload = {
+      protocolVersion: PROTOCOL_VERSION,
+      chainId,
+      shortcutId: SHORTCUT_WALLET_SEND_CALLS,
+      shortcutVersion: SHORTCUT_VERSION,
+      body: {
+        case: 'walletSendCalls',
+        value: walletSendCalls,
+      },
+      capabilities: request.capabilities ? encodeCapabilities(request.capabilities) : undefined,
+    };
+  } else if (request.method === 'wallet_sign') {
+    // Validate params structure
+    if (!Array.isArray(request.params) || request.params.length === 0) {
+      throw new Error('wallet_sign requires params array with at least one element');
+    }
+
+    const params = request.params[0];
+    if (typeof params !== 'object' || !params) {
+      throw new Error('wallet_sign params[0] must be an object');
+    }
+
+    // Extract chainId from params
+    const chainIdHex = (params as { chainId?: string }).chainId;
+    if (!chainIdHex) {
+      throw new Error('wallet_sign requires chainId in params');
+    }
+    const chainId = Number.parseInt(chainIdHex, 16);
+
+    const walletSign = encodeWalletSign(params as Parameters<typeof encodeWalletSign>[0]);
+
+    payload = {
+      protocolVersion: PROTOCOL_VERSION,
+      chainId,
+      shortcutId: SHORTCUT_WALLET_SIGN,
+      shortcutVersion: SHORTCUT_VERSION,
+      body: {
+        case: 'walletSign',
+        value: walletSign,
+      },
+      capabilities: request.capabilities ? encodeCapabilities(request.capabilities) : undefined,
+    };
+  } else {
+    // Generic JSON-RPC
+    const generic = encodeGenericRpc(request.method, request.params);
+
+    payload = {
+      protocolVersion: PROTOCOL_VERSION,
+      chainId: request.chainId,
+      shortcutId: SHORTCUT_GENERIC,
+      shortcutVersion: SHORTCUT_VERSION,
+      body: {
+        case: 'generic',
+        value: generic,
+      },
+      capabilities: request.capabilities ? encodeCapabilities(request.capabilities) : undefined,
+    };
+  }
+
+  // Serialize to protobuf
+  const protoBytes = encodeRpcLinkPayload(payload);
+
+  // Compress (with flag byte)
+  const { compressed, flag } = await compressPayload(protoBytes);
+  const withFlag = new Uint8Array(compressed.length + 1);
+  withFlag[0] = flag;
+  withFlag.set(compressed, 1);
+
+  // Base64url encode
+  return encodeBase64url(withFlag);
+}
+
+/**
+ * Decode a prolink payload to JSON-RPC request
+ * @param payload - Base64url-encoded prolink payload
+ * @returns Decoded JSON-RPC request
+ */
+export async function decodeProlink(payload: string): Promise<ProlinkDecoded> {
+  // Base64url decode
+  const bytes = decodeBase64url(payload);
+
+  // Decompress
+  const decompressed = await decompressPayload(bytes);
+
+  // Deserialize protobuf
+  const rpcPayload = decodeRpcLinkPayload(decompressed);
+
+  // Validate protocol version
+  if (rpcPayload.protocolVersion !== PROTOCOL_VERSION) {
+    throw new Error(
+      `Unsupported protocol version: ${rpcPayload.protocolVersion} (expected ${PROTOCOL_VERSION})`
+    );
+  }
+
+  // Decode capabilities
+  const capabilities = rpcPayload.capabilities
+    ? decodeCapabilities(rpcPayload.capabilities)
+    : undefined;
+
+  // Dispatch to shortcut decoder
+  if (rpcPayload.shortcutId === SHORTCUT_GENERIC) {
+    if (rpcPayload.body.case !== 'generic') {
+      throw new Error('Invalid payload: shortcut 0 requires generic body');
+    }
+
+    const { method, params } = decodeGenericRpc(rpcPayload.body.value);
+
+    return {
+      method,
+      params,
+      chainId: rpcPayload.chainId,
+      capabilities,
+    };
+  }
+
+  if (rpcPayload.shortcutId === SHORTCUT_WALLET_SEND_CALLS) {
+    if (rpcPayload.body.case !== 'walletSendCalls') {
+      throw new Error('Invalid payload: shortcut 1 requires walletSendCalls body');
+    }
+
+    if (!rpcPayload.chainId) {
+      throw new Error('wallet_sendCalls requires chainId');
+    }
+
+    const params = decodeWalletSendCalls(rpcPayload.body.value, rpcPayload.chainId, capabilities);
+
+    return {
+      method: 'wallet_sendCalls',
+      params: [params],
+    };
+  }
+
+  if (rpcPayload.shortcutId === SHORTCUT_WALLET_SIGN) {
+    if (rpcPayload.body.case !== 'walletSign') {
+      throw new Error('Invalid payload: shortcut 2 requires walletSign body');
+    }
+
+    if (!rpcPayload.chainId) {
+      throw new Error('wallet_sign requires chainId');
+    }
+
+    const params = decodeWalletSign(rpcPayload.body.value, rpcPayload.chainId, capabilities);
+
+    return {
+      method: 'wallet_sign',
+      params: [params],
+    };
+  }
+
+  throw new Error(`Unsupported shortcut ID: ${rpcPayload.shortcutId}`);
+}
+
+// Re-export types
+export type { ProlinkDecoded, ProlinkRequest } from './types.js';
diff --git a/packages/account-sdk/src/interface/public-utilities/prolink/index.test.ts b/packages/account-sdk/src/interface/public-utilities/prolink/index.test.ts
new file mode 100644
index 000000000..ab466a413
--- /dev/null
+++ b/packages/account-sdk/src/interface/public-utilities/prolink/index.test.ts
@@ -0,0 +1,315 @@
+// Copyright (c) 2018-2025 Coinbase, Inc. <https://www.coinbase.com/>
+
+import { describe, expect, it } from 'vitest';
+import { decodeProlink, encodeProlink } from './index.node.js';
+
+describe('prolink end-to-end', () => {
+  describe('wallet_sendCalls', () => {
+    it('should encode and decode ERC20 transfer', async () => {
+      const request = {
+        method: 'wallet_sendCalls',
+        params: [
+          {
+            version: '1.0',
+            chainId: '0x2105',
+            calls: [
+              {
+                to: '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913',
+                data: '0xa9059cbb000000000000000000000000fe21034794a5a574b94fe4fdfd16e005f1c96e5100000000000000000000000000000000000000000000000000000000004c4b40',
+                value: '0x0',
+              },
+            ],
+          },
+        ],
+      };
+
+      const encoded = await encodeProlink(request);
+      expect(typeof encoded).toBe('string');
+      expect(encoded.length).toBeGreaterThan(0);
+
+      const decoded = await decodeProlink(encoded);
+      expect(decoded.method).toBe('wallet_sendCalls');
+      expect(Array.isArray(decoded.params)).toBe(true);
+
+      const params = (decoded.params as Array<{ chainId: string; calls: unknown[] }>)[0];
+      expect(params.chainId).toBe('0x2105'); // hex string
+      expect(params.calls.length).toBe(1);
+    });
+
+    it('should encode and decode native transfer', async () => {
+      const request = {
+        method: 'wallet_sendCalls',
+        params: [
+          {
+            version: '1.0',
+            chainId: '0x1',
+            calls: [
+              {
+                to: '0xfe21034794a5a574b94fe4fdfd16e005f1c96e51',
+                data: '0x',
+                value: '0xde0b6b3a7640000',
+              },
+            ],
+          },
+        ],
+      };
+
+      const encoded = await encodeProlink(request);
+      const decoded = await decodeProlink(encoded);
+
+      expect(decoded.method).toBe('wallet_sendCalls');
+      const params = (decoded.params as Array<{ chainId: string }>)[0];
+      expect(params.chainId).toBe('0x1');
+    });
+
+    it('should encode and decode with capabilities', async () => {
+      const request = {
+        method: 'wallet_sendCalls',
+        params: [
+          {
+            version: '1.0',
+            chainId: '0x1',
+            calls: [
+              {
+                to: '0xfe21034794a5a574b94fe4fdfd16e005f1c96e51',
+                data: '0x',
+                value: '0x100',
+              },
+            ],
+          },
+        ],
+        capabilities: {
+          dataCallback: {
+            callbackURL: 'https://example.com',
+            events: ['initiated'],
+          },
+        },
+      };
+
+      const encoded = await encodeProlink(request);
+      const decoded = await decodeProlink(encoded);
+
+      const params = (decoded.params as Array<{ capabilities?: Record<string, unknown> }>)[0];
+      expect(params.capabilities).toBeDefined();
+      expect(params.capabilities?.dataCallback).toEqual({
+        callbackURL: 'https://example.com',
+        events: ['initiated'],
+      });
+    });
+  });
+
+  describe('wallet_sign', () => {
+    it('should encode and decode SpendPermission', async () => {
+      const request = {
+        method: 'wallet_sign',
+        params: [
+          {
+            version: '1',
+            chainId: '0x14a34',
+            type: '0x01',
+            data: {
+              types: {
+                SpendPermission: [
+                  { name: 'account', type: 'address' },
+                  { name: 'spender', type: 'address' },
+                  { name: 'token', type: 'address' },
+                  { name: 'allowance', type: 'uint160' },
+                  { name: 'period', type: 'uint48' },
+                  { name: 'start', type: 'uint48' },
+                  { name: 'end', type: 'uint48' },
+                  { name: 'salt', type: 'uint256' },
+                  { name: 'extraData', type: 'bytes' },
+                ],
+              },
+              domain: {
+                name: 'Spend Permission Manager',
+                version: '1',
+                chainId: 84532,
+                verifyingContract: '0xf85210b21cc50302f477ba56686d2019dc9b67ad',
+              },
+              primaryType: 'SpendPermission',
+              message: {
+                account: '0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
+                spender: '0x8d9F34934dc9619e5DC3Df27D0A40b4A744E7eAa',
+                token: '0x036CbD53842c5426634e7929541eC2318f3dCF7e',
+                allowance: '0x2710',
+                period: 281474976710655,
+                start: 0,
+                end: 1914749767655,
+                salt: '0x2d6688aae9435fb91ab0a1fe7ea54ec3ffd86e8e18a0c17e1923c467dea4b75f',
+                extraData: '0x',
+              },
+            },
+          },
+        ],
+      };
+
+      const encoded = await encodeProlink(request);
+      expect(typeof encoded).toBe('string');
+
+      const decoded = await decodeProlink(encoded);
+      expect(decoded.method).toBe('wallet_sign');
+      const params = (
+        decoded.params as Array<{ chainId: string; data: { primaryType: string } }>
+      )[0];
+      expect(params.chainId).toBe('0x14a34'); // hex string for 84532
+      expect(params.data.primaryType).toBe('SpendPermission');
+    });
+  });
+
+  describe('generic JSON-RPC', () => {
+    it('should encode and decode generic method', async () => {
+      const request = {
+        method: 'eth_sendTransaction',
+        params: [
+          {
+            from: '0x1111111111111111111111111111111111111111',
+            to: '0x2222222222222222222222222222222222222222',
+            value: '0x100',
+            data: '0x',
+          },
+        ],
+        chainId: 1,
+      };
+
+      const encoded = await encodeProlink(request);
+      const decoded = await decodeProlink(encoded);
+
+      expect(decoded.method).toBe('eth_sendTransaction');
+      expect(decoded.chainId).toBe(1);
+      expect(decoded.params).toEqual(request.params);
+    });
+
+    it('should encode and decode complex params', async () => {
+      const request = {
+        method: 'custom_method',
+        params: {
+          nested: {
+            array: [1, 2, 3],
+            string: 'test',
+            bool: true,
+          },
+        },
+      };
+
+      const encoded = await encodeProlink(request);
+      const decoded = await decodeProlink(encoded);
+
+      expect(decoded.method).toBe('custom_method');
+      expect(decoded.params).toEqual(request.params);
+    });
+  });
+
+  describe('error handling', () => {
+    it('should throw on invalid wallet_sendCalls params', async () => {
+      const request = {
+        method: 'wallet_sendCalls',
+        params: [],
+      };
+
+      await expect(encodeProlink(request)).rejects.toThrow(/requires params array/);
+    });
+
+    it('should throw on missing chainId in wallet_sendCalls', async () => {
+      const request = {
+        method: 'wallet_sendCalls',
+        params: [
+          {
+            version: '1.0',
+            calls: [],
+          },
+        ],
+      };
+
+      await expect(encodeProlink(request)).rejects.toThrow(/requires chainId/);
+    });
+
+    it('should throw on invalid base64url', async () => {
+      await expect(decodeProlink('invalid!@#$%')).rejects.toThrow(/Invalid Base64url/);
+    });
+
+    it('should throw on unsupported protocol version', async () => {
+      // Create a payload with protocol version 99
+      // We need to encode a proper protobuf message with invalid protocol version
+      // Format: [compression_flag, protobuf_data]
+      // protobuf data: field 1 (protocol_version) = 99
+      // varint encoding: field_tag = (1 << 3) | 0 = 0x08, value = 99 = 0x63
+      const protobufData = new Uint8Array([0x08, 0x63]); // protocol_version = 99
+      const withFlag = new Uint8Array([0x00, ...protobufData]); // No compression
+      const { encodeBase64url } = await import('./utils/base64url.js');
+      const invalidPayload = encodeBase64url(withFlag);
+
+      await expect(decodeProlink(invalidPayload)).rejects.toThrow(/Unsupported protocol version/);
+    });
+  });
+
+  describe('compression', () => {
+    it('should use compression for large payloads', async () => {
+      const request = {
+        method: 'wallet_sendCalls',
+        params: [
+          {
+            version: '1.0',
+            chainId: '0x1',
+            calls: new Array(50).fill(null).map((_, _i) => ({
+              to: `0x${'1'.repeat(40)}`,
+              data: `0x${'ab'.repeat(100)}`,
+              value: '0x0',
+            })),
+          },
+        ],
+      };
+
+      const encoded = await encodeProlink(request);
+      // Compressed payload should still be a valid base64url string
+      expect(encoded).toMatch(/^[A-Za-z0-9_-]+$/);
+
+      // Should be able to decode successfully
+      const decoded = await decodeProlink(encoded);
+      expect(decoded.method).toBe('wallet_sendCalls');
+    });
+  });
+
+  describe('roundtrip correctness', () => {
+    it('should preserve all data through roundtrip', async () => {
+      const request = {
+        method: 'wallet_sendCalls',
+        params: [
+          {
+            version: '2.0',
+            chainId: '0x2105',
+            from: '0x1234567890123456789012345678901234567890',
+            calls: [
+              {
+                to: '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913',
+                data: '0xa9059cbb000000000000000000000000fe21034794a5a574b94fe4fdfd16e005f1c96e5100000000000000000000000000000000000000000000000000000000004c4b40',
+                value: '0x0',
+              },
+            ],
+          },
+        ],
+        capabilities: {
+          order_id: 'ORDER-12345',
+          tip_bps: 50,
+        },
+      };
+
+      const encoded = await encodeProlink(request);
+      const decoded = await decodeProlink(encoded);
+
+      expect(decoded.method).toBe(request.method);
+      const params = (
+        decoded.params as Array<{
+          version?: string;
+          from?: string;
+          chainId: string;
+          capabilities?: Record<string, unknown>;
+        }>
+      )[0];
+      expect(params.chainId).toBe('0x2105'); // hex string for 8453
+      expect(params.capabilities).toEqual(request.capabilities);
+      expect(params.version).toBe('2.0');
+      expect(params.from?.toLowerCase()).toBe(request.params[0].from.toLowerCase());
+    });
+  });
+});
diff --git a/packages/account-sdk/src/interface/public-utilities/prolink/index.ts b/packages/account-sdk/src/interface/public-utilities/prolink/index.ts
new file mode 100644
index 000000000..1bda9037c
--- /dev/null
+++ b/packages/account-sdk/src/interface/public-utilities/prolink/index.ts
@@ -0,0 +1,211 @@
+// Copyright (c) 2018-2025 Coinbase, Inc. <https://www.coinbase.com/>
+
+/**
+ * Prolink URI encoding/decoding
+ * Implements the Compressed RPC Link Format ERC specification
+ */
+
+import { decodeGenericRpc, encodeGenericRpc } from './shortcuts/generic.js';
+import { decodeWalletSendCalls, encodeWalletSendCalls } from './shortcuts/sendCalls.js';
+import { decodeWalletSign, encodeWalletSign } from './shortcuts/sign.js';
+import type { ProlinkDecoded, ProlinkRequest, RpcLinkPayload } from './types.js';
+import { decodeBase64url, encodeBase64url } from './utils/base64url.js';
+import { compressPayload, decompressPayload } from './utils/compression.js';
+import { decodeCapabilities, encodeCapabilities } from './utils/encoding.js';
+import { decodeRpcLinkPayload, encodeRpcLinkPayload } from './utils/protobuf.js';
+
+const PROTOCOL_VERSION = 1;
+const SHORTCUT_VERSION = 0;
+
+const SHORTCUT_GENERIC = 0;
+const SHORTCUT_WALLET_SEND_CALLS = 1;
+const SHORTCUT_WALLET_SIGN = 2;
+
+/**
+ * Encode a JSON-RPC request to prolink format
+ * @param request - JSON-RPC request with method, params, optional chainId and capabilities
+ * @returns Base64url-encoded prolink payload
+ */
+export async function encodeProlink(request: ProlinkRequest): Promise<string> {
+  let payload: RpcLinkPayload;
+
+  // Auto-detect shortcut based on method
+  if (request.method === 'wallet_sendCalls') {
+    // Validate params structure
+    if (!Array.isArray(request.params) || request.params.length === 0) {
+      throw new Error('wallet_sendCalls requires params array with at least one element');
+    }
+
+    const params = request.params[0];
+    if (typeof params !== 'object' || !params) {
+      throw new Error('wallet_sendCalls params[0] must be an object');
+    }
+
+    // Extract chainId from params
+    const chainIdHex = (params as { chainId?: string }).chainId;
+    if (!chainIdHex) {
+      throw new Error('wallet_sendCalls requires chainId in params');
+    }
+    const chainId = Number.parseInt(chainIdHex, 16);
+
+    const walletSendCalls = encodeWalletSendCalls(
+      params as Parameters<typeof encodeWalletSendCalls>[0]
+    );
+
+    payload = {
+      protocolVersion: PROTOCOL_VERSION,
+      chainId,
+      shortcutId: SHORTCUT_WALLET_SEND_CALLS,
+      shortcutVersion: SHORTCUT_VERSION,
+      body: {
+        case: 'walletSendCalls',
+        value: walletSendCalls,
+      },
+      capabilities: request.capabilities ? encodeCapabilities(request.capabilities) : undefined,
+    };
+  } else if (request.method === 'wallet_sign') {
+    // Validate params structure
+    if (!Array.isArray(request.params) || request.params.length === 0) {
+      throw new Error('wallet_sign requires params array with at least one element');
+    }
+
+    const params = request.params[0];
+    if (typeof params !== 'object' || !params) {
+      throw new Error('wallet_sign params[0] must be an object');
+    }
+
+    // Extract chainId from params
+    const chainIdHex = (params as { chainId?: string }).chainId;
+    if (!chainIdHex) {
+      throw new Error('wallet_sign requires chainId in params');
+    }
+    const chainId = Number.parseInt(chainIdHex, 16);
+
+    const walletSign = encodeWalletSign(params as Parameters<typeof encodeWalletSign>[0]);
+
+    payload = {
+      protocolVersion: PROTOCOL_VERSION,
+      chainId,
+      shortcutId: SHORTCUT_WALLET_SIGN,
+      shortcutVersion: SHORTCUT_VERSION,
+      body: {
+        case: 'walletSign',
+        value: walletSign,
+      },
+      capabilities: request.capabilities ? encodeCapabilities(request.capabilities) : undefined,
+    };
+  } else {
+    // Generic JSON-RPC
+    const generic = encodeGenericRpc(request.method, request.params);
+
+    payload = {
+      protocolVersion: PROTOCOL_VERSION,
+      chainId: request.chainId,
+      shortcutId: SHORTCUT_GENERIC,
+      shortcutVersion: SHORTCUT_VERSION,
+      body: {
+        case: 'generic',
+        value: generic,
+      },
+      capabilities: request.capabilities ? encodeCapabilities(request.capabilities) : undefined,
+    };
+  }
+
+  // Serialize to protobuf
+  const protoBytes = encodeRpcLinkPayload(payload);
+
+  // Compress (with flag byte)
+  const { compressed, flag } = await compressPayload(protoBytes);
+  const withFlag = new Uint8Array(compressed.length + 1);
+  withFlag[0] = flag;
+  withFlag.set(compressed, 1);
+
+  // Base64url encode
+  return encodeBase64url(withFlag);
+}
+
+/**
+ * Decode a prolink payload to JSON-RPC request
+ * @param payload - Base64url-encoded prolink payload
+ * @returns Decoded JSON-RPC request
+ */
+export async function decodeProlink(payload: string): Promise<ProlinkDecoded> {
+  // Base64url decode
+  const bytes = decodeBase64url(payload);
+
+  // Decompress
+  const decompressed = await decompressPayload(bytes);
+
+  // Deserialize protobuf
+  const rpcPayload = decodeRpcLinkPayload(decompressed);
+
+  // Validate protocol version
+  if (rpcPayload.protocolVersion !== PROTOCOL_VERSION) {
+    throw new Error(
+      `Unsupported protocol version: ${rpcPayload.protocolVersion} (expected ${PROTOCOL_VERSION})`
+    );
+  }
+
+  // Decode capabilities
+  const capabilities = rpcPayload.capabilities
+    ? decodeCapabilities(rpcPayload.capabilities)
+    : undefined;
+
+  // Dispatch to shortcut decoder
+  if (rpcPayload.shortcutId === SHORTCUT_GENERIC) {
+    if (rpcPayload.body.case !== 'generic') {
+      throw new Error('Invalid payload: shortcut 0 requires generic body');
+    }
+
+    const { method, params } = decodeGenericRpc(rpcPayload.body.value);
+
+    return {
+      method,
+      params,
+      chainId: rpcPayload.chainId,
+      capabilities,
+    };
+  }
+
+  if (rpcPayload.shortcutId === SHORTCUT_WALLET_SEND_CALLS) {
+    if (rpcPayload.body.case !== 'walletSendCalls') {
+      throw new Error('Invalid payload: shortcut 1 requires walletSendCalls body');
+    }
+
+    if (!rpcPayload.chainId) {
+      throw new Error('wallet_sendCalls requires chainId');
+    }
+
+    const params = decodeWalletSendCalls(rpcPayload.body.value, rpcPayload.chainId, capabilities);
+
+    return {
+      method: 'wallet_sendCalls',
+      params: [params],
+    };
+  }
+
+  if (rpcPayload.shortcutId === SHORTCUT_WALLET_SIGN) {
+    if (rpcPayload.body.case !== 'walletSign') {
+      throw new Error('Invalid payload: shortcut 2 requires walletSign body');
+    }
+
+    if (!rpcPayload.chainId) {
+      throw new Error('wallet_sign requires chainId');
+    }
+
+    const params = decodeWalletSign(rpcPayload.body.value, rpcPayload.chainId, capabilities);
+
+    return {
+      method: 'wallet_sign',
+      params: [params],
+    };
+  }
+
+  throw new Error(`Unsupported shortcut ID: ${rpcPayload.shortcutId}`);
+}
+
+// Re-export universal link utilities
+export { createProlinkUrl } from './createProlinkUrl.js';
+
+// Re-export types
+export type { ProlinkDecoded, ProlinkRequest } from './types.js';
diff --git a/packages/account-sdk/src/interface/public-utilities/prolink/shortcuts/generic.test.ts b/packages/account-sdk/src/interface/public-utilities/prolink/shortcuts/generic.test.ts
new file mode 100644
index 000000000..d9fd5b3f2
--- /dev/null
+++ b/packages/account-sdk/src/interface/public-utilities/prolink/shortcuts/generic.test.ts
@@ -0,0 +1,254 @@
+// Copyright (c) 2018-2025 Coinbase, Inc. <https://www.coinbase.com/>
+
+import { describe, expect, it } from 'vitest';
+import { decodeGenericRpc, encodeGenericRpc } from './generic.js';
+
+describe('generic JSON-RPC shortcut (EIP-8050 Shortcut 0)', () => {
+  describe('encoding', () => {
+    it('should encode method name correctly', () => {
+      const encoded = encodeGenericRpc('eth_sendTransaction', []);
+      expect(encoded.method).toBe('eth_sendTransaction');
+    });
+
+    it('should encode params as UTF-8 JSON bytes', () => {
+      const params = [{ to: '0x1234', value: '0x100' }];
+      const encoded = encodeGenericRpc('eth_sendTransaction', params);
+
+      const decoded = new TextDecoder().decode(encoded.paramsJson);
+      expect(JSON.parse(decoded)).toEqual(params);
+    });
+
+    it('should set rpc version to 2.0', () => {
+      const encoded = encodeGenericRpc('eth_chainId', []);
+      expect(encoded.rpcVersion).toBe('2.0');
+    });
+
+    it('should handle array params', () => {
+      const params = ['0x1234', 'latest'];
+      const encoded = encodeGenericRpc('eth_getBalance', params);
+
+      const decoded = JSON.parse(new TextDecoder().decode(encoded.paramsJson));
+      expect(decoded).toEqual(params);
+    });
+
+    it('should handle object params (JSON-RPC 2.0 named params)', () => {
+      const params = { address: '0x1234', blockTag: 'latest' };
+      const encoded = encodeGenericRpc('eth_getBalance', params);
+
+      const decoded = JSON.parse(new TextDecoder().decode(encoded.paramsJson));
+      expect(decoded).toEqual(params);
+    });
+
+    it('should handle null params', () => {
+      const encoded = encodeGenericRpc('eth_chainId', null);
+
+      const decoded = JSON.parse(new TextDecoder().decode(encoded.paramsJson));
+      expect(decoded).toBeNull();
+    });
+
+    it('should handle undefined params', () => {
+      const encoded = encodeGenericRpc('eth_chainId', undefined);
+
+      const decoded = new TextDecoder().decode(encoded.paramsJson);
+      // JSON.stringify(undefined) returns undefined (not a string), but in practice
+      // we get the string "undefined" which is not valid JSON
+      // This behavior depends on implementation; let's check what actually happens
+      expect(decoded).toBeDefined();
+    });
+
+    it('should handle complex nested params', () => {
+      const params = {
+        nested: {
+          array: [1, 2, 3],
+          object: { a: 'b' },
+        },
+        boolean: true,
+        number: 42,
+        string: 'test',
+      };
+      const encoded = encodeGenericRpc('custom_method', params);
+
+      const decoded = JSON.parse(new TextDecoder().decode(encoded.paramsJson));
+      expect(decoded).toEqual(params);
+    });
+  });
+
+  describe('decoding', () => {
+    it('should decode method name', () => {
+      const encoded = encodeGenericRpc('eth_sendTransaction', []);
+      const decoded = decodeGenericRpc(encoded);
+
+      expect(decoded.method).toBe('eth_sendTransaction');
+    });
+
+    it('should decode array params', () => {
+      const params = ['0x1234', 'latest'];
+      const encoded = encodeGenericRpc('eth_getBalance', params);
+      const decoded = decodeGenericRpc(encoded);
+
+      expect(decoded.params).toEqual(params);
+    });
+
+    it('should decode object params', () => {
+      const params = { address: '0x1234', blockTag: 'latest' };
+      const encoded = encodeGenericRpc('eth_getBalance', params);
+      const decoded = decodeGenericRpc(encoded);
+
+      expect(decoded.params).toEqual(params);
+    });
+
+    it('should throw on invalid JSON', () => {
+      const invalidPayload = {
+        method: 'test',
+        paramsJson: new Uint8Array([0xff, 0xfe, 0xfd]), // Invalid UTF-8
+        rpcVersion: '2.0',
+      };
+
+      expect(() => decodeGenericRpc(invalidPayload)).toThrow(/Failed to parse params JSON/);
+    });
+
+    it('should throw on malformed JSON', () => {
+      const malformedPayload = {
+        method: 'test',
+        paramsJson: new TextEncoder().encode('{ invalid json }'),
+        rpcVersion: '2.0',
+      };
+
+      expect(() => decodeGenericRpc(malformedPayload)).toThrow(/Failed to parse params JSON/);
+    });
+  });
+
+  describe('roundtrip', () => {
+    it('should roundtrip eth_sendTransaction', () => {
+      const method = 'eth_sendTransaction';
+      const params = [
+        {
+          from: '0x1111111111111111111111111111111111111111',
+          to: '0x2222222222222222222222222222222222222222',
+          value: '0x100',
+          data: '0x1234',
+        },
+      ];
+
+      const encoded = encodeGenericRpc(method, params);
+      const decoded = decodeGenericRpc(encoded);
+
+      expect(decoded.method).toBe(method);
+      expect(decoded.params).toEqual(params);
+    });
+
+    it('should roundtrip eth_call with complex params', () => {
+      const method = 'eth_call';
+      const params = [
+        {
+          to: '0x1234567890123456789012345678901234567890',
+          data: '0xa9059cbb0000000000000000000000001234567890123456789012345678901234567890000000000000000000000000000000000000000000000000000000000000000a',
+        },
+        'latest',
+      ];
+
+      const encoded = encodeGenericRpc(method, params);
+      const decoded = decodeGenericRpc(encoded);
+
+      expect(decoded.method).toBe(method);
+      expect(decoded.params).toEqual(params);
+    });
+
+    it('should roundtrip wallet_sendCalls (fallback scenario)', () => {
+      // Even wallet_sendCalls can be encoded via generic shortcut
+      const method = 'wallet_sendCalls';
+      const params = [
+        {
+          version: '1.0',
+          chainId: '0x1',
+          calls: [
+            {
+              to: '0x1234567890123456789012345678901234567890',
+              data: '0x',
+              value: '0x100',
+            },
+          ],
+        },
+      ];
+
+      const encoded = encodeGenericRpc(method, params);
+      const decoded = decodeGenericRpc(encoded);
+
+      expect(decoded.method).toBe(method);
+      expect(decoded.params).toEqual(params);
+    });
+
+    it('should roundtrip empty params array', () => {
+      const method = 'eth_chainId';
+      const params: unknown[] = [];
+
+      const encoded = encodeGenericRpc(method, params);
+      const decoded = decodeGenericRpc(encoded);
+
+      expect(decoded.method).toBe(method);
+      expect(decoded.params).toEqual(params);
+    });
+  });
+
+  describe('method name handling', () => {
+    // Per spec: "method: case-sensitive, MUST match the target RPC interface"
+
+    it('should preserve case sensitivity', () => {
+      const encoded = encodeGenericRpc('ETH_sendTransaction', []);
+      const decoded = decodeGenericRpc(encoded);
+
+      expect(decoded.method).toBe('ETH_sendTransaction');
+    });
+
+    it('should handle underscores in method names', () => {
+      const encoded = encodeGenericRpc('wallet_send_calls', []);
+      const decoded = decodeGenericRpc(encoded);
+
+      expect(decoded.method).toBe('wallet_send_calls');
+    });
+
+    it('should handle namespaced methods', () => {
+      const encoded = encodeGenericRpc('debug_traceTransaction', []);
+      const decoded = decodeGenericRpc(encoded);
+
+      expect(decoded.method).toBe('debug_traceTransaction');
+    });
+  });
+
+  describe('JSON encoding edge cases', () => {
+    it('should handle Unicode strings', () => {
+      const params = { message: '你好世界 🌍' };
+      const encoded = encodeGenericRpc('custom_method', params);
+      const decoded = decodeGenericRpc(encoded);
+
+      expect(decoded.params).toEqual(params);
+    });
+
+    it('should handle special characters', () => {
+      const params = { special: '\\n\\t\\"' };
+      const encoded = encodeGenericRpc('custom_method', params);
+      const decoded = decodeGenericRpc(encoded);
+
+      expect(decoded.params).toEqual(params);
+    });
+
+    it('should handle large numbers as strings', () => {
+      // BigInt values should be passed as strings to avoid precision loss
+      const params = {
+        amount: '115792089237316195423570985008687907853269984665640564039457584007913129639935',
+      };
+      const encoded = encodeGenericRpc('custom_method', params);
+      const decoded = decodeGenericRpc(encoded);
+
+      expect(decoded.params).toEqual(params);
+    });
+
+    it('should handle boolean values', () => {
+      const params = { flag: true, other: false };
+      const encoded = encodeGenericRpc('custom_method', params);
+      const decoded = decodeGenericRpc(encoded);
+
+      expect(decoded.params).toEqual(params);
+    });
+  });
+});
diff --git a/packages/account-sdk/src/interface/public-utilities/prolink/shortcuts/generic.ts b/packages/account-sdk/src/interface/public-utilities/prolink/shortcuts/generic.ts
new file mode 100644
index 000000000..eeed067fd
--- /dev/null
+++ b/packages/account-sdk/src/interface/public-utilities/prolink/shortcuts/generic.ts
@@ -0,0 +1,48 @@
+// Copyright (c) 2018-2025 Coinbase, Inc. <https://www.coinbase.com/>
+
+/**
+ * Shortcut 0: Generic JSON-RPC encoder/decoder
+ * Universal fallback for any JSON-RPC method
+ */
+
+import type { GenericJsonRpc } from '../types.js';
+
+/**
+ * Encode a generic JSON-RPC request
+ * @param method - JSON-RPC method name
+ * @param params - Parameters (any JSON-serializable value)
+ * @returns GenericJsonRpc message
+ */
+export function encodeGenericRpc(method: string, params: unknown): GenericJsonRpc {
+  const paramsJson = JSON.stringify(params);
+  const paramsBytes = new TextEncoder().encode(paramsJson);
+
+  return {
+    method,
+    paramsJson: paramsBytes,
+    rpcVersion: '2.0',
+  };
+}
+
+/**
+ * Decode a generic JSON-RPC request
+ * @param payload - GenericJsonRpc message
+ * @returns Decoded method and params
+ */
+export function decodeGenericRpc(payload: GenericJsonRpc): { method: string; params: unknown } {
+  const paramsJson = new TextDecoder().decode(payload.paramsJson);
+
+  let params: unknown;
+  try {
+    params = JSON.parse(paramsJson);
+  } catch (error) {
+    throw new Error(
+      `Failed to parse params JSON: ${error instanceof Error ? error.message : 'unknown error'}`
+    );
+  }
+
+  return {
+    method: payload.method,
+    params,
+  };
+}
diff --git a/packages/account-sdk/src/interface/public-utilities/prolink/shortcuts/sendCalls.test.ts b/packages/account-sdk/src/interface/public-utilities/prolink/shortcuts/sendCalls.test.ts
new file mode 100644
index 000000000..ef4f34acf
--- /dev/null
+++ b/packages/account-sdk/src/interface/public-utilities/prolink/shortcuts/sendCalls.test.ts
@@ -0,0 +1,601 @@
+// Copyright (c) 2018-2025 Coinbase, Inc. <https://www.coinbase.com/>
+
+import { describe, expect, it } from 'vitest';
+import { SendCallsType } from '../types.js';
+import { decodeWalletSendCalls, encodeWalletSendCalls } from './sendCalls.js';
+
+describe('sendCalls shortcut (EIP-8050 Shortcut 1)', () => {
+  describe('ERC20 transfer detection', () => {
+    it('should detect ERC20 transfer', () => {
+      const params = {
+        version: '1.0',
+        chainId: '0x2105',
+        calls: [
+          {
+            to: '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913',
+            data: '0xa9059cbb000000000000000000000000fe21034794a5a574b94fe4fdfd16e005f1c96e5100000000000000000000000000000000000000000000000000000000004c4b40',
+            value: '0x0',
+          },
+        ],
+      };
+
+      const encoded = encodeWalletSendCalls(params);
+
+      expect(encoded.type).toBe(SendCallsType.ERC20_TRANSFER);
+      expect(encoded.transactionData.case).toBe('erc20Transfer');
+
+      if (encoded.transactionData.case === 'erc20Transfer') {
+        const { token, recipient, amount } = encoded.transactionData.value;
+        expect(token.length).toBe(20);
+        expect(recipient.length).toBe(20);
+        expect(amount).toEqual(new Uint8Array([0x4c, 0x4b, 0x40]));
+      }
+    });
+
+    it('should NOT detect ERC20 if multiple calls', () => {
+      const params = {
+        chainId: '0x1',
+        calls: [
+          {
+            to: '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913',
+            data: '0xa9059cbb000000000000000000000000fe21034794a5a574b94fe4fdfd16e005f1c96e5100000000000000000000000000000000000000000000000000000000004c4b40',
+            value: '0x0',
+          },
+          {
+            to: '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913',
+            data: '0x',
+            value: '0x0',
+          },
+        ],
+      };
+
+      const encoded = encodeWalletSendCalls(params);
+      expect(encoded.type).toBe(SendCallsType.GENERIC_CALLS);
+    });
+
+    it('should NOT detect ERC20 if non-zero value', () => {
+      const params = {
+        chainId: '0x1',
+        calls: [
+          {
+            to: '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913',
+            data: '0xa9059cbb000000000000000000000000fe21034794a5a574b94fe4fdfd16e005f1c96e5100000000000000000000000000000000000000000000000000000000004c4b40',
+            value: '0x1',
+          },
+        ],
+      };
+
+      const encoded = encodeWalletSendCalls(params);
+      expect(encoded.type).toBe(SendCallsType.GENERIC_CALLS);
+    });
+
+    it('should NOT detect ERC20 if wrong data length', () => {
+      const params = {
+        chainId: '0x1',
+        calls: [
+          {
+            to: '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913',
+            data: '0xa9059cbb0000000000000000000000fe21034794a5a574b94fe4fdfd16e005f1c96e51',
+            value: '0x0',
+          },
+        ],
+      };
+
+      const encoded = encodeWalletSendCalls(params);
+      expect(encoded.type).toBe(SendCallsType.GENERIC_CALLS);
+    });
+  });
+
+  describe('Native transfer detection', () => {
+    it('should detect native transfer', () => {
+      const params = {
+        version: '1.0',
+        chainId: '0x1',
+        calls: [
+          {
+            to: '0xfe21034794a5a574b94fe4fdfd16e005f1c96e51',
+            data: '0x',
+            value: '0xde0b6b3a7640000',
+          },
+        ],
+      };
+
+      const encoded = encodeWalletSendCalls(params);
+
+      expect(encoded.type).toBe(SendCallsType.NATIVE_TRANSFER);
+      expect(encoded.transactionData.case).toBe('nativeTransfer');
+
+      if (encoded.transactionData.case === 'nativeTransfer') {
+        const { recipient, amount } = encoded.transactionData.value;
+        expect(recipient.length).toBe(20);
+        expect(amount).toEqual(new Uint8Array([0x0d, 0xe0, 0xb6, 0xb3, 0xa7, 0x64, 0x00, 0x00]));
+      }
+    });
+
+    it('should NOT detect native if has data', () => {
+      const params = {
+        chainId: '0x1',
+        calls: [
+          {
+            to: '0xfe21034794a5a574b94fe4fdfd16e005f1c96e51',
+            data: '0x1234',
+            value: '0xde0b6b3a7640000',
+          },
+        ],
+      };
+
+      const encoded = encodeWalletSendCalls(params);
+      expect(encoded.type).toBe(SendCallsType.GENERIC_CALLS);
+    });
+
+    it('should NOT detect native if zero value', () => {
+      const params = {
+        chainId: '0x1',
+        calls: [
+          {
+            to: '0xfe21034794a5a574b94fe4fdfd16e005f1c96e51',
+            data: '0x',
+            value: '0x0',
+          },
+        ],
+      };
+
+      const encoded = encodeWalletSendCalls(params);
+      expect(encoded.type).toBe(SendCallsType.GENERIC_CALLS);
+    });
+  });
+
+  describe('Generic calls', () => {
+    it('should encode multiple calls as generic', () => {
+      const params = {
+        chainId: '0x1',
+        calls: [
+          {
+            to: '0x1111111111111111111111111111111111111111',
+            data: '0x1234',
+            value: '0x0',
+          },
+          {
+            to: '0x2222222222222222222222222222222222222222',
+            data: '0x5678',
+            value: '0x100',
+          },
+        ],
+      };
+
+      const encoded = encodeWalletSendCalls(params);
+
+      expect(encoded.type).toBe(SendCallsType.GENERIC_CALLS);
+      expect(encoded.transactionData.case).toBe('genericCalls');
+
+      if (encoded.transactionData.case === 'genericCalls') {
+        expect(encoded.transactionData.value.calls.length).toBe(2);
+      }
+    });
+  });
+
+  describe('ERC20 roundtrip', () => {
+    it('should roundtrip ERC20 transfer', () => {
+      const params = {
+        version: '1.0',
+        chainId: '0x2105',
+        calls: [
+          {
+            to: '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913',
+            data: '0xa9059cbb000000000000000000000000fe21034794a5a574b94fe4fdfd16e005f1c96e5100000000000000000000000000000000000000000000000000000000004c4b40',
+            value: '0x0',
+          },
+        ],
+      };
+
+      const encoded = encodeWalletSendCalls(params);
+      const decoded = decodeWalletSendCalls(encoded, 8453);
+
+      expect(decoded.chainId).toBe(params.chainId);
+      expect(decoded.version).toBe(params.version);
+      expect(decoded.calls.length).toBe(1);
+
+      // Normalize addresses for comparison
+      expect(decoded.calls[0].to.toLowerCase()).toBe(params.calls[0].to.toLowerCase());
+      expect(decoded.calls[0].data?.toLowerCase()).toBe(params.calls[0].data.toLowerCase());
+      expect(decoded.calls[0].value).toBe(params.calls[0].value);
+    });
+  });
+
+  describe('Native transfer roundtrip', () => {
+    it('should roundtrip native transfer', () => {
+      const params = {
+        version: '1.0',
+        chainId: '0x1',
+        calls: [
+          {
+            to: '0xfe21034794a5a574b94fe4fdfd16e005f1c96e51',
+            data: '0x',
+            value: '0xde0b6b3a7640000',
+          },
+        ],
+      };
+
+      const encoded = encodeWalletSendCalls(params);
+      const decoded = decodeWalletSendCalls(encoded, 1);
+
+      expect(decoded.chainId).toBe(params.chainId);
+      expect(decoded.version).toBe(params.version);
+      expect(decoded.calls.length).toBe(1);
+      expect(decoded.calls[0].to.toLowerCase()).toBe(params.calls[0].to.toLowerCase());
+      expect(decoded.calls[0].data).toBe(params.calls[0].data);
+      expect(decoded.calls[0].value?.toLowerCase()).toBe(params.calls[0].value.toLowerCase());
+    });
+  });
+
+  describe('Generic calls roundtrip', () => {
+    it('should roundtrip generic calls', () => {
+      const params = {
+        version: '1.0',
+        chainId: '0x1',
+        calls: [
+          {
+            to: '0x1111111111111111111111111111111111111111',
+            data: '0x1234',
+            value: '0x0',
+          },
+          {
+            to: '0x2222222222222222222222222222222222222222',
+            data: '0x5678',
+            value: '0x100',
+          },
+        ],
+      };
+
+      const encoded = encodeWalletSendCalls(params);
+      const decoded = decodeWalletSendCalls(encoded, 1);
+
+      expect(decoded.calls.length).toBe(2);
+      expect(decoded.calls[0].to.toLowerCase()).toBe(params.calls[0].to.toLowerCase());
+      expect(decoded.calls[1].to.toLowerCase()).toBe(params.calls[1].to.toLowerCase());
+    });
+  });
+
+  describe('EIP-8050 type detection order', () => {
+    // Per spec: "Encoders MUST detect transaction types in this order:
+    // 1. ERC20 Transfer, 2. Native Transfer, 3. Generic Calls"
+
+    it('should prioritize ERC20 over native (ERC20 has data)', () => {
+      // A call with ERC20 transfer data should be detected as ERC20, not native
+      const params = {
+        chainId: '0x1',
+        calls: [
+          {
+            to: '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913',
+            data: '0xa9059cbb000000000000000000000000fe21034794a5a574b94fe4fdfd16e005f1c96e5100000000000000000000000000000000000000000000000000000000004c4b40',
+            value: '0x0',
+          },
+        ],
+      };
+
+      const encoded = encodeWalletSendCalls(params);
+      expect(encoded.type).toBe(SendCallsType.ERC20_TRANSFER);
+    });
+
+    it('should detect native only with empty data', () => {
+      const params = {
+        chainId: '0x1',
+        calls: [
+          {
+            to: '0xfe21034794a5a574b94fe4fdfd16e005f1c96e51',
+            data: '0x',
+            value: '0x100',
+          },
+        ],
+      };
+
+      const encoded = encodeWalletSendCalls(params);
+      expect(encoded.type).toBe(SendCallsType.NATIVE_TRANSFER);
+    });
+  });
+
+  describe('ERC20 transfer edge cases', () => {
+    // Per spec: data starts with 0xa9059cbb, data length is exactly 68 bytes (136 hex chars)
+
+    it('should NOT detect ERC20 with wrong selector', () => {
+      const params = {
+        chainId: '0x1',
+        calls: [
+          {
+            to: '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913',
+            // transferFrom selector instead of transfer
+            data: '0x23b872dd000000000000000000000000fe21034794a5a574b94fe4fdfd16e005f1c96e5100000000000000000000000000000000000000000000000000000000004c4b40',
+            value: '0x0',
+          },
+        ],
+      };
+
+      const encoded = encodeWalletSendCalls(params);
+      expect(encoded.type).toBe(SendCallsType.GENERIC_CALLS);
+    });
+
+    it('should NOT detect ERC20 with data too short', () => {
+      const params = {
+        chainId: '0x1',
+        calls: [
+          {
+            to: '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913',
+            data: '0xa9059cbb0000000000000000000000fe21034794a5a574b94fe4fdfd16e005f1c96e51', // Short
+            value: '0x0',
+          },
+        ],
+      };
+
+      const encoded = encodeWalletSendCalls(params);
+      expect(encoded.type).toBe(SendCallsType.GENERIC_CALLS);
+    });
+
+    it('should NOT detect ERC20 with data too long', () => {
+      const params = {
+        chainId: '0x1',
+        calls: [
+          {
+            to: '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913',
+            // 68 bytes + extra byte
+            data: '0xa9059cbb000000000000000000000000fe21034794a5a574b94fe4fdfd16e005f1c96e5100000000000000000000000000000000000000000000000000000000004c4b4000',
+            value: '0x0',
+          },
+        ],
+      };
+
+      const encoded = encodeWalletSendCalls(params);
+      expect(encoded.type).toBe(SendCallsType.GENERIC_CALLS);
+    });
+
+    it('should handle case-insensitive selector matching', () => {
+      const params = {
+        chainId: '0x1',
+        calls: [
+          {
+            to: '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913',
+            // Uppercase selector
+            data: '0xA9059CBB000000000000000000000000fe21034794a5a574b94fe4fdfd16e005f1c96e5100000000000000000000000000000000000000000000000000000000004c4b40',
+            value: '0x0',
+          },
+        ],
+      };
+
+      const encoded = encodeWalletSendCalls(params);
+      expect(encoded.type).toBe(SendCallsType.ERC20_TRANSFER);
+    });
+
+    it('should accept value as empty string as zero', () => {
+      const params = {
+        chainId: '0x1',
+        calls: [
+          {
+            to: '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913',
+            data: '0xa9059cbb000000000000000000000000fe21034794a5a574b94fe4fdfd16e005f1c96e5100000000000000000000000000000000000000000000000000000000004c4b40',
+            // Missing value treated as zero
+          },
+        ],
+      };
+
+      const encoded = encodeWalletSendCalls(params);
+      expect(encoded.type).toBe(SendCallsType.ERC20_TRANSFER);
+    });
+  });
+
+  describe('Native transfer edge cases', () => {
+    it('should accept empty string data as empty', () => {
+      const params = {
+        chainId: '0x1',
+        calls: [
+          {
+            to: '0xfe21034794a5a574b94fe4fdfd16e005f1c96e51',
+            data: '', // Empty string instead of 0x
+            value: '0x100',
+          },
+        ],
+      };
+
+      const encoded = encodeWalletSendCalls(params);
+      expect(encoded.type).toBe(SendCallsType.NATIVE_TRANSFER);
+    });
+
+    it('should NOT detect native if data is 0x00', () => {
+      const params = {
+        chainId: '0x1',
+        calls: [
+          {
+            to: '0xfe21034794a5a574b94fe4fdfd16e005f1c96e51',
+            data: '0x00', // Single zero byte is not empty
+            value: '0x100',
+          },
+        ],
+      };
+
+      const encoded = encodeWalletSendCalls(params);
+      expect(encoded.type).toBe(SendCallsType.GENERIC_CALLS);
+    });
+  });
+
+  describe('from field handling', () => {
+    it('should preserve from field in encoding', () => {
+      const params = {
+        version: '1.0',
+        chainId: '0x1',
+        from: '0x1234567890123456789012345678901234567890',
+        calls: [
+          {
+            to: '0xfe21034794a5a574b94fe4fdfd16e005f1c96e51',
+            data: '0x',
+            value: '0x100',
+          },
+        ],
+      };
+
+      const encoded = encodeWalletSendCalls(params);
+      expect(encoded.from).toBeDefined();
+      expect(encoded.from?.length).toBe(20);
+    });
+
+    it('should decode from field correctly', () => {
+      const params = {
+        version: '1.0',
+        chainId: '0x1',
+        from: '0x1234567890123456789012345678901234567890',
+        calls: [
+          {
+            to: '0xfe21034794a5a574b94fe4fdfd16e005f1c96e51',
+            data: '0x',
+            value: '0x100',
+          },
+        ],
+      };
+
+      const encoded = encodeWalletSendCalls(params);
+      const decoded = decodeWalletSendCalls(encoded, 1);
+
+      expect(decoded.from?.toLowerCase()).toBe(params.from.toLowerCase());
+    });
+
+    it('should handle missing from field', () => {
+      const params = {
+        version: '1.0',
+        chainId: '0x1',
+        calls: [
+          {
+            to: '0xfe21034794a5a574b94fe4fdfd16e005f1c96e51',
+            data: '0x',
+            value: '0x100',
+          },
+        ],
+      };
+
+      const encoded = encodeWalletSendCalls(params);
+      expect(encoded.from).toBeUndefined();
+
+      const decoded = decodeWalletSendCalls(encoded, 1);
+      expect(decoded.from).toBeUndefined();
+    });
+  });
+
+  describe('version field handling', () => {
+    it('should default version to 1.0', () => {
+      const params = {
+        chainId: '0x1',
+        calls: [
+          {
+            to: '0xfe21034794a5a574b94fe4fdfd16e005f1c96e51',
+            data: '0x',
+            value: '0x100',
+          },
+        ],
+      };
+
+      const encoded = encodeWalletSendCalls(params);
+      expect(encoded.version).toBe('1.0');
+    });
+
+    it('should preserve custom version', () => {
+      const params = {
+        version: '2.0',
+        chainId: '0x1',
+        calls: [
+          {
+            to: '0xfe21034794a5a574b94fe4fdfd16e005f1c96e51',
+            data: '0x',
+            value: '0x100',
+          },
+        ],
+      };
+
+      const encoded = encodeWalletSendCalls(params);
+      expect(encoded.version).toBe('2.0');
+
+      const decoded = decodeWalletSendCalls(encoded, 1);
+      expect(decoded.version).toBe('2.0');
+    });
+  });
+
+  describe('capabilities handling', () => {
+    it('should include capabilities in decoded params', () => {
+      const params = {
+        version: '1.0',
+        chainId: '0x1',
+        calls: [
+          {
+            to: '0xfe21034794a5a574b94fe4fdfd16e005f1c96e51',
+            data: '0x',
+            value: '0x100',
+          },
+        ],
+      };
+
+      const capabilities = {
+        dataCallback: {
+          callbackURL: 'https://example.com/callback',
+          events: ['initiated'],
+        },
+        order_id: 'ORDER-123',
+      };
+
+      const encoded = encodeWalletSendCalls(params);
+      const decoded = decodeWalletSendCalls(encoded, 1, capabilities);
+
+      expect(decoded.capabilities).toEqual(capabilities);
+    });
+  });
+
+  describe('EIP-8050 Test Vector 1: ERC20 Transfer', () => {
+    // Test vector from the spec
+    it('should match spec test vector structure', () => {
+      const params = {
+        version: '1.0',
+        chainId: '0x2105',
+        calls: [
+          {
+            to: '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913',
+            data: '0xa9059cbb000000000000000000000000fe21034794a5a574b94fe4fdfd16e005f1c96e5100000000000000000000000000000000000000000000000000000000004c4b40',
+            value: '0x0',
+          },
+        ],
+      };
+
+      const encoded = encodeWalletSendCalls(params);
+
+      expect(encoded.type).toBe(SendCallsType.ERC20_TRANSFER);
+      expect(encoded.version).toBe('1.0');
+
+      if (encoded.transactionData.case === 'erc20Transfer') {
+        const { amount } = encoded.transactionData.value;
+        // 5000000 = 0x4c4b40 (3 bytes)
+        expect(amount).toEqual(new Uint8Array([0x4c, 0x4b, 0x40]));
+      }
+    });
+  });
+
+  describe('EIP-8050 Test Vector 2: Native Transfer', () => {
+    // Test vector from the spec
+    it('should match spec test vector structure', () => {
+      const params = {
+        version: '1.0',
+        chainId: '0x1',
+        calls: [
+          {
+            to: '0xfe21034794a5a574b94fe4fdfd16e005f1c96e51',
+            data: '0x',
+            value: '0xde0b6b3a7640000', // 1 ETH
+          },
+        ],
+      };
+
+      const encoded = encodeWalletSendCalls(params);
+
+      expect(encoded.type).toBe(SendCallsType.NATIVE_TRANSFER);
+      expect(encoded.version).toBe('1.0');
+
+      if (encoded.transactionData.case === 'nativeTransfer') {
+        const { amount } = encoded.transactionData.value;
+        // 1 ETH = 0x0de0b6b3a7640000 (8 bytes)
+        expect(amount).toEqual(new Uint8Array([0x0d, 0xe0, 0xb6, 0xb3, 0xa7, 0x64, 0x00, 0x00]));
+      }
+    });
+  });
+});
diff --git a/packages/account-sdk/src/interface/public-utilities/prolink/shortcuts/sendCalls.ts b/packages/account-sdk/src/interface/public-utilities/prolink/shortcuts/sendCalls.ts
new file mode 100644
index 000000000..7436d0d3e
--- /dev/null
+++ b/packages/account-sdk/src/interface/public-utilities/prolink/shortcuts/sendCalls.ts
@@ -0,0 +1,222 @@
+// Copyright (c) 2018-2025 Coinbase, Inc. <https://www.coinbase.com/>
+
+/**
+ * Shortcut 1: wallet_sendCalls encoder/decoder
+ * Optimizes EIP-5792 wallet_sendCalls requests
+ */
+
+import type { WalletSendCalls } from '../types.js';
+import { SendCallsType } from '../types.js';
+import {
+  bytesToHex,
+  decodeAddress,
+  encodeAddress,
+  encodeAmount,
+  hexToBytes,
+  pad32,
+} from '../utils/encoding.js';
+
+// ERC20 transfer(address,uint256) selector
+const ERC20_TRANSFER_SELECTOR = '0xa9059cbb';
+
+type SendCallsParams = {
+  version?: string;
+  chainId: string;
+  from?: string;
+  calls: Array<{
+    to: string;
+    data?: string;
+    value?: string;
+  }>;
+  capabilities?: Record<string, unknown>;
+};
+
+/**
+ * Detect if calls represent an ERC20 transfer
+ * Must be exactly one call with transfer selector, 68-byte data, and zero value
+ */
+function detectErc20Transfer(
+  calls: SendCallsParams['calls']
+): { token: string; recipient: string; amount: bigint } | null {
+  if (calls.length !== 1) return null;
+
+  const call = calls[0];
+  const data = call.data || '0x';
+  const value = call.value || '0x0';
+
+  // Check for zero value
+  const valueAmount = BigInt(value);
+  if (valueAmount !== 0n) return null;
+
+  // Check selector and length (4 bytes selector + 32 bytes recipient + 32 bytes amount = 68 bytes = 136 hex chars)
+  if (!data.toLowerCase().startsWith(ERC20_TRANSFER_SELECTOR.toLowerCase())) return null;
+
+  // Remove 0x prefix for length check
+  const dataNoPrefix = data.slice(2);
+  if (dataNoPrefix.length !== 136) return null; // 68 bytes = 136 hex chars
+
+  // Extract recipient (bytes 4-35, i.e., chars 8-71)
+  const recipientPadded = dataNoPrefix.slice(8, 72);
+  const recipient = `0x${recipientPadded.slice(24)}`; // Last 20 bytes (40 chars)
+
+  // Extract amount (bytes 36-67, i.e., chars 72-135)
+  const amountHex = dataNoPrefix.slice(72, 136);
+  const amount = BigInt(`0x${amountHex}`);
+
+  return {
+    token: call.to,
+    recipient,
+    amount,
+  };
+}
+
+/**
+ * Detect if calls represent a native transfer
+ * Must be exactly one call with empty data and non-zero value
+ */
+function detectNativeTransfer(
+  calls: SendCallsParams['calls']
+): { recipient: string; amount: bigint } | null {
+  if (calls.length !== 1) return null;
+
+  const call = calls[0];
+  const data = call.data || '0x';
+  const value = call.value || '0x0';
+
+  // Check for empty data
+  if (data !== '0x' && data !== '') return null;
+
+  // Check for non-zero value
+  const amount = BigInt(value);
+  if (amount === 0n) return null;
+
+  return {
+    recipient: call.to,
+    amount,
+  };
+}
+
+/**
+ * Encode wallet_sendCalls request
+ * @param params - EIP-5792 wallet_sendCalls parameters
+ * @returns WalletSendCalls message
+ */
+export function encodeWalletSendCalls(params: SendCallsParams): WalletSendCalls {
+  // Detect transaction type (order matters per spec)
+  const erc20 = detectErc20Transfer(params.calls);
+  if (erc20) {
+    return {
+      type: SendCallsType.ERC20_TRANSFER,
+      transactionData: {
+        case: 'erc20Transfer',
+        value: {
+          token: encodeAddress(erc20.token),
+          recipient: encodeAddress(erc20.recipient),
+          amount: encodeAmount(erc20.amount),
+        },
+      },
+      from: params.from ? encodeAddress(params.from) : undefined,
+      version: params.version || '1.0',
+    };
+  }
+
+  const native = detectNativeTransfer(params.calls);
+  if (native) {
+    return {
+      type: SendCallsType.NATIVE_TRANSFER,
+      transactionData: {
+        case: 'nativeTransfer',
+        value: {
+          recipient: encodeAddress(native.recipient),
+          amount: encodeAmount(native.amount),
+        },
+      },
+      from: params.from ? encodeAddress(params.from) : undefined,
+      version: params.version || '1.0',
+    };
+  }
+
+  // Generic calls
+  return {
+    type: SendCallsType.GENERIC_CALLS,
+    transactionData: {
+      case: 'genericCalls',
+      value: {
+        calls: params.calls.map((call) => ({
+          to: encodeAddress(call.to),
+          data: call.data ? hexToBytes(call.data) : new Uint8Array(),
+          value: encodeAmount(call.value || '0x0'),
+        })),
+      },
+    },
+    from: params.from ? encodeAddress(params.from) : undefined,
+    version: params.version || '1.0',
+  };
+}
+
+/**
+ * Decode wallet_sendCalls request
+ * @param payload - WalletSendCalls message
+ * @param chainId - Chain ID from top-level payload
+ * @param capabilities - Optional capabilities from top-level payload
+ * @returns EIP-5792 wallet_sendCalls parameters (ERC-8050 compliant with capabilities inside)
+ */
+export function decodeWalletSendCalls(
+  payload: WalletSendCalls,
+  chainId: number,
+  capabilities?: Record<string, unknown>
+): SendCallsParams {
+  const result: SendCallsParams = {
+    version: payload.version || '1.0',
+    chainId: `0x${chainId.toString(16)}`,
+    from: payload.from ? decodeAddress(payload.from) : undefined,
+    calls: [],
+    capabilities,
+  };
+
+  if (payload.transactionData.case === 'erc20Transfer') {
+    const { token, recipient, amount } = payload.transactionData.value;
+
+    // Reconstruct ERC20 transfer call data with proper 32-byte padding
+    const recipientPadded = pad32(recipient);
+    const amountPadded = pad32(amount.length > 0 ? amount : new Uint8Array([0]));
+
+    // Convert to hex without minimal encoding (keep all padding)
+    const recipientHex = Array.from(recipientPadded)
+      .map((b) => b.toString(16).padStart(2, '0'))
+      .join('');
+    const amountHex = Array.from(amountPadded)
+      .map((b) => b.toString(16).padStart(2, '0'))
+      .join('');
+
+    const data = ERC20_TRANSFER_SELECTOR + recipientHex + amountHex;
+
+    result.calls = [
+      {
+        to: decodeAddress(token),
+        data,
+        value: '0x0',
+      },
+    ];
+  } else if (payload.transactionData.case === 'nativeTransfer') {
+    const { recipient, amount } = payload.transactionData.value;
+
+    result.calls = [
+      {
+        to: decodeAddress(recipient),
+        data: '0x',
+        value: bytesToHex(amount.length > 0 ? amount : new Uint8Array([0])),
+      },
+    ];
+  } else if (payload.transactionData.case === 'genericCalls') {
+    const { calls } = payload.transactionData.value;
+
+    result.calls = calls.map((call) => ({
+      to: decodeAddress(call.to),
+      data: call.data.length > 0 ? bytesToHex(call.data) : '0x',
+      value: bytesToHex(call.value.length > 0 ? call.value : new Uint8Array([0])),
+    }));
+  }
+
+  return result;
+}
diff --git a/packages/account-sdk/src/interface/public-utilities/prolink/shortcuts/sign.test.ts b/packages/account-sdk/src/interface/public-utilities/prolink/shortcuts/sign.test.ts
new file mode 100644
index 000000000..9331d077a
--- /dev/null
+++ b/packages/account-sdk/src/interface/public-utilities/prolink/shortcuts/sign.test.ts
@@ -0,0 +1,564 @@
+// Copyright (c) 2018-2025 Coinbase, Inc. <https://www.coinbase.com/>
+
+import { describe, expect, it } from 'vitest';
+import { SignType } from '../types.js';
+import { decodeWalletSign, encodeWalletSign } from './sign.js';
+
+describe('sign shortcut', () => {
+  describe('SpendPermission detection (EIP-8050 Shortcut 2)', () => {
+    it('should detect SpendPermission typed data', () => {
+      const params = {
+        version: '1',
+        chainId: '0x14a34',
+        type: '0x01',
+        data: {
+          types: {
+            SpendPermission: [
+              { name: 'account', type: 'address' },
+              { name: 'spender', type: 'address' },
+              { name: 'token', type: 'address' },
+              { name: 'allowance', type: 'uint160' },
+              { name: 'period', type: 'uint48' },
+              { name: 'start', type: 'uint48' },
+              { name: 'end', type: 'uint48' },
+              { name: 'salt', type: 'uint256' },
+              { name: 'extraData', type: 'bytes' },
+            ],
+          },
+          domain: {
+            name: 'Spend Permission Manager',
+            version: '1',
+            chainId: 84532,
+            verifyingContract: '0xf85210b21cc50302f477ba56686d2019dc9b67ad',
+          },
+          primaryType: 'SpendPermission',
+          message: {
+            account: '0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
+            spender: '0x8d9F34934dc9619e5DC3Df27D0A40b4A744E7eAa',
+            token: '0x036CbD53842c5426634e7929541eC2318f3dCF7e',
+            allowance: '0x2710',
+            period: 281474976710655,
+            start: 0,
+            end: 1914749767655,
+            salt: '0x2d6688aae9435fb91ab0a1fe7ea54ec3ffd86e8e18a0c17e1923c467dea4b75f',
+            extraData: '0x',
+          },
+        },
+      };
+
+      const encoded = encodeWalletSign(params);
+
+      expect(encoded.type).toBe(SignType.SPEND_PERMISSION);
+      expect(encoded.signatureData.case).toBe('spendPermission');
+
+      if (encoded.signatureData.case === 'spendPermission') {
+        const sp = encoded.signatureData.value;
+        expect(sp.account.length).toBe(20);
+        expect(sp.spender.length).toBe(20);
+        expect(sp.token.length).toBe(20);
+        expect(sp.verifyingContract.length).toBe(20);
+        expect(sp.salt.length).toBe(32);
+        expect(sp.domainName).toBe('Spend Permission Manager');
+        expect(sp.domainVersion).toBe('1');
+      }
+    });
+
+    it('should NOT detect SpendPermission without verifyingContract', () => {
+      const params = {
+        version: '1',
+        chainId: '0x1',
+        type: '0x01',
+        data: {
+          types: {
+            SpendPermission: [{ name: 'account', type: 'address' }],
+          },
+          domain: {
+            name: 'Test',
+            version: '1',
+            chainId: 1,
+            // Missing verifyingContract
+          },
+          primaryType: 'SpendPermission',
+          message: {
+            account: '0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
+          },
+        },
+      };
+
+      const encoded = encodeWalletSign(params as Parameters<typeof encodeWalletSign>[0]);
+      expect(encoded.type).toBe(SignType.GENERIC_TYPED_DATA);
+    });
+  });
+
+  describe('ReceiveWithAuthorization detection', () => {
+    it('should detect ReceiveWithAuthorization typed data', () => {
+      const params = {
+        version: '1',
+        chainId: '0x2105',
+        type: '0x01',
+        data: {
+          types: {
+            ReceiveWithAuthorization: [
+              { name: 'from', type: 'address' },
+              { name: 'to', type: 'address' },
+              { name: 'value', type: 'uint256' },
+              { name: 'validAfter', type: 'uint256' },
+              { name: 'validBefore', type: 'uint256' },
+              { name: 'nonce', type: 'bytes32' },
+            ],
+          },
+          domain: {
+            name: 'USDC',
+            version: '2',
+            chainId: 8453,
+            verifyingContract: '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913',
+          },
+          primaryType: 'ReceiveWithAuthorization',
+          message: {
+            from: '0x1111111111111111111111111111111111111111',
+            to: '0x2222222222222222222222222222222222222222',
+            value: '0x5f5e100',
+            validAfter: '0x0',
+            validBefore: '0xffffffffffffffff',
+            nonce: '0x1234567890123456789012345678901234567890123456789012345678901234',
+          },
+        },
+      };
+
+      const encoded = encodeWalletSign(params);
+
+      expect(encoded.type).toBe(SignType.RECEIVE_WITH_AUTHORIZATION);
+      expect(encoded.signatureData.case).toBe('receiveWithAuthorization');
+
+      if (encoded.signatureData.case === 'receiveWithAuthorization') {
+        const rwa = encoded.signatureData.value;
+        expect(rwa.from.length).toBe(20);
+        expect(rwa.to.length).toBe(20);
+        expect(rwa.nonce.length).toBe(32);
+        expect(rwa.domainName).toBe('USDC');
+        expect(rwa.domainVersion).toBe('2');
+      }
+    });
+  });
+
+  describe('Generic typed data fallback', () => {
+    it('should encode unknown primaryType as generic', () => {
+      const params = {
+        version: '1',
+        chainId: '0x1',
+        type: '0x01',
+        data: {
+          types: {
+            CustomMessage: [
+              { name: 'foo', type: 'string' },
+              { name: 'bar', type: 'uint256' },
+            ],
+          },
+          domain: {
+            name: 'Custom App',
+            version: '1',
+            chainId: 1,
+            verifyingContract: '0x1111111111111111111111111111111111111111',
+          },
+          primaryType: 'CustomMessage',
+          message: {
+            foo: 'hello',
+            bar: 12345,
+          },
+        },
+      };
+
+      const encoded = encodeWalletSign(params);
+
+      expect(encoded.type).toBe(SignType.GENERIC_TYPED_DATA);
+      expect(encoded.signatureData.case).toBe('genericTypedData');
+
+      if (encoded.signatureData.case === 'genericTypedData') {
+        const json = new TextDecoder().decode(encoded.signatureData.value.typedDataJson);
+        const parsed = JSON.parse(json);
+        expect(parsed.primaryType).toBe('CustomMessage');
+      }
+    });
+  });
+
+  describe('Type field normalization (EIP-8050 requirement)', () => {
+    // Per spec: "Encoders MUST accept the following variants as equivalent to EIP-712"
+
+    it('should accept type as "0x01" (canonical)', () => {
+      const params = createValidSignParams({ type: '0x01' });
+      expect(() => encodeWalletSign(params)).not.toThrow();
+    });
+
+    it('should accept type as "0x1" (no leading zero)', () => {
+      const params = createValidSignParams({ type: '0x1' });
+      expect(() => encodeWalletSign(params)).not.toThrow();
+    });
+
+    it('should accept type as number 1', () => {
+      const params = createValidSignParams({ type: 1 });
+      expect(() => encodeWalletSign(params)).not.toThrow();
+    });
+
+    it('should accept missing type field (assume EIP-712)', () => {
+      const params = createValidSignParams({});
+      delete (params as { type?: string | number }).type;
+      expect(() => encodeWalletSign(params)).not.toThrow();
+    });
+
+    it('should reject unsupported sign type', () => {
+      const params = createValidSignParams({ type: '0x02' });
+      expect(() => encodeWalletSign(params)).toThrow(/Unsupported sign type/);
+    });
+  });
+
+  describe('Chain ID validation (EIP-8050 requirement)', () => {
+    // Per spec: "Encoders MUST verify that params.chainId and domain.chainId represent the same chain"
+
+    it('should accept matching chainIds', () => {
+      const params = createValidSignParams({
+        chainId: '0x1',
+        domainChainId: 1,
+      });
+      expect(() => encodeWalletSign(params)).not.toThrow();
+    });
+
+    it('should reject mismatched chainIds', () => {
+      const params = createValidSignParams({
+        chainId: '0x1',
+        domainChainId: 8453,
+      });
+      expect(() => encodeWalletSign(params)).toThrow(/Chain ID mismatch/);
+    });
+
+    it('should handle chainId as hex string in domain', () => {
+      const params = {
+        version: '1',
+        chainId: '0x2105',
+        type: '0x01',
+        data: {
+          types: { CustomType: [{ name: 'x', type: 'uint256' }] },
+          domain: {
+            name: 'Test',
+            version: '1',
+            chainId: '0x2105', // hex string in domain
+            verifyingContract: '0x1111111111111111111111111111111111111111',
+          },
+          primaryType: 'CustomType',
+          message: { x: 1 },
+        },
+      };
+      expect(() => encodeWalletSign(params)).not.toThrow();
+    });
+  });
+
+  describe('SpendPermission roundtrip (EIP-8050 Test Vector 3)', () => {
+    it('should roundtrip SpendPermission with all fields', () => {
+      const params = {
+        version: '1',
+        chainId: '0x14a34',
+        type: '0x01',
+        data: {
+          types: {
+            SpendPermission: [
+              { name: 'account', type: 'address' },
+              { name: 'spender', type: 'address' },
+              { name: 'token', type: 'address' },
+              { name: 'allowance', type: 'uint160' },
+              { name: 'period', type: 'uint48' },
+              { name: 'start', type: 'uint48' },
+              { name: 'end', type: 'uint48' },
+              { name: 'salt', type: 'uint256' },
+              { name: 'extraData', type: 'bytes' },
+            ],
+          },
+          domain: {
+            name: 'Spend Permission Manager',
+            version: '1',
+            chainId: 84532,
+            verifyingContract: '0xf85210b21cc50302f477ba56686d2019dc9b67ad',
+          },
+          primaryType: 'SpendPermission',
+          message: {
+            account: '0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
+            spender: '0x8d9F34934dc9619e5DC3Df27D0A40b4A744E7eAa',
+            token: '0x036CbD53842c5426634e7929541eC2318f3dCF7e',
+            allowance: '0x2710',
+            period: 281474976710655,
+            start: 0,
+            end: 1914749767655,
+            salt: '0x2d6688aae9435fb91ab0a1fe7ea54ec3ffd86e8e18a0c17e1923c467dea4b75f',
+            extraData: '0x',
+          },
+        },
+      };
+
+      const encoded = encodeWalletSign(params);
+      const decoded = decodeWalletSign(encoded, 84532);
+
+      expect(decoded.chainId).toBe('0x14a34');
+      expect(decoded.type).toBe('0x01');
+      expect(decoded.data.primaryType).toBe('SpendPermission');
+      expect(decoded.data.domain.name).toBe('Spend Permission Manager');
+      expect(decoded.data.domain.verifyingContract?.toLowerCase()).toBe(
+        '0xf85210b21cc50302f477ba56686d2019dc9b67ad'
+      );
+      expect(decoded.data.message.account).toBe(
+        '0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'.toLowerCase()
+      );
+      expect(decoded.data.message.period).toBe(281474976710655);
+      expect(decoded.data.message.start).toBe(0);
+      expect(decoded.data.message.end).toBe(1914749767655);
+      expect((decoded.data.message.extraData as string).toLowerCase()).toBe('0x');
+    });
+  });
+
+  describe('ReceiveWithAuthorization roundtrip', () => {
+    it('should roundtrip ReceiveWithAuthorization with all fields', () => {
+      const params = {
+        version: '1',
+        chainId: '0x2105',
+        type: '0x01',
+        data: {
+          types: {
+            ReceiveWithAuthorization: [
+              { name: 'from', type: 'address' },
+              { name: 'to', type: 'address' },
+              { name: 'value', type: 'uint256' },
+              { name: 'validAfter', type: 'uint256' },
+              { name: 'validBefore', type: 'uint256' },
+              { name: 'nonce', type: 'bytes32' },
+            ],
+          },
+          domain: {
+            name: 'USDC',
+            version: '2',
+            chainId: 8453,
+            verifyingContract: '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913',
+          },
+          primaryType: 'ReceiveWithAuthorization',
+          message: {
+            from: '0x1111111111111111111111111111111111111111',
+            to: '0x2222222222222222222222222222222222222222',
+            value: '0x5f5e100',
+            validAfter: '0x0',
+            validBefore: '0xffffffffffffffff',
+            nonce: '0x1234567890123456789012345678901234567890123456789012345678901234',
+          },
+        },
+      };
+
+      const encoded = encodeWalletSign(params);
+      const decoded = decodeWalletSign(encoded, 8453);
+
+      expect(decoded.chainId).toBe('0x2105');
+      expect(decoded.data.primaryType).toBe('ReceiveWithAuthorization');
+      expect(decoded.data.domain.name).toBe('USDC');
+      expect(decoded.data.message.from).toBe(
+        '0x1111111111111111111111111111111111111111'.toLowerCase()
+      );
+    });
+  });
+
+  describe('Generic typed data roundtrip', () => {
+    it('should roundtrip generic typed data', () => {
+      const params = {
+        version: '1',
+        chainId: '0x1',
+        type: '0x01',
+        data: {
+          types: {
+            CustomMessage: [
+              { name: 'text', type: 'string' },
+              { name: 'number', type: 'uint256' },
+            ],
+          },
+          domain: {
+            name: 'Custom App',
+            version: '1',
+            chainId: 1,
+            verifyingContract: '0x1111111111111111111111111111111111111111',
+          },
+          primaryType: 'CustomMessage',
+          message: {
+            text: 'Hello World',
+            number: 42,
+          },
+        },
+      };
+
+      const encoded = encodeWalletSign(params);
+      const decoded = decodeWalletSign(encoded, 1);
+
+      expect(decoded.data.primaryType).toBe('CustomMessage');
+      expect(decoded.data.message.text).toBe('Hello World');
+      expect(decoded.data.message.number).toBe(42);
+    });
+  });
+
+  describe('EIP-712 domain reconstruction', () => {
+    // Per spec: Decoded EIP-712 must have proper types structure
+
+    it('should reconstruct EIP712Domain types for SpendPermission', () => {
+      const params = createSpendPermissionParams();
+      const encoded = encodeWalletSign(params);
+      const decoded = decodeWalletSign(encoded, 84532);
+
+      // Verify EIP712Domain is included in types
+      expect(decoded.data.types.EIP712Domain).toEqual([
+        { name: 'name', type: 'string' },
+        { name: 'version', type: 'string' },
+        { name: 'chainId', type: 'uint256' },
+        { name: 'verifyingContract', type: 'address' },
+      ]);
+
+      // Verify SpendPermission types
+      expect(decoded.data.types.SpendPermission).toEqual([
+        { name: 'account', type: 'address' },
+        { name: 'spender', type: 'address' },
+        { name: 'token', type: 'address' },
+        { name: 'allowance', type: 'uint160' },
+        { name: 'period', type: 'uint48' },
+        { name: 'start', type: 'uint48' },
+        { name: 'end', type: 'uint48' },
+        { name: 'salt', type: 'uint256' },
+        { name: 'extraData', type: 'bytes' },
+      ]);
+    });
+
+    it('should reconstruct EIP712Domain types for ReceiveWithAuthorization', () => {
+      const params = createReceiveWithAuthParams();
+      const encoded = encodeWalletSign(params);
+      const decoded = decodeWalletSign(encoded, 8453);
+
+      expect(decoded.data.types.EIP712Domain).toBeDefined();
+      expect(decoded.data.types.ReceiveWithAuthorization).toEqual([
+        { name: 'from', type: 'address' },
+        { name: 'to', type: 'address' },
+        { name: 'value', type: 'uint256' },
+        { name: 'validAfter', type: 'uint256' },
+        { name: 'validBefore', type: 'uint256' },
+        { name: 'nonce', type: 'bytes32' },
+      ]);
+    });
+  });
+
+  describe('Capabilities handling', () => {
+    it('should include capabilities in decoded params', () => {
+      const params = createSpendPermissionParams();
+      const capabilities = {
+        dataCallback: {
+          callbackURL: 'https://example.com/callback',
+          events: [{ type: 'postSign' }],
+        },
+      };
+
+      const encoded = encodeWalletSign(params);
+      const decoded = decodeWalletSign(encoded, 84532, capabilities);
+
+      expect(decoded.capabilities).toEqual(capabilities);
+    });
+  });
+});
+
+// Helper functions to create valid test params
+
+function createValidSignParams(overrides: {
+  type?: string | number;
+  chainId?: string;
+  domainChainId?: number;
+}) {
+  return {
+    version: '1',
+    chainId: overrides.chainId || '0x1',
+    type: overrides.type,
+    data: {
+      types: {
+        CustomType: [{ name: 'x', type: 'uint256' }],
+      },
+      domain: {
+        name: 'Test',
+        version: '1',
+        chainId: overrides.domainChainId !== undefined ? overrides.domainChainId : 1,
+        verifyingContract: '0x1111111111111111111111111111111111111111',
+      },
+      primaryType: 'CustomType',
+      message: { x: 1 },
+    },
+  };
+}
+
+function createSpendPermissionParams() {
+  return {
+    version: '1',
+    chainId: '0x14a34',
+    type: '0x01',
+    data: {
+      types: {
+        SpendPermission: [
+          { name: 'account', type: 'address' },
+          { name: 'spender', type: 'address' },
+          { name: 'token', type: 'address' },
+          { name: 'allowance', type: 'uint160' },
+          { name: 'period', type: 'uint48' },
+          { name: 'start', type: 'uint48' },
+          { name: 'end', type: 'uint48' },
+          { name: 'salt', type: 'uint256' },
+          { name: 'extraData', type: 'bytes' },
+        ],
+      },
+      domain: {
+        name: 'Spend Permission Manager',
+        version: '1',
+        chainId: 84532,
+        verifyingContract: '0xf85210b21cc50302f477ba56686d2019dc9b67ad',
+      },
+      primaryType: 'SpendPermission',
+      message: {
+        account: '0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
+        spender: '0x8d9F34934dc9619e5DC3Df27D0A40b4A744E7eAa',
+        token: '0x036CbD53842c5426634e7929541eC2318f3dCF7e',
+        allowance: '0x2710',
+        period: 281474976710655,
+        start: 0,
+        end: 1914749767655,
+        salt: '0x2d6688aae9435fb91ab0a1fe7ea54ec3ffd86e8e18a0c17e1923c467dea4b75f',
+        extraData: '0x',
+      },
+    },
+  };
+}
+
+function createReceiveWithAuthParams() {
+  return {
+    version: '1',
+    chainId: '0x2105',
+    type: '0x01',
+    data: {
+      types: {
+        ReceiveWithAuthorization: [
+          { name: 'from', type: 'address' },
+          { name: 'to', type: 'address' },
+          { name: 'value', type: 'uint256' },
+          { name: 'validAfter', type: 'uint256' },
+          { name: 'validBefore', type: 'uint256' },
+          { name: 'nonce', type: 'bytes32' },
+        ],
+      },
+      domain: {
+        name: 'USDC',
+        version: '2',
+        chainId: 8453,
+        verifyingContract: '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913',
+      },
+      primaryType: 'ReceiveWithAuthorization',
+      message: {
+        from: '0x1111111111111111111111111111111111111111',
+        to: '0x2222222222222222222222222222222222222222',
+        value: '0x5f5e100',
+        validAfter: '0x0',
+        validBefore: '0xffffffffffffffff',
+        nonce: '0x1234567890123456789012345678901234567890123456789012345678901234',
+      },
+    },
+  };
+}
diff --git a/packages/account-sdk/src/interface/public-utilities/prolink/shortcuts/sign.ts b/packages/account-sdk/src/interface/public-utilities/prolink/shortcuts/sign.ts
new file mode 100644
index 000000000..8ebc54dc5
--- /dev/null
+++ b/packages/account-sdk/src/interface/public-utilities/prolink/shortcuts/sign.ts
@@ -0,0 +1,302 @@
+// Copyright (c) 2018-2025 Coinbase, Inc. <https://www.coinbase.com/>
+
+/**
+ * Shortcut 2: wallet_sign encoder/decoder
+ * Optimizes EIP-7871 wallet_sign requests with EIP-712 typed data
+ */
+
+import type { WalletSign } from '../types.js';
+import { SignType } from '../types.js';
+import {
+  bytesToHex,
+  decodeAddress,
+  encodeAddress,
+  encodeAmount,
+  hexToBytes,
+} from '../utils/encoding.js';
+
+type TypedData = {
+  types: Record<string, Array<{ name: string; type: string }>>;
+  domain: {
+    name?: string;
+    version?: string;
+    chainId?: number | string;
+    verifyingContract?: string;
+  };
+  primaryType: string;
+  message: Record<string, unknown>;
+};
+
+type WalletSignParams = {
+  version?: string;
+  chainId: string;
+  type?: string | number;
+  data: TypedData;
+  capabilities?: Record<string, unknown>;
+};
+
+/**
+ * Normalize type field to canonical EIP-712 indicator
+ * Per EIP-8050: "Encoders MUST accept the following variants as equivalent to EIP-712:
+ *  - String "0x01" (canonical)
+ *  - String "0x1" (no leading zero)
+ *  - Number 1
+ *  - Missing type field (assume EIP-712 if data contains typed data structure)"
+ */
+function normalizeType(type?: string | number): string {
+  if (type === undefined) return '0x01';
+  if (typeof type === 'number') {
+    // Handle numeric 1 as EIP-712
+    if (type === 1) return '0x01';
+    return `0x${type.toString(16)}`;
+  }
+  if (type === '0x1') return '0x01';
+  return type;
+}
+
+/**
+ * Detect if typed data is a SpendPermission
+ */
+function detectSpendPermission(typedData: TypedData): boolean {
+  return (
+    typedData.primaryType === 'SpendPermission' && typedData.domain.verifyingContract !== undefined
+  );
+}
+
+/**
+ * Detect if typed data is a ReceiveWithAuthorization
+ */
+function detectReceiveWithAuthorization(typedData: TypedData): boolean {
+  return (
+    typedData.primaryType === 'ReceiveWithAuthorization' &&
+    typedData.domain.verifyingContract !== undefined
+  );
+}
+
+/**
+ * Encode wallet_sign request
+ * @param params - EIP-7871 wallet_sign parameters
+ * @returns WalletSign message
+ */
+export function encodeWalletSign(params: WalletSignParams): WalletSign {
+  const normalizedType = normalizeType(params.type);
+
+  // Validate it's EIP-712
+  if (normalizedType !== '0x01') {
+    throw new Error(`Unsupported sign type for prolink encoding: ${normalizedType}`);
+  }
+
+  // Validate chain ID consistency
+  const paramsChainId = BigInt(params.chainId);
+  const domainChainId =
+    typeof params.data.domain.chainId === 'string'
+      ? BigInt(params.data.domain.chainId)
+      : BigInt(params.data.domain.chainId || 0);
+
+  if (paramsChainId !== domainChainId) {
+    throw new Error(`Chain ID mismatch: params has ${paramsChainId}, domain has ${domainChainId}`);
+  }
+
+  // Detect signature type
+  if (detectSpendPermission(params.data)) {
+    const msg = params.data.message;
+
+    return {
+      type: SignType.SPEND_PERMISSION,
+      signatureData: {
+        case: 'spendPermission',
+        value: {
+          account: encodeAddress(msg.account as string),
+          spender: encodeAddress(msg.spender as string),
+          token: encodeAddress(msg.token as string),
+          allowance: encodeAmount(msg.allowance as string | bigint),
+          period: BigInt(msg.period as number | bigint),
+          start: BigInt(msg.start as number | bigint),
+          end: BigInt(msg.end as number | bigint),
+          salt: hexToBytes(msg.salt as string),
+          extraData:
+            !msg.extraData || msg.extraData === '0x'
+              ? new Uint8Array()
+              : hexToBytes(msg.extraData as string),
+          verifyingContract: encodeAddress(params.data.domain.verifyingContract!),
+          domainName: params.data.domain.name || '',
+          domainVersion: params.data.domain.version || '',
+        },
+      },
+      version: params.version || '1',
+    };
+  }
+
+  if (detectReceiveWithAuthorization(params.data)) {
+    const msg = params.data.message;
+
+    return {
+      type: SignType.RECEIVE_WITH_AUTHORIZATION,
+      signatureData: {
+        case: 'receiveWithAuthorization',
+        value: {
+          from: encodeAddress(msg.from as string),
+          to: encodeAddress(msg.to as string),
+          value: encodeAmount(msg.value as string | bigint),
+          validAfter: encodeAmount(msg.validAfter as string | bigint),
+          validBefore: encodeAmount(msg.validBefore as string | bigint),
+          nonce: hexToBytes(msg.nonce as string),
+          verifyingContract: encodeAddress(params.data.domain.verifyingContract!),
+          domainName: params.data.domain.name || '',
+          domainVersion: params.data.domain.version || '',
+        },
+      },
+      version: params.version || '1',
+    };
+  }
+
+  // Generic typed data
+  const typedDataJson = JSON.stringify(params.data);
+  const typedDataBytes = new TextEncoder().encode(typedDataJson);
+
+  return {
+    type: SignType.GENERIC_TYPED_DATA,
+    signatureData: {
+      case: 'genericTypedData',
+      value: {
+        typedDataJson: typedDataBytes,
+      },
+    },
+    version: params.version || '1',
+  };
+}
+
+/**
+ * Decode wallet_sign request
+ * @param payload - WalletSign message
+ * @param chainId - Chain ID from top-level payload
+ * @param capabilities - Optional capabilities from top-level payload
+ * @returns EIP-7871 wallet_sign parameters (ERC-8050 compliant with capabilities inside)
+ */
+export function decodeWalletSign(
+  payload: WalletSign,
+  chainId: number,
+  capabilities?: Record<string, unknown>
+): WalletSignParams {
+  if (payload.signatureData.case === 'spendPermission') {
+    const sp = payload.signatureData.value;
+
+    const typedData: TypedData = {
+      types: {
+        EIP712Domain: [
+          { name: 'name', type: 'string' },
+          { name: 'version', type: 'string' },
+          { name: 'chainId', type: 'uint256' },
+          { name: 'verifyingContract', type: 'address' },
+        ],
+        SpendPermission: [
+          { name: 'account', type: 'address' },
+          { name: 'spender', type: 'address' },
+          { name: 'token', type: 'address' },
+          { name: 'allowance', type: 'uint160' },
+          { name: 'period', type: 'uint48' },
+          { name: 'start', type: 'uint48' },
+          { name: 'end', type: 'uint48' },
+          { name: 'salt', type: 'uint256' },
+          { name: 'extraData', type: 'bytes' },
+        ],
+      },
+      domain: {
+        name: sp.domainName,
+        version: sp.domainVersion,
+        chainId,
+        verifyingContract: decodeAddress(sp.verifyingContract),
+      },
+      primaryType: 'SpendPermission',
+      message: {
+        account: decodeAddress(sp.account),
+        spender: decodeAddress(sp.spender),
+        token: decodeAddress(sp.token),
+        allowance: bytesToHex(sp.allowance.length > 0 ? sp.allowance : new Uint8Array([0])),
+        period: Number(sp.period),
+        start: Number(sp.start),
+        end: Number(sp.end),
+        salt: bytesToHex(sp.salt),
+        extraData: sp.extraData.length > 0 ? bytesToHex(sp.extraData) : '0x',
+      },
+    };
+
+    return {
+      version: payload.version || '1',
+      chainId: `0x${chainId.toString(16)}`,
+      type: '0x01',
+      data: typedData,
+      capabilities,
+    };
+  }
+
+  if (payload.signatureData.case === 'receiveWithAuthorization') {
+    const rwa = payload.signatureData.value;
+
+    const typedData: TypedData = {
+      types: {
+        EIP712Domain: [
+          { name: 'name', type: 'string' },
+          { name: 'version', type: 'string' },
+          { name: 'chainId', type: 'uint256' },
+          { name: 'verifyingContract', type: 'address' },
+        ],
+        ReceiveWithAuthorization: [
+          { name: 'from', type: 'address' },
+          { name: 'to', type: 'address' },
+          { name: 'value', type: 'uint256' },
+          { name: 'validAfter', type: 'uint256' },
+          { name: 'validBefore', type: 'uint256' },
+          { name: 'nonce', type: 'bytes32' },
+        ],
+      },
+      domain: {
+        name: rwa.domainName,
+        version: rwa.domainVersion,
+        chainId,
+        verifyingContract: decodeAddress(rwa.verifyingContract),
+      },
+      primaryType: 'ReceiveWithAuthorization',
+      message: {
+        from: decodeAddress(rwa.from),
+        to: decodeAddress(rwa.to),
+        value: bytesToHex(rwa.value.length > 0 ? rwa.value : new Uint8Array([0])),
+        validAfter: bytesToHex(rwa.validAfter.length > 0 ? rwa.validAfter : new Uint8Array([0])),
+        validBefore: bytesToHex(rwa.validBefore.length > 0 ? rwa.validBefore : new Uint8Array([0])),
+        nonce: bytesToHex(rwa.nonce),
+      },
+    };
+
+    return {
+      version: payload.version || '1',
+      chainId: `0x${chainId.toString(16)}`,
+      type: '0x01',
+      data: typedData,
+      capabilities,
+    };
+  }
+
+  if (payload.signatureData.case === 'genericTypedData') {
+    const gtd = payload.signatureData.value;
+    const typedDataJson = new TextDecoder().decode(gtd.typedDataJson);
+
+    let typedData: TypedData;
+    try {
+      typedData = JSON.parse(typedDataJson);
+    } catch (error) {
+      throw new Error(
+        `Failed to parse typed data JSON: ${error instanceof Error ? error.message : 'unknown error'}`
+      );
+    }
+
+    return {
+      version: payload.version || '1',
+      chainId: `0x${chainId.toString(16)}`,
+      type: '0x01',
+      data: typedData,
+      capabilities,
+    };
+  }
+
+  throw new Error('Unknown signature data type');
+}
diff --git a/packages/account-sdk/src/interface/public-utilities/prolink/types.ts b/packages/account-sdk/src/interface/public-utilities/prolink/types.ts
new file mode 100644
index 000000000..bc8738882
--- /dev/null
+++ b/packages/account-sdk/src/interface/public-utilities/prolink/types.ts
@@ -0,0 +1,177 @@
+// Copyright (c) 2018-2025 Coinbase, Inc. <https://www.coinbase.com/>
+
+/**
+ * Protocol Buffers message types for Prolink encoding
+ * Based on the Compressed RPC Link Format ERC specification
+ */
+
+/**
+ * Transaction type discriminator for wallet_sendCalls
+ */
+export enum SendCallsType {
+  SEND_CALLS_UNKNOWN = 0,
+  ERC20_TRANSFER = 1,
+  NATIVE_TRANSFER = 2,
+  GENERIC_CALLS = 3,
+}
+
+/**
+ * Signature type discriminator for wallet_sign
+ */
+export enum SignType {
+  SIGN_UNKNOWN = 0,
+  SPEND_PERMISSION = 1,
+  RECEIVE_WITH_AUTHORIZATION = 2,
+  GENERIC_TYPED_DATA = 3,
+}
+
+/**
+ * ERC20 transfer data
+ */
+export type Erc20Transfer = {
+  token: Uint8Array; // 20-byte ERC20 token contract address
+  recipient: Uint8Array; // 20-byte recipient address
+  amount: Uint8Array; // Amount in token's smallest unit (big-endian bytes, minimal encoding)
+};
+
+/**
+ * Native transfer data
+ */
+export type NativeTransfer = {
+  recipient: Uint8Array; // 20-byte recipient address
+  amount: Uint8Array; // Amount in wei (big-endian bytes, minimal encoding)
+};
+
+/**
+ * Generic call data
+ */
+export type Call = {
+  to: Uint8Array; // 20-byte contract/EOA address
+  data: Uint8Array; // Calldata (may be empty)
+  value: Uint8Array; // Value in wei (big-endian bytes, minimal encoding)
+};
+
+/**
+ * Generic calls data
+ */
+export type GenericCalls = {
+  calls: Call[];
+};
+
+/**
+ * wallet_sendCalls message
+ */
+export type WalletSendCalls = {
+  type: SendCallsType;
+  transactionData:
+    | { case: 'erc20Transfer'; value: Erc20Transfer }
+    | { case: 'nativeTransfer'; value: NativeTransfer }
+    | { case: 'genericCalls'; value: GenericCalls }
+    | { case: undefined; value?: undefined };
+  from?: Uint8Array; // 20-byte address (optional)
+  version?: string; // RPC version (e.g., "1.0")
+};
+
+/**
+ * Spend permission data
+ */
+export type SpendPermission = {
+  // EIP-712 message fields
+  account: Uint8Array; // 20-byte account address
+  spender: Uint8Array; // 20-byte spender address
+  token: Uint8Array; // 20-byte token address
+  allowance: Uint8Array; // uint160 (big-endian bytes, minimal encoding)
+  period: bigint; // uint48
+  start: bigint; // uint48
+  end: bigint; // uint48
+  salt: Uint8Array; // 32-byte salt
+  extraData: Uint8Array; // extraData (may be empty for "0x")
+
+  // EIP-712 domain fields
+  verifyingContract: Uint8Array; // 20-byte verifyingContract
+  domainName: string; // Domain name
+  domainVersion: string; // Domain version
+};
+
+/**
+ * Receive with authorization data
+ */
+export type ReceiveWithAuthorization = {
+  // EIP-712 message fields
+  from: Uint8Array; // 20-byte from address
+  to: Uint8Array; // 20-byte to address
+  value: Uint8Array; // uint256 (big-endian bytes, minimal encoding)
+  validAfter: Uint8Array; // uint256 (typically 0)
+  validBefore: Uint8Array; // uint256 (timestamp)
+  nonce: Uint8Array; // bytes32
+
+  // EIP-712 domain fields
+  verifyingContract: Uint8Array; // 20-byte USDC contract
+  domainName: string; // Domain name
+  domainVersion: string; // Domain version
+};
+
+/**
+ * Generic typed data
+ */
+export type GenericTypedData = {
+  typedDataJson: Uint8Array; // UTF-8 JSON-encoded EIP-712 TypedData
+};
+
+/**
+ * wallet_sign message
+ */
+export type WalletSign = {
+  type: SignType;
+  signatureData:
+    | { case: 'spendPermission'; value: SpendPermission }
+    | { case: 'receiveWithAuthorization'; value: ReceiveWithAuthorization }
+    | { case: 'genericTypedData'; value: GenericTypedData }
+    | { case: undefined; value?: undefined };
+  version?: string; // RPC version
+};
+
+/**
+ * Generic JSON-RPC message
+ */
+export type GenericJsonRpc = {
+  method: string; // JSON-RPC method name
+  paramsJson: Uint8Array; // UTF-8 JSON-encoded params
+  rpcVersion?: string; // Optional JSON-RPC version
+};
+
+/**
+ * Core RPC link payload
+ */
+export type RpcLinkPayload = {
+  protocolVersion: number; // Core payload version (1)
+  chainId?: number; // Canonical numeric chain ID
+  shortcutId: number; // 0 = GENERIC_JSON_RPC, 1 = WALLET_SEND_CALLS, 2 = WALLET_SIGN
+  shortcutVersion: number; // Shortcut-specific version
+  body:
+    | { case: 'generic'; value: GenericJsonRpc }
+    | { case: 'walletSendCalls'; value: WalletSendCalls }
+    | { case: 'walletSign'; value: WalletSign }
+    | { case: undefined; value?: undefined };
+  capabilities?: Map<string, Uint8Array>; // Extension point for metadata
+};
+
+/**
+ * High-level request type for encoding
+ */
+export type ProlinkRequest = {
+  method: string;
+  params: unknown;
+  chainId?: number;
+  capabilities?: Record<string, unknown>;
+};
+
+/**
+ * High-level decoded type
+ */
+export type ProlinkDecoded = {
+  method: string;
+  params: unknown;
+  chainId?: number;
+  capabilities?: Record<string, unknown>;
+};
diff --git a/packages/account-sdk/src/interface/public-utilities/prolink/utils/base64url.test.ts b/packages/account-sdk/src/interface/public-utilities/prolink/utils/base64url.test.ts
new file mode 100644
index 000000000..226da78c7
--- /dev/null
+++ b/packages/account-sdk/src/interface/public-utilities/prolink/utils/base64url.test.ts
@@ -0,0 +1,230 @@
+// Copyright (c) 2018-2025 Coinbase, Inc. <https://www.coinbase.com/>
+
+import { describe, expect, it } from 'vitest';
+import { decodeBase64url, encodeBase64url } from './base64url.js';
+
+describe('base64url (EIP-8050 RFC 4648 Compliance)', () => {
+  describe('encodeBase64url', () => {
+    it('should encode empty array', () => {
+      const result = encodeBase64url(new Uint8Array([]));
+      expect(result).toBe('');
+    });
+
+    it('should encode single byte', () => {
+      const result = encodeBase64url(new Uint8Array([0x00]));
+      expect(result).toBe('AA');
+    });
+
+    it('should encode without padding', () => {
+      const data = new Uint8Array([0x48, 0x65, 0x6c, 0x6c, 0x6f]); // "Hello"
+      const result = encodeBase64url(data);
+      expect(result).not.toContain('=');
+      expect(result).toBe('SGVsbG8');
+    });
+
+    it('should use URL-safe characters', () => {
+      // This input would produce + and / in standard base64
+      const data = new Uint8Array([0xfb, 0xff, 0xfe]);
+      const result = encodeBase64url(data);
+      expect(result).not.toContain('+');
+      expect(result).not.toContain('/');
+      expect(result).toBe('-__-'); // + becomes -, / becomes _
+    });
+
+    it('should roundtrip correctly', () => {
+      const data = new Uint8Array([1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
+      const encoded = encodeBase64url(data);
+      const decoded = decodeBase64url(encoded);
+      expect(decoded).toEqual(data);
+    });
+  });
+
+  describe('decodeBase64url', () => {
+    it('should decode empty string', () => {
+      const result = decodeBase64url('');
+      expect(result).toEqual(new Uint8Array([]));
+    });
+
+    it('should decode without padding', () => {
+      const result = decodeBase64url('SGVsbG8');
+      expect(result).toEqual(new Uint8Array([0x48, 0x65, 0x6c, 0x6c, 0x6f]));
+    });
+
+    it('should decode with padding', () => {
+      const result = decodeBase64url('SGVsbG8=');
+      expect(result).toEqual(new Uint8Array([0x48, 0x65, 0x6c, 0x6c, 0x6f]));
+    });
+
+    it('should decode URL-safe characters', () => {
+      const result = decodeBase64url('-__-');
+      expect(result).toEqual(new Uint8Array([0xfb, 0xff, 0xfe]));
+    });
+
+    it('should throw on invalid characters', () => {
+      expect(() => decodeBase64url('ABC@DEF')).toThrow(/Invalid Base64url character/);
+      expect(() => decodeBase64url('ABC DEF')).toThrow(/Invalid Base64url character/);
+      expect(() => decodeBase64url('ABC+DEF')).toThrow(/Invalid Base64url character/);
+    });
+
+    it('should throw on invalid padding', () => {
+      expect(() => decodeBase64url('ABC=DEF')).toThrow(/Invalid Base64url/);
+      expect(() => decodeBase64url('ABCD===')).toThrow(/Invalid Base64url padding/);
+    });
+
+    it('should handle long strings', () => {
+      const data = new Uint8Array(1000).map((_, i) => i % 256);
+      const encoded = encodeBase64url(data);
+      const decoded = decodeBase64url(encoded);
+      expect(decoded).toEqual(data);
+    });
+  });
+
+  describe('EIP-8050 specific requirements', () => {
+    // Per spec: "Encoders MUST NOT include Base64url padding (=)"
+    // Per spec: "Decoders MUST accept payloads with or without padding"
+
+    it('should encode without padding characters', () => {
+      // Test various lengths that would require 1 or 2 padding chars in standard base64
+      const data1 = new Uint8Array([1]); // Would need == padding
+      const data2 = new Uint8Array([1, 2]); // Would need = padding
+      const data3 = new Uint8Array([1, 2, 3]); // No padding needed
+
+      expect(encodeBase64url(data1)).not.toContain('=');
+      expect(encodeBase64url(data2)).not.toContain('=');
+      expect(encodeBase64url(data3)).not.toContain('=');
+    });
+
+    it('should decode with single padding', () => {
+      // "SGVsbA==" in standard base64 is "Hell" (4 chars)
+      // As base64url without padding: "SGVsbA"
+      // With padding: "SGVsbA=="
+      const withPadding = 'SGVsbA==';
+      const decoded = decodeBase64url(withPadding);
+      expect(new TextDecoder().decode(decoded)).toBe('Hell');
+    });
+
+    it('should decode without padding', () => {
+      const withoutPadding = 'SGVsbA';
+      const decoded = decodeBase64url(withoutPadding);
+      expect(new TextDecoder().decode(decoded)).toBe('Hell');
+    });
+
+    // Per spec: "Decoders MUST reject characters outside the Base64url alphabet"
+    describe('character validation', () => {
+      it('should reject + character (standard base64)', () => {
+        expect(() => decodeBase64url('ABC+DEF')).toThrow(/Invalid Base64url character/);
+      });
+
+      it('should reject / character (standard base64)', () => {
+        expect(() => decodeBase64url('ABC/DEF')).toThrow(/Invalid Base64url character/);
+      });
+
+      it('should reject space character', () => {
+        expect(() => decodeBase64url('ABC DEF')).toThrow(/Invalid Base64url character/);
+      });
+
+      it('should reject newline character', () => {
+        expect(() => decodeBase64url('ABC\nDEF')).toThrow(/Invalid Base64url character/);
+      });
+
+      it('should reject special characters', () => {
+        expect(() => decodeBase64url('ABC@DEF')).toThrow(/Invalid Base64url character/);
+        expect(() => decodeBase64url('ABC#DEF')).toThrow(/Invalid Base64url character/);
+        expect(() => decodeBase64url('ABC$DEF')).toThrow(/Invalid Base64url character/);
+      });
+
+      it('should accept all valid Base64url characters', () => {
+        // Valid alphabet: A-Z, a-z, 0-9, -, _
+        const validChars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_';
+        // This should decode without error (though the result may not be meaningful)
+        expect(() => decodeBase64url(validChars)).not.toThrow();
+      });
+    });
+
+    // Per spec: "Invalid padding (padding characters not at the end, or incorrect padding length)"
+    describe('padding validation', () => {
+      it('should reject padding in the middle', () => {
+        expect(() => decodeBase64url('ABC=DEF')).toThrow(/Invalid Base64url/);
+      });
+
+      it('should reject more than 2 padding characters', () => {
+        expect(() => decodeBase64url('ABCD===')).toThrow(/Invalid Base64url padding/);
+      });
+
+      it('should accept valid single padding', () => {
+        expect(() => decodeBase64url('SGVsbG8=')).not.toThrow();
+      });
+
+      it('should accept valid double padding', () => {
+        // "QQ==" is valid: 1 byte ('A') needs 2 base64 chars + == padding
+        expect(() => decodeBase64url('QQ==')).not.toThrow();
+        expect(decodeBase64url('QQ==')).toEqual(new Uint8Array([0x41])); // 'A'
+      });
+    });
+  });
+
+  describe('URL-safe character substitution', () => {
+    // Per spec: Base64url uses - instead of + and _ instead of /
+
+    it('should use - instead of + in encoding', () => {
+      // Find a byte sequence that would produce + in standard base64
+      // 0xfb in base64 produces '+'
+      const data = new Uint8Array([0xfb]);
+      const encoded = encodeBase64url(data);
+      expect(encoded).toContain('-');
+      expect(encoded).not.toContain('+');
+    });
+
+    it('should use _ instead of / in encoding', () => {
+      // 0xff in base64 produces '/'
+      const data = new Uint8Array([0xff]);
+      const encoded = encodeBase64url(data);
+      expect(encoded).toContain('_');
+      expect(encoded).not.toContain('/');
+    });
+
+    it('should decode - as + equivalent', () => {
+      // -__- in base64url = +//+ in standard base64
+      const result = decodeBase64url('-__-');
+      expect(result).toEqual(new Uint8Array([0xfb, 0xff, 0xfe]));
+    });
+  });
+
+  describe('roundtrip with typical prolink payloads', () => {
+    it('should roundtrip protobuf-like binary data', () => {
+      // Simulating a small protobuf payload
+      const protoData = new Uint8Array([
+        0x08,
+        0x01, // field 1 = 1
+        0x10,
+        0xa5,
+        0x42, // field 2 = 8453
+        0x18,
+        0x01, // field 3 = 1
+      ]);
+
+      const encoded = encodeBase64url(protoData);
+      const decoded = decodeBase64url(encoded);
+      expect(decoded).toEqual(protoData);
+    });
+
+    it('should roundtrip compressed data', () => {
+      // Brotli compressed data often contains bytes that would be + or / in base64
+      const compressedData = new Uint8Array([
+        0x01, // compression flag
+        0x8b,
+        0x05,
+        0x80,
+        0x08,
+        0x01,
+        0x10,
+        0xa5,
+        0x42, // brotli data
+      ]);
+
+      const encoded = encodeBase64url(compressedData);
+      const decoded = decodeBase64url(encoded);
+      expect(decoded).toEqual(compressedData);
+    });
+  });
+});
diff --git a/packages/account-sdk/src/interface/public-utilities/prolink/utils/base64url.ts b/packages/account-sdk/src/interface/public-utilities/prolink/utils/base64url.ts
new file mode 100644
index 000000000..62b9f51e5
--- /dev/null
+++ b/packages/account-sdk/src/interface/public-utilities/prolink/utils/base64url.ts
@@ -0,0 +1,79 @@
+// Copyright (c) 2018-2025 Coinbase, Inc. <https://www.coinbase.com/>
+
+/**
+ * Base64url encoding/decoding utilities
+ * RFC 4648 compliant
+ */
+
+const BASE64URL_ALPHABET = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_';
+
+/**
+ * Encode a Uint8Array to Base64url without padding
+ * @param data - Data to encode
+ * @returns Base64url encoded string without padding
+ */
+export function encodeBase64url(data: Uint8Array): string {
+  let binary = '';
+  for (let i = 0; i < data.length; i++) {
+    binary += String.fromCharCode(data[i]);
+  }
+  const base64 = btoa(binary);
+
+  // Convert base64 to base64url (replace + with -, / with _)
+  // Remove padding (=)
+  return base64.replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, '');
+}
+
+/**
+ * Decode a Base64url string to Uint8Array
+ * Accepts strings with or without padding
+ * @param payload - Base64url encoded string
+ * @returns Decoded Uint8Array
+ * @throws Error if payload contains invalid characters
+ */
+export function decodeBase64url(payload: string): Uint8Array {
+  // Validate characters
+  for (let i = 0; i < payload.length; i++) {
+    const char = payload[i];
+    if (!BASE64URL_ALPHABET.includes(char) && char !== '=') {
+      throw new Error(
+        `Invalid Base64url character at position ${i}: '${char}'. Only A-Z, a-z, 0-9, -, _ are allowed.`
+      );
+    }
+  }
+
+  // Validate padding (must be at end only)
+  const paddingIndex = payload.indexOf('=');
+  if (paddingIndex !== -1) {
+    const paddingPart = payload.slice(paddingIndex);
+    if (paddingPart !== '=' && paddingPart !== '==') {
+      throw new Error('Invalid Base64url padding');
+    }
+    // Ensure no non-padding characters after padding
+    for (let i = paddingIndex; i < payload.length; i++) {
+      if (payload[i] !== '=') {
+        throw new Error('Invalid Base64url: characters found after padding');
+      }
+    }
+  }
+
+  // Convert base64url to standard base64
+  let base64 = payload.replace(/-/g, '+').replace(/_/g, '/');
+
+  // Add padding if needed (base64 requires padding for decoding)
+  const paddingNeeded = (4 - (base64.length % 4)) % 4;
+  base64 += '='.repeat(paddingNeeded);
+
+  try {
+    const binary = atob(base64);
+    const bytes = new Uint8Array(binary.length);
+    for (let i = 0; i < binary.length; i++) {
+      bytes[i] = binary.charCodeAt(i);
+    }
+    return bytes;
+  } catch (error) {
+    throw new Error(
+      `Failed to decode Base64url: ${error instanceof Error ? error.message : 'unknown error'}`
+    );
+  }
+}
diff --git a/packages/account-sdk/src/interface/public-utilities/prolink/utils/compression.node.ts b/packages/account-sdk/src/interface/public-utilities/prolink/utils/compression.node.ts
new file mode 100644
index 000000000..ec0e1d486
--- /dev/null
+++ b/packages/account-sdk/src/interface/public-utilities/prolink/utils/compression.node.ts
@@ -0,0 +1,120 @@
+// Copyright (c) 2018-2025 Coinbase, Inc. <https://www.coinbase.com/>
+
+/**
+ * Brotli compression wrapper - Node.js version
+ * Handles compression and decompression with flag byte prefix
+ * Uses Node.js zlib with fallback to brotli-wasm
+ */
+
+const COMPRESSION_FLAG_NONE = 0x00;
+const COMPRESSION_FLAG_BROTLI = 0x01;
+
+type BrotliModule = {
+  compress: (data: Uint8Array, options?: { quality?: number; lgwin?: number }) => Uint8Array;
+  decompress: (data: Uint8Array) => Uint8Array;
+};
+
+let brotliModule: BrotliModule | null = null;
+
+/**
+ * Initialize brotli module (idempotent)
+ * Node.js version - uses zlib with fallback to brotli-wasm
+ */
+async function ensureBrotliInitialized(): Promise<void> {
+  if (!brotliModule) {
+    // Try Node.js zlib first (more reliable in Node/test environments)
+    try {
+      const zlib = await import('node:zlib');
+
+      brotliModule = {
+        compress: (data, options) => {
+          const params = {
+            [zlib.constants.BROTLI_PARAM_QUALITY]: options?.quality || 5,
+            [zlib.constants.BROTLI_PARAM_LGWIN]: options?.lgwin || 22,
+          };
+          return new Uint8Array(zlib.brotliCompressSync(data, { params }));
+        },
+        decompress: (data) => {
+          return new Uint8Array(zlib.brotliDecompressSync(data));
+        },
+      };
+    } catch (_error) {
+      // Fall back to brotli-wasm if node:zlib fails
+      const brotliPromise = await import('brotli-wasm');
+      brotliModule = (await brotliPromise.default) as BrotliModule;
+    }
+  }
+}
+
+/**
+ * Compress payload with Brotli if beneficial
+ * @param data - Data to compress
+ * @returns Object with compressed data and flag byte
+ */
+export async function compressPayload(
+  data: Uint8Array
+): Promise<{ compressed: Uint8Array; flag: 0x00 | 0x01 }> {
+  await ensureBrotliInitialized();
+
+  if (!brotliModule) {
+    throw new Error('Brotli module not initialized');
+  }
+
+  // Try Brotli compression (quality 5, window 22 bits per spec)
+  const compressed = brotliModule.compress(data, {
+    quality: 5,
+    lgwin: 22, // 22 bits = 4 MB window
+  });
+
+  // Only use compression if it's actually smaller (including the flag byte)
+  if (compressed.length + 1 < data.length + 1) {
+    return {
+      compressed,
+      flag: COMPRESSION_FLAG_BROTLI,
+    };
+  }
+
+  // No compression is better
+  return {
+    compressed: data,
+    flag: COMPRESSION_FLAG_NONE,
+  };
+}
+
+/**
+ * Decompress payload based on flag byte
+ * @param data - Data with flag byte prefix
+ * @returns Decompressed data
+ * @throws Error if compression flag is unknown or decompression fails
+ */
+export async function decompressPayload(data: Uint8Array): Promise<Uint8Array> {
+  if (data.length === 0) {
+    throw new Error('Cannot decompress empty payload');
+  }
+
+  const flag = data[0];
+  const payload = data.slice(1);
+
+  if (flag === COMPRESSION_FLAG_NONE) {
+    return payload;
+  }
+
+  if (flag === COMPRESSION_FLAG_BROTLI) {
+    await ensureBrotliInitialized();
+
+    if (!brotliModule) {
+      throw new Error('Brotli module not initialized');
+    }
+
+    try {
+      const decompressed = brotliModule.decompress(payload);
+      return decompressed;
+    } catch (error) {
+      throw new Error(
+        `Brotli decompression failed: ${error instanceof Error ? error.message : 'unknown error'}`
+      );
+    }
+  }
+
+  throw new Error(`Unknown compression flag: 0x${flag.toString(16).padStart(2, '0')}`);
+}
diff --git a/packages/account-sdk/src/interface/public-utilities/prolink/utils/compression.test.ts b/packages/account-sdk/src/interface/public-utilities/prolink/utils/compression.test.ts
new file mode 100644
index 000000000..07f6f2ebb
--- /dev/null
+++ b/packages/account-sdk/src/interface/public-utilities/prolink/utils/compression.test.ts
@@ -0,0 +1,243 @@
+// Copyright (c) 2018-2025 Coinbase, Inc. <https://www.coinbase.com/>
+
+import { describe, expect, it } from 'vitest';
+import { compressPayload, decompressPayload } from './compression.node.js';
+
+describe('compression (EIP-8050 Compression Flags)', () => {
+  describe('compression flags', () => {
+    // Per spec: "0x00: No compression (Protocol Buffers only)"
+    // Per spec: "0x01: Brotli compressed"
+
+    it('should use flag 0x00 for uncompressed data', async () => {
+      // Small payload - compression not beneficial
+      const smallData = new Uint8Array([1, 2, 3, 4, 5]);
+      const result = await compressPayload(smallData);
+
+      // For small data, compression may not be beneficial
+      // Check that we get a valid flag (either 0x00 or 0x01)
+      expect([0x00, 0x01]).toContain(result.flag);
+    });
+
+    it('should use flag 0x01 for compressed data when beneficial', async () => {
+      // Large repetitive payload - compression should be beneficial
+      const largeData = new Uint8Array(1000).fill(0x42);
+      const result = await compressPayload(largeData);
+
+      // Large repetitive data should compress well
+      expect(result.flag).toBe(0x01);
+      expect(result.compressed.length).toBeLessThan(largeData.length);
+    });
+
+    it('should reject unknown compression flag 0x02', async () => {
+      const invalidData = new Uint8Array([0x02, 0x01, 0x02, 0x03]);
+
+      await expect(decompressPayload(invalidData)).rejects.toThrow(/Unknown compression flag/);
+    });
+
+    it('should reject unknown compression flag 0xFF', async () => {
+      const invalidData = new Uint8Array([0xff, 0x01, 0x02, 0x03]);
+
+      await expect(decompressPayload(invalidData)).rejects.toThrow(/Unknown compression flag/);
+    });
+  });
+
+  describe('decompression', () => {
+    it('should decompress flag 0x00 (no compression)', async () => {
+      const payload = new Uint8Array([0x00, 0x01, 0x02, 0x03, 0x04]);
+      const result = await decompressPayload(payload);
+
+      expect(result).toEqual(new Uint8Array([0x01, 0x02, 0x03, 0x04]));
+    });
+
+    it('should decompress flag 0x01 (Brotli)', async () => {
+      // First compress some data
+      const original = new Uint8Array(500).fill(0x42);
+      const { compressed, flag } = await compressPayload(original);
+
+      // Create payload with flag
+      const payload = new Uint8Array(compressed.length + 1);
+      payload[0] = flag;
+      payload.set(compressed, 1);
+
+      // Decompress
+      const result = await decompressPayload(payload);
+      expect(result).toEqual(original);
+    });
+
+    it('should throw on empty payload', async () => {
+      await expect(decompressPayload(new Uint8Array([]))).rejects.toThrow(/empty payload/);
+    });
+
+    it('should handle payload with only flag byte', async () => {
+      // Flag 0x00 with no content = empty result
+      const result = await decompressPayload(new Uint8Array([0x00]));
+      expect(result).toEqual(new Uint8Array([]));
+    });
+
+    it('should throw on corrupted Brotli data', async () => {
+      const invalidBrotli = new Uint8Array([0x01, 0xff, 0xfe, 0xfd, 0xfc]);
+
+      await expect(decompressPayload(invalidBrotli)).rejects.toThrow(/Brotli decompression failed/);
+    });
+  });
+
+  describe('compression decision logic', () => {
+    // Per spec: "Encoders SHOULD use 0x01 if compressed size (including flag byte) is strictly smaller"
+
+    it('should only compress when beneficial', async () => {
+      // Random data doesn't compress well
+      const randomData = new Uint8Array(50);
+      for (let i = 0; i < randomData.length; i++) {
+        randomData[i] = Math.floor(Math.random() * 256);
+      }
+
+      const result = await compressPayload(randomData);
+
+      // Check the decision was made correctly
+      if (result.flag === 0x01) {
+        // If compressed, verify it's actually smaller
+        expect(result.compressed.length + 1).toBeLessThan(randomData.length + 1);
+      } else {
+        // If uncompressed, verify compression wouldn't help
+        expect(result.compressed).toEqual(randomData);
+      }
+    });
+
+    it('should prefer smaller output regardless of compression', async () => {
+      // Test with various payload sizes
+      const sizes = [10, 50, 100, 500, 1000];
+
+      for (const size of sizes) {
+        const data = new Uint8Array(size).fill(0x42);
+        const result = await compressPayload(data);
+
+        // The total size (flag + data) should be optimal
+        const resultSize = result.compressed.length + 1;
+        const uncompressedSize = data.length + 1;
+
+        // Either compressed is smaller, or we didn't compress
+        if (result.flag === 0x01) {
+          expect(resultSize).toBeLessThan(uncompressedSize);
+        } else {
+          // Compression wasn't beneficial
+          expect(result.compressed).toEqual(data);
+        }
+      }
+    });
+  });
+
+  describe('roundtrip', () => {
+    it('should roundtrip small payload', async () => {
+      const original = new Uint8Array([1, 2, 3, 4, 5]);
+      const { compressed, flag } = await compressPayload(original);
+
+      const payload = new Uint8Array(compressed.length + 1);
+      payload[0] = flag;
+      payload.set(compressed, 1);
+
+      const result = await decompressPayload(payload);
+      expect(result).toEqual(original);
+    });
+
+    it('should roundtrip large payload', async () => {
+      const original = new Uint8Array(10000);
+      for (let i = 0; i < original.length; i++) {
+        original[i] = i % 256;
+      }
+
+      const { compressed, flag } = await compressPayload(original);
+
+      const payload = new Uint8Array(compressed.length + 1);
+      payload[0] = flag;
+      payload.set(compressed, 1);
+
+      const result = await decompressPayload(payload);
+      expect(result).toEqual(original);
+    });
+
+    it('should roundtrip empty payload', async () => {
+      const original = new Uint8Array([]);
+      const { compressed, flag } = await compressPayload(original);
+
+      const payload = new Uint8Array(compressed.length + 1);
+      payload[0] = flag;
+      payload.set(compressed, 1);
+
+      const result = await decompressPayload(payload);
+      expect(result).toEqual(original);
+    });
+
+    it('should roundtrip binary data', async () => {
+      // Simulating protobuf binary data
+      const original = new Uint8Array([
+        0x08,
+        0x01, // field 1 = 1
+        0x10,
+        0xa5,
+        0x42, // field 2 = 8453
+        0x18,
+        0x01, // field 3 = 1
+        0x52,
+        0x1a, // field 10 = message (26 bytes)
+        0x08,
+        0x01, // type = 1
+        0x52,
+        0x14, // erc20 transfer (20 bytes)
+        ...new Uint8Array(20).fill(0x83), // token address
+      ]);
+
+      const { compressed, flag } = await compressPayload(original);
+
+      const payload = new Uint8Array(compressed.length + 1);
+      payload[0] = flag;
+      payload.set(compressed, 1);
+
+      const result = await decompressPayload(payload);
+      expect(result).toEqual(original);
+    });
+  });
+
+  describe('Brotli settings (EIP-8050 recommended)', () => {
+    // Per spec: "Quality: 4-6, Window size: 22 bits (4 MB)"
+    // These are informative recommendations; we test that compression works correctly
+
+    it('should achieve good compression on typical protobuf payloads', async () => {
+      // Simulate a typical wallet_sendCalls protobuf payload
+      const typicalPayload = new Uint8Array([
+        0x08,
+        0x01, // protocol_version = 1
+        0x10,
+        0xa5,
+        0x42, // chain_id = 8453
+        0x18,
+        0x01, // shortcut_id = 1
+        0x20,
+        0x00, // shortcut_version = 0
+        // wallet_send_calls message
+        0x5a,
+        0x30, // field 11 (tag 88), length 48
+        0x08,
+        0x01, // type = ERC20_TRANSFER
+        0x52,
+        0x2a, // erc20_transfer (42 bytes)
+        ...new Uint8Array(20).fill(0x83), // token
+        ...new Uint8Array(20).fill(0xfe), // recipient
+        0x4c,
+        0x4b,
+        0x40, // amount
+        0x22,
+        0x03, // version "1.0"
+        0x31,
+        0x2e,
+        0x30,
+      ]);
+
+      const { compressed, flag } = await compressPayload(typicalPayload);
+
+      // Should compress somewhat (repetitive bytes)
+      if (flag === 0x01) {
+        expect(compressed.length).toBeLessThan(typicalPayload.length);
+      }
+    });
+  });
+});
diff --git a/packages/account-sdk/src/interface/public-utilities/prolink/utils/compression.ts b/packages/account-sdk/src/interface/public-utilities/prolink/utils/compression.ts
new file mode 100644
index 000000000..a0e2255f1
--- /dev/null
+++ b/packages/account-sdk/src/interface/public-utilities/prolink/utils/compression.ts
@@ -0,0 +1,107 @@
+// Copyright (c) 2018-2025 Coinbase, Inc. <https://www.coinbase.com/>
+
+/**
+ * Brotli compression wrapper - Browser version
+ * Handles compression and decompression with flag byte prefix
+ * Uses brotli-wasm only (no Node.js dependencies)
+ */
+
+const COMPRESSION_FLAG_NONE = 0x00;
+const COMPRESSION_FLAG_BROTLI = 0x01;
+
+type BrotliModule = {
+  compress: (data: Uint8Array, options?: { quality?: number; lgwin?: number }) => Uint8Array;
+  decompress: (data: Uint8Array) => Uint8Array;
+};
+
+let brotliModule: BrotliModule | null = null;
+
+/**
+ * Initialize brotli module (idempotent)
+ * Browser version - uses brotli-wasm
+ */
+async function ensureBrotliInitialized(): Promise<void> {
+  if (!brotliModule) {
+    try {
+      const brotliPromise = await import('brotli-wasm');
+      brotliModule = (await brotliPromise.default) as BrotliModule;
+    } catch (error) {
+      throw new Error(
+        `Failed to initialize brotli-wasm: ${error instanceof Error ? error.message : 'unknown error'}`
+      );
+    }
+  }
+}
+
+/**
+ * Compress payload with Brotli if beneficial
+ * @param data - Data to compress
+ * @returns Object with compressed data and flag byte
+ */
+export async function compressPayload(
+  data: Uint8Array
+): Promise<{ compressed: Uint8Array; flag: 0x00 | 0x01 }> {
+  await ensureBrotliInitialized();
+
+  if (!brotliModule) {
+    throw new Error('Brotli module not initialized');
+  }
+
+  // Try Brotli compression (quality 5, window 22 bits per spec)
+  const compressed = brotliModule.compress(data, {
+    quality: 5,
+    lgwin: 22, // 22 bits = 4 MB window
+  });
+
+  // Only use compression if it's actually smaller (including the flag byte)
+  if (compressed.length + 1 < data.length + 1) {
+    return {
+      compressed,
+      flag: COMPRESSION_FLAG_BROTLI,
+    };
+  }
+
+  // No compression is better
+  return {
+    compressed: data,
+    flag: COMPRESSION_FLAG_NONE,
+  };
+}
+
+/**
+ * Decompress payload based on flag byte
+ * @param data - Data with flag byte prefix
+ * @returns Decompressed data
+ * @throws Error if compression flag is unknown or decompression fails
+ */
+export async function decompressPayload(data: Uint8Array): Promise<Uint8Array> {
+  if (data.length === 0) {
+    throw new Error('Cannot decompress empty payload');
+  }
+
+  const flag = data[0];
+  const payload = data.slice(1);
+
+  if (flag === COMPRESSION_FLAG_NONE) {
+    return payload;
+  }
+
+  if (flag === COMPRESSION_FLAG_BROTLI) {
+    await ensureBrotliInitialized();
+
+    if (!brotliModule) {
+      throw new Error('Brotli module not initialized');
+    }
+
+    try {
+      const decompressed = brotliModule.decompress(payload);
+      return decompressed;
+    } catch (error) {
+      throw new Error(
+        `Brotli decompression failed: ${error instanceof Error ? error.message : 'unknown error'}`
+      );
+    }
+  }
+
+  throw new Error(`Unknown compression flag: 0x${flag.toString(16).padStart(2, '0')}`);
+}
diff --git a/packages/account-sdk/src/interface/public-utilities/prolink/utils/encoding.test.ts b/packages/account-sdk/src/interface/public-utilities/prolink/utils/encoding.test.ts
new file mode 100644
index 000000000..925e21e6c
--- /dev/null
+++ b/packages/account-sdk/src/interface/public-utilities/prolink/utils/encoding.test.ts
@@ -0,0 +1,433 @@
+// Copyright (c) 2018-2025 Coinbase, Inc. <https://www.coinbase.com/>
+
+import { describe, expect, it } from 'vitest';
+import {
+  bytesToHex,
+  decodeAddress,
+  decodeAmount,
+  decodeCapabilities,
+  encodeAddress,
+  encodeAmount,
+  encodeCapabilities,
+  hexToBytes,
+  pad32,
+} from './encoding.js';
+
+describe('encoding', () => {
+  describe('encodeAddress / decodeAddress', () => {
+    it('should encode and decode address', () => {
+      const address = '0x1234567890123456789012345678901234567890';
+      const encoded = encodeAddress(address);
+      expect(encoded.length).toBe(20);
+      const decoded = decodeAddress(encoded);
+      expect(decoded).toBe(address);
+    });
+
+    it('should normalize address to lowercase', () => {
+      const address = '0xABCDEF1234567890123456789012345678901234';
+      const encoded = encodeAddress(address);
+      const decoded = decodeAddress(encoded);
+      expect(decoded).toBe(address.toLowerCase());
+    });
+
+    it('should handle address without 0x prefix', () => {
+      const address = '1234567890123456789012345678901234567890';
+      const encoded = encodeAddress(address);
+      expect(encoded.length).toBe(20);
+    });
+
+    it('should throw on invalid address length', () => {
+      expect(() => encodeAddress('0x1234')).toThrow(/Invalid address length/);
+      expect(() => decodeAddress(new Uint8Array(10))).toThrow(/Invalid address length/);
+    });
+  });
+
+  describe('encodeAmount / decodeAmount', () => {
+    it('should encode zero', () => {
+      const encoded = encodeAmount(0n);
+      expect(encoded).toEqual(new Uint8Array([0x00]));
+      expect(decodeAmount(encoded)).toBe(0n);
+    });
+
+    it('should encode zero from string', () => {
+      const encoded = encodeAmount('0x0');
+      expect(encoded).toEqual(new Uint8Array([0x00]));
+    });
+
+    it('should decode empty bytes as zero', () => {
+      const decoded = decodeAmount(new Uint8Array([]));
+      expect(decoded).toBe(0n);
+    });
+
+    it('should encode small amounts minimally', () => {
+      const encoded = encodeAmount(255n);
+      expect(encoded).toEqual(new Uint8Array([0xff]));
+      expect(decodeAmount(encoded)).toBe(255n);
+    });
+
+    it('should encode large amounts minimally', () => {
+      const encoded = encodeAmount(5000000n); // 0x4c4b40
+      expect(encoded).toEqual(new Uint8Array([0x4c, 0x4b, 0x40]));
+      expect(decodeAmount(encoded)).toBe(5000000n);
+    });
+
+    it('should encode from hex string', () => {
+      const encoded = encodeAmount('0x4c4b40');
+      expect(encoded).toEqual(new Uint8Array([0x4c, 0x4b, 0x40]));
+      expect(decodeAmount(encoded)).toBe(5000000n);
+    });
+
+    it('should reject leading zeros in decoding', () => {
+      const invalidEncoding = new Uint8Array([0x00, 0x01]);
+      expect(() => decodeAmount(invalidEncoding)).toThrow(/leading zeros/);
+    });
+
+    it('should reject negative amounts', () => {
+      expect(() => encodeAmount(-1n)).toThrow(/negative/);
+    });
+
+    it('should handle 1 ETH (18 decimals)', () => {
+      const oneEth = 10n ** 18n; // 0xde0b6b3a7640000
+      const encoded = encodeAmount(oneEth);
+      expect(encoded).toEqual(new Uint8Array([0x0d, 0xe0, 0xb6, 0xb3, 0xa7, 0x64, 0x00, 0x00]));
+      expect(decodeAmount(encoded)).toBe(oneEth);
+    });
+  });
+
+  describe('encodeCapabilities / decodeCapabilities', () => {
+    it('should encode empty capabilities', () => {
+      const encoded = encodeCapabilities({});
+      expect(encoded.size).toBe(0);
+    });
+
+    it('should encode string capability', () => {
+      const caps = { orderId: 'ORDER-123' };
+      const encoded = encodeCapabilities(caps);
+      expect(encoded.size).toBe(1);
+      const decoded = decodeCapabilities(encoded);
+      expect(decoded).toEqual(caps);
+    });
+
+    it('should encode object capability', () => {
+      const caps = {
+        dataCallback: {
+          callbackURL: 'https://example.com',
+          events: ['initiated'],
+        },
+      };
+      const encoded = encodeCapabilities(caps);
+      const decoded = decodeCapabilities(encoded);
+      expect(decoded).toEqual(caps);
+    });
+
+    it('should encode multiple capabilities', () => {
+      const caps = {
+        order_id: 'ORDER-123',
+        tip_bps: 50,
+        dataCallback: { callbackURL: 'https://example.com' },
+      };
+      const encoded = encodeCapabilities(caps);
+      const decoded = decodeCapabilities(encoded);
+      expect(decoded).toEqual(caps);
+    });
+
+    it('should throw on invalid JSON in decode', () => {
+      const invalidMap = new Map<string, Uint8Array>();
+      invalidMap.set('test', new Uint8Array([0xff, 0xfe])); // Invalid UTF-8
+      expect(() => decodeCapabilities(invalidMap)).toThrow();
+    });
+  });
+
+  describe('pad32', () => {
+    it('should pad address to 32 bytes', () => {
+      const address = new Uint8Array(20).fill(0x42);
+      const padded = pad32(address);
+      expect(padded.length).toBe(32);
+      expect(padded.slice(0, 12)).toEqual(new Uint8Array(12).fill(0));
+      expect(padded.slice(12)).toEqual(address);
+    });
+
+    it('should pad amount to 32 bytes', () => {
+      const amount = new Uint8Array([0x01, 0x02, 0x03]);
+      const padded = pad32(amount);
+      expect(padded.length).toBe(32);
+      expect(padded[29]).toBe(0x01);
+      expect(padded[30]).toBe(0x02);
+      expect(padded[31]).toBe(0x03);
+    });
+
+    it('should not modify 32-byte input', () => {
+      const data = new Uint8Array(32).fill(0x42);
+      const padded = pad32(data);
+      expect(padded).toEqual(data);
+    });
+
+    it('should throw on input larger than 32 bytes', () => {
+      const tooLarge = new Uint8Array(33);
+      expect(() => pad32(tooLarge)).toThrow(/larger than 32 bytes/);
+    });
+  });
+
+  describe('EIP-8050 canonical encodings', () => {
+    describe('addresses - exactly 20 bytes', () => {
+      it('should encode valid 20-byte address', () => {
+        const address = '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913';
+        const encoded = encodeAddress(address);
+        expect(encoded.length).toBe(20);
+      });
+
+      it('should reject address with 19 bytes', () => {
+        const shortAddress = '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA029'; // 19 bytes
+        expect(() => encodeAddress(shortAddress)).toThrow(/Invalid address length/);
+      });
+
+      it('should reject address with 21 bytes', () => {
+        const longAddress = '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA0291300'; // 21 bytes
+        expect(() => encodeAddress(longAddress)).toThrow(/Invalid address length/);
+      });
+
+      it('should reject decoding non-20-byte array', () => {
+        expect(() => decodeAddress(new Uint8Array(19))).toThrow(/Invalid address length/);
+        expect(() => decodeAddress(new Uint8Array(21))).toThrow(/Invalid address length/);
+      });
+    });
+
+    describe('amounts - minimal big-endian bytes, no leading zeros', () => {
+      // Per spec: "big-endian minimal bytes with NO leading zero octets"
+
+      it('should encode 255 as single byte 0xff', () => {
+        const encoded = encodeAmount(255n);
+        expect(encoded).toEqual(new Uint8Array([0xff]));
+      });
+
+      it('should encode 256 as two bytes 0x0100', () => {
+        const encoded = encodeAmount(256n);
+        expect(encoded).toEqual(new Uint8Array([0x01, 0x00]));
+      });
+
+      it('should encode 5000000 as 3 bytes (EIP-8050 example)', () => {
+        // Per spec: "5000000 → 0x4c4b40 (3 bytes)"
+        const encoded = encodeAmount(5000000n);
+        expect(encoded).toEqual(new Uint8Array([0x4c, 0x4b, 0x40]));
+      });
+
+      it('should reject decoding bytes with leading zeros', () => {
+        // Per spec: "Decoders MUST reject encodings with unnecessary leading zeros"
+        const invalidEncoding = new Uint8Array([0x00, 0x01]); // 1 with leading zero
+        expect(() => decodeAmount(invalidEncoding)).toThrow(/leading zeros/);
+      });
+
+      it('should accept single 0x00 byte for zero', () => {
+        // Per spec: "Zero encoding: Encoders SHOULD encode zero as a single 0x00 byte"
+        const encoded = encodeAmount(0n);
+        expect(encoded).toEqual(new Uint8Array([0x00]));
+      });
+
+      it('should treat empty bytes as zero', () => {
+        // Per spec: "Decoders MUST treat missing fields, empty bytes (length 0), and 0x00 (1 byte) as zero"
+        expect(decodeAmount(new Uint8Array([]))).toBe(0n);
+        expect(decodeAmount(new Uint8Array([0x00]))).toBe(0n);
+      });
+    });
+
+    describe('fixed-size fields - salt/nonce must be 32 bytes', () => {
+      it('should pad values to 32 bytes correctly', () => {
+        // 20-byte address padded to 32
+        const address = new Uint8Array(20).fill(0x42);
+        const padded = pad32(address);
+        expect(padded.length).toBe(32);
+        expect(padded.slice(0, 12)).toEqual(new Uint8Array(12).fill(0)); // Left-padded with zeros
+        expect(padded.slice(12)).toEqual(address);
+      });
+
+      it('should reject values larger than 32 bytes', () => {
+        const tooLarge = new Uint8Array(33).fill(0x42);
+        expect(() => pad32(tooLarge)).toThrow(/larger than 32 bytes/);
+      });
+
+      it('should not modify 32-byte values', () => {
+        const exact = new Uint8Array(32).fill(0x42);
+        const padded = pad32(exact);
+        expect(padded).toEqual(exact);
+      });
+    });
+  });
+
+  describe('capabilities encoding (EIP-8050)', () => {
+    // Per spec: "Each capability value is stored as the UTF-8 bytes of a JSON-serialized value"
+
+    describe('allowed JSON types', () => {
+      it('should encode object values', () => {
+        const caps = {
+          dataCallback: { callbackURL: 'https://example.com', events: ['initiated'] },
+        };
+        const encoded = encodeCapabilities(caps);
+        const decoded = decodeCapabilities(encoded);
+        expect(decoded).toEqual(caps);
+      });
+
+      it('should encode array values', () => {
+        const caps = { events: ['initiated', 'postSign'] };
+        const encoded = encodeCapabilities(caps);
+        const decoded = decodeCapabilities(encoded);
+        expect(decoded).toEqual(caps);
+      });
+
+      it('should encode string values', () => {
+        // Per spec example: { "order_id": "ORDER-123" } stored as '"ORDER-123"'
+        const caps = { order_id: 'ORDER-123' };
+        const encoded = encodeCapabilities(caps);
+        const decoded = decodeCapabilities(encoded);
+        expect(decoded).toEqual(caps);
+      });
+
+      it('should encode number values', () => {
+        // Per spec example: { "tip_bps": 50 } stored as '50'
+        const caps = { tip_bps: 50 };
+        const encoded = encodeCapabilities(caps);
+        const decoded = decodeCapabilities(encoded);
+        expect(decoded).toEqual(caps);
+      });
+
+      it('should encode boolean values', () => {
+        const caps = { enabled: true, disabled: false };
+        const encoded = encodeCapabilities(caps);
+        const decoded = decodeCapabilities(encoded);
+        expect(decoded).toEqual(caps);
+      });
+
+      it('should encode null values', () => {
+        const caps = { nullValue: null };
+        const encoded = encodeCapabilities(caps);
+        const decoded = decodeCapabilities(encoded);
+        expect(decoded).toEqual(caps);
+      });
+    });
+
+    describe('error handling', () => {
+      it('should throw on invalid UTF-8 bytes', () => {
+        const invalidMap = new Map<string, Uint8Array>();
+        invalidMap.set('test', new Uint8Array([0xff, 0xfe])); // Invalid UTF-8
+        expect(() => decodeCapabilities(invalidMap)).toThrow(/Failed to decode capability/);
+      });
+
+      it('should throw on malformed JSON', () => {
+        const malformedMap = new Map<string, Uint8Array>();
+        malformedMap.set('test', new TextEncoder().encode('{ invalid json }'));
+        expect(() => decodeCapabilities(malformedMap)).toThrow(/Failed to decode capability/);
+      });
+    });
+
+    describe('ERC-8026 dataCallback capability', () => {
+      it('should encode full dataCallback with data requests', () => {
+        // Per spec example
+        const caps = {
+          dataCallback: {
+            callbackURL: 'https://example.com/callback',
+            events: [
+              { type: 'initiated', context: { orderId: 'ORDER-123' } },
+              {
+                type: 'preSign',
+                requests: [{ type: 'email' }, { type: 'physicalAddress', optional: true }],
+              },
+              { type: 'postSign' },
+            ],
+          },
+        };
+        const encoded = encodeCapabilities(caps);
+        const decoded = decodeCapabilities(encoded);
+        expect(decoded).toEqual(caps);
+      });
+
+      it('should encode simple dataCallback (notifications only)', () => {
+        // Per spec simpler example
+        const caps = {
+          dataCallback: {
+            callbackURL: 'https://example.com/callback',
+            events: [{ type: 'initiated' }, { type: 'postSign' }],
+          },
+        };
+        const encoded = encodeCapabilities(caps);
+        const decoded = decodeCapabilities(encoded);
+        expect(decoded).toEqual(caps);
+      });
+    });
+  });
+
+  describe('bytesToHex / hexToBytes', () => {
+    it('should convert bytes to hex', () => {
+      const bytes = new Uint8Array([0x12, 0x34, 0x56, 0x78]);
+      const hex = bytesToHex(bytes);
+      expect(hex).toBe('0x12345678');
+    });
+
+    it('should convert zero to 0x0', () => {
+      const bytes = new Uint8Array([0x00]);
+      const hex = bytesToHex(bytes);
+      expect(hex).toBe('0x0');
+    });
+
+    it('should remove leading zeros (minimal encoding)', () => {
+      const bytes = new Uint8Array([0x00, 0x00, 0x12, 0x34]);
+      const hex = bytesToHex(bytes);
+      expect(hex).toBe('0x1234');
+    });
+
+    it('should handle single leading zero byte', () => {
+      const bytes = new Uint8Array([0x00, 0x12]);
+      const hex = bytesToHex(bytes);
+      expect(hex).toBe('0x12');
+    });
+
+    it('should convert hex to bytes', () => {
+      const hex = '0x12345678';
+      const bytes = hexToBytes(hex);
+      expect(bytes).toEqual(new Uint8Array([0x12, 0x34, 0x56, 0x78]));
+    });
+
+    it('should handle hex without 0x prefix', () => {
+      const bytes = hexToBytes('12345678');
+      expect(bytes).toEqual(new Uint8Array([0x12, 0x34, 0x56, 0x78]));
+    });
+
+    it('should roundtrip correctly with leading zeros handled', () => {
+      const original = new Uint8Array([1, 2, 255, 254, 253]);
+      const hex = bytesToHex(original);
+      // bytesToHex strips leading zeros, so we need to compare values
+      expect(BigInt(hex)).toBe(
+        BigInt(
+          `0x${Array.from(original)
+            .map((b) => b.toString(16).padStart(2, '0'))
+            .join('')}`
+        )
+      );
+    });
+
+    it('should handle odd-length hex strings correctly', () => {
+      // Bug fix: 0x123 should be parsed as 0x0123, not lose data
+      const hex = '0x123';
+      const bytes = hexToBytes(hex);
+      expect(bytes).toEqual(new Uint8Array([0x01, 0x23]));
+    });
+
+    it('should handle odd-length hex without 0x prefix', () => {
+      const hex = '123';
+      const bytes = hexToBytes(hex);
+      expect(bytes).toEqual(new Uint8Array([0x01, 0x23]));
+    });
+
+    it('should handle single hex digit', () => {
+      const hex = '0xa';
+      const bytes = hexToBytes(hex);
+      expect(bytes).toEqual(new Uint8Array([0x0a]));
+    });
+
+    it('should roundtrip odd-length hex correctly', () => {
+      const hex = '0xabc';
+      const bytes = hexToBytes(hex);
+      const roundtrip = bytesToHex(bytes);
+      // bytesToHex does minimal encoding, so it strips leading zeros
+      expect(roundtrip).toBe('0xabc');
+    });
+  });
+});
diff --git a/packages/account-sdk/src/interface/public-utilities/prolink/utils/encoding.ts b/packages/account-sdk/src/interface/public-utilities/prolink/utils/encoding.ts
new file mode 100644
index 000000000..0c6b29e43
--- /dev/null
+++ b/packages/account-sdk/src/interface/public-utilities/prolink/utils/encoding.ts
@@ -0,0 +1,198 @@
+// Copyright (c) 2018-2025 Coinbase, Inc. <https://www.coinbase.com/>
+
+import { Bytes, Hex } from 'ox';
+
+/**
+ * Field encoding helpers for canonical encoding
+ */
+
+/**
+ * Encode an Ethereum address to 20 bytes
+ * @param address - Hex address string (with or without 0x prefix)
+ * @returns 20-byte address
+ * @throws Error if address is not 20 bytes
+ */
+export function encodeAddress(address: string): Uint8Array {
+  // Normalize to ensure 0x prefix
+  const normalized = address.startsWith('0x') ? address : `0x${address}`;
+
+  // Validate length (0x + 40 hex chars)
+  if (normalized.length !== 42) {
+    throw new Error(`Invalid address length: expected 40 hex chars, got ${normalized.length - 2}`);
+  }
+
+  const bytes = Bytes.fromHex(normalized as Hex.Hex);
+
+  if (bytes.length !== 20) {
+    throw new Error(`Invalid address length: expected 20 bytes, got ${bytes.length}`);
+  }
+
+  return bytes;
+}
+
+/**
+ * Decode 20-byte address to hex string
+ * @param bytes - 20-byte address
+ * @returns Hex address string with 0x prefix
+ */
+export function decodeAddress(bytes: Uint8Array): string {
+  if (bytes.length !== 20) {
+    throw new Error(`Invalid address length: expected 20 bytes, got ${bytes.length}`);
+  }
+
+  return Hex.fromBytes(bytes);
+}
+
+/**
+ * Encode an amount to minimal big-endian bytes (no leading zeros)
+ * @param value - Amount as bigint or hex string
+ * @returns Minimal big-endian bytes
+ */
+export function encodeAmount(value: bigint | string): Uint8Array {
+  let bigintValue: bigint;
+
+  if (typeof value === 'string') {
+    // Handle hex strings
+    const normalized = value.toLowerCase().replace(/^0x/, '');
+    if (normalized === '' || normalized === '0') {
+      return new Uint8Array([0x00]);
+    }
+    bigintValue = BigInt(`0x${normalized}`);
+  } else {
+    bigintValue = value;
+  }
+
+  // Handle zero
+  if (bigintValue === 0n) {
+    return new Uint8Array([0x00]);
+  }
+
+  // Handle negative (not allowed)
+  if (bigintValue < 0n) {
+    throw new Error('Cannot encode negative amounts');
+  }
+
+  // Convert to minimal big-endian bytes using Ox
+  const hex = bigintValue.toString(16);
+  // Pad to even length if needed (for proper byte conversion)
+  const paddedHex = hex.length % 2 === 0 ? hex : `0${hex}`;
+  return Bytes.fromHex(`0x${paddedHex}` as Hex.Hex);
+}
+
+/**
+ * Decode minimal big-endian bytes to bigint
+ * @param bytes - Minimal big-endian bytes (or empty for zero)
+ * @returns Amount as bigint
+ */
+export function decodeAmount(bytes: Uint8Array): bigint {
+  if (bytes.length === 0) {
+    return 0n;
+  }
+
+  // Validate no leading zeros (except for single 0x00)
+  if (bytes.length > 1 && bytes[0] === 0) {
+    throw new Error('Invalid amount encoding: leading zeros not allowed');
+  }
+
+  const hex = Hex.fromBytes(bytes);
+  return BigInt(hex);
+}
+
+/**
+ * Encode capabilities map to protobuf format
+ * @param caps - Capabilities object
+ * @returns Map with UTF-8 JSON-encoded values
+ */
+export function encodeCapabilities(caps: Record<string, unknown>): Map<string, Uint8Array> {
+  const map = new Map<string, Uint8Array>();
+
+  for (const [key, value] of Object.entries(caps)) {
+    const json = JSON.stringify(value);
+    const bytes = new TextEncoder().encode(json);
+    map.set(key, bytes);
+  }
+
+  return map;
+}
+
+/**
+ * Decode capabilities map from protobuf format
+ * @param map - Map with UTF-8 JSON-encoded values
+ * @returns Capabilities object
+ */
+export function decodeCapabilities(map: Map<string, Uint8Array>): Record<string, unknown> {
+  const caps: Record<string, unknown> = {};
+
+  for (const [key, bytes] of map.entries()) {
+    try {
+      const json = new TextDecoder().decode(bytes);
+      caps[key] = JSON.parse(json);
+    } catch (error) {
+      throw new Error(
+        `Failed to decode capability '${key}': ${error instanceof Error ? error.message : 'unknown error'}`
+      );
+    }
+  }
+
+  return caps;
+}
+
+/**
+ * Pad a value to 32 bytes (for EIP-712 encoding)
+ * @param bytes - Value to pad
+ * @returns 32-byte padded value
+ */
+export function pad32(bytes: Uint8Array): Uint8Array {
+  if (bytes.length > 32) {
+    throw new Error(`Cannot pad value larger than 32 bytes: ${bytes.length}`);
+  }
+
+  const padded = new Uint8Array(32);
+  // Left-pad with zeros
+  padded.set(bytes, 32 - bytes.length);
+  return padded;
+}
+
+/**
+ * Convert bytes to hex string with 0x prefix
+ * Minimal encoding: no leading zeros unless value is zero
+ * @param bytes - Bytes to convert
+ * @returns Hex string
+ */
+export function bytesToHex(bytes: Uint8Array): string {
+  if (bytes.length === 0) {
+    return '0x0';
+  }
+
+  // For single byte 0, return 0x0
+  if (bytes.length === 1 && bytes[0] === 0) {
+    return '0x0';
+  }
+
+  // Use Ox to convert bytes to hex
+  const fullHex = Hex.fromBytes(bytes);
+
+  // Strip leading zeros for minimal encoding
+  // Keep at least one character (for 0x0)
+  let hex = fullHex.replace(/^0x0+/, '0x') || '0x0';
+
+  // Ensure we don't end up with just '0x'
+  if (hex === '0x') {
+    hex = '0x0';
+  }
+
+  return hex;
+}
+
+/**
+ * Convert hex string to bytes
+ * @param hex - Hex string (with or without 0x prefix)
+ * @returns Bytes
+ */
+export function hexToBytes(hex: string): Uint8Array {
+  // Normalize to ensure 0x prefix
+  const normalized = hex.startsWith('0x') ? hex : `0x${hex}`;
+
+  // Use Ox's Bytes.fromHex which properly handles odd-length hex strings
+  return Bytes.fromHex(normalized as Hex.Hex);
+}
diff --git a/packages/account-sdk/src/interface/public-utilities/prolink/utils/protobuf.ts b/packages/account-sdk/src/interface/public-utilities/prolink/utils/protobuf.ts
new file mode 100644
index 000000000..c50b547ea
--- /dev/null
+++ b/packages/account-sdk/src/interface/public-utilities/prolink/utils/protobuf.ts
@@ -0,0 +1,631 @@
+// Copyright (c) 2018-2025 Coinbase, Inc. <https://www.coinbase.com/>
+
+/**
+ * Protocol Buffers wire format encoding/decoding
+ * Implements a subset of proto3 wire format for our message types
+ */
+
+import type {
+  Call,
+  Erc20Transfer,
+  GenericCalls,
+  GenericJsonRpc,
+  GenericTypedData,
+  NativeTransfer,
+  ReceiveWithAuthorization,
+  RpcLinkPayload,
+  SpendPermission,
+  WalletSendCalls,
+  WalletSign,
+} from '../types.js';
+import { SendCallsType, SignType } from '../types.js';
+
+// Wire types
+const WIRE_TYPE_VARINT = 0;
+const WIRE_TYPE_LENGTH_DELIMITED = 2;
+
+/**
+ * Encode a varint (unsigned)
+ */
+function encodeVarint(value: number | bigint): Uint8Array {
+  const result: number[] = [];
+  let n = typeof value === 'bigint' ? value : BigInt(value);
+
+  if (n < 0n) {
+    throw new Error('Cannot encode negative varint');
+  }
+
+  do {
+    let byte = Number(n & 0x7fn);
+    n >>= 7n;
+    if (n !== 0n) {
+      byte |= 0x80;
+    }
+    result.push(byte);
+  } while (n !== 0n);
+
+  return new Uint8Array(result);
+}
+
+/**
+ * Decode a varint from buffer
+ */
+function decodeVarint(buffer: Uint8Array, offset: number): { value: bigint; length: number } {
+  let value = 0n;
+  let shift = 0n;
+  let length = 0;
+
+  while (offset + length < buffer.length) {
+    const byte = buffer[offset + length];
+    length++;
+
+    value |= BigInt(byte & 0x7f) << shift;
+    shift += 7n;
+
+    if ((byte & 0x80) === 0) {
+      return { value, length };
+    }
+  }
+
+  throw new Error('Incomplete varint');
+}
+
+/**
+ * Encode a length-delimited field
+ */
+function encodeBytes(fieldNumber: number, value: Uint8Array): Uint8Array {
+  if (value.length === 0) return new Uint8Array(0); // Omit empty bytes
+
+  const tag = (fieldNumber << 3) | WIRE_TYPE_LENGTH_DELIMITED;
+  const tagBytes = encodeVarint(tag);
+  const lengthBytes = encodeVarint(value.length);
+
+  const result = new Uint8Array(tagBytes.length + lengthBytes.length + value.length);
+  result.set(tagBytes, 0);
+  result.set(lengthBytes, tagBytes.length);
+  result.set(value, tagBytes.length + lengthBytes.length);
+
+  return result;
+}
+
+/**
+ * Encode a varint field
+ */
+function encodeVarintField(fieldNumber: number, value: number | bigint): Uint8Array {
+  if (value === 0 || value === 0n) return new Uint8Array(0); // Omit zero values in proto3
+
+  const tag = (fieldNumber << 3) | WIRE_TYPE_VARINT;
+  const tagBytes = encodeVarint(tag);
+  const valueBytes = encodeVarint(value);
+
+  const result = new Uint8Array(tagBytes.length + valueBytes.length);
+  result.set(tagBytes, 0);
+  result.set(valueBytes, tagBytes.length);
+
+  return result;
+}
+
+/**
+ * Encode a string field
+ */
+function encodeString(fieldNumber: number, value: string): Uint8Array {
+  if (!value) return new Uint8Array(0); // Omit empty strings
+
+  const bytes = new TextEncoder().encode(value);
+  return encodeBytes(fieldNumber, bytes);
+}
+
+/**
+ * Encode a message field
+ */
+function encodeMessage(fieldNumber: number, value: Uint8Array): Uint8Array {
+  if (value.length === 0) return new Uint8Array(0); // Omit empty messages
+
+  return encodeBytes(fieldNumber, value);
+}
+
+/**
+ * Concatenate byte arrays
+ */
+function concat(...arrays: Uint8Array[]): Uint8Array {
+  const totalLength = arrays.reduce((sum, arr) => sum + arr.length, 0);
+  const result = new Uint8Array(totalLength);
+  let offset = 0;
+  for (const arr of arrays) {
+    result.set(arr, offset);
+    offset += arr.length;
+  }
+  return result;
+}
+
+/**
+ * Encode Erc20Transfer message
+ */
+function encodeErc20Transfer(value: Erc20Transfer): Uint8Array {
+  return concat(
+    encodeBytes(1, value.token),
+    encodeBytes(2, value.recipient),
+    encodeBytes(3, value.amount)
+  );
+}
+
+/**
+ * Encode NativeTransfer message
+ */
+function encodeNativeTransfer(value: NativeTransfer): Uint8Array {
+  return concat(encodeBytes(1, value.recipient), encodeBytes(2, value.amount));
+}
+
+/**
+ * Encode Call message
+ */
+function encodeCall(value: Call): Uint8Array {
+  return concat(encodeBytes(1, value.to), encodeBytes(2, value.data), encodeBytes(3, value.value));
+}
+
+/**
+ * Encode GenericCalls message
+ */
+function encodeGenericCalls(value: GenericCalls): Uint8Array {
+  const parts: Uint8Array[] = [];
+  for (const call of value.calls) {
+    const callBytes = encodeCall(call);
+    parts.push(encodeMessage(1, callBytes));
+  }
+  return concat(...parts);
+}
+
+/**
+ * Encode WalletSendCalls message
+ */
+export function encodeWalletSendCalls(value: WalletSendCalls): Uint8Array {
+  const parts: Uint8Array[] = [encodeVarintField(1, value.type)];
+
+  // Encode transaction data based on type
+  if (value.transactionData.case === 'erc20Transfer') {
+    const encoded = encodeErc20Transfer(value.transactionData.value);
+    parts.push(encodeMessage(10, encoded));
+  } else if (value.transactionData.case === 'nativeTransfer') {
+    const encoded = encodeNativeTransfer(value.transactionData.value);
+    parts.push(encodeMessage(11, encoded));
+  } else if (value.transactionData.case === 'genericCalls') {
+    const encoded = encodeGenericCalls(value.transactionData.value);
+    parts.push(encodeMessage(12, encoded));
+  }
+
+  if (value.from) {
+    parts.push(encodeBytes(3, value.from));
+  }
+
+  if (value.version) {
+    parts.push(encodeString(4, value.version));
+  }
+
+  return concat(...parts);
+}
+
+/**
+ * Encode SpendPermission message
+ */
+function encodeSpendPermission(value: SpendPermission): Uint8Array {
+  return concat(
+    encodeBytes(1, value.account),
+    encodeBytes(2, value.spender),
+    encodeBytes(3, value.token),
+    encodeBytes(4, value.allowance),
+    encodeVarintField(5, value.period),
+    encodeVarintField(6, value.start),
+    encodeVarintField(7, value.end),
+    encodeBytes(8, value.salt),
+    encodeBytes(9, value.extraData),
+    encodeBytes(10, value.verifyingContract),
+    encodeString(11, value.domainName),
+    encodeString(12, value.domainVersion)
+  );
+}
+
+/**
+ * Encode ReceiveWithAuthorization message
+ */
+function encodeReceiveWithAuthorization(value: ReceiveWithAuthorization): Uint8Array {
+  return concat(
+    encodeBytes(1, value.from),
+    encodeBytes(2, value.to),
+    encodeBytes(3, value.value),
+    encodeBytes(4, value.validAfter),
+    encodeBytes(5, value.validBefore),
+    encodeBytes(6, value.nonce),
+    encodeBytes(7, value.verifyingContract),
+    encodeString(8, value.domainName),
+    encodeString(9, value.domainVersion)
+  );
+}
+
+/**
+ * Encode GenericTypedData message
+ */
+function encodeGenericTypedData(value: GenericTypedData): Uint8Array {
+  return encodeBytes(1, value.typedDataJson);
+}
+
+/**
+ * Encode WalletSign message
+ */
+export function encodeWalletSign(value: WalletSign): Uint8Array {
+  const parts: Uint8Array[] = [encodeVarintField(1, value.type)];
+
+  if (value.signatureData.case === 'spendPermission') {
+    const encoded = encodeSpendPermission(value.signatureData.value);
+    parts.push(encodeMessage(10, encoded));
+  } else if (value.signatureData.case === 'receiveWithAuthorization') {
+    const encoded = encodeReceiveWithAuthorization(value.signatureData.value);
+    parts.push(encodeMessage(11, encoded));
+  } else if (value.signatureData.case === 'genericTypedData') {
+    const encoded = encodeGenericTypedData(value.signatureData.value);
+    parts.push(encodeMessage(12, encoded));
+  }
+
+  if (value.version) {
+    parts.push(encodeString(3, value.version));
+  }
+
+  return concat(...parts);
+}
+
+/**
+ * Encode GenericJsonRpc message
+ */
+export function encodeGenericJsonRpc(value: GenericJsonRpc): Uint8Array {
+  return concat(
+    encodeString(1, value.method),
+    encodeBytes(2, value.paramsJson),
+    encodeString(3, value.rpcVersion || '')
+  );
+}
+
+/**
+ * Encode map field (for capabilities)
+ */
+function encodeMap(fieldNumber: number, map: Map<string, Uint8Array>): Uint8Array {
+  const parts: Uint8Array[] = [];
+
+  for (const [key, value] of map.entries()) {
+    // Each map entry is encoded as a message with field 1 = key, field 2 = value
+    const entryBytes = concat(encodeString(1, key), encodeBytes(2, value));
+    parts.push(encodeMessage(fieldNumber, entryBytes));
+  }
+
+  return concat(...parts);
+}
+
+/**
+ * Encode RpcLinkPayload message
+ */
+export function encodeRpcLinkPayload(value: RpcLinkPayload): Uint8Array {
+  const parts: Uint8Array[] = [
+    encodeVarintField(1, value.protocolVersion),
+    encodeVarintField(2, value.chainId || 0),
+    encodeVarintField(3, value.shortcutId),
+    encodeVarintField(4, value.shortcutVersion),
+  ];
+
+  // Encode body based on shortcut
+  if (value.body.case === 'generic') {
+    const encoded = encodeGenericJsonRpc(value.body.value);
+    parts.push(encodeMessage(10, encoded));
+  } else if (value.body.case === 'walletSendCalls') {
+    const encoded = encodeWalletSendCalls(value.body.value);
+    parts.push(encodeMessage(11, encoded));
+  } else if (value.body.case === 'walletSign') {
+    const encoded = encodeWalletSign(value.body.value);
+    parts.push(encodeMessage(12, encoded));
+  }
+
+  // Encode capabilities map
+  if (value.capabilities && value.capabilities.size > 0) {
+    parts.push(encodeMap(20, value.capabilities));
+  }
+
+  return concat(...parts);
+}
+
+/**
+ * Decode a protobuf message
+ * This is a simplified decoder that reads fields sequentially
+ */
+export function decodeRpcLinkPayload(buffer: Uint8Array): RpcLinkPayload {
+  const fields = parseFields(buffer);
+
+  const protocolVersion = Number(fields.get(1) || 0n);
+  const chainId = fields.get(2) ? Number(fields.get(2)) : undefined;
+  const shortcutId = Number(fields.get(3) || 0n);
+  const shortcutVersion = Number(fields.get(4) || 0n);
+
+  let body: RpcLinkPayload['body'] = { case: undefined };
+
+  // Decode body based on which field is present
+  if (fields.has(10)) {
+    const genericBytes = fields.get(10) as Uint8Array;
+    body = { case: 'generic', value: decodeGenericJsonRpc(genericBytes) };
+  } else if (fields.has(11)) {
+    const sendCallsBytes = fields.get(11) as Uint8Array;
+    body = { case: 'walletSendCalls', value: decodeWalletSendCalls(sendCallsBytes) };
+  } else if (fields.has(12)) {
+    const signBytes = fields.get(12) as Uint8Array;
+    body = { case: 'walletSign', value: decodeWalletSign(signBytes) };
+  }
+
+  // Decode capabilities map
+  const capabilities = fields.get(20) ? (fields.get(20) as Map<string, Uint8Array>) : undefined;
+
+  return {
+    protocolVersion,
+    chainId,
+    shortcutId,
+    shortcutVersion,
+    body,
+    capabilities,
+  };
+}
+
+/**
+ * Parse protobuf fields from buffer
+ */
+function parseFields(
+  buffer: Uint8Array
+): Map<number, bigint | Uint8Array | Map<string, Uint8Array>> {
+  const fields = new Map<number, bigint | Uint8Array | Map<string, Uint8Array>>();
+  let offset = 0;
+
+  while (offset < buffer.length) {
+    const { value: tag, length: tagLength } = decodeVarint(buffer, offset);
+    offset += tagLength;
+
+    const fieldNumber = Number(tag >> 3n);
+    const wireType = Number(tag & 0x7n);
+
+    if (wireType === WIRE_TYPE_VARINT) {
+      const { value, length } = decodeVarint(buffer, offset);
+      offset += length;
+      fields.set(fieldNumber, value);
+    } else if (wireType === WIRE_TYPE_LENGTH_DELIMITED) {
+      const { value: length, length: lengthSize } = decodeVarint(buffer, offset);
+      offset += lengthSize;
+
+      const bytes = buffer.slice(offset, offset + Number(length));
+      offset += Number(length);
+
+      // Field 20 is the capabilities map
+      if (fieldNumber === 20) {
+        if (!fields.has(20)) {
+          fields.set(20, new Map<string, Uint8Array>());
+        }
+        const mapField = fields.get(20) as Map<string, Uint8Array>;
+        const entry = parseMapEntry(bytes);
+        mapField.set(entry.key, entry.value);
+      } else {
+        fields.set(fieldNumber, bytes);
+      }
+    } else {
+      throw new Error(`Unsupported wire type: ${wireType}`);
+    }
+  }
+
+  return fields;
+}
+
+/**
+ * Parse a map entry (key-value pair)
+ */
+function parseMapEntry(buffer: Uint8Array): { key: string; value: Uint8Array } {
+  const fields = parseFields(buffer);
+  const keyBytes = fields.get(1) as Uint8Array;
+  const valueBytes = fields.get(2) as Uint8Array;
+
+  if (!keyBytes || !valueBytes) {
+    throw new Error('Invalid map entry: missing key or value');
+  }
+
+  const key = new TextDecoder().decode(keyBytes);
+  return { key, value: valueBytes };
+}
+
+/**
+ * Decode GenericJsonRpc message
+ */
+function decodeGenericJsonRpc(buffer: Uint8Array): GenericJsonRpc {
+  const fields = parseFields(buffer);
+
+  const methodBytes = fields.get(1) as Uint8Array;
+  const paramsJsonBytes = fields.get(2) as Uint8Array;
+  const rpcVersionBytes = fields.get(3) as Uint8Array | undefined;
+
+  return {
+    method: new TextDecoder().decode(methodBytes || new Uint8Array()),
+    paramsJson: paramsJsonBytes || new Uint8Array(),
+    rpcVersion: rpcVersionBytes ? new TextDecoder().decode(rpcVersionBytes) : undefined,
+  };
+}
+
+/**
+ * Decode WalletSendCalls message
+ */
+function decodeWalletSendCalls(buffer: Uint8Array): WalletSendCalls {
+  const fields = parseFields(buffer);
+
+  const type = Number(fields.get(1) || 0n) as SendCallsType;
+  const fromBytes = fields.get(3) as Uint8Array | undefined;
+  const versionBytes = fields.get(4) as Uint8Array | undefined;
+
+  let transactionData: WalletSendCalls['transactionData'] = { case: undefined };
+
+  if (fields.has(10)) {
+    const erc20Bytes = fields.get(10) as Uint8Array;
+    transactionData = { case: 'erc20Transfer', value: decodeErc20Transfer(erc20Bytes) };
+  } else if (fields.has(11)) {
+    const nativeBytes = fields.get(11) as Uint8Array;
+    transactionData = { case: 'nativeTransfer', value: decodeNativeTransfer(nativeBytes) };
+  } else if (fields.has(12)) {
+    const genericBytes = fields.get(12) as Uint8Array;
+    transactionData = { case: 'genericCalls', value: decodeGenericCalls(genericBytes) };
+  }
+
+  return {
+    type,
+    transactionData,
+    from: fromBytes,
+    version: versionBytes ? new TextDecoder().decode(versionBytes) : undefined,
+  };
+}
+
+/**
+ * Decode Erc20Transfer message
+ */
+function decodeErc20Transfer(buffer: Uint8Array): Erc20Transfer {
+  const fields = parseFields(buffer);
+
+  return {
+    token: (fields.get(1) as Uint8Array) || new Uint8Array(),
+    recipient: (fields.get(2) as Uint8Array) || new Uint8Array(),
+    amount: (fields.get(3) as Uint8Array) || new Uint8Array(),
+  };
+}
+
+/**
+ * Decode NativeTransfer message
+ */
+function decodeNativeTransfer(buffer: Uint8Array): NativeTransfer {
+  const fields = parseFields(buffer);
+
+  return {
+    recipient: (fields.get(1) as Uint8Array) || new Uint8Array(),
+    amount: (fields.get(2) as Uint8Array) || new Uint8Array(),
+  };
+}
+
+/**
+ * Decode Call message
+ */
+function decodeCall(buffer: Uint8Array): Call {
+  const fields = parseFields(buffer);
+
+  return {
+    to: (fields.get(1) as Uint8Array) || new Uint8Array(),
+    data: (fields.get(2) as Uint8Array) || new Uint8Array(),
+    value: (fields.get(3) as Uint8Array) || new Uint8Array(),
+  };
+}
+
+/**
+ * Decode GenericCalls message
+ */
+function decodeGenericCalls(buffer: Uint8Array): GenericCalls {
+  const calls: Call[] = [];
+  let offset = 0;
+
+  while (offset < buffer.length) {
+    const { value: tag, length: tagLength } = decodeVarint(buffer, offset);
+    offset += tagLength;
+
+    const fieldNumber = Number(tag >> 3n);
+    const wireType = Number(tag & 0x7n);
+
+    if (fieldNumber === 1 && wireType === WIRE_TYPE_LENGTH_DELIMITED) {
+      const { value: length, length: lengthSize } = decodeVarint(buffer, offset);
+      offset += lengthSize;
+
+      const callBytes = buffer.slice(offset, offset + Number(length));
+      offset += Number(length);
+
+      calls.push(decodeCall(callBytes));
+    } else {
+      throw new Error(`Unexpected field in GenericCalls: ${fieldNumber}`);
+    }
+  }
+
+  return { calls };
+}
+
+/**
+ * Decode WalletSign message
+ */
+function decodeWalletSign(buffer: Uint8Array): WalletSign {
+  const fields = parseFields(buffer);
+
+  const type = Number(fields.get(1) || 0n) as SignType;
+  const versionBytes = fields.get(3) as Uint8Array | undefined;
+
+  let signatureData: WalletSign['signatureData'] = { case: undefined };
+
+  if (fields.has(10)) {
+    const spendBytes = fields.get(10) as Uint8Array;
+    signatureData = { case: 'spendPermission', value: decodeSpendPermission(spendBytes) };
+  } else if (fields.has(11)) {
+    const receiveBytes = fields.get(11) as Uint8Array;
+    signatureData = {
+      case: 'receiveWithAuthorization',
+      value: decodeReceiveWithAuthorization(receiveBytes),
+    };
+  } else if (fields.has(12)) {
+    const genericBytes = fields.get(12) as Uint8Array;
+    signatureData = { case: 'genericTypedData', value: decodeGenericTypedData(genericBytes) };
+  }
+
+  return {
+    type,
+    signatureData,
+    version: versionBytes ? new TextDecoder().decode(versionBytes) : undefined,
+  };
+}
+
+/**
+ * Decode SpendPermission message
+ */
+function decodeSpendPermission(buffer: Uint8Array): SpendPermission {
+  const fields = parseFields(buffer);
+
+  return {
+    account: (fields.get(1) as Uint8Array) || new Uint8Array(),
+    spender: (fields.get(2) as Uint8Array) || new Uint8Array(),
+    token: (fields.get(3) as Uint8Array) || new Uint8Array(),
+    allowance: (fields.get(4) as Uint8Array) || new Uint8Array(),
+    period: (fields.get(5) as bigint) || 0n,
+    start: (fields.get(6) as bigint) || 0n,
+    end: (fields.get(7) as bigint) || 0n,
+    salt: (fields.get(8) as Uint8Array) || new Uint8Array(),
+    extraData: (fields.get(9) as Uint8Array) || new Uint8Array(),
+    verifyingContract: (fields.get(10) as Uint8Array) || new Uint8Array(),
+    domainName: new TextDecoder().decode((fields.get(11) as Uint8Array) || new Uint8Array()),
+    domainVersion: new TextDecoder().decode((fields.get(12) as Uint8Array) || new Uint8Array()),
+  };
+}
+
+/**
+ * Decode ReceiveWithAuthorization message
+ */
+function decodeReceiveWithAuthorization(buffer: Uint8Array): ReceiveWithAuthorization {
+  const fields = parseFields(buffer);
+
+  return {
+    from: (fields.get(1) as Uint8Array) || new Uint8Array(),
+    to: (fields.get(2) as Uint8Array) || new Uint8Array(),
+    value: (fields.get(3) as Uint8Array) || new Uint8Array(),
+    validAfter: (fields.get(4) as Uint8Array) || new Uint8Array(),
+    validBefore: (fields.get(5) as Uint8Array) || new Uint8Array(),
+    nonce: (fields.get(6) as Uint8Array) || new Uint8Array(),
+    verifyingContract: (fields.get(7) as Uint8Array) || new Uint8Array(),
+    domainName: new TextDecoder().decode((fields.get(8) as Uint8Array) || new Uint8Array()),
+    domainVersion: new TextDecoder().decode((fields.get(9) as Uint8Array) || new Uint8Array()),
+  };
+}
+
+/**
+ * Decode GenericTypedData message
+ */
+function decodeGenericTypedData(buffer: Uint8Array): GenericTypedData {
+  const fields = parseFields(buffer);
+
+  return {
+    typedDataJson: (fields.get(1) as Uint8Array) || new Uint8Array(),
+  };
+}
diff --git a/packages/account-sdk/src/interface/public-utilities/spend-permission/methods/getHash.test.ts b/packages/account-sdk/src/interface/public-utilities/spend-permission/methods/getHash.test.ts
index 92e3bb61c..0e9f64e6e 100644
--- a/packages/account-sdk/src/interface/public-utilities/spend-permission/methods/getHash.test.ts
+++ b/packages/account-sdk/src/interface/public-utilities/spend-permission/methods/getHash.test.ts
@@ -2,7 +2,7 @@ import {
   spendPermissionManagerAbi,
   spendPermissionManagerAddress,
 } from ':sign/base-account/utils/constants.js';
-import { getClient } from ':store/chain-clients/utils.js';
+import { createClients, getClient } from ':store/chain-clients/utils.js';
 import { createPublicClient, http } from 'viem';
 import { readContract } from 'viem/actions';
 import { Mock, beforeEach, describe, expect, it, vi } from 'vitest';
@@ -11,6 +11,7 @@ import { getHash } from './getHash.js';
 
 vi.mock(':store/chain-clients/utils.js', () => ({
   getClient: vi.fn(),
+  createClients: vi.fn(),
 }));
 
 vi.mock('viem/actions', () => ({
@@ -51,6 +52,7 @@ describe('getHash', () => {
 
       expect(result).toBe(mockHash);
       expect(getClient).toHaveBeenCalledWith(8453);
+      expect(createClients).not.toHaveBeenCalled();
       expect(readContract).toHaveBeenCalledWith(mockClient, {
         address: spendPermissionManagerAddress,
         abi: spendPermissionManagerAbi,
@@ -79,6 +81,7 @@ describe('getHash', () => {
 
       for (const chainId of testChainIds) {
         (getClient as Mock).mockClear();
+        (createClients as Mock).mockClear();
         (readContract as Mock).mockClear();
 
         await getHash({ permission: mockPermission, chainId });
@@ -86,6 +89,18 @@ describe('getHash', () => {
         expect(getClient).toHaveBeenCalledWith(chainId);
       }
     });
+
+    it('should work with supported fallback client when getClient returns one', async () => {
+      // With the curated supported chains list, getClient will automatically create a fallback client
+      // if one doesn't exist in storage and the chain is in the supported list
+      (getClient as Mock).mockReturnValue(mockClient);
+      (readContract as Mock).mockResolvedValue(mockHash);
+
+      await getHash({ permission: mockPermission, chainId: 8453 });
+
+      expect(getClient).toHaveBeenCalledWith(8453);
+      expect(readContract).toHaveBeenCalledWith(mockClient, expect.any(Object));
+    });
   });
 
   describe('parameter handling', () => {
@@ -182,13 +197,15 @@ describe('getHash', () => {
 
   describe('error handling', () => {
     it('should throw error when no client is found', async () => {
-      (getClient as Mock).mockReturnValue(null);
+      // getClient returns undefined when chain is not in the supported list or has no RPC URL
+      (getClient as Mock).mockReturnValue(undefined);
 
-      await expect(getHash({ permission: mockPermission, chainId: 8453 })).rejects.toThrow(
-        'No client found for chain ID 8453. Chain not supported or RPC URL not available'
+      await expect(getHash({ permission: mockPermission, chainId: 999999 })).rejects.toThrow(
+        'No client found for chain ID 999999. Chain not supported or RPC URL not available'
       );
 
-      expect(getClient).toHaveBeenCalledWith(8453);
+      expect(getClient).toHaveBeenCalledWith(999999);
+      expect(createClients).not.toHaveBeenCalled();
       expect(readContract).not.toHaveBeenCalled();
     });
 
diff --git a/packages/account-sdk/src/interface/public-utilities/spend-permission/methods/getPermissionStatus.test.ts b/packages/account-sdk/src/interface/public-utilities/spend-permission/methods/getPermissionStatus.test.ts
index e2824bf1a..642ce7b2b 100644
--- a/packages/account-sdk/src/interface/public-utilities/spend-permission/methods/getPermissionStatus.test.ts
+++ b/packages/account-sdk/src/interface/public-utilities/spend-permission/methods/getPermissionStatus.test.ts
@@ -5,15 +5,14 @@ import {
 } from ':sign/base-account/utils/constants.js';
 import { getClient } from ':store/chain-clients/utils.js';
 import { PublicClient, createPublicClient, http } from 'viem';
-import { readContract } from 'viem/actions';
 import { Mock, beforeEach, describe, expect, it, vi } from 'vitest';
+import { multicall } from '../../multicall/index.js';
 import { timestampInSecondsToDate, toSpendPermissionArgs } from '../utils.js';
 import { getPublicClientFromChainId } from '../utils.node.js';
 import { GetPermissionStatusResponseType, getPermissionStatus } from './getPermissionStatus.js';
 
 vi.mock(':store/chain-clients/utils.js', () => ({
   getClient: vi.fn(),
-  FALLBACK_CHAINS: [],
 }));
 
 vi.mock('../utils.node.js', () => ({
@@ -22,8 +21,16 @@ vi.mock('../utils.node.js', () => ({
 
 const getPublicClientFromChainIdSpy = vi.mocked(getPublicClientFromChainId);
 
-vi.mock('viem/actions', () => ({
-  readContract: vi.fn(),
+vi.mock('../../multicall/index.js', () => ({
+  multicall: vi.fn(),
+  unwrapMulticallResults: vi.fn((results: any[]) => {
+    return results.map((result, index) => {
+      if (result.status === 'success') {
+        return result.result;
+      }
+      throw new Error(`Call ${index} failed`);
+    });
+  }),
 }));
 
 vi.mock('../utils.js', () => ({
@@ -37,6 +44,17 @@ describe('getPermissionStatus - browser + node', () => {
   let mockSpendPermission: SpendPermission;
   let mockSpendPermissionArgs: ReturnType<typeof toSpendPermissionArgs>;
 
+  // Helper function to create multicall response
+  const createMulticallResponse = (
+    currentPeriod: { start: number; end: number; spend: bigint },
+    isRevoked: boolean,
+    isValid: boolean
+  ) => [
+    { status: 'success' as const, result: currentPeriod },
+    { status: 'success' as const, result: isRevoked },
+    { status: 'success' as const, result: isValid },
+  ];
+
   beforeEach(() => {
     vi.clearAllMocks();
 
@@ -90,14 +108,16 @@ describe('getPermissionStatus - browser + node', () => {
         spend: BigInt('500000000000000000'), // 0.5 ETH spent
       };
       const mockIsRevoked = false;
-      const mockIsValid = true;
+
+      // Mock Date.now() to control the current timestamp
+      const originalDateNow = Date.now;
+      Date.now = vi.fn(() => 1234567890 * 1000); // Set to same as permission start time
 
       // Test with browser environment (client in store)
       (getClient as Mock).mockReturnValue(mockClient);
-      (readContract as Mock)
-        .mockResolvedValueOnce(mockCurrentPeriod) // getCurrentPeriod
-        .mockResolvedValueOnce(mockIsRevoked) // isRevoked
-        .mockResolvedValueOnce(mockIsValid); // isValid
+      (multicall as Mock).mockResolvedValueOnce(
+        createMulticallResponse(mockCurrentPeriod, mockIsRevoked, true)
+      );
 
       const result: GetPermissionStatusResponseType =
         await getPermissionStatus(mockSpendPermission);
@@ -105,26 +125,32 @@ describe('getPermissionStatus - browser + node', () => {
       expect(result).toEqual({
         remainingSpend: BigInt('500000000000000000'), // 1 ETH - 0.5 ETH = 0.5 ETH remaining
         nextPeriodStart: new Date(1641081601 * 1000), // end + 1 converted to Date
-        isActive: true, // not revoked and valid
+        isRevoked: false,
+        isExpired: false, // current time (1234567890) < end time (1234654290)
+        isActive: true, // not revoked and not expired
+        isApprovedOnchain: true, // isValid returns true
+        currentPeriod: mockCurrentPeriod,
       });
 
       expect(getClient).toHaveBeenCalledWith(8453);
       expect(toSpendPermissionArgs).toHaveBeenCalledWith(mockSpendPermission);
-      expect(readContract).toHaveBeenCalledTimes(3);
+      expect(multicall).toHaveBeenCalledTimes(1);
 
       // Test with node environment (no client in store)
       (getClient as Mock).mockReturnValue(null);
       getPublicClientFromChainIdSpy.mockReturnValue(mockClient as unknown as PublicClient);
-      (readContract as Mock)
-        .mockResolvedValueOnce(mockCurrentPeriod) // getCurrentPeriod
-        .mockResolvedValueOnce(mockIsRevoked) // isRevoked
-        .mockResolvedValueOnce(mockIsValid); // isValid
+      (multicall as Mock).mockResolvedValueOnce(
+        createMulticallResponse(mockCurrentPeriod, mockIsRevoked, true)
+      );
 
       const nodeResult: GetPermissionStatusResponseType =
         await getPermissionStatus(mockSpendPermission);
 
       expect(nodeResult).toEqual(result);
       expect(getPublicClientFromChainIdSpy).toHaveBeenCalledWith(8453);
+
+      // Restore Date.now
+      Date.now = originalDateNow;
     });
 
     it('should return zero remaining spend when allowance is exceeded', async () => {
@@ -134,31 +160,39 @@ describe('getPermissionStatus - browser + node', () => {
         spend: BigInt('1500000000000000000'), // 1.5 ETH spent (more than allowance)
       };
       const mockIsRevoked = false;
-      const mockIsValid = true;
+
+      // Mock Date.now() to control the current timestamp
+      const originalDateNow = Date.now;
+      Date.now = vi.fn(() => 1234567890 * 1000); // Set to same as permission start time
 
       // Test with browser environment
       (getClient as Mock).mockReturnValue(mockClient);
-      (readContract as Mock)
-        .mockResolvedValueOnce(mockCurrentPeriod)
-        .mockResolvedValueOnce(mockIsRevoked)
-        .mockResolvedValueOnce(mockIsValid);
+      (multicall as Mock).mockResolvedValueOnce(
+        createMulticallResponse(mockCurrentPeriod, mockIsRevoked, true)
+      );
 
       const result = await getPermissionStatus(mockSpendPermission);
 
       expect(result.remainingSpend).toBe(BigInt(0));
+      expect(result.isRevoked).toBe(false);
+      expect(result.isExpired).toBe(false);
       expect(result.isActive).toBe(true);
+      expect(result.isApprovedOnchain).toBe(true);
+      expect(result.currentPeriod).toEqual(mockCurrentPeriod);
 
       // Test with node environment
       (getClient as Mock).mockReturnValue(null);
       getPublicClientFromChainIdSpy.mockReturnValue(mockClient as unknown as PublicClient);
-      (readContract as Mock)
-        .mockResolvedValueOnce(mockCurrentPeriod)
-        .mockResolvedValueOnce(mockIsRevoked)
-        .mockResolvedValueOnce(mockIsValid);
+      (multicall as Mock).mockResolvedValueOnce(
+        createMulticallResponse(mockCurrentPeriod, mockIsRevoked, true)
+      );
 
       const nodeResult = await getPermissionStatus(mockSpendPermission);
 
       expect(nodeResult).toEqual(result);
+
+      // Restore Date.now
+      Date.now = originalDateNow;
     });
 
     it('should return inactive status when permission is revoked', async () => {
@@ -168,78 +202,97 @@ describe('getPermissionStatus - browser + node', () => {
         spend: BigInt('0'),
       };
       const mockIsRevoked = true;
-      const mockIsValid = true;
+
+      // Mock Date.now() to control the current timestamp
+      const originalDateNow = Date.now;
+      Date.now = vi.fn(() => 1234567890 * 1000); // Set to same as permission start time
 
       // Test with browser environment
       (getClient as Mock).mockReturnValue(mockClient);
-      (readContract as Mock)
-        .mockResolvedValueOnce(mockCurrentPeriod)
-        .mockResolvedValueOnce(mockIsRevoked)
-        .mockResolvedValueOnce(mockIsValid);
+      (multicall as Mock).mockResolvedValueOnce(
+        createMulticallResponse(mockCurrentPeriod, mockIsRevoked, true)
+      );
 
       const result = await getPermissionStatus(mockSpendPermission);
 
+      expect(result.isRevoked).toBe(true);
+      expect(result.isExpired).toBe(false);
       expect(result.isActive).toBe(false);
+      expect(result.isApprovedOnchain).toBe(true);
+      expect(result.currentPeriod).toEqual(mockCurrentPeriod);
 
       // Test with node environment
       (getClient as Mock).mockReturnValue(null);
       getPublicClientFromChainIdSpy.mockReturnValue(mockClient as unknown as PublicClient);
-      (readContract as Mock)
-        .mockResolvedValueOnce(mockCurrentPeriod)
-        .mockResolvedValueOnce(mockIsRevoked)
-        .mockResolvedValueOnce(mockIsValid);
+      (multicall as Mock).mockResolvedValueOnce(
+        createMulticallResponse(mockCurrentPeriod, mockIsRevoked, true)
+      );
 
       const nodeResult = await getPermissionStatus(mockSpendPermission);
 
       expect(nodeResult).toEqual(result);
+
+      // Restore Date.now
+      Date.now = originalDateNow;
     });
 
-    it('should return inactive status when permission is invalid', async () => {
+    it('should return inactive status when permission is expired', async () => {
       const mockCurrentPeriod = {
         start: 1640995200,
         end: 1641081600,
         spend: BigInt('0'),
       };
       const mockIsRevoked = false;
-      const mockIsValid = false;
+
+      // Mock Date.now() to be after the permission end time
+      const originalDateNow = Date.now;
+      Date.now = vi.fn(() => 1234654291 * 1000); // Set to after permission end time (1234654290)
 
       // Test with browser environment
       (getClient as Mock).mockReturnValue(mockClient);
-      (readContract as Mock)
-        .mockResolvedValueOnce(mockCurrentPeriod)
-        .mockResolvedValueOnce(mockIsRevoked)
-        .mockResolvedValueOnce(mockIsValid);
+      (multicall as Mock).mockResolvedValueOnce(
+        createMulticallResponse(mockCurrentPeriod, mockIsRevoked, true)
+      );
 
       const result = await getPermissionStatus(mockSpendPermission);
 
+      expect(result.isRevoked).toBe(false);
+      expect(result.isExpired).toBe(true);
       expect(result.isActive).toBe(false);
+      expect(result.isApprovedOnchain).toBe(true);
+      expect(result.currentPeriod).toEqual(mockCurrentPeriod);
 
       // Test with node environment
       (getClient as Mock).mockReturnValue(null);
       getPublicClientFromChainIdSpy.mockReturnValue(mockClient as unknown as PublicClient);
-      (readContract as Mock)
-        .mockResolvedValueOnce(mockCurrentPeriod)
-        .mockResolvedValueOnce(mockIsRevoked)
-        .mockResolvedValueOnce(mockIsValid);
+      (multicall as Mock).mockResolvedValueOnce(
+        createMulticallResponse(mockCurrentPeriod, mockIsRevoked, true)
+      );
 
       const nodeResult = await getPermissionStatus(mockSpendPermission);
 
       expect(nodeResult).toEqual(result);
+
+      // Restore Date.now
+      Date.now = originalDateNow;
     });
 
     it('should handle different chain IDs correctly', async () => {
       const testChainIds = [1, 8453, 137, 42161];
 
+      // Mock Date.now() to control the current timestamp
+      const originalDateNow = Date.now;
+      Date.now = vi.fn(() => 1234567890 * 1000); // Set to same as permission start time
+
       for (const chainId of testChainIds) {
         const permission = { ...mockSpendPermission, chainId };
         const mockCurrentPeriod = { start: 1, end: 2, spend: BigInt('0') };
 
         // Test with browser environment
         (getClient as Mock).mockReturnValue(mockClient);
-        (readContract as Mock)
-          .mockResolvedValueOnce(mockCurrentPeriod)
-          .mockResolvedValueOnce(false)
-          .mockResolvedValueOnce(true);
+        (multicall as Mock).mockResolvedValueOnce(
+          createMulticallResponse(mockCurrentPeriod, false, true)
+        );
 
         await getPermissionStatus(permission);
 
@@ -248,15 +301,17 @@ describe('getPermissionStatus - browser + node', () => {
         // Test with node environment
         (getClient as Mock).mockReturnValue(null);
         getPublicClientFromChainIdSpy.mockReturnValue(mockClient as unknown as PublicClient);
-        (readContract as Mock)
-          .mockResolvedValueOnce(mockCurrentPeriod)
-          .mockResolvedValueOnce(false)
-          .mockResolvedValueOnce(true);
+        (multicall as Mock).mockResolvedValueOnce(
+          createMulticallResponse(mockCurrentPeriod, false, true)
+        );
 
         await getPermissionStatus(permission);
 
         expect(getPublicClientFromChainIdSpy).toHaveBeenCalledWith(chainId);
       }
+
+      // Restore Date.now
+      Date.now = originalDateNow;
     });
   });
 
@@ -273,7 +328,7 @@ describe('getPermissionStatus - browser + node', () => {
       );
 
       expect(getClient).not.toHaveBeenCalled();
-      expect(readContract).not.toHaveBeenCalled();
+      expect(multicall).not.toHaveBeenCalled();
 
       // Test with node environment
       (getClient as Mock).mockReturnValue(null);
@@ -283,7 +338,7 @@ describe('getPermissionStatus - browser + node', () => {
       );
 
       expect(getPublicClientFromChainIdSpy).not.toHaveBeenCalled();
-      expect(readContract).not.toHaveBeenCalled();
+      expect(multicall).not.toHaveBeenCalled();
     });
 
     it('should throw error when client is not available', async () => {
@@ -297,34 +352,34 @@ describe('getPermissionStatus - browser + node', () => {
 
       expect(getClient).toHaveBeenCalledWith(8453);
       expect(getPublicClientFromChainIdSpy).toHaveBeenCalledWith(8453);
-      expect(readContract).not.toHaveBeenCalled();
+      expect(multicall).not.toHaveBeenCalled();
     });
 
-    it('should propagate readContract errors', async () => {
+    it('should propagate multicall errors', async () => {
       const contractError = new Error('Contract call failed');
 
       // Test with browser environment
       (getClient as Mock).mockReturnValue(mockClient);
-      (readContract as Mock).mockRejectedValue(contractError);
+      (multicall as Mock).mockRejectedValue(contractError);
 
       await expect(getPermissionStatus(mockSpendPermission)).rejects.toThrow(
         'Contract call failed'
       );
 
       expect(getClient).toHaveBeenCalledWith(8453);
-      expect(readContract).toHaveBeenCalled();
+      expect(multicall).toHaveBeenCalled();
 
       // Test with node environment
       (getClient as Mock).mockReturnValue(null);
       getPublicClientFromChainIdSpy.mockReturnValue(mockClient as unknown as PublicClient);
-      (readContract as Mock).mockRejectedValue(contractError);
+      (multicall as Mock).mockRejectedValue(contractError);
 
       await expect(getPermissionStatus(mockSpendPermission)).rejects.toThrow(
         'Contract call failed'
       );
 
       expect(getPublicClientFromChainIdSpy).toHaveBeenCalledWith(8453);
-      expect(readContract).toHaveBeenCalled();
+      expect(multicall).toHaveBeenCalled();
     });
 
     it('should handle network errors gracefully', async () => {
@@ -332,7 +387,7 @@ describe('getPermissionStatus - browser + node', () => {
 
       // Test with browser environment
       (getClient as Mock).mockReturnValue(mockClient);
-      (readContract as Mock).mockRejectedValue(networkError);
+      (multicall as Mock).mockRejectedValue(networkError);
 
       await expect(getPermissionStatus(mockSpendPermission)).rejects.toThrow(
         'Network request failed'
@@ -341,12 +396,52 @@ describe('getPermissionStatus - browser + node', () => {
       // Test with node environment
       (getClient as Mock).mockReturnValue(null);
       getPublicClientFromChainIdSpy.mockReturnValue(mockClient as unknown as PublicClient);
-      (readContract as Mock).mockRejectedValue(networkError);
+      (multicall as Mock).mockRejectedValue(networkError);
 
       await expect(getPermissionStatus(mockSpendPermission)).rejects.toThrow(
         'Network request failed'
       );
     });
+
+    it('should handle multicall failure for getCurrentPeriod', async () => {
+      // Test with browser environment
+      (getClient as Mock).mockReturnValue(mockClient);
+      (multicall as Mock).mockResolvedValueOnce([
+        { status: 'failure' as const, error: new Error('Call failed') },
+        { status: 'success' as const, result: false },
+        { status: 'success' as const, result: true },
+      ]);
+
+      await expect(getPermissionStatus(mockSpendPermission)).rejects.toThrow('Call 0 failed');
+    });
+
+    it('should handle multicall failure for isRevoked', async () => {
+      const mockCurrentPeriod = { start: 1, end: 2, spend: BigInt('0') };
+
+      // Test with browser environment
+      (getClient as Mock).mockReturnValue(mockClient);
+      (multicall as Mock).mockResolvedValueOnce([
+        { status: 'success' as const, result: mockCurrentPeriod },
+        { status: 'failure' as const, error: new Error('Call failed') },
+        { status: 'success' as const, result: true },
+      ]);
+
+      await expect(getPermissionStatus(mockSpendPermission)).rejects.toThrow('Call 1 failed');
+    });
+
+    it('should handle multicall failure for isValid', async () => {
+      const mockCurrentPeriod = { start: 1, end: 2, spend: BigInt('0') };
+
+      // Test with browser environment
+      (getClient as Mock).mockReturnValue(mockClient);
+      (multicall as Mock).mockResolvedValueOnce([
+        { status: 'success' as const, result: mockCurrentPeriod },
+        { status: 'success' as const, result: false },
+        { status: 'failure' as const, error: new Error('Call failed') },
+      ]);
+
+      await expect(getPermissionStatus(mockSpendPermission)).rejects.toThrow('Call 2 failed');
+    });
   });
 
   describe('contract call verification', () => {
@@ -358,6 +453,10 @@ describe('getPermissionStatus - browser + node', () => {
       async (environment, getPermissionStatusFunc) => {
         const mockCurrentPeriod = { start: 1, end: 2, spend: BigInt('0') };
 
+        // Mock Date.now() to control the current timestamp
+        const originalDateNow = Date.now;
+        Date.now = vi.fn(() => 1234567890 * 1000); // Set to same as permission start time
+
         if (environment === 'browser') {
           (getClient as Mock).mockReturnValue(mockClient);
         } else {
@@ -365,38 +464,45 @@ describe('getPermissionStatus - browser + node', () => {
           getPublicClientFromChainIdSpy.mockReturnValue(mockClient as unknown as PublicClient);
         }
 
-        (readContract as Mock)
-          .mockResolvedValueOnce(mockCurrentPeriod)
-          .mockResolvedValueOnce(false)
-          .mockResolvedValueOnce(true);
+        (multicall as Mock).mockResolvedValueOnce(
+          createMulticallResponse(mockCurrentPeriod, false, true)
+        );
 
         await getPermissionStatusFunc(mockSpendPermission);
 
-        expect(readContract).toHaveBeenCalledTimes(3);
-
-        // Verify getCurrentPeriod call
-        expect(readContract).toHaveBeenNthCalledWith(1, mockClient, {
-          address: spendPermissionManagerAddress,
-          abi: spendPermissionManagerAbi,
-          functionName: 'getCurrentPeriod',
-          args: [mockSpendPermissionArgs],
-        });
-
-        // Verify isRevoked call
-        expect(readContract).toHaveBeenNthCalledWith(2, mockClient, {
-          address: spendPermissionManagerAddress,
-          abi: spendPermissionManagerAbi,
-          functionName: 'isRevoked',
-          args: [mockSpendPermissionArgs],
+        expect(multicall).toHaveBeenCalledTimes(1);
+
+        // Verify multicall was called with correct contracts
+        expect(multicall).toHaveBeenCalledWith(mockClient, {
+          contracts: [
+            {
+              address: spendPermissionManagerAddress,
+              abi: spendPermissionManagerAbi,
+              functionName: 'getCurrentPeriod',
+              args: [mockSpendPermissionArgs],
+            },
+            {
+              address: spendPermissionManagerAddress,
+              abi: spendPermissionManagerAbi,
+              functionName: 'isRevoked',
+              args: [mockSpendPermissionArgs],
+            },
+            {
+              address: spendPermissionManagerAddress,
+              abi: spendPermissionManagerAbi,
+              functionName: 'isValid',
+              args: [mockSpendPermissionArgs],
+            },
+          ],
+          errorMessages: [
+            'Failed to fetch current period',
+            'Failed to fetch revoked status',
+            'Failed to fetch valid status',
+          ],
         });
 
-        // Verify isValid call
-        expect(readContract).toHaveBeenNthCalledWith(3, mockClient, {
-          address: spendPermissionManagerAddress,
-          abi: spendPermissionManagerAbi,
-          functionName: 'isValid',
-          args: [mockSpendPermissionArgs],
-        });
+        // Restore Date.now
+        Date.now = originalDateNow;
       }
     );
 
@@ -404,10 +510,14 @@ describe('getPermissionStatus - browser + node', () => {
       ['browser', getPermissionStatus],
       ['node', getPermissionStatus],
     ])(
-      'should make contract calls in parallel for better performance for %s environment',
+      'should batch all contract calls into a single multicall for %s environment',
       async (environment, getPermissionStatusFunc) => {
         const mockCurrentPeriod = { start: 1, end: 2, spend: BigInt('0') };
 
+        // Mock Date.now() to control the current timestamp
+        const originalDateNow = Date.now;
+        Date.now = vi.fn(() => 1234567890 * 1000); // Set to same as permission start time
+
         if (environment === 'browser') {
           (getClient as Mock).mockReturnValue(mockClient);
         } else {
@@ -415,37 +525,17 @@ describe('getPermissionStatus - browser + node', () => {
           getPublicClientFromChainIdSpy.mockReturnValue(mockClient as unknown as PublicClient);
         }
 
-        // Create promises that we can control
-        let resolveGetCurrentPeriod: (value: any) => void;
-        let resolveIsRevoked: (value: any) => void;
-        let resolveIsValid: (value: any) => void;
-
-        const getCurrentPeriodPromise = new Promise((resolve) => {
-          resolveGetCurrentPeriod = resolve;
-        });
-        const isRevokedPromise = new Promise((resolve) => {
-          resolveIsRevoked = resolve;
-        });
-        const isValidPromise = new Promise((resolve) => {
-          resolveIsValid = resolve;
-        });
+        (multicall as Mock).mockResolvedValueOnce(
+          createMulticallResponse(mockCurrentPeriod, false, true)
+        );
 
-        (readContract as Mock)
-          .mockReturnValueOnce(getCurrentPeriodPromise)
-          .mockReturnValueOnce(isRevokedPromise)
-          .mockReturnValueOnce(isValidPromise);
-
-        const statusPromise = getPermissionStatusFunc(mockSpendPermission);
-
-        // Verify all contract calls are made immediately
-        expect(readContract).toHaveBeenCalledTimes(3);
+        await getPermissionStatusFunc(mockSpendPermission);
 
-        // Resolve all promises
-        resolveGetCurrentPeriod!(mockCurrentPeriod);
-        resolveIsRevoked!(false);
-        resolveIsValid!(true);
+        // Verify only one multicall is made (batching all 3 contract reads)
+        expect(multicall).toHaveBeenCalledTimes(1);
 
-        await statusPromise;
+        // Restore Date.now
+        Date.now = originalDateNow;
       }
     );
   });
@@ -462,28 +552,34 @@ describe('getPermissionStatus - browser + node', () => {
 
       const mockCurrentPeriod = { start: 1, end: 2, spend: BigInt('0') };
 
+      // Mock Date.now() to control the current timestamp
+      const originalDateNow = Date.now;
+      Date.now = vi.fn(() => 1234567890 * 1000); // Set to same as permission start time
+
       // Test with browser environment
       (getClient as Mock).mockReturnValue(mockClient);
-      (readContract as Mock)
-        .mockResolvedValueOnce(mockCurrentPeriod)
-        .mockResolvedValueOnce(false)
-        .mockResolvedValueOnce(true);
+      (multicall as Mock).mockResolvedValueOnce(
+        createMulticallResponse(mockCurrentPeriod, false, true)
+      );
 
       const result = await getPermissionStatus(permissionWithZeroAllowance);
 
       expect(result.remainingSpend).toBe(BigInt(0));
+      expect(result.currentPeriod).toEqual(mockCurrentPeriod);
 
       // Test with node environment
       (getClient as Mock).mockReturnValue(null);
       getPublicClientFromChainIdSpy.mockReturnValue(mockClient as unknown as PublicClient);
-      (readContract as Mock)
-        .mockResolvedValueOnce(mockCurrentPeriod)
-        .mockResolvedValueOnce(false)
-        .mockResolvedValueOnce(true);
+      (multicall as Mock).mockResolvedValueOnce(
+        createMulticallResponse(mockCurrentPeriod, false, true)
+      );
 
       const nodeResult = await getPermissionStatus(permissionWithZeroAllowance);
 
       expect(nodeResult).toEqual(result);
+
+      // Restore Date.now
+      Date.now = originalDateNow;
     });
 
     it('should handle very large allowance values', async () => {
@@ -501,30 +597,36 @@ describe('getPermissionStatus - browser + node', () => {
         spend: BigInt('1000000000000000000'),
       };
 
+      // Mock Date.now() to control the current timestamp
+      const originalDateNow = Date.now;
+      Date.now = vi.fn(() => 1234567890 * 1000); // Set to same as permission start time
+
       // Test with browser environment
       (getClient as Mock).mockReturnValue(mockClient);
-      (readContract as Mock)
-        .mockResolvedValueOnce(mockCurrentPeriod)
-        .mockResolvedValueOnce(false)
-        .mockResolvedValueOnce(true);
+      (multicall as Mock).mockResolvedValueOnce(
+        createMulticallResponse(mockCurrentPeriod, false, true)
+      );
 
       const result = await getPermissionStatus(permissionWithLargeAllowance);
 
       expect(result.remainingSpend).toBe(
         BigInt('999999999999999999999999999999') - BigInt('1000000000000000000')
       );
+      expect(result.currentPeriod).toEqual(mockCurrentPeriod);
 
       // Test with node environment
       (getClient as Mock).mockReturnValue(null);
       getPublicClientFromChainIdSpy.mockReturnValue(mockClient as unknown as PublicClient);
-      (readContract as Mock)
-        .mockResolvedValueOnce(mockCurrentPeriod)
-        .mockResolvedValueOnce(false)
-        .mockResolvedValueOnce(true);
+      (multicall as Mock).mockResolvedValueOnce(
+        createMulticallResponse(mockCurrentPeriod, false, true)
+      );
 
       const nodeResult = await getPermissionStatus(permissionWithLargeAllowance);
 
       expect(nodeResult).toEqual(result);
+
+      // Restore Date.now
+      Date.now = originalDateNow;
     });
 
     it('should handle period end at maximum timestamp', async () => {
@@ -534,28 +636,76 @@ describe('getPermissionStatus - browser + node', () => {
         spend: BigInt('0'),
       };
 
+      // Mock Date.now() to control the current timestamp
+      const originalDateNow = Date.now;
+      Date.now = vi.fn(() => 1234567890 * 1000); // Set to same as permission start time
+
       // Test with browser environment
       (getClient as Mock).mockReturnValue(mockClient);
-      (readContract as Mock)
-        .mockResolvedValueOnce(mockCurrentPeriod)
-        .mockResolvedValueOnce(false)
-        .mockResolvedValueOnce(true);
+      (multicall as Mock).mockResolvedValueOnce(
+        createMulticallResponse(mockCurrentPeriod, false, true)
+      );
 
       const result = await getPermissionStatus(mockSpendPermission);
 
       expect(result.nextPeriodStart).toEqual(new Date(2147483648 * 1000));
+      expect(result.currentPeriod).toEqual(mockCurrentPeriod);
 
       // Test with node environment
       (getClient as Mock).mockReturnValue(null);
       getPublicClientFromChainIdSpy.mockReturnValue(mockClient as unknown as PublicClient);
-      (readContract as Mock)
-        .mockResolvedValueOnce(mockCurrentPeriod)
-        .mockResolvedValueOnce(false)
-        .mockResolvedValueOnce(true);
+      (multicall as Mock).mockResolvedValueOnce(
+        createMulticallResponse(mockCurrentPeriod, false, true)
+      );
 
       const nodeResult = await getPermissionStatus(mockSpendPermission);
 
       expect(nodeResult).toEqual(result);
+
+      // Restore Date.now
+      Date.now = originalDateNow;
+    });
+
+    it('should use custom RPC URL when provided', async () => {
+      const mockCurrentPeriod = {
+        start: 1640995200,
+        end: 1641081600,
+        spend: BigInt('0'),
+      };
+      const mockIsRevoked = false;
+      const customRpcUrl = 'https://custom-rpc.example.com';
+
+      // Mock Date.now() to control the current timestamp
+      const originalDateNow = Date.now;
+      Date.now = vi.fn(() => 1234567890 * 1000);
+
+      // When custom RPC URL is provided, a new client should be created with custom transport
+      getPublicClientFromChainIdSpy.mockReturnValue(mockClient as unknown as PublicClient);
+
+      (multicall as Mock).mockResolvedValueOnce(
+        createMulticallResponse(mockCurrentPeriod, mockIsRevoked, true)
+      );
+
+      const result = await getPermissionStatus(mockSpendPermission, { rpcUrl: customRpcUrl });
+
+      expect(result).toEqual({
+        remainingSpend: BigInt('1000000000000000000'),
+        nextPeriodStart: new Date(1641081601 * 1000),
+        isRevoked: false,
+        isExpired: false,
+        isActive: true,
+        isApprovedOnchain: true,
+        currentPeriod: mockCurrentPeriod,
+      });
+
+      expect(multicall).toHaveBeenCalledTimes(1);
+      expect(toSpendPermissionArgs).toHaveBeenCalledWith(mockSpendPermission);
+
+      // Verify that getClient was not called when custom RPC URL is provided
+      expect(getClient).not.toHaveBeenCalled();
+
+      // Restore Date.now
+      Date.now = originalDateNow;
     });
   });
 });
diff --git a/packages/account-sdk/src/interface/public-utilities/spend-permission/methods/getPermissionStatus.ts b/packages/account-sdk/src/interface/public-utilities/spend-permission/methods/getPermissionStatus.ts
index 3cf9234f4..d65398bad 100644
--- a/packages/account-sdk/src/interface/public-utilities/spend-permission/methods/getPermissionStatus.ts
+++ b/packages/account-sdk/src/interface/public-utilities/spend-permission/methods/getPermissionStatus.ts
@@ -4,8 +4,8 @@ import {
   spendPermissionManagerAddress,
 } from ':sign/base-account/utils/constants.js';
 import { getClient } from ':store/chain-clients/utils.js';
-import { PublicClient } from 'viem';
-import { readContract } from 'viem/actions';
+import { PublicClient, createPublicClient, http } from 'viem';
+import { multicall, unwrapMulticallResults } from '../../multicall/index.js';
 import { timestampInSecondsToDate, toSpendPermissionArgs } from '../utils.js';
 import { getPublicClientFromChainId } from '../utils.node.js';
 import { withTelemetry } from '../withTelemetry.js';
@@ -13,7 +13,15 @@ import { withTelemetry } from '../withTelemetry.js';
 export type GetPermissionStatusResponseType = {
   remainingSpend: bigint;
   nextPeriodStart: Date;
+  isRevoked: boolean;
+  isExpired: boolean;
   isActive: boolean;
+  isApprovedOnchain: boolean;
+  currentPeriod: {
+    start: number;
+    end: number;
+    spend: bigint;
+  };
 };
 
 /**
@@ -30,6 +38,8 @@ export type GetPermissionStatusResponseType = {
  * When the spend permission does not have a chainId, the function will throw an error.
  *
  * @param permission - The spend permission object to check status for.
+ * @param options - Optional configuration options.
+ * @param options.rpcUrl - Optional custom RPC URL to use for blockchain queries. Useful for avoiding rate limits on public endpoints.
  *
  * @returns A promise that resolves to an object containing permission status details.
  *
@@ -40,8 +50,15 @@ export type GetPermissionStatusResponseType = {
  * // Check the status of a permission (no client needed)
  * const status = await getPermissionStatus(permission);
  *
+ * // With custom RPC URL to avoid rate limits
+ * const status = await getPermissionStatus(permission, {
+ *   rpcUrl: 'https://my-custom-rpc.example.com'
+ * });
+ *
  * console.log(`Remaining spend: ${status.remainingSpend} wei`);
- * console.log(`Next period starts: ${new Date(parseInt(status.nextPeriodStart) * 1000)}`);
+ * console.log(`Next period starts: ${status.nextPeriodStart}`);
+ * console.log(`Is revoked: ${status.isRevoked}`);
+ * console.log(`Is expired: ${status.isExpired}`);
  * console.log(`Is active: ${status.isActive}`);
  *
  * if (status.isActive && status.remainingSpend > BigInt(0)) {
@@ -50,47 +67,80 @@ export type GetPermissionStatusResponseType = {
  * ```
  */
 const getPermissionStatusFn = async (
-  permission: SpendPermission
+  permission: SpendPermission,
+  options?: { rpcUrl?: string }
 ): Promise<GetPermissionStatusResponseType> => {
   const { chainId } = permission;
+  const { rpcUrl } = options ?? {};
 
   if (!chainId) {
     throw new Error('chainId is missing in the spend permission');
   }
 
-  // Try to get client from store first (browser environment with connected SDK)
-  let client: PublicClient | undefined = getClient(chainId);
+  let client: PublicClient | undefined;
 
-  // If no client in store, create one using the node utility (node environment or disconnected SDK)
-  if (!client) {
-    client = getPublicClientFromChainId(chainId);
+  // If a custom RPC URL is provided, create a client with it
+  if (rpcUrl) {
+    const viemChain = getPublicClientFromChainId(chainId);
+    const chain = viemChain?.chain;
+
+    client = createPublicClient({
+      chain,
+      transport: http(rpcUrl),
+    });
+  } else {
+    // Try to get client from store first (browser environment with connected SDK)
+    client = getClient(chainId);
+
+    // If no client in store, create one using the node utility (node environment or disconnected SDK)
     if (!client) {
-      throw new Error(`No client available for chain ID ${chainId}. Chain is not supported.`);
+      client = getPublicClientFromChainId(chainId);
     }
   }
 
+  if (!client) {
+    throw new Error(`No client available for chain ID ${chainId}. Chain is not supported.`);
+  }
+
   const spendPermissionArgs = toSpendPermissionArgs(permission);
 
-  const [currentPeriod, isRevoked, isValid] = await Promise.all([
-    readContract(client, {
-      address: spendPermissionManagerAddress,
-      abi: spendPermissionManagerAbi,
-      functionName: 'getCurrentPeriod',
-      args: [spendPermissionArgs],
-    }) as Promise<{ start: number; end: number; spend: bigint }>,
-    readContract(client, {
-      address: spendPermissionManagerAddress,
-      abi: spendPermissionManagerAbi,
-      functionName: 'isRevoked',
-      args: [spendPermissionArgs],
-    }) as Promise<boolean>,
-    readContract(client, {
-      address: spendPermissionManagerAddress,
-      abi: spendPermissionManagerAbi,
-      functionName: 'isValid',
-      args: [spendPermissionArgs],
-    }) as Promise<boolean>,
-  ]);
+  // Use multicall to batch all contract reads into a single RPC call
+  const results = await multicall(client, {
+    contracts: [
+      {
+        address: spendPermissionManagerAddress,
+        abi: spendPermissionManagerAbi,
+        functionName: 'getCurrentPeriod',
+        args: [spendPermissionArgs],
+      },
+      {
+        address: spendPermissionManagerAddress,
+        abi: spendPermissionManagerAbi,
+        functionName: 'isRevoked',
+        args: [spendPermissionArgs],
+      },
+      {
+        address: spendPermissionManagerAddress,
+        abi: spendPermissionManagerAbi,
+        functionName: 'isValid',
+        args: [spendPermissionArgs],
+      },
+    ],
+    errorMessages: [
+      'Failed to fetch current period',
+      'Failed to fetch revoked status',
+      'Failed to fetch valid status',
+    ],
+  });
+
+  // Extract results from multicall response
+  const [currentPeriod, isRevoked, isValid] = unwrapMulticallResults<
+    { start: number; end: number; spend: bigint } | boolean
+  >(results, [
+    'Failed to fetch current period',
+    'Failed to fetch revoked status',
+    'Failed to fetch valid status',
+  ]) as [{ start: number; end: number; spend: bigint }, boolean, boolean];
 
   // Calculate remaining spend in current period
   const allowance = BigInt(permission.permission.allowance);
@@ -101,13 +151,24 @@ const getPermissionStatusFn = async (
   // Next period starts immediately after current period ends
   const nextPeriodStart = (Number(currentPeriod.end) + 1).toString();
 
-  // Permission is active if it's not revoked and is still valid
-  const isActive = !isRevoked && isValid;
+  // Check if permission is expired
+  const currentTimestamp = Math.floor(Date.now() / 1000);
+  const isExpired = currentTimestamp > permission.permission.end;
+
+  // Permission is active if it's not revoked and not expired
+  const isActive = !isRevoked && !isExpired;
+
+  // isApprovedOnchain indicates if the permission has been approved on the blockchain and is not revoked
+  const isApprovedOnchain = isValid;
 
   return {
     remainingSpend,
     nextPeriodStart: timestampInSecondsToDate(Number(nextPeriodStart)),
+    isRevoked,
+    isExpired,
     isActive,
+    isApprovedOnchain,
+    currentPeriod,
   };
 };
 
diff --git a/packages/account-sdk/src/interface/public-utilities/spend-permission/methods/prepareRevokeCallData.test.ts b/packages/account-sdk/src/interface/public-utilities/spend-permission/methods/prepareRevokeCallData.test.ts
index e224afeb2..16d6ca664 100644
--- a/packages/account-sdk/src/interface/public-utilities/spend-permission/methods/prepareRevokeCallData.test.ts
+++ b/packages/account-sdk/src/interface/public-utilities/spend-permission/methods/prepareRevokeCallData.test.ts
@@ -75,7 +75,7 @@ describe('prepareRevokeCallData', () => {
     expect(result).toEqual({
       to: spendPermissionManagerAddress,
       data: mockEncodedData,
-      value: '0x0',
+      value: 0n,
     });
   });
 
@@ -106,7 +106,7 @@ describe('prepareRevokeCallData', () => {
   it('should always set value to 0x0', async () => {
     const result = await prepareRevokeCallData(mockSpendPermission);
 
-    expect(result.value).toBe('0x0');
+    expect(result.value).toBe(0n);
   });
 
   it('should handle different spend permission structures', async () => {
@@ -143,7 +143,7 @@ describe('prepareRevokeCallData', () => {
     expect(result).toEqual({
       to: spendPermissionManagerAddress,
       data: differentEncodedData,
-      value: '0x0',
+      value: 0n,
     });
   });
 
diff --git a/packages/account-sdk/src/interface/public-utilities/spend-permission/methods/prepareRevokeCallData.ts b/packages/account-sdk/src/interface/public-utilities/spend-permission/methods/prepareRevokeCallData.ts
index 0aa756917..cd54fead8 100644
--- a/packages/account-sdk/src/interface/public-utilities/spend-permission/methods/prepareRevokeCallData.ts
+++ b/packages/account-sdk/src/interface/public-utilities/spend-permission/methods/prepareRevokeCallData.ts
@@ -10,7 +10,7 @@ import { withTelemetry } from '../withTelemetry.js';
 type RevokeSpendPermissionResponse = {
   to: Address;
   data: Hex;
-  value: '0x0'; // explicitly set to 0x0
+  value: bigint;
 };
 
 /**
@@ -40,7 +40,7 @@ type RevokeSpendPermissionResponse = {
  * const call = {
  *   to,
  *   data,
- *   value: '0x0'
+ *   value: 0n
  * };
  * ```
  */
@@ -57,7 +57,7 @@ const prepareRevokeCallDataFn = async (
   const response: RevokeSpendPermissionResponse = {
     to: spendPermissionManagerAddress,
     data,
-    value: '0x0', // explicitly set to 0x0
+    value: 0n,
   };
 
   return response;
diff --git a/packages/account-sdk/src/interface/public-utilities/spend-permission/methods/prepareSpendCallData.test.ts b/packages/account-sdk/src/interface/public-utilities/spend-permission/methods/prepareSpendCallData.test.ts
index 208e67e7d..26d13c24a 100644
--- a/packages/account-sdk/src/interface/public-utilities/spend-permission/methods/prepareSpendCallData.test.ts
+++ b/packages/account-sdk/src/interface/public-utilities/spend-permission/methods/prepareSpendCallData.test.ts
@@ -7,7 +7,7 @@ import { Address, Hex, encodeFunctionData } from 'viem';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { toSpendPermissionArgs } from '../utils.js';
-import { getPermissionStatus } from './getPermissionStatus.js';
+import { GetPermissionStatusResponseType, getPermissionStatus } from './getPermissionStatus.js';
 import { PrepareSpendCallDataResponseType, prepareSpendCallData } from './prepareSpendCallData.js';
 
 vi.mock('./getPermissionStatus.js');
@@ -24,6 +24,31 @@ const mockGetPermissionStatus = vi.mocked(getPermissionStatus);
 const mockToSpendPermissionArgs = vi.mocked(toSpendPermissionArgs);
 const mockEncodeFunctionData = vi.mocked(encodeFunctionData);
 
+// Factory function to create a complete mock status object
+// This makes tests more resilient to changes in GetPermissionStatusResponseType
+function createMockPermissionStatus(
+  overrides?: Partial<GetPermissionStatusResponseType>
+): GetPermissionStatusResponseType {
+  const defaultStatus: GetPermissionStatusResponseType = {
+    remainingSpend: BigInt('500000000000000000'), // 0.5 ETH remaining
+    nextPeriodStart: new Date('2024-01-01T00:00:00Z'),
+    isActive: true,
+    isRevoked: false,
+    isExpired: false,
+    isApprovedOnchain: true,
+    currentPeriod: {
+      start: 1234567890,
+      end: 1234654290,
+      spend: BigInt('500000000000000000'),
+    },
+  };
+
+  return {
+    ...defaultStatus,
+    ...overrides,
+  };
+}
+
 describe('prepareSpendCallData', () => {
   const mockSpendPermission: SpendPermission = {
     createdAt: 1234567890,
@@ -55,16 +80,11 @@ describe('prepareSpendCallData', () => {
     extraData: '0x' as Hex,
   };
 
-  const mockStatus = {
-    remainingSpend: BigInt('500000000000000000'), // 0.5 ETH remaining
-    nextPeriodStart: new Date('2024-01-01T00:00:00Z'),
-    isActive: true,
-  };
-
   beforeEach(() => {
     vi.clearAllMocks();
 
-    mockGetPermissionStatus.mockResolvedValue(mockStatus);
+    // Use the factory function to create default mock status
+    mockGetPermissionStatus.mockResolvedValue(createMockPermissionStatus());
 
     mockToSpendPermissionArgs.mockReturnValue(mockSpendPermissionArgs);
 
@@ -79,12 +99,10 @@ describe('prepareSpendCallData', () => {
     });
   });
 
-  it('should prepare call data for approve and spend operations when permission is not active', async () => {
-    const inactiveStatus = {
-      ...mockStatus,
-      isActive: false, // Permission is not active, so approve call should be included
-    };
-    mockGetPermissionStatus.mockResolvedValue(inactiveStatus);
+  it('should prepare call data for approve and spend operations when permission is not approved onchain', async () => {
+    mockGetPermissionStatus.mockResolvedValue(
+      createMockPermissionStatus({ isApprovedOnchain: false })
+    );
 
     const result = await prepareSpendCallData(mockSpendPermission, 'max-remaining-allowance');
 
@@ -92,17 +110,17 @@ describe('prepareSpendCallData', () => {
     expect(result[0]).toEqual({
       to: spendPermissionManagerAddress,
       data: '0xapprovedata123456',
-      value: '0x0',
+      value: 0n,
     });
     expect(result[1]).toEqual({
       to: spendPermissionManagerAddress,
       data: '0xspenddata789abc',
-      value: '0x0',
+      value: 0n,
     });
   });
 
   it('should prepare call data for spend operation only when permission is already active', async () => {
-    mockGetPermissionStatus.mockResolvedValue(mockStatus);
+    mockGetPermissionStatus.mockResolvedValue(createMockPermissionStatus());
 
     const result = await prepareSpendCallData(mockSpendPermission, 'max-remaining-allowance');
 
@@ -110,10 +128,10 @@ describe('prepareSpendCallData', () => {
     expect(result[0]).toEqual({
       to: spendPermissionManagerAddress,
       data: '0xspenddata789abc',
-      value: '0x0',
+      value: 0n,
     });
 
-    // Verify approve call is not made when permission is active
+    // Verify approve call is not made when permission is already approved onchain
     expect(mockEncodeFunctionData).not.toHaveBeenCalledWith({
       abi: spendPermissionManagerAbi,
       functionName: 'approveWithSignature',
@@ -123,10 +141,7 @@ describe('prepareSpendCallData', () => {
 
   it('should use remaining spend amount when max-remaining-allowance is specified', async () => {
     const remainingSpend = BigInt('750000000000000000');
-    mockGetPermissionStatus.mockResolvedValue({
-      ...mockStatus,
-      remainingSpend,
-    });
+    mockGetPermissionStatus.mockResolvedValue(createMockPermissionStatus({ remainingSpend }));
 
     await prepareSpendCallData(mockSpendPermission, 'max-remaining-allowance');
 
@@ -152,7 +167,19 @@ describe('prepareSpendCallData', () => {
   it('should call getPermissionStatus with the correct permission', async () => {
     await prepareSpendCallData(mockSpendPermission, 'max-remaining-allowance');
 
-    expect(mockGetPermissionStatus).toHaveBeenCalledWith(mockSpendPermission);
+    expect(mockGetPermissionStatus).toHaveBeenCalledWith(mockSpendPermission, undefined);
+  });
+
+  it('should pass rpcUrl option to getPermissionStatus when provided', async () => {
+    const customRpcUrl = 'https://my-custom-rpc.example.com';
+
+    await prepareSpendCallData(mockSpendPermission, 'max-remaining-allowance', undefined, {
+      rpcUrl: customRpcUrl,
+    });
+
+    expect(mockGetPermissionStatus).toHaveBeenCalledWith(mockSpendPermission, {
+      rpcUrl: customRpcUrl,
+    });
   });
 
   it('should call toSpendPermissionArgs with the correct permission', async () => {
@@ -161,12 +188,10 @@ describe('prepareSpendCallData', () => {
     expect(mockToSpendPermissionArgs).toHaveBeenCalledWith(mockSpendPermission);
   });
 
-  it('should encode approveWithSignature function data correctly when permission is not active', async () => {
-    const inactiveStatus = {
-      ...mockStatus,
-      isActive: false, // Permission is not active, so approve call should be included
-    };
-    mockGetPermissionStatus.mockResolvedValue(inactiveStatus);
+  it('should encode approveWithSignature function data correctly when permission is not approved onchain', async () => {
+    mockGetPermissionStatus.mockResolvedValue(
+      createMockPermissionStatus({ isApprovedOnchain: false })
+    );
 
     await prepareSpendCallData(mockSpendPermission, 'max-remaining-allowance');
 
@@ -189,12 +214,10 @@ describe('prepareSpendCallData', () => {
     });
   });
 
-  it('should return calls with correct structure when permission is not active', async () => {
-    const inactiveStatus = {
-      ...mockStatus,
-      isActive: false, // Permission is not active, so approve call should be included
-    };
-    mockGetPermissionStatus.mockResolvedValue(inactiveStatus);
+  it('should return calls with correct structure when permission is not approved onchain', async () => {
+    mockGetPermissionStatus.mockResolvedValue(
+      createMockPermissionStatus({ isApprovedOnchain: false })
+    );
 
     const result = await prepareSpendCallData(mockSpendPermission, 'max-remaining-allowance');
 
@@ -206,17 +229,17 @@ describe('prepareSpendCallData', () => {
     expect(typedResult[0]).toHaveProperty('to');
     expect(typedResult[0]).toHaveProperty('data');
     expect(typedResult[0]).toHaveProperty('value');
-    expect(typedResult[0].value).toBe('0x0');
+    expect(typedResult[0].value).toBe(0n);
 
     // Check spend call structure
     expect(typedResult[1]).toHaveProperty('to');
     expect(typedResult[1]).toHaveProperty('data');
     expect(typedResult[1]).toHaveProperty('value');
-    expect(typedResult[1].value).toBe('0x0');
+    expect(typedResult[1].value).toBe(0n);
   });
 
-  it('should return calls with correct structure when permission is active', async () => {
-    mockGetPermissionStatus.mockResolvedValue(mockStatus);
+  it('should return calls with correct structure when permission is already approved onchain', async () => {
+    mockGetPermissionStatus.mockResolvedValue(createMockPermissionStatus());
 
     const result = await prepareSpendCallData(mockSpendPermission, 'max-remaining-allowance');
 
@@ -228,7 +251,7 @@ describe('prepareSpendCallData', () => {
     expect(typedResult[0]).toHaveProperty('to');
     expect(typedResult[0]).toHaveProperty('data');
     expect(typedResult[0]).toHaveProperty('value');
-    expect(typedResult[0].value).toBe('0x0');
+    expect(typedResult[0].value).toBe(0n);
   });
 
   it('should handle zero amount', async () => {
@@ -243,10 +266,7 @@ describe('prepareSpendCallData', () => {
     const remainingSpend = BigInt('500000000000000000'); // 0.5 ETH remaining
     const excessiveAmount = BigInt('600000000000000000'); // 0.6 ETH (more than remaining)
 
-    mockGetPermissionStatus.mockResolvedValue({
-      ...mockStatus,
-      remainingSpend,
-    });
+    mockGetPermissionStatus.mockResolvedValue(createMockPermissionStatus({ remainingSpend }));
 
     await expect(prepareSpendCallData(mockSpendPermission, excessiveAmount)).rejects.toThrow(
       'Remaining spend amount is insufficient'
@@ -257,10 +277,9 @@ describe('prepareSpendCallData', () => {
     const largeAmount = BigInt('999999999999999999999999999');
 
     // Mock sufficient remaining balance for the large amount
-    mockGetPermissionStatus.mockResolvedValue({
-      ...mockStatus,
-      remainingSpend: largeAmount, // Set remaining spend to match the large amount
-    });
+    mockGetPermissionStatus.mockResolvedValue(
+      createMockPermissionStatus({ remainingSpend: largeAmount })
+    );
 
     await prepareSpendCallData(mockSpendPermission, largeAmount);
 
@@ -271,12 +290,25 @@ describe('prepareSpendCallData', () => {
     });
   });
 
-  it('should use the same spendPermissionManagerAddress for both calls when permission is not active', async () => {
-    mockGetPermissionStatus.mockResolvedValue({
-      remainingSpend: BigInt('500000000000000000'),
-      nextPeriodStart: new Date('2024-01-01T00:00:00Z'),
-      isActive: false,
-    });
+  it('should throw error when permission is revoked', async () => {
+    mockGetPermissionStatus.mockResolvedValue(
+      createMockPermissionStatus({
+        isRevoked: true,
+      })
+    );
+
+    await expect(
+      prepareSpendCallData(mockSpendPermission, 'max-remaining-allowance')
+    ).rejects.toThrow('Spend permission has been revoked');
+  });
+
+  it('should use the same spendPermissionManagerAddress for both calls when permission is not approved onchain', async () => {
+    mockGetPermissionStatus.mockResolvedValue(
+      createMockPermissionStatus({
+        isApprovedOnchain: false,
+        isRevoked: false,
+      })
+    );
 
     const result = await prepareSpendCallData(mockSpendPermission, 'max-remaining-allowance');
 
@@ -284,13 +316,8 @@ describe('prepareSpendCallData', () => {
     expect(result[1].to).toBe(spendPermissionManagerAddress);
   });
 
-  it('should use the same spendPermissionManagerAddress for spend call when permission is active', async () => {
-    const status = {
-      remainingSpend: BigInt('500000000000000000'),
-      nextPeriodStart: new Date('2024-01-01T00:00:00Z'),
-      isActive: true,
-    };
-    mockGetPermissionStatus.mockResolvedValue(status);
+  it('should use the same spendPermissionManagerAddress for spend call when permission is already approved onchain', async () => {
+    mockGetPermissionStatus.mockResolvedValue(createMockPermissionStatus());
 
     const result = await prepareSpendCallData(mockSpendPermission, 'max-remaining-allowance');
 
@@ -301,7 +328,7 @@ describe('prepareSpendCallData', () => {
     const recipientAddress = '0x742d35Cc6634C0532925a3b844Bc9e7595f0bEb8' as Address;
     const spendAmount = BigInt('100000000'); // 100 USDC
 
-    mockGetPermissionStatus.mockResolvedValue(mockStatus);
+    mockGetPermissionStatus.mockResolvedValue(createMockPermissionStatus());
 
     // Mock the transfer call encoding
     mockEncodeFunctionData.mockImplementation(({ functionName }) => {
@@ -323,14 +350,14 @@ describe('prepareSpendCallData', () => {
     expect(result[0]).toEqual({
       to: spendPermissionManagerAddress,
       data: '0xspenddata789abc',
-      value: '0x0',
+      value: 0n,
     });
 
     // Second call should be the ERC20 transfer
     expect(result[1]).toEqual({
       to: mockSpendPermission.permission.token,
       data: '0xtransferdata123',
-      value: '0x0',
+      value: 0n,
     });
 
     // Verify encodeFunctionData was called with correct args for transfer
@@ -345,6 +372,7 @@ describe('prepareSpendCallData', () => {
   it('should include transfer with max amount when using max-remaining-allowance with recipient', async () => {
     const recipientAddress = '0x742d35Cc6634C0532925a3b844Bc9e7595f0bEb8' as Address;
 
+    const mockStatus = createMockPermissionStatus();
     mockGetPermissionStatus.mockResolvedValue(mockStatus);
 
     // Mock the transfer call encoding
@@ -379,7 +407,7 @@ describe('prepareSpendCallData', () => {
   it('should not include transfer call when recipient is not provided', async () => {
     const spendAmount = BigInt('100000000'); // 100 USDC
 
-    mockGetPermissionStatus.mockResolvedValue(mockStatus);
+    mockGetPermissionStatus.mockResolvedValue(createMockPermissionStatus());
 
     const result = await prepareSpendCallData(mockSpendPermission, spendAmount);
 
@@ -388,33 +416,30 @@ describe('prepareSpendCallData', () => {
     expect(result[0].to).toBe(spendPermissionManagerAddress);
   });
 
-  it('should set value to 0x0 for both calls when permission is not active', async () => {
-    const status = {
-      remainingSpend: BigInt('500000000000000000'),
-      nextPeriodStart: new Date('2024-01-01T00:00:00Z'),
-      isActive: false,
-    };
-    mockGetPermissionStatus.mockResolvedValue(status);
+  it('should set value to 0x0 for both calls when permission is not approved onchain', async () => {
+    mockGetPermissionStatus.mockResolvedValue(
+      createMockPermissionStatus({
+        isApprovedOnchain: false,
+        isExpired: true,
+      })
+    );
 
     const result = await prepareSpendCallData(mockSpendPermission, 'max-remaining-allowance');
 
-    expect(result[0].value).toBe('0x0');
-    expect(result[1].value).toBe('0x0');
+    expect(result[0].value).toBe(0n);
+    expect(result[1].value).toBe(0n);
   });
 
-  it('should set value to 0x0 for spend call when permission is active', async () => {
+  it('should set value to 0x0 for spend call when permission is already approved onchain', async () => {
     const result = await prepareSpendCallData(mockSpendPermission, 'max-remaining-allowance');
 
-    expect(result[0].value).toBe('0x0');
+    expect(result[0].value).toBe(0n);
   });
 
   it('should handle remaining spend of zero', async () => {
-    const status = {
-      remainingSpend: BigInt('0'),
-      nextPeriodStart: new Date('2024-01-01T00:00:00Z'),
-      isActive: true,
-    };
-    mockGetPermissionStatus.mockResolvedValue(status);
+    mockGetPermissionStatus.mockResolvedValue(
+      createMockPermissionStatus({ remainingSpend: BigInt('0') })
+    );
 
     await expect(
       prepareSpendCallData(mockSpendPermission, 'max-remaining-allowance')
@@ -422,16 +447,16 @@ describe('prepareSpendCallData', () => {
   });
 
   it('should work correctly when permission status indicates not approved', async () => {
-    const status = {
-      remainingSpend: BigInt('500000000000000000'),
-      nextPeriodStart: new Date('2024-01-01T00:00:00Z'),
-      isActive: false,
-    };
-    mockGetPermissionStatus.mockResolvedValue(status);
+    mockGetPermissionStatus.mockResolvedValue(
+      createMockPermissionStatus({
+        isApprovedOnchain: false,
+        isExpired: true,
+      })
+    );
 
     const result = await prepareSpendCallData(mockSpendPermission, 'max-remaining-allowance');
 
-    // Should prepare both calls when permission is not active
+    // Should prepare both calls when permission is not approved onchain
     expect(result).toHaveLength(2);
     expect(mockEncodeFunctionData).toHaveBeenCalledWith({
       abi: spendPermissionManagerAbi,
diff --git a/packages/account-sdk/src/interface/public-utilities/spend-permission/methods/prepareSpendCallData.ts b/packages/account-sdk/src/interface/public-utilities/spend-permission/methods/prepareSpendCallData.ts
index 9ccd0a296..17e5160ea 100644
--- a/packages/account-sdk/src/interface/public-utilities/spend-permission/methods/prepareSpendCallData.ts
+++ b/packages/account-sdk/src/interface/public-utilities/spend-permission/methods/prepareSpendCallData.ts
@@ -12,7 +12,7 @@ import { getPermissionStatus } from './getPermissionStatus.js';
 type Call = {
   to: Address;
   data: Hex;
-  value: '0x0'; // explicitly set to 0x0
+  value: bigint;
 };
 
 export type PrepareSpendCallDataResponseType = Call[];
@@ -22,7 +22,7 @@ export type PrepareSpendCallDataResponseType = Call[];
  *
  * This helper method constructs the call data for `approveWithSignature`
  * and `spend` functions. The approve call is only included when the permission
- * is not yet active. If the permission is already approved, only the spend call is returned.
+ * is not yet approved onchain. If the permission is already approved, only the spend call is returned.
  *
  * When 'max-remaining-allowance' is provided as the amount, the function automatically uses all remaining
  * spend permission allowance.
@@ -37,9 +37,15 @@ export type PrepareSpendCallDataResponseType = Call[];
  * @param permission - The spend permission object containing the permission details and signature.
  * @param amount - The amount to spend in wei. If 'max-remaining-allowance' is provided, the full remaining allowance will be spent.
  * @param recipient - Optional recipient address to receive the spent tokens via ERC20 transfer.
+ * @param options - Optional configuration options.
+ * @param options.rpcUrl - Optional custom RPC URL to use for blockchain queries. Useful for avoiding rate limits on public endpoints.
  *
  * @returns A promise that resolves to an array containing all the necessary calls.
  *
+ * @throws {Error} Throws an error if the spend permission has been revoked.
+ * @throws {Error} Throws an error if the spend amount is 0.
+ * @throws {Error} Throws an error if the spend amount exceeds the remaining allowance.
+ *
  * @example
  * ```typescript
  * import { prepareSpendCallData } from '@base-org/account/spend-permission';
@@ -63,6 +69,14 @@ export type PrepareSpendCallDataResponseType = Call[];
  *   '0x742d35Cc6634C0532925a3b844Bc9e7595f0bEb8' // recipient address
  * );
  *
+ * // With custom RPC URL to avoid rate limits
+ * const callsWithCustomRpc = await prepareSpendCallData(
+ *   permission,
+ *   50n * 10n ** 6n,
+ *   undefined,
+ *   { rpcUrl: 'https://my-custom-rpc.example.com' }
+ * );
+ *
  * // Send the calls using your app's spender account
  * // this is an example of how to send the calls using the wallet_sendCalls method
  * await provider.request({
@@ -107,9 +121,18 @@ const ERC20_TRANSFER_ABI = [
 const prepareSpendCallDataFn = async (
   permission: SpendPermission,
   amount: bigint | 'max-remaining-allowance',
-  recipient?: Address
+  recipient?: Address,
+  options?: { rpcUrl?: string }
 ): Promise<PrepareSpendCallDataResponseType> => {
-  const { remainingSpend, isActive } = await getPermissionStatus(permission);
+  const { remainingSpend, isApprovedOnchain, isRevoked } = await getPermissionStatus(
+    permission,
+    options
+  );
+
+  if (isRevoked) {
+    throw new Error('Spend permission has been revoked');
+  }
+
   const spendAmount = amount === 'max-remaining-allowance' ? remainingSpend : amount;
 
   if (spendAmount === BigInt(0)) {
@@ -124,7 +147,7 @@ const prepareSpendCallDataFn = async (
 
   const spendPermissionArgs = toSpendPermissionArgs(permission);
 
-  if (!isActive) {
+  if (!isApprovedOnchain) {
     const approveData = encodeFunctionData({
       abi: spendPermissionManagerAbi,
       functionName: 'approveWithSignature',
@@ -133,7 +156,7 @@ const prepareSpendCallDataFn = async (
     approveCall = {
       to: spendPermissionManagerAddress,
       data: approveData,
-      value: '0x0', // explicitly set to 0x0
+      value: 0n,
     };
   }
 
@@ -145,7 +168,7 @@ const prepareSpendCallDataFn = async (
   const spendCall: Call = {
     to: spendPermissionManagerAddress,
     data: spendData,
-    value: '0x0', // explicitly set to 0x0
+    value: 0n,
   };
 
   const calls: Call[] = [approveCall, spendCall].filter((item) => item !== null);
@@ -163,7 +186,7 @@ const prepareSpendCallDataFn = async (
     calls.push({
       to: permission.permission.token as Address,
       data: transferCallData,
-      value: '0x0',
+      value: 0n,
     });
   }
 
diff --git a/packages/account-sdk/src/interface/public-utilities/spend-permission/methods/requestSpendPermission.test.ts b/packages/account-sdk/src/interface/public-utilities/spend-permission/methods/requestSpendPermission.test.ts
index 2cd879a26..3f63970d9 100644
--- a/packages/account-sdk/src/interface/public-utilities/spend-permission/methods/requestSpendPermission.test.ts
+++ b/packages/account-sdk/src/interface/public-utilities/spend-permission/methods/requestSpendPermission.test.ts
@@ -7,7 +7,11 @@ import {
   dateToTimestampInSeconds,
 } from '../utils.js';
 import { getHash } from './getHash.js';
-import { RequestSpendPermissionType, requestSpendPermission } from './requestSpendPermission.js';
+import {
+  RequestSpendPermissionType,
+  WalletSignCapabilities,
+  requestSpendPermission,
+} from './requestSpendPermission.js';
 
 vi.mock('../utils.js', () => ({
   createSpendPermissionTypedData: vi.fn(),
@@ -269,6 +273,125 @@ describe('requestSpendPermission', () => {
     });
   });
 
+  describe('capabilities support', () => {
+    it('should use wallet_sign when capabilities are provided', async () => {
+      const capabilities: WalletSignCapabilities = {
+        spendPermission: {
+          requireBalance: true,
+        },
+      };
+
+      const mockWalletSignResponse = {
+        signature: mockSignature,
+        signedData: mockTypedData,
+      };
+
+      (createSpendPermissionTypedData as Mock).mockReturnValue(mockTypedData);
+      (mockProviderRequest as Mock).mockResolvedValue(mockWalletSignResponse);
+      (getHash as Mock).mockResolvedValue(mockPermissionHash);
+
+      const requestWithCapabilities = {
+        ...mockRequestData,
+        capabilities,
+      };
+
+      const result = await requestSpendPermission(requestWithCapabilities);
+
+      expect(createSpendPermissionTypedData).toHaveBeenCalledWith(requestWithCapabilities);
+      expect(mockProviderRequest).toHaveBeenCalledWith({
+        method: 'wallet_sign',
+        params: [
+          {
+            version: '1.0',
+            request: {
+              type: '0x01',
+              data: mockTypedData,
+            },
+            mutableData: {
+              fields: ['message.account'],
+            },
+            capabilities,
+          },
+        ],
+      });
+      expect(getHash).toHaveBeenCalledWith({
+        permission: mockTypedData.message,
+        chainId: mockRequestData.chainId,
+      });
+      expect(result).toEqual<SpendPermission>({
+        createdAt: mockTimestamp,
+        permissionHash: mockPermissionHash,
+        signature: mockSignature,
+        chainId: mockRequestData.chainId,
+        permission: mockTypedData.message,
+      });
+    });
+
+    it('should handle invalid wallet_sign response', async () => {
+      const capabilities: WalletSignCapabilities = {
+        spendPermission: {
+          requireBalance: true,
+        },
+      };
+
+      (createSpendPermissionTypedData as Mock).mockReturnValue(mockTypedData);
+      (mockProviderRequest as Mock).mockResolvedValue('invalid response');
+
+      const requestWithCapabilities = {
+        ...mockRequestData,
+        capabilities,
+      };
+
+      await expect(requestSpendPermission(requestWithCapabilities)).rejects.toThrow(
+        'Invalid response from wallet_sign: expected object but got string'
+      );
+    });
+
+    it('should handle missing signature in wallet_sign response', async () => {
+      const capabilities: WalletSignCapabilities = {
+        spendPermission: {
+          requireBalance: true,
+        },
+      };
+
+      const invalidResponse = {
+        signedData: mockTypedData,
+        // missing signature
+      };
+
+      (createSpendPermissionTypedData as Mock).mockReturnValue(mockTypedData);
+      (mockProviderRequest as Mock).mockResolvedValue(invalidResponse);
+
+      const requestWithCapabilities = {
+        ...mockRequestData,
+        capabilities,
+      };
+
+      await expect(requestSpendPermission(requestWithCapabilities)).rejects.toThrow(
+        'Invalid response from wallet_sign: missing signature'
+      );
+    });
+
+    it('should use eth_signTypedData_v4 when capabilities are not provided', async () => {
+      (createSpendPermissionTypedData as Mock).mockReturnValue(mockTypedData);
+      (mockProviderRequest as Mock).mockResolvedValue(mockSignature);
+      (getHash as Mock).mockResolvedValue(mockPermissionHash);
+
+      const result = await requestSpendPermission(mockRequestData);
+
+      expect(mockProviderRequest).toHaveBeenCalledWith({
+        method: 'eth_signTypedData_v4',
+        params: [mockRequestData.account, mockTypedData],
+      });
+      expect(mockProviderRequest).not.toHaveBeenCalledWith(
+        expect.objectContaining({
+          method: 'wallet_sign',
+        })
+      );
+      expect(result.signature).toBe(mockSignature);
+    });
+  });
+
   describe('return value structure', () => {
     it('should return correct SpendPermission structure', async () => {
       (createSpendPermissionTypedData as Mock).mockReturnValue(mockTypedData);
diff --git a/packages/account-sdk/src/interface/public-utilities/spend-permission/methods/requestSpendPermission.ts b/packages/account-sdk/src/interface/public-utilities/spend-permission/methods/requestSpendPermission.ts
index 3879e08c7..850262b36 100644
--- a/packages/account-sdk/src/interface/public-utilities/spend-permission/methods/requestSpendPermission.ts
+++ b/packages/account-sdk/src/interface/public-utilities/spend-permission/methods/requestSpendPermission.ts
@@ -5,6 +5,12 @@ import { createSpendPermissionTypedData, dateToTimestampInSeconds } from '../uti
 import { withTelemetry } from '../withTelemetry.js';
 import { getHash } from './getHash.js';
 
+export type WalletSignCapabilities = {
+  spendPermission?: {
+    requireBalance?: boolean;
+  };
+};
+
 export type RequestSpendPermissionType = {
   account: string;
   spender: string;
@@ -16,6 +22,7 @@ export type RequestSpendPermissionType = {
   end?: Date; // default to never
   salt?: string; // default to a random value by crypto.getRandomValues
   extraData?: string; // default to '0x'
+  capabilities?: WalletSignCapabilities; // optional capabilities for wallet_sign
 };
 
 /**
@@ -64,17 +71,71 @@ export type RequestSpendPermissionType = {
 const requestSpendPermissionFn = async (
   request: RequestSpendPermissionType & { provider: ProviderInterface }
 ): Promise<SpendPermission> => {
-  const { provider, account, chainId } = request;
+  const { provider, account, chainId, capabilities } = request;
 
   const typedData = createSpendPermissionTypedData(request);
 
-  const [signature, permissionHash] = await Promise.all([
-    provider.request({
-      method: 'eth_signTypedData_v4',
-      params: [account, typedData],
-    }) as Promise<string>,
-    getHash({ permission: typedData.message, chainId }),
-  ]);
+  // Check if we should use wallet_sign (when capabilities are provided) or eth_signTypedData_v4
+  let signature: string;
+  let permissionHash: string;
+
+  if (capabilities) {
+    // Use wallet_sign with capabilities
+    const signParams = {
+      version: '1.0',
+      request: {
+        type: '0x01' as const, // EIP-712 Typed Data
+        data: typedData,
+      },
+      mutableData: {
+        fields: ['message.account'],
+      },
+      capabilities,
+    };
+
+    const result = await provider.request({
+      method: 'wallet_sign',
+      params: [signParams],
+    });
+
+    // Type guard and validation for the result
+    if (!result || typeof result !== 'object') {
+      throw new Error(
+        `Invalid response from wallet_sign: expected object but got ${typeof result}`
+      );
+    }
+
+    // Check for expected properties
+    const hasSignature = 'signature' in result;
+    const hasSignedData = 'signedData' in result;
+
+    if (!hasSignature || !hasSignedData) {
+      throw new Error(
+        `Invalid response from wallet_sign: missing ${!hasSignature ? 'signature' : ''} ${!hasSignedData ? 'signedData' : ''}`
+      );
+    }
+
+    // Cast to expected response type
+    const signResult = result as {
+      signature: `0x${string}`;
+      signedData: typeof typedData;
+    };
+
+    signature = signResult.signature;
+    permissionHash = await getHash({
+      permission: signResult.signedData.message,
+      chainId,
+    });
+  } else {
+    // Use the original eth_signTypedData_v4 method
+    [signature, permissionHash] = await Promise.all([
+      provider.request({
+        method: 'eth_signTypedData_v4',
+        params: [account, typedData],
+      }) as Promise<string>,
+      getHash({ permission: typedData.message, chainId }),
+    ]);
+  }
 
   const permission: SpendPermission = {
     createdAt: dateToTimestampInSeconds(new Date()),
diff --git a/packages/account-sdk/src/interface/public-utilities/spend-permission/utils.ts b/packages/account-sdk/src/interface/public-utilities/spend-permission/utils.ts
index daabd7fe0..eaf7fe317 100644
--- a/packages/account-sdk/src/interface/public-utilities/spend-permission/utils.ts
+++ b/packages/account-sdk/src/interface/public-utilities/spend-permission/utils.ts
@@ -97,6 +97,62 @@ export function createSpendPermissionTypedData(
   };
 }
 
+/**
+ * TEST ONLY: Creates a spend permission with period in seconds instead of days.
+ * ⚠️ WARNING: This function should ONLY be used for testing purposes on testnet.
+ * Using this in production scenarios is not supported and may lead to unexpected behavior.
+ *
+ * @testOnly
+ * @param request - The request parameters with periodInSeconds instead of periodInDays
+ * @returns SpendPermissionTypedData
+ */
+export function createSpendPermissionTypedDataWithSeconds(
+  request: Omit<RequestSpendPermissionType, 'periodInDays'> & { periodInSeconds: number }
+): SpendPermissionTypedData {
+  const {
+    account,
+    spender,
+    token,
+    chainId,
+    allowance,
+    periodInSeconds,
+    start,
+    end,
+    salt,
+    extraData,
+  } = request;
+
+  // Runtime check to prevent misuse
+  if (process.env.NODE_ENV === 'production') {
+    console.warn(
+      '⚠️ createSpendPermissionTypedDataWithSeconds is being used. ' +
+        'This function is intended for testing purposes only.'
+    );
+  }
+
+  return {
+    domain: {
+      name: 'Spend Permission Manager',
+      version: '1',
+      chainId: chainId,
+      verifyingContract: spendPermissionManagerAddress,
+    },
+    types: SPEND_PERMISSION_TYPED_DATA_TYPES,
+    primaryType: 'SpendPermission',
+    message: {
+      account: getAddress(account),
+      spender: getAddress(spender),
+      token: getAddress(token),
+      allowance: allowance.toString(),
+      period: periodInSeconds, // Direct seconds value for testing
+      start: dateToTimestampInSeconds(start ?? new Date()),
+      end: end ? dateToTimestampInSeconds(end) : ETERNITY_TIMESTAMP,
+      salt: salt ?? getRandomHexString(32),
+      extraData: extraData ? (extraData as Hex) : '0x',
+    },
+  };
+}
+
 function getRandomHexString(byteLength: number): `0x${string}` {
   const bytes = new Uint8Array(byteLength);
   crypto.getRandomValues(bytes);
diff --git a/packages/account-sdk/src/sign/base-account/Signer.test.ts b/packages/account-sdk/src/sign/base-account/Signer.test.ts
index 56be797a2..b8e206279 100644
--- a/packages/account-sdk/src/sign/base-account/Signer.test.ts
+++ b/packages/account-sdk/src/sign/base-account/Signer.test.ts
@@ -531,7 +531,7 @@ describe('Signer', () => {
       vi.restoreAllMocks();
     });
 
-    it('should return accounts in correct order based on enableAutoSubAccounts', async () => {
+    it('should return accounts in correct order based on defaultAccount', async () => {
       // Set up the signer with a global account
       signer['accounts'] = [globalAccountAddress];
       signer['chain'] = { id: 1, rpcUrl: 'https://eth-rpc.example.com/1' };
@@ -543,23 +543,23 @@ describe('Signer', () => {
         factoryData: '0x',
       });
 
-      // Test with enableAutoSubAccounts = false
+      // Test with defaultAccount = 'universal'
       const configSpy = vi.spyOn(store.subAccountsConfig, 'get').mockReturnValue({
-        enableAutoSubAccounts: false,
+        defaultAccount: 'universal',
       });
 
       let accounts = await signer.request({ method: 'eth_accounts' });
       expect(accounts).toEqual([globalAccountAddress, subAccountAddress]);
 
-      // Test with enableAutoSubAccounts = true
+      // Test with defaultAccount = 'sub'
       configSpy.mockReturnValue({
-        enableAutoSubAccounts: true,
+        defaultAccount: 'sub',
       });
 
       accounts = await signer.request({ method: 'eth_accounts' });
       expect(accounts).toEqual([subAccountAddress, globalAccountAddress]);
 
-      // Test when enableAutoSubAccounts is undefined (should default to false behavior)
+      // Test when defaultAccount is undefined (should default to universal behavior)
       configSpy.mockReturnValue(undefined);
 
       accounts = await signer.request({ method: 'eth_accounts' });
@@ -972,12 +972,12 @@ describe('Signer', () => {
       });
     });
 
-    it('should always return sub account first when enableAutoSubAccounts is true', async () => {
+    it('should always return sub account first when defaultAccount is sub', async () => {
       expect(signer['accounts']).toEqual([]);
 
-      // Enable auto sub accounts
+      // Enable sub as default account
       vi.spyOn(store.subAccountsConfig, 'get').mockReturnValue({
-        enableAutoSubAccounts: true,
+        defaultAccount: 'sub',
       });
 
       const mockRequest: RequestArguments = {
@@ -1021,12 +1021,14 @@ describe('Signer', () => {
         factoryData: '0x',
       });
 
-      // When enableAutoSubAccounts is true, sub account should be first
+      // When defaultAccount is sub, sub account should be first
       const accounts = await signer.request({ method: 'eth_accounts' });
       expect(accounts).toEqual([subAccountAddress, globalAccountAddress]);
 
       // Test with eth_requestAccounts as well
-      const requestedAccounts = await signer.request({ method: 'eth_requestAccounts' });
+      const requestedAccounts = await signer.request({
+        method: 'eth_requestAccounts',
+      });
       expect(requestedAccounts).toEqual([subAccountAddress, globalAccountAddress]);
     });
   });
@@ -1192,12 +1194,12 @@ describe('Signer', () => {
       expect(accounts).toEqual([globalAccountAddress, subAccountAddress]);
     });
 
-    it('should always return sub account first when enableAutoSubAccounts is true', async () => {
+    it('should always return sub account first when defaultAccount is sub', async () => {
       await signer.cleanup();
 
-      // Enable auto sub accounts
+      // Enable sub as default account
       vi.spyOn(store.subAccountsConfig, 'get').mockReturnValue({
-        enableAutoSubAccounts: true,
+        defaultAccount: 'sub',
       });
 
       const mockRequest: RequestArguments = {
@@ -1257,14 +1259,162 @@ describe('Signer', () => {
         ],
       });
 
-      // wallet_addSubAccount now respects enableAutoSubAccounts, so sub account should be first
+      // wallet_addSubAccount now respects defaultAccount, so sub account should be first
       const accounts = await signer.request({ method: 'eth_accounts' });
       expect(accounts).toEqual([subAccountAddress, globalAccountAddress]);
 
-      // However, eth_requestAccounts will reorder based on enableAutoSubAccounts
-      const requestedAccounts = await signer.request({ method: 'eth_requestAccounts' });
+      // eth_requestAccounts will also order based on defaultAccount
+      const requestedAccounts = await signer.request({
+        method: 'eth_requestAccounts',
+      });
       expect(requestedAccounts).toEqual([subAccountAddress, globalAccountAddress]);
     });
+
+    it('should return cached sub account when requested address matches', async () => {
+      await signer.cleanup();
+
+      // Setup initial connection
+      (decryptContent as Mock).mockResolvedValueOnce({
+        result: { value: null },
+      });
+      await signer.handshake({ method: 'handshake' });
+
+      (decryptContent as Mock).mockResolvedValueOnce({
+        result: {
+          value: {
+            accounts: [{ address: globalAccountAddress, capabilities: {} }],
+          },
+        },
+      });
+      await signer.request({ method: 'wallet_connect', params: [] });
+
+      // Cache a sub account
+      store.subAccounts.set({
+        address: subAccountAddress,
+        factory: globalAccountAddress,
+        factoryData: '0x',
+      });
+
+      // Request same address (isAddressEqual handles case-insensitive comparison)
+      const result = await signer.request({
+        method: 'wallet_addSubAccount',
+        params: [
+          {
+            version: '1',
+            account: {
+              type: 'deployed',
+              address: subAccountAddress,
+              chainId: '0x14a34',
+            },
+          },
+        ],
+      });
+
+      // Should return cached without calling backend
+      expect(result.address).toBe(subAccountAddress);
+      expect(decryptContent).toHaveBeenCalledTimes(2); // Only handshake + connect, not addSubAccount
+    });
+
+    it('should fetch from backend when requested address differs from cached', async () => {
+      await signer.cleanup();
+
+      const secondSubAccountAddress = '0x9999999999999999999999999999999999999999';
+
+      // Setup initial connection
+      (decryptContent as Mock).mockResolvedValueOnce({
+        result: { value: null },
+      });
+      await signer.handshake({ method: 'handshake' });
+
+      (decryptContent as Mock).mockResolvedValueOnce({
+        result: {
+          value: {
+            accounts: [{ address: globalAccountAddress, capabilities: {} }],
+          },
+        },
+      });
+      await signer.request({ method: 'wallet_connect', params: [] });
+
+      // Cache a sub account
+      store.subAccounts.set({
+        address: subAccountAddress,
+        factory: globalAccountAddress,
+        factoryData: '0x',
+      });
+
+      // Request different address
+      (decryptContent as Mock).mockResolvedValueOnce({
+        result: {
+          value: {
+            address: secondSubAccountAddress,
+            factory: globalAccountAddress,
+            factoryData: '0x123',
+          },
+        },
+      });
+
+      const result = await signer.request({
+        method: 'wallet_addSubAccount',
+        params: [
+          {
+            version: '1',
+            account: {
+              type: 'deployed',
+              address: secondSubAccountAddress,
+              chainId: '0x14a34',
+            },
+          },
+        ],
+      });
+
+      // Should call backend and return new sub account
+      expect(result.address).toBe(secondSubAccountAddress);
+      expect(decryptContent).toHaveBeenCalledTimes(3); // handshake + connect + addSubAccount
+    });
+
+    it('should return cached sub account for create type (no address specified)', async () => {
+      await signer.cleanup();
+
+      // Setup initial connection
+      (decryptContent as Mock).mockResolvedValueOnce({
+        result: { value: null },
+      });
+      await signer.handshake({ method: 'handshake' });
+
+      (decryptContent as Mock).mockResolvedValueOnce({
+        result: {
+          value: {
+            accounts: [{ address: globalAccountAddress, capabilities: {} }],
+          },
+        },
+      });
+      await signer.request({ method: 'wallet_connect', params: [] });
+
+      // Cache a sub account
+      store.subAccounts.set({
+        address: subAccountAddress,
+        factory: globalAccountAddress,
+        factoryData: '0x',
+      });
+
+      // Request create type (no specific address)
+      const result = await signer.request({
+        method: 'wallet_addSubAccount',
+        params: [
+          {
+            version: '1',
+            account: {
+              type: 'create',
+              keys: [{ publicKey: '0x123', type: 'p256' }],
+            },
+          },
+        ],
+      });
+
+      // Should return cached without calling backend
+      expect(result.address).toBe(subAccountAddress);
+      expect(decryptContent).toHaveBeenCalledTimes(2); // Only handshake + connect, not addSubAccount
+    });
   });
 
   describe('auto sub account', () => {
@@ -1279,7 +1429,8 @@ describe('Signer', () => {
       });
 
       vi.spyOn(store.subAccountsConfig, 'get').mockReturnValue({
-        enableAutoSubAccounts: true,
+        defaultAccount: 'sub',
+        funding: 'spend-permissions',
       });
 
       (decryptContent as Mock).mockResolvedValueOnce({
@@ -1855,7 +2006,10 @@ describe('Signer', () => {
       });
 
       // Set the chain to match the mocked client
-      signer['chain'] = { id: 84532, rpcUrl: 'https://eth-rpc.example.com/84532' };
+      signer['chain'] = {
+        id: 84532,
+        rpcUrl: 'https://eth-rpc.example.com/84532',
+      };
       signer['accounts'] = [globalAccountAddress];
 
       // Setup basic handshake
@@ -1904,7 +2058,8 @@ describe('Signer', () => {
       });
 
       vi.spyOn(store.subAccountsConfig, 'get').mockReturnValue({
-        enableAutoSubAccounts: true,
+        defaultAccount: 'sub',
+        funding: 'spend-permissions',
         toOwnerAccount: async () => ({
           account: {
             type: 'local' as const,
@@ -2121,7 +2276,7 @@ describe('Signer', () => {
     });
   });
 
-  describe('unstable_enableAutoSpendPermissions', () => {
+  describe('funding mode', () => {
     beforeEach(async () => {
       await signer.cleanup();
 
@@ -2142,7 +2297,10 @@ describe('Signer', () => {
       });
 
       // Set the chain to match the mocked client
-      signer['chain'] = { id: 84532, rpcUrl: 'https://eth-rpc.example.com/84532' };
+      signer['chain'] = {
+        id: 84532,
+        rpcUrl: 'https://eth-rpc.example.com/84532',
+      };
       signer['accounts'] = [globalAccountAddress];
 
       // Mock decryptContent for wallet_connect to set up accounts
@@ -2195,11 +2353,11 @@ describe('Signer', () => {
       vi.mocked(routeThroughGlobalAccount).mockReset();
     });
 
-    it('should skip spend permission check when unstable_enableAutoSpendPermissions is false', async () => {
-      // Mock the config with unstable_enableAutoSpendPermissions disabled
+    it('should skip spend permission check when funding is manual', async () => {
+      // Mock the config with funding set to manual
       vi.spyOn(store.subAccountsConfig, 'get').mockReturnValue({
-        enableAutoSubAccounts: true,
-        unstable_enableAutoSpendPermissions: false,
+        defaultAccount: 'sub',
+        funding: 'manual',
         toOwnerAccount: async () => ({
           account: {
             type: 'local' as const,
@@ -2246,11 +2404,11 @@ describe('Signer', () => {
       expect(result).toBe('0xSubAccountResult');
     });
 
-    it('should skip insufficient balance error handling when unstable_enableAutoSpendPermissions is false', async () => {
-      // Mock the config with unstable_enableAutoSpendPermissions disabled
+    it('should skip insufficient balance error handling when funding is manual', async () => {
+      // Mock the config with funding set to manual
       vi.spyOn(store.subAccountsConfig, 'get').mockReturnValue({
-        enableAutoSubAccounts: true,
-        unstable_enableAutoSpendPermissions: false,
+        defaultAccount: 'sub',
+        funding: 'manual',
         toOwnerAccount: async () => ({
           account: {
             type: 'local' as const,
@@ -2325,11 +2483,11 @@ describe('Signer', () => {
       expect(handleInsufficientBalanceError).not.toHaveBeenCalled();
     });
 
-    it('should still route through global account and handle insufficient balance errors when unstable_enableAutoSpendPermissions is true', async () => {
-      // Mock the config with unstable_enableAutoSpendPermissions enabled (default)
+    it('should still route through global account and handle insufficient balance errors when funding is spend-permissions', async () => {
+      // Mock the config with funding set to spend-permissions
       vi.spyOn(store.subAccountsConfig, 'get').mockReturnValue({
-        enableAutoSubAccounts: true,
-        unstable_enableAutoSpendPermissions: true,
+        defaultAccount: 'sub',
+        funding: 'spend-permissions',
         toOwnerAccount: async () => ({
           account: {
             type: 'local' as const,
@@ -2371,10 +2529,10 @@ describe('Signer', () => {
       expect(result).toBe(mockRouteResult);
     });
 
-    it('should handle insufficient balance errors when unstable_enableAutoSpendPermissions is undefined (default behavior)', async () => {
-      // Mock the config without unstable_enableAutoSpendPermissions (undefined)
+    it('should handle insufficient balance errors when funding is undefined (default to spend-permissions)', async () => {
+      // Mock the config without explicit funding mode (defaults to spend-permissions)
       vi.spyOn(store.subAccountsConfig, 'get').mockReturnValue({
-        enableAutoSubAccounts: true,
+        defaultAccount: 'sub',
         toOwnerAccount: async () => ({
           account: {
             type: 'local' as const,
diff --git a/packages/account-sdk/src/sign/base-account/Signer.ts b/packages/account-sdk/src/sign/base-account/Signer.ts
index 9d3599104..d5a5ad1d6 100644
--- a/packages/account-sdk/src/sign/base-account/Signer.ts
+++ b/packages/account-sdk/src/sign/base-account/Signer.ts
@@ -1,5 +1,5 @@
 import { CB_WALLET_RPC_URL } from ':core/constants.js';
-import { Hex, hexToNumber, isAddressEqual, numberToHex } from 'viem';
+import { Hex, WalletSendCallsParameters, hexToNumber, isAddressEqual, numberToHex } from 'viem';
 
 import { Communicator } from ':core/communicator/Communicator.js';
 import { isActionableHttpRequestError, isViemError, standardErrors } from ':core/error/errors.js';
@@ -35,7 +35,7 @@ import {
 import { parseErrorMessageFromAny } from ':core/telemetry/utils.js';
 import { Address } from ':core/type/index.js';
 import { ensureIntNumber, hexStringFromNumber } from ':core/type/util.js';
-import { FALLBACK_CHAINS, SDKChain, createClients, getClient } from ':store/chain-clients/utils.js';
+import { SDKChain, createClients, getClient } from ':store/chain-clients/utils.js';
 import { correlationIds } from ':store/correlation-ids/store.js';
 import { spendPermissions, store } from ':store/store.js';
 import { assertArrayPresence, assertPresence } from ':util/assertPresence.js';
@@ -61,7 +61,6 @@ import {
   injectRequestCapabilities,
   makeDataSuffix,
   prependWithoutDuplicates,
-  requestHasCapability,
 } from './utils.js';
 import { createSubAccountSigner } from './utils/createSubAccountSigner.js';
 import { findOwnerIndex } from './utils/findOwnerIndex.js';
@@ -94,8 +93,11 @@ export class Signer {
       id: params.metadata.appChainIds?.[0] ?? 1,
     };
 
-    // Use fallback chains if no chains are provided
-    createClients(chains ?? FALLBACK_CHAINS);
+    // Initialize chain clients if chains are provided
+    if (chains) {
+      createClients(chains);
+    }
+    // Note: getClient will automatically create fallback clients when needed
   }
 
   public get isConnected() {
@@ -176,14 +178,15 @@ export class Signer {
           await this.communicator.waitForPopupLoaded?.();
           await initSubAccountConfig();
 
-          // Check if addSubAccount capability is present and if so, inject the the sub account capabilities
-          let capabilitiesToInject: Record<string, unknown> = {};
-          if (requestHasCapability(request, 'addSubAccount')) {
-            capabilitiesToInject = store.subAccountsConfig.get()?.capabilities ?? {};
-          }
-          const modifiedRequest = injectRequestCapabilities(request, capabilitiesToInject);
+          const subAccountsConfig = store.subAccountsConfig.get();
+          // Inject capabilities from config (e.g., addSubAccount when creation: 'on-connect')
+          const modifiedRequest = injectRequestCapabilities(
+            request,
+            subAccountsConfig?.capabilities ?? {}
+          );
           return this.sendRequestToPopup(modifiedRequest);
         }
+        case 'experimental_requestInfo':
         case 'wallet_sendCalls':
         case 'wallet_sign': {
           return this.sendRequestToPopup(request);
@@ -210,17 +213,23 @@ export class Signer {
       }
     }
 
+    // Handle all experimental methods
+    if (request.method.startsWith('experimental_')) {
+      return this.sendRequestToPopup(request);
+    }
+
     switch (request.method) {
       case 'eth_requestAccounts':
       case 'eth_accounts': {
         const subAccount = store.subAccounts.get();
         const subAccountsConfig = store.subAccountsConfig.get();
         if (subAccount?.address) {
-          // if auto sub accounts are enabled and we have a sub account, we need to return it as a top level account
+          // if defaultAccount is 'sub' and we have a sub account, we need to return it as the first account
           // otherwise, we just append it to the accounts array
-          this.accounts = subAccountsConfig?.enableAutoSubAccounts
-            ? prependWithoutDuplicates(this.accounts, subAccount.address)
-            : appendWithoutDuplicates(this.accounts, subAccount.address);
+          this.accounts =
+            subAccountsConfig?.defaultAccount === 'sub'
+              ? prependWithoutDuplicates(this.accounts, subAccount.address)
+              : appendWithoutDuplicates(this.accounts, subAccount.address);
         }
 
         this.callback?.('connect', { chainId: numberToHex(this.chain.id) });
@@ -388,10 +397,11 @@ export class Signer {
         const subAccountsConfig = store.subAccountsConfig.get();
 
         if (subAccount?.address) {
-          // Sub account should be returned as a top level account if auto sub accounts are enabled
-          this.accounts = subAccountsConfig?.enableAutoSubAccounts
-            ? prependWithoutDuplicates(this.accounts, subAccount.address)
-            : appendWithoutDuplicates(this.accounts, subAccount.address);
+          // Sub account should be returned as the default account if defaultAccount is 'sub'
+          this.accounts =
+            subAccountsConfig?.defaultAccount === 'sub'
+              ? prependWithoutDuplicates(this.accounts, subAccount.address)
+              : appendWithoutDuplicates(this.accounts, subAccount.address);
         }
 
         const spendPermissions = response?.accounts?.[0].capabilities?.spendPermissions;
@@ -408,9 +418,10 @@ export class Signer {
         const subAccount = result.value;
         store.subAccounts.set(subAccount);
         const subAccountsConfig = store.subAccountsConfig.get();
-        this.accounts = subAccountsConfig?.enableAutoSubAccounts
-          ? prependWithoutDuplicates(this.accounts, subAccount.address)
-          : appendWithoutDuplicates(this.accounts, subAccount.address);
+        this.accounts =
+          subAccountsConfig?.defaultAccount === 'sub'
+            ? prependWithoutDuplicates(this.accounts, subAccount.address)
+            : appendWithoutDuplicates(this.accounts, subAccount.address);
         this.callback?.('accountsChanged', this.accounts);
         break;
       }
@@ -598,14 +609,32 @@ export class Signer {
     factoryData?: Hex;
   }> {
     const state = store.getState();
-    const subAccount = state.subAccount;
+    const cachedSubAccount = state.subAccount;
     const subAccountsConfig = store.subAccountsConfig.get();
-    if (subAccount?.address) {
-      this.accounts = subAccountsConfig?.enableAutoSubAccounts
-        ? prependWithoutDuplicates(this.accounts, subAccount.address)
-        : appendWithoutDuplicates(this.accounts, subAccount.address);
-      this.callback?.('accountsChanged', this.accounts);
-      return subAccount;
+
+    // Extract requested address from params (for deployed/undeployed types)
+    const requestedAddress =
+      Array.isArray(request.params) &&
+      request.params.length > 0 &&
+      request.params[0]?.account?.address
+        ? request.params[0].account.address
+        : undefined;
+
+    // Only return cached if:
+    // 1. Cache exists AND
+    // 2. No specific address requested (create type) OR requested address matches cached
+    if (cachedSubAccount?.address) {
+      const shouldUseCache =
+        !requestedAddress || isAddressEqual(requestedAddress, cachedSubAccount.address);
+
+      if (shouldUseCache) {
+        this.accounts =
+          subAccountsConfig?.defaultAccount === 'sub'
+            ? prependWithoutDuplicates(this.accounts, cachedSubAccount.address)
+            : appendWithoutDuplicates(this.accounts, cachedSubAccount.address);
+        this.callback?.('accountsChanged', this.accounts);
+        return cachedSubAccount;
+      }
     }
 
     // Wait for the popup to be loaded before sending the request
@@ -703,10 +732,10 @@ export class Signer {
     });
 
     // Determine effective chainId - use request chainId for wallet_sendCalls, default otherwise
-    const chainId =
-      request.method === 'wallet_sendCalls' && (request.params as any[])?.[0]?.chainId
-        ? hexToNumber((request.params as any[])[0].chainId)
-        : this.chain.id;
+    const walletSendCallsChainId =
+      request.method === 'wallet_sendCalls' &&
+      (request.params as WalletSendCallsParameters)?.[0]?.chainId;
+    const chainId = walletSendCallsChainId ? hexToNumber(walletSendCallsChainId) : this.chain.id;
 
     const client = getClient(chainId);
     assertPresence(
@@ -718,9 +747,9 @@ export class Signer {
 
     if (['eth_sendTransaction', 'wallet_sendCalls'].includes(request.method)) {
       // If we have never had a spend permission, we need to do this tx through the global account
-      // Only perform this check if unstable_enableAutoSpendPermissions is enabled
+      // Only perform this check if funding mode is 'spend-permissions'
       const subAccountsConfig = store.subAccountsConfig.get();
-      if (subAccountsConfig?.unstable_enableAutoSpendPermissions !== false) {
+      if (subAccountsConfig?.funding === 'spend-permissions') {
         const storedSpendPermissions = spendPermissions.get();
         if (storedSpendPermissions.length === 0) {
           const result = await routeThroughGlobalAccount({
@@ -786,9 +815,9 @@ export class Signer {
       const result = await subAccountRequest(request);
       return result;
     } catch (error) {
-      // Skip insufficient balance error handling if unstable_enableAutoSpendPermissions is disabled
+      // Skip insufficient balance error handling if funding mode is 'manual'
       const subAccountsConfig = store.subAccountsConfig.get();
-      if (subAccountsConfig?.unstable_enableAutoSpendPermissions === false) {
+      if (subAccountsConfig?.funding === 'manual') {
         throw error;
       }
 
diff --git a/packages/account-sdk/src/sign/base-account/utils.test.ts b/packages/account-sdk/src/sign/base-account/utils.test.ts
index d4e7b39de..e4dcdebfc 100644
--- a/packages/account-sdk/src/sign/base-account/utils.test.ts
+++ b/packages/account-sdk/src/sign/base-account/utils.test.ts
@@ -266,12 +266,89 @@ describe('injectRequestCapabilities', () => {
 
     expect(() => injectRequestCapabilities(request, capabilities)).toThrow();
   });
+
+  it('should inject addSubAccount capability when not present in request', () => {
+    const request = {
+      method: 'wallet_connect',
+      params: [
+        {
+          version: '1',
+        },
+      ],
+    };
+
+    const result = injectRequestCapabilities(request, capabilities);
+    expect(result).toEqual({
+      method: 'wallet_connect',
+      params: [
+        {
+          version: '1',
+          capabilities: {
+            addSubAccount: capabilities.addSubAccount,
+          },
+        },
+      ],
+    });
+  });
+
+  it('should not override addSubAccount capability if already present in request', () => {
+    const customAddSubAccount = {
+      account: {
+        type: 'import',
+        keys: [{ type: 'webauthn-p256', publicKey: '0xabc' }],
+      },
+    };
+
+    const request = {
+      method: 'wallet_connect',
+      params: [
+        {
+          version: '1',
+          capabilities: {
+            addSubAccount: customAddSubAccount,
+          },
+        },
+      ],
+    };
+
+    const result = injectRequestCapabilities(request, capabilities);
+    expect(result).toEqual({
+      method: 'wallet_connect',
+      params: [
+        {
+          version: '1',
+          capabilities: {
+            addSubAccount: customAddSubAccount, // Request's version takes precedence
+          },
+        },
+      ],
+    });
+  });
+
+  it('should inject addSubAccount capability when params is empty array', () => {
+    const request = {
+      method: 'wallet_connect',
+      params: [],
+    };
+
+    const result = injectRequestCapabilities(request, capabilities);
+    expect(result).toEqual({
+      method: 'wallet_connect',
+      params: [
+        {
+          capabilities: {
+            addSubAccount: capabilities.addSubAccount,
+          },
+        },
+      ],
+    });
+  });
 });
 
 describe('initSubAccountConfig', () => {
   it('should initialize the sub account config', async () => {
     store.subAccountsConfig.set({
-      enableAutoSubAccounts: true,
+      creation: 'on-connect',
       toOwnerAccount: vi.fn().mockResolvedValue({
         account: {
           address: '0x123',
diff --git a/packages/account-sdk/src/sign/base-account/utils.ts b/packages/account-sdk/src/sign/base-account/utils.ts
index 873a923e0..cb63babba 100644
--- a/packages/account-sdk/src/sign/base-account/utils.ts
+++ b/packages/account-sdk/src/sign/base-account/utils.ts
@@ -123,6 +123,9 @@ export function injectRequestCapabilities<T extends RequestArguments>(
       throw standardErrors.rpc.invalidParams();
     }
 
+    // Merge capabilities: injected capabilities first, then request capabilities
+    // This ensures that if the request doesn't have a capability (e.g., addSubAccount),
+    // it gets injected. If the request already has it, the request's version takes precedence.
     requestCapabilities = {
       ...capabilities,
       ...requestCapabilities,
@@ -148,7 +151,7 @@ export async function initSubAccountConfig() {
 
   const capabilities: WalletConnectRequest['params'][0]['capabilities'] = {};
 
-  if (config.enableAutoSubAccounts) {
+  if (config.creation === 'on-connect') {
     // Get the owner account
     const { account: owner } = config.toOwnerAccount
       ? await config.toOwnerAccount()
@@ -171,8 +174,9 @@ export async function initSubAccountConfig() {
     };
   }
 
-  // Store the owner account and capabilities in the non-persisted config
+  // Merge capabilities with existing config (don't overwrite the other properties!)
   store.subAccountsConfig.set({
+    ...config,
     capabilities,
   });
 }
diff --git a/packages/account-sdk/src/sign/base-account/utils/routeThroughGlobalAccount.ts b/packages/account-sdk/src/sign/base-account/utils/routeThroughGlobalAccount.ts
index 974875902..029bf2206 100644
--- a/packages/account-sdk/src/sign/base-account/utils/routeThroughGlobalAccount.ts
+++ b/packages/account-sdk/src/sign/base-account/utils/routeThroughGlobalAccount.ts
@@ -46,7 +46,7 @@ export async function routeThroughGlobalAccount({
   /** Optional calls to prepend to the request. */
   prependCalls?: { to: Address; data: Hex; value: Hex }[] | undefined;
   /** The function to use to send the request to the global account. */
-  globalAccountRequest: (request: RequestArguments) => Promise<any>;
+  globalAccountRequest: (request: RequestArguments) => Promise<unknown>;
 }) {
   // Construct call to execute the original calls using executeBatch
   let originalSendCallsParams: WalletSendCallsParameters[0];
diff --git a/packages/account-sdk/src/store/chain-clients/utils.test.ts b/packages/account-sdk/src/store/chain-clients/utils.test.ts
index 86b868137..e939d6a40 100644
--- a/packages/account-sdk/src/store/chain-clients/utils.test.ts
+++ b/packages/account-sdk/src/store/chain-clients/utils.test.ts
@@ -129,4 +129,54 @@ describe('chain-clients/utils', () => {
       expect(ChainClients.getState()[999999]).toBeUndefined();
     });
   });
+
+  describe('multicall3 contract preservation', () => {
+    it('should preserve multicall3 contract configuration from viem chain for Base Sepolia', () => {
+      createClients([
+        {
+          id: baseSepolia.id,
+          rpcUrl: baseSepolia.rpcUrls.default.http[0],
+        },
+      ]);
+
+      const client = ChainClients.getState()[baseSepolia.id]?.client;
+      expect(client).toBeDefined();
+      expect(client?.chain?.contracts?.multicall3).toBeDefined();
+      expect(client?.chain?.contracts?.multicall3?.address).toBe(
+        '0xca11bde05977b3631167028862be2a173976ca11'
+      );
+    });
+
+    it('should preserve multicall3 contract configuration when using fallback RPC', () => {
+      createClients([
+        {
+          id: baseSepolia.id,
+          // No rpcUrl - will use fallback
+        },
+      ]);
+
+      const client = ChainClients.getState()[baseSepolia.id]?.client;
+      expect(client).toBeDefined();
+      expect(client?.chain?.contracts?.multicall3).toBeDefined();
+      expect(client?.chain?.contracts?.multicall3?.address).toBe(
+        '0xca11bde05977b3631167028862be2a173976ca11'
+      );
+    });
+
+    it('should preserve multicall3 contract configuration for Base mainnet', () => {
+      createClients([
+        {
+          id: base.id,
+          rpcUrl: base.rpcUrls.default.http[0],
+        },
+      ]);
+
+      const client = ChainClients.getState()[base.id]?.client;
+      expect(client).toBeDefined();
+      expect(client?.chain?.contracts?.multicall3).toBeDefined();
+      expect(client?.chain?.contracts?.multicall3?.address).toBe(
+        '0xca11bde05977b3631167028862be2a173976ca11'
+      );
+    });
+  });
 });
diff --git a/packages/account-sdk/src/store/chain-clients/utils.ts b/packages/account-sdk/src/store/chain-clients/utils.ts
index 9d1964ef2..65de2d800 100644
--- a/packages/account-sdk/src/store/chain-clients/utils.ts
+++ b/packages/account-sdk/src/store/chain-clients/utils.ts
@@ -1,6 +1,18 @@
-import { createPublicClient, defineChain, http, PublicClient } from 'viem';
+import { Chain, createPublicClient, defineChain, http, PublicClient } from 'viem';
 import { BundlerClient, createBundlerClient } from 'viem/account-abstraction';
-import { base, baseSepolia } from 'viem/chains';
+import {
+  arbitrum,
+  avalanche,
+  base,
+  baseSepolia,
+  bsc,
+  mainnet,
+  optimism,
+  optimismSepolia,
+  polygon,
+  sepolia,
+  zora,
+} from 'viem/chains';
 
 import { RPCResponseNativeCurrency } from ':core/message/RPCResponse.js';
 import { ChainClients } from './store.js';
@@ -11,37 +23,83 @@ export type SDKChain = {
   nativeCurrency?: RPCResponseNativeCurrency;
 };
 
-// Fallback chains using viem's chain definitions directly
-export const FALLBACK_CHAINS: SDKChain[] = [
-  {
-    id: base.id,
-    rpcUrl: base.rpcUrls.default.http[0],
+export const SUPPORTED_MAINNET_CHAINS: [Chain, ...Chain[]] = [
+  base,
+  avalanche,
+  arbitrum,
+  polygon,
+  mainnet,
+  bsc,
+  zora,
+  optimism,
+];
+
+export const SUPPORTED_TESTNET_CHAINS: [Chain, ...Chain[]] = [
+  baseSepolia,
+  sepolia,
+  optimismSepolia,
+];
+
+const SUPPORTED_CHAINS_BY_ID: Map<number, Chain> = [
+  ...SUPPORTED_MAINNET_CHAINS,
+  ...SUPPORTED_TESTNET_CHAINS,
+].reduce((acc, chain) => {
+  acc.set(chain.id, chain);
+  return acc;
+}, new Map<number, Chain>());
+
+// Get fallback chain data from supported chain list
+function getSupportedChainById(chainId: number): Chain | undefined {
+  return SUPPORTED_CHAINS_BY_ID.get(chainId);
+}
+
+// Get fallback RPC URL from viem's chain definitions
+function getFallbackRpcUrl(chainId: number): string | undefined {
+  const viemChain = getSupportedChainById(chainId);
+  if (viemChain?.rpcUrls?.default?.http?.[0]) {
+    return viemChain.rpcUrls.default.http[0];
+  }
+  return undefined;
+}
+
+function defineChainConfig(
+  chainId: number,
+  rpcUrl: string,
+  options?: {
+    viemChain?: Chain;
+    nativeCurrency?: RPCResponseNativeCurrency;
+  }
+): Chain {
+  const viemChain = options?.viemChain;
+  const nativeCurrency = options?.nativeCurrency;
+
+  const name = nativeCurrency?.name ?? viemChain?.name ?? '';
+  const symbol = nativeCurrency?.symbol ?? viemChain?.nativeCurrency?.symbol ?? '';
+  const decimals = nativeCurrency?.decimal ?? viemChain?.nativeCurrency?.decimals ?? 18;
+
+  return defineChain({
+    id: chainId,
+    name,
     nativeCurrency: {
-      name: base.nativeCurrency.name,
-      symbol: base.nativeCurrency.symbol,
-      decimal: base.nativeCurrency.decimals,
+      name,
+      symbol,
+      decimals,
     },
-  },
-  {
-    id: baseSepolia.id,
-    rpcUrl: baseSepolia.rpcUrls.default.http[0],
-    nativeCurrency: {
-      name: baseSepolia.nativeCurrency.name,
-      symbol: baseSepolia.nativeCurrency.symbol,
-      decimal: baseSepolia.nativeCurrency.decimals,
+    rpcUrls: {
+      default: {
+        http: [rpcUrl],
+      },
     },
-  },
-];
+    contracts: viemChain?.contracts,
+  });
+}
 
 export function createClients(chains: SDKChain[]) {
   chains.forEach((c) => {
-    // Use fallback RPC URL for Base networks if wallet hasn't provided one
+    // Use fallback RPC URL from viem if wallet hasn't provided one
     let rpcUrl = c.rpcUrl;
     if (!rpcUrl) {
-      const fallbackChain = FALLBACK_CHAINS.find((fc) => fc.id === c.id);
-      if (fallbackChain) {
-        rpcUrl = fallbackChain.rpcUrl;
-      }
+      rpcUrl = getFallbackRpcUrl(c.id);
     }
 
     // Skip if still no RPC URL available
@@ -49,44 +107,107 @@ export function createClients(chains: SDKChain[]) {
       return;
     }
 
-    const viemchain = defineChain({
-      id: c.id,
-      rpcUrls: {
-        default: {
-          http: [rpcUrl],
-        },
-      },
-      name: c.nativeCurrency?.name ?? '',
-      nativeCurrency: {
-        name: c.nativeCurrency?.name ?? '',
-        symbol: c.nativeCurrency?.symbol ?? '',
-        decimals: c.nativeCurrency?.decimal ?? 18,
-      },
+    const viemChain = getSupportedChainById(c.id);
+    const clients = createClientPair({
+      chainId: c.id,
+      rpcUrl,
+      nativeCurrency: c.nativeCurrency,
+      viemChain,
     });
 
-    const client = createPublicClient({
-      chain: viemchain,
-      transport: http(rpcUrl),
-    });
-    const bundlerClient = createBundlerClient({
-      client,
-      transport: http(rpcUrl),
-    });
+    storeClientPair(c.id, clients);
+  });
+}
 
-    ChainClients.setState((state) => ({
-      ...state,
-      [c.id]: {
-        client,
-        bundlerClient,
-      },
-    }));
+type ClientPair = {
+  client: PublicClient;
+  bundlerClient: BundlerClient;
+};
+
+function createClientPair(options: {
+  chainId: number;
+  rpcUrl: string;
+  nativeCurrency?: RPCResponseNativeCurrency;
+  viemChain?: Chain;
+}): ClientPair {
+  const { chainId, rpcUrl, nativeCurrency, viemChain } = options;
+  const chain = defineChainConfig(chainId, rpcUrl, {
+    viemChain,
+    nativeCurrency,
+  });
+
+  const client = createPublicClient({
+    chain,
+    transport: http(rpcUrl),
+  });
+
+  const bundlerClient = createBundlerClient({
+    client,
+    transport: http(rpcUrl),
+  });
+
+  return { client, bundlerClient };
+}
+
+function createFallbackClientPair(chainId: number): ClientPair | undefined {
+  const rpcUrl = getFallbackRpcUrl(chainId);
+  const viemChain = getSupportedChainById(chainId);
+
+  if (!rpcUrl) {
+    return undefined;
+  }
+
+  return createClientPair({
+    chainId,
+    rpcUrl,
+    viemChain,
   });
 }
 
+function storeClientPair(chainId: number, pair: ClientPair) {
+  ChainClients.setState((state) => ({
+    ...state,
+    [chainId]: {
+      client: pair.client,
+      bundlerClient: pair.bundlerClient,
+    },
+  }));
+}
+
 export function getClient(chainId: number): PublicClient | undefined {
-  return ChainClients.getState()[chainId]?.client;
+  // First check if client exists in storage
+  const storedClient = ChainClients.getState()[chainId]?.client;
+  if (storedClient) {
+    return storedClient;
+  }
+
+  // If not in storage, try to create a fallback client
+  const fallbackPair = createFallbackClientPair(chainId);
+
+  // If we successfully created fallback clients, store them for future use
+  if (fallbackPair) {
+    storeClientPair(chainId, fallbackPair);
+    return fallbackPair.client;
+  }
+
+  return undefined;
 }
 
 export function getBundlerClient(chainId: number): BundlerClient | undefined {
-  return ChainClients.getState()[chainId]?.bundlerClient;
+  // First check if bundler client exists in storage
+  const storedBundlerClient = ChainClients.getState()[chainId]?.bundlerClient;
+  if (storedBundlerClient) {
+    return storedBundlerClient;
+  }
+
+  // If not in storage, try to create a fallback bundler client
+  const fallbackPair = createFallbackClientPair(chainId);
+
+  // If we successfully created fallback clients, store them for future use
+  if (fallbackPair) {
+    storeClientPair(chainId, fallbackPair);
+    return fallbackPair.bundlerClient;
+  }
+
+  return undefined;
 }
diff --git a/packages/account-sdk/src/ui/Dialog/Dialog.tsx b/packages/account-sdk/src/ui/Dialog/Dialog.tsx
index 20df99428..d3f1c357e 100644
--- a/packages/account-sdk/src/ui/Dialog/Dialog.tsx
+++ b/packages/account-sdk/src/ui/Dialog/Dialog.tsx
@@ -1,7 +1,7 @@
 // Copyright (c) 2018-2025 Coinbase, Inc. <https://www.coinbase.com/>
 
 import { clsx } from 'clsx';
-import { FunctionComponent, render } from 'preact';
+import { FunctionComponent, JSX, render } from 'preact';
 
 import { getDisplayableUsername } from ':core/username/getDisplayableUsername.js';
 import { store } from ':store/store.js';
@@ -122,7 +122,7 @@ export const DialogContainer: FunctionComponent = (props) => {
   const [startY, setStartY] = useState(0);
 
   // Touch event handlers for drag-to-dismiss (entire dialog area)
-  const handleTouchStart = (e: any) => {
+  const handleTouchStart = (e: JSX.TargetedTouchEvent<HTMLDivElement>) => {
     // Only enable drag on mobile portrait mode
     if (!isPhonePortrait()) return;
 
@@ -131,7 +131,7 @@ export const DialogContainer: FunctionComponent = (props) => {
     setIsDragging(true);
   };
 
-  const handleTouchMove = (e: any) => {
+  const handleTouchMove = (e: JSX.TargetedTouchEvent<HTMLDivElement>) => {
     if (!isDragging) return;
 
     const touch = e.touches[0];
diff --git a/packages/account-sdk/src/util/encoding.test.ts b/packages/account-sdk/src/util/encoding.test.ts
index e98e5a0a2..0c120b2de 100644
--- a/packages/account-sdk/src/util/encoding.test.ts
+++ b/packages/account-sdk/src/util/encoding.test.ts
@@ -1,4 +1,5 @@
-import { arrayBufferToBase64Url, base64ToBase64Url } from './encoding.js';
+import { Signature } from 'ox';
+import { arrayBufferToBase64Url, base64ToBase64Url, convertCredentialToJSON } from './encoding.js';
 
 describe('arrayBufferToBase64Url', () => {
   it('should convert an array buffer to a base64 url equivalent to using Buffer.from', () => {
@@ -9,3 +10,206 @@ describe('arrayBufferToBase64Url', () => {
     expect(base64Url).toBe(base64ToBase64Url(originalBuffer.toString('base64')));
   });
 });
+
+describe('convertCredentialToJSON', () => {
+  const mockWebauthn = {
+    authenticatorData:
+      '0x49960de5880e8c687434170f6476605b8fe4aeb9a28632c7995cf3ba831d9763' as const,
+    clientDataJSON: JSON.stringify({ type: 'webauthn.get', challenge: 'test' }),
+    challengeIndex: 23,
+    typeIndex: 1,
+    userVerificationRequired: false,
+  };
+
+  /**
+   * Helper to decode base64url to bytes for inspection
+   */
+  function base64UrlToBytes(base64url: string): Uint8Array {
+    const base64 = base64url.replace(/-/g, '+').replace(/_/g, '/');
+    const padded = base64 + '='.repeat((4 - (base64.length % 4)) % 4);
+    const binary = atob(padded);
+    return new Uint8Array([...binary].map((c) => c.charCodeAt(0)));
+  }
+
+  /**
+   * Parse DER signature and extract r and s byte arrays
+   */
+  function parseDerSignature(derBytes: Uint8Array): {
+    isValid: boolean;
+    rBytes: Uint8Array;
+    sBytes: Uint8Array;
+  } | null {
+    if (derBytes[0] !== 0x30) return null; // Not a SEQUENCE
+    if (derBytes[2] !== 0x02) return null; // First element not INTEGER
+
+    const rLength = derBytes[3];
+    const rStart = 4;
+    const rBytes = derBytes.slice(rStart, rStart + rLength);
+
+    const sOffset = rStart + rLength;
+    if (derBytes[sOffset] !== 0x02) return null; // Second element not INTEGER
+
+    const sLength = derBytes[sOffset + 1];
+    const sStart = sOffset + 2;
+    const sBytes = derBytes.slice(sStart, sStart + sLength);
+
+    return { isValid: true, rBytes, sBytes };
+  }
+
+  it('should produce valid DER-encoded signature', () => {
+    const signature = Signature.toHex({
+      r: BigInt('0x6e100a352ec6ad1b70802290e18aeed190704973570f3b8ed42cb9808e2ea6bf'),
+      s: BigInt('0x4a90a229a244495b41890987806fcbd2d5d23fc0dbe5f5256c2613c039d76db8'),
+      yParity: 1,
+    });
+
+    const result = convertCredentialToJSON({
+      webauthn: mockWebauthn,
+      signature,
+      id: 'test-credential-id',
+    });
+
+    expect(result.response.signature).toBeDefined();
+    expect(typeof result.response.signature).toBe('string');
+
+    // Decode and verify DER structure
+    const derBytes = base64UrlToBytes(result.response.signature);
+    expect(derBytes[0]).toBe(0x30); // SEQUENCE tag
+  });
+
+  it('should add 0x00 padding when r has high bit set (required for positive INTEGER)', () => {
+    // r starts with 0x8e (binary 10001110) - high bit IS set
+    // DER requires 0x00 prefix to indicate this is a positive number
+    const r = BigInt('0x8e100a352ec6ad1b70802290e18aeed190704973570f3b8ed42cb9808e2ea6bf');
+    const s = BigInt('0x4a90a229a244495b41890987806fcbd2d5d23fc0dbe5f5256c2613c039d76db8');
+
+    const signature = Signature.toHex({ r, s, yParity: 1 });
+
+    const result = convertCredentialToJSON({
+      webauthn: mockWebauthn,
+      signature,
+      id: 'test-credential-id',
+    });
+
+    const derBytes = base64UrlToBytes(result.response.signature);
+    const parsed = parseDerSignature(derBytes);
+
+    expect(parsed).not.toBeNull();
+    // r MUST have 0x00 padding because its first byte (0x8e) has high bit set
+    expect(parsed!.rBytes[0]).toBe(0x00);
+    expect(parsed!.rBytes[1]).toBe(0x8e);
+  });
+
+  it('should add 0x00 padding when s has high bit set', () => {
+    // s starts with 0xca (binary 11001010) - high bit IS set
+    const r = BigInt('0x6e100a352ec6ad1b70802290e18aeed190704973570f3b8ed42cb9808e2ea6bf');
+    const s = BigInt('0xca90a229a244495b41890987806fcbd2d5d23fc0dbe5f5256c2613c039d76db8');
+
+    const signature = Signature.toHex({ r, s, yParity: 1 });
+
+    const result = convertCredentialToJSON({
+      webauthn: mockWebauthn,
+      signature,
+      id: 'test-credential-id',
+    });
+
+    const derBytes = base64UrlToBytes(result.response.signature);
+    const parsed = parseDerSignature(derBytes);
+
+    expect(parsed).not.toBeNull();
+    // s MUST have 0x00 padding because its first byte (0xca) has high bit set
+    expect(parsed!.sBytes[0]).toBe(0x00);
+    expect(parsed!.sBytes[1]).toBe(0xca);
+  });
+
+  it('should NOT add 0x00 padding when high bit is not set', () => {
+    // r starts with 0x6e (binary 01101110) - high bit NOT set
+    // s starts with 0x4a (binary 01001010) - high bit NOT set
+    // Neither should have 0x00 padding
+    const r = BigInt('0x6e100a352ec6ad1b70802290e18aeed190704973570f3b8ed42cb9808e2ea6bf');
+    const s = BigInt('0x4a90a229a244495b41890987806fcbd2d5d23fc0dbe5f5256c2613c039d76db8');
+
+    const signature = Signature.toHex({ r, s, yParity: 1 });
+
+    const result = convertCredentialToJSON({
+      webauthn: mockWebauthn,
+      signature,
+      id: 'test-credential-id',
+    });
+
+    const derBytes = base64UrlToBytes(result.response.signature);
+    const parsed = parseDerSignature(derBytes);
+
+    expect(parsed).not.toBeNull();
+    // Neither r nor s should have 0x00 padding since their high bits are not set
+    expect(parsed!.rBytes[0]).toBe(0x6e); // No padding, starts directly with value
+    expect(parsed!.sBytes[0]).toBe(0x4a); // No padding, starts directly with value
+  });
+
+  it('should handle edge case where r or s is small (fewer than 32 bytes)', () => {
+    // Small values that don't need full 32 bytes
+    const signature = Signature.toHex({
+      r: BigInt('0x123456'),
+      s: BigInt('0x7bcdef'), // starts with 0x7b, high bit NOT set
+      yParity: 0,
+    });
+
+    const result = convertCredentialToJSON({
+      webauthn: mockWebauthn,
+      signature,
+      id: 'test-credential-id',
+    });
+
+    const derBytes = base64UrlToBytes(result.response.signature);
+    const parsed = parseDerSignature(derBytes);
+
+    expect(parsed).not.toBeNull();
+    expect(parsed!.rBytes[0]).toBe(0x12); // No padding needed
+    expect(parsed!.sBytes[0]).toBe(0x7b); // No padding needed
+  });
+
+  it('should handle small value with high bit set', () => {
+    // Small value 0xabcdef starts with 0xab (high bit set) - needs padding
+    const signature = Signature.toHex({
+      r: BigInt('0x123456'),
+      s: BigInt('0xabcdef'), // starts with 0xab, high bit IS set
+      yParity: 0,
+    });
+
+    const result = convertCredentialToJSON({
+      webauthn: mockWebauthn,
+      signature,
+      id: 'test-credential-id',
+    });
+
+    const derBytes = base64UrlToBytes(result.response.signature);
+    const parsed = parseDerSignature(derBytes);
+
+    expect(parsed).not.toBeNull();
+    expect(parsed!.rBytes[0]).toBe(0x12); // No padding needed
+    // s needs padding because 0xab has high bit set
+    expect(parsed!.sBytes[0]).toBe(0x00);
+    expect(parsed!.sBytes[1]).toBe(0xab);
+  });
+
+  it('should include all required credential fields', () => {
+    const signature = Signature.toHex({
+      r: BigInt('0x6e100a352ec6ad1b70802290e18aeed190704973570f3b8ed42cb9808e2ea6bf'),
+      s: BigInt('0x4a90a229a244495b41890987806fcbd2d5d23fc0dbe5f5256c2613c039d76db8'),
+      yParity: 1,
+    });
+
+    const result = convertCredentialToJSON({
+      webauthn: mockWebauthn,
+      signature,
+      id: 'test-credential-id',
+    });
+
+    expect(result.id).toBe('test-credential-id');
+    expect(result.rawId).toBeDefined();
+    expect(result.response.authenticatorData).toBeDefined();
+    expect(result.response.clientDataJSON).toBeDefined();
+    expect(result.response.signature).toBeDefined();
+    expect(result.type).toBe('webauthn.get');
+  });
+});
diff --git a/packages/account-sdk/src/util/encoding.ts b/packages/account-sdk/src/util/encoding.ts
index 055c42208..7e7a5bfc6 100644
--- a/packages/account-sdk/src/util/encoding.ts
+++ b/packages/account-sdk/src/util/encoding.ts
@@ -1,5 +1,5 @@
 import { Signature, WebAuthnP256 } from 'ox';
-import { ByteArray, Hex, hexToBytes, numberToHex, stringToBytes, trim } from 'viem';
+import { ByteArray, Hex, hexToBytes, stringToBytes } from 'viem';
 
 export function base64ToBase64Url(base64: string): string {
   return base64.replaceAll('+', '-').replaceAll('/', '_').replace(/=+$/, '');
@@ -29,38 +29,8 @@ export function convertCredentialToJSON({
     response: {
       authenticatorData: arrayBufferToBase64Url(hexToBytes(webauthn.authenticatorData)),
       clientDataJSON: arrayBufferToBase64Url(stringToBytes(webauthn.clientDataJSON)),
-      signature: arrayBufferToBase64Url(asn1EncodeSignature(signatureRaw.r, signatureRaw.s)),
+      signature: arrayBufferToBase64Url(Signature.toDerBytes(signatureRaw)),
     },
     type: JSON.parse(webauthn.clientDataJSON).type,
   };
 }
-
-export function asn1EncodeSignature(r: bigint, s: bigint): Uint8Array {
-  // Convert r and s to byte arrays and remove any leading zeros
-  const rBytes = hexToBytes(trim(numberToHex(r)));
-  const sBytes = hexToBytes(trim(numberToHex(s)));
-
-  // Calculate lengths
-  const rLength = rBytes.length;
-  const sLength = sBytes.length;
-  const totalLength = rLength + sLength + 4; // 4 additional bytes for type and length fields
-
-  // Create the signature buffer
-  const signature = new Uint8Array(totalLength + 2); // +2 for sequence header
-
-  // Sequence header
-  signature[0] = 0x30; // ASN.1 sequence tag
-  signature[1] = totalLength;
-
-  // Encode r value
-  signature[2] = 0x02; // ASN.1 integer tag
-  signature[3] = rLength;
-  signature.set(rBytes, 4);
-
-  // Encode s value
-  signature[rLength + 4] = 0x02; // ASN.1 integer tag
-  signature[rLength + 5] = sLength;
-  signature.set(sBytes, rLength + 6);
-
-  return signature;
-}
diff --git a/yarn.lock b/yarn.lock
index fc23ab083..d09a33294 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -262,7 +262,6 @@ __metadata:
   resolution: "@base-org/account@workspace:packages/account-sdk"
   dependencies:
     "@coinbase/cdp-sdk": "npm:^1.0.0"
-    "@noble/hashes": "npm:1.4.0"
     "@rollup/plugin-commonjs": "npm:^25.0.7"
     "@rollup/plugin-json": "npm:^6.1.0"
     "@rollup/plugin-node-resolve": "npm:^15.2.3"
@@ -274,6 +273,7 @@ __metadata:
     "@types/node": "npm:^14.18.54"
     "@vitest/coverage-v8": "npm:2.1.2"
     "@vitest/web-worker": "npm:3.2.1"
+    brotli-wasm: "npm:^3.0.0"
     clsx: "npm:1.2.1"
     eventemitter3: "npm:5.0.1"
     fake-indexeddb: "npm:^6.0.0"
@@ -3626,6 +3626,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/qrcode.react@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "@types/qrcode.react@npm:3.0.0"
+  dependencies:
+    qrcode.react: "npm:*"
+  checksum: 10/8ce11d0455fca9a898f6e9d499529526671c5e398f44cf2bc507ad84e1e4982ff0f384261e52b16b933bdd1d6db6bef27b437f90bb804a039ddfe21112d19da5
+  languageName: node
+  linkType: hard
+
 "@types/react@npm:18.2.15":
   version: 18.2.15
   resolution: "@types/react@npm:18.2.15"
@@ -4649,6 +4658,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"brotli-wasm@npm:^3.0.0":
+  version: 3.0.1
+  resolution: "brotli-wasm@npm:3.0.1"
+  checksum: 10/8d400459eea945cd66008ced3298efb24f65490d9cfd4953bfed088f4212aae0ff52bb3bd53970728b2cb29953ba25de02a2862d76f4fe74ba37befe265c5402
+  languageName: node
+  linkType: hard
+
 "browserslist@npm:^4.21.10":
   version: 4.23.3
   resolution: "browserslist@npm:4.23.3"
@@ -8234,6 +8250,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"qrcode.react@npm:*, qrcode.react@npm:^4.2.0":
+  version: 4.2.0
+  resolution: "qrcode.react@npm:4.2.0"
+  peerDependencies:
+    react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+  checksum: 10/665036d88b160e6d5de4e24d101bc63bd2b76712802e874bbffe56c6b6e5fe50c63f02c3cba2975b2e2b555c1f1e112cbb42987f8cb3a626ce2d17023cfde6ac
+  languageName: node
+  linkType: hard
+
 "queue-lit@npm:^1.5.1":
   version: 1.5.2
   resolution: "queue-lit@npm:1.5.2"
@@ -8860,10 +8885,12 @@ __metadata:
     "@metamask/eth-sig-util": "npm:^7.0.0"
     "@testing-library/react": "npm:^16.2.0"
     "@types/acorn": "npm:^4.0.6"
+    "@types/qrcode.react": "npm:^3.0.0"
     "@types/react": "npm:18.2.15"
     acorn: "npm:^8.15.0"
     framer-motion: "npm:^10.13.1"
     next: "npm:^14.2.10"
+    qrcode.react: "npm:^4.2.0"
     react: "npm:^18.2.0"
     react-dom: "npm:^18.2.0"
     react-hook-form: "npm:7.45.2"