Update gas station contract addresses and modify intent builder types for consistency

Bijan-Massoumi · Bijan-Massoumi · commit dbf451b1e50e · 2025-11-11T15:08:50.000-05:00
diff --git a/packages/gas-station/src/abi/gas-station.ts b/packages/gas-station/src/abi/gas-station.ts
@@ -8,9 +8,15 @@ export const gasStationAbi = [
   },
   { inputs: [], name: "ExecutionFailed", type: "error" },
   { inputs: [], name: "InvalidFunctionSelector", type: "error" },
-  { inputs: [], name: "NoEthAllowed", type: "error" },
   { inputs: [], name: "NotDelegated", type: "error" },
   { stateMutability: "nonpayable", type: "fallback" },
+  {
+    inputs: [],
+    name: "TK_GAS_DELEGATE",
+    outputs: [{ internalType: "address", name: "", type: "address" }],
+    stateMutability: "view",
+    type: "function",
+  },
   {
     inputs: [
       { internalType: "address", name: "_target", type: "address" },
@@ -152,26 +158,6 @@ export const gasStationAbi = [
     stateMutability: "view",
     type: "function",
   },
-  {
-    inputs: [
-      { internalType: "address", name: "_targetEoA", type: "address" },
-      { internalType: "uint128", name: "_nonce", type: "uint128" },
-      {
-        components: [
-          { internalType: "address", name: "to", type: "address" },
-          { internalType: "uint256", name: "value", type: "uint256" },
-          { internalType: "bytes", name: "data", type: "bytes" },
-        ],
-        internalType: "struct IBatchExecution.Call[]",
-        name: "_calls",
-        type: "tuple[]",
-      },
-    ],
-    name: "hashBatchExecution",
-    outputs: [{ internalType: "bytes32", name: "", type: "bytes32" }],
-    stateMutability: "view",
-    type: "function",
-  },
   {
     inputs: [
       { internalType: "address", name: "_targetEoA", type: "address" },
@@ -207,7 +193,6 @@ export const gasStationAbi = [
     inputs: [
       { internalType: "address", name: "_targetEoA", type: "address" },
       { internalType: "uint128", name: "_counter", type: "uint128" },
-      { internalType: "address", name: "_sender", type: "address" },
     ],
     name: "hashBurnSessionCounter",
     outputs: [{ internalType: "bytes32", name: "", type: "bytes32" }],
@@ -248,13 +233,6 @@ export const gasStationAbi = [
     stateMutability: "view",
     type: "function",
   },
-  {
-    inputs: [],
-    name: "tkGasDelegate",
-    outputs: [{ internalType: "address", name: "", type: "address" }],
-    stateMutability: "view",
-    type: "function",
-  },
   {
     inputs: [
       { internalType: "address", name: "_targetEoA", type: "address" },
@@ -266,5 +244,4 @@ export const gasStationAbi = [
     stateMutability: "view",
     type: "function",
   },
-  { stateMutability: "payable", type: "receive" },
 ] as const;
diff --git a/packages/gas-station/src/config.ts b/packages/gas-station/src/config.ts
@@ -4,9 +4,9 @@ import { base, mainnet, sepolia } from "viem/chains";
 
 // Default contract addresses (deterministically deployed across all chains)
 export const DEFAULT_DELEGATE_CONTRACT: Hex =
-  "0xC2a37Ee08cAc3778d9d05FF0a93FD5B553C77E3a";
+  "0x000066a00056CD44008768E2aF00696e19A30084";
 export const DEFAULT_EXECUTION_CONTRACT: Hex =
-  "0x4ece92b06C7d2d99d87f052E0Fca47Fb180c3348";
+  "0x00000000008c57a1CE37836a5e9d36759D070d8c";
 
 // Type definitions
 export interface GasStationConfig {
diff --git a/packages/gas-station/src/intentBuilder.ts b/packages/gas-station/src/intentBuilder.ts
@@ -145,23 +145,23 @@ export class IntentBuilder {
       verifyingContract: this.config.eoaAddress,
     };
 
-    // Original: keccak256("Execution(uint128 nonce,uint32 deadline,address outputContract,uint256 ethAmount,bytes arguments)")
+    // keccak256("Execution(uint128 nonce,uint32 deadline,address to,uint256 value,bytes data)")
     const types = {
       Execution: [
         { name: "nonce", type: "uint128" },
         { name: "deadline", type: "uint32" },
-        { name: "outputContract", type: "address" },
-        { name: "ethAmount", type: "uint256" },
-        { name: "arguments", type: "bytes" },
+        { name: "to", type: "address" },
+        { name: "value", type: "uint256" },
+        { name: "data", type: "bytes" },
       ],
     };
 
     const message = {
       nonce,
       deadline,
-      outputContract: this.outputContract,
-      ethAmount: this.ethAmount,
-      arguments: this.callData,
+      to: this.outputContract,
+      value: this.ethAmount,
+      data: this.callData,
     };
 
     const signature = await this.config.eoaWalletClient.signTypedData({
@@ -213,17 +213,17 @@ export class IntentBuilder {
     };
 
     // Based on hashApproveThenExecute from the contract
-    // keccak256("ApproveThenExecute(uint128 nonce,uint32 deadline,address erc20Contract,address spender,uint256 approveAmount,address outputContract,uint256 ethAmount,bytes arguments)")
+    // keccak256("ApproveThenExecute(uint128 nonce,uint32 deadline,address erc20Contract,address spender,uint256 approveAmount,address to,uint256 value,bytes data)")
     const types = {
       ApproveThenExecute: [
         { name: "nonce", type: "uint128" },
         { name: "deadline", type: "uint32" },
         { name: "erc20Contract", type: "address" },
         { name: "spender", type: "address" },
         { name: "approveAmount", type: "uint256" },
-        { name: "outputContract", type: "address" },
-        { name: "ethAmount", type: "uint256" },
-        { name: "arguments", type: "bytes" },
+        { name: "to", type: "address" },
+        { name: "value", type: "uint256" },
+        { name: "data", type: "bytes" },
       ],
     };
 
@@ -233,9 +233,9 @@ export class IntentBuilder {
       erc20Contract: erc20Address,
       spender,
       approveAmount,
-      outputContract: this.outputContract,
-      ethAmount: this.ethAmount,
-      arguments: this.callData,
+      to: this.outputContract,
+      value: this.ethAmount,
+      data: this.callData,
     };
 
     const signature = await this.config.eoaWalletClient.signTypedData({
diff --git a/packages/gas-station/src/policyUtils.ts b/packages/gas-station/src/policyUtils.ts
@@ -15,7 +15,7 @@ import type { Hex } from "viem";
  * @param config.customConsensus - Optional custom consensus expression (overrides eoaUserId and additionalApprovers)
  * @param config.restrictions - Signing restrictions
  * @param config.restrictions.allowedContracts - Whitelist of contract addresses EOA can sign intents for
- * @param config.restrictions.disallowEthTransfer - Whether to disallow ETH transfers (if true, ethAmount must be 0)
+ * @param config.restrictions.disallowEthTransfer - Whether to disallow ETH transfers (if true, value must be 0)
  * @param config.policyName - Optional policy name
  * @returns Policy object ready to submit to Turnkey createPolicy API
  *
@@ -39,9 +39,9 @@ import type { Hex } from "viem";
  *   consensus: "approvers.any(user, user.id == 'user-456')",
  *   condition: "activity.resource == 'PRIVATE_KEY' && activity.action == 'SIGN' && " +
  *              "eth.eip_712.primary_type == 'Execution' && " +
- *              "(eth.eip_712.message['outputContract'] == '0x833...usdc' || " +
- *              "eth.eip_712.message['outputContract'] == '0x6b1...dai') && " +
- *              "eth.eip_712.message['ethAmount'] == '0'",
+ *              "(eth.eip_712.message['to'] == '0x833...usdc' || " +
+ *              "eth.eip_712.message['to'] == '0x6b1...dai') && " +
+ *              "eth.eip_712.message['value'] == '0'",
  *   notes: "Restricts which EIP-712 intents the EOA can sign for gas station execution"
  * }
  *
@@ -66,8 +66,8 @@ import type { Hex } from "viem";
  *              "approvers.any(user, user.id == 'backup-user-789')",
  *   condition: "activity.resource == 'PRIVATE_KEY' && activity.action == 'SIGN' && " +
  *              "eth.eip_712.primary_type == 'Execution' && " +
- *              "(eth.eip_712.message['outputContract'] == '0x833...usdc') && " +
- *              "eth.eip_712.message['ethAmount'] == '0'",
+ *              "(eth.eip_712.message['to'] == '0x833...usdc') && " +
+ *              "eth.eip_712.message['value'] == '0'",
  *   notes: "Restricts which EIP-712 intents the EOA can sign for gas station execution"
  * }
  *
@@ -109,14 +109,14 @@ export function buildIntentSigningPolicy(config: {
     // Convert to lowercase for case-insensitive comparison
     const contractConditions = config.restrictions.allowedContracts
       .map(
-        (c) => `eth.eip_712.message['outputContract'] == '${c.toLowerCase()}'`,
+        (c) => `eth.eip_712.message['to'] == '${c.toLowerCase()}'`,
       )
       .join(" || ");
     conditions.push(`(${contractConditions})`);
   }
 
   if (!!config.restrictions?.disallowEthTransfer) {
-    conditions.push(`eth.eip_712.message['ethAmount'] == '0'`);
+    conditions.push(`eth.eip_712.message['value'] == '0'`);
   }
 
   // Build consensus expression
