fix(smart-wallet-sdk): Call struct ordering (#350)

Author: zhongeric

sdks/smart-wallet-sdk/src/utils/callPlanner.test.ts

@@ -1,6 +1,6 @@
-import { zeroAddress } from 'viem'
+import { decodeAbiParameters, zeroAddress } from 'viem'
 
-import { CallPlanner } from './callPlanner'
+import { CALL_ABI_PARAMS, CallPlanner } from './callPlanner'
 
 
 // Test constants
@@ -53,13 +53,14 @@ describe('CallPlanner', () => {
   describe('encode', () => {
     it('should correctly abi encode the calls', () => {
       const planner = new CallPlanner([
-        { to: TEST_ADDRESS_1, data: TEST_DATA_1, value: TEST_VALUE_1 }
+        { to: TEST_ADDRESS_1, value: TEST_VALUE_1, data: TEST_DATA_1 }
       ])
 
       const encoded = planner.encode()
-      // We're just checking that it returns a hex string and doesn't throw
-      expect(encoded).toMatch(/^0x/)
-      expect(typeof encoded).toBe('string')
+      
+      // decode the encoded data
+      const decoded = decodeAbiParameters(CALL_ABI_PARAMS, encoded)
+      expect(decoded).toEqual([[{ to: TEST_ADDRESS_1, value: TEST_VALUE_1, data: TEST_DATA_1 }]])
     })
 
     it('should throw an error if there are no calls to encode', () => {
@@ -71,31 +72,31 @@ describe('CallPlanner', () => {
   describe('add', () => {
     it('should add a new call to the calls array', () => {
       const planner = new CallPlanner()
-      planner.add(TEST_ADDRESS_1, TEST_DATA_1, TEST_VALUE_1)
+      planner.add(TEST_ADDRESS_1, TEST_VALUE_1, TEST_DATA_1)
       expect(planner.calls).toEqual([{ to: TEST_ADDRESS_1, data: TEST_DATA_1, value: TEST_VALUE_1 }])
     })
 
     it('should add a new call with bigint value', () => {
       const planner = new CallPlanner()
-      planner.add(TEST_ADDRESS_1, TEST_DATA_1, 100n)
+      planner.add(TEST_ADDRESS_1, 100n, TEST_DATA_1)
       expect(planner.calls).toEqual([{ to: TEST_ADDRESS_1, data: TEST_DATA_1, value: 100n }])
     })
 
     it('should return the planner instance for chaining', () => {
       const planner = new CallPlanner()
-      const result = planner.add(TEST_ADDRESS_1, TEST_DATA_1, TEST_VALUE_1)
+      const result = planner.add(TEST_ADDRESS_1, TEST_VALUE_1, TEST_DATA_1)
       expect(result).toBe(planner)
     })
 
     it('should allow chaining multiple add calls', () => {
       const planner = new CallPlanner()
       planner
-        .add(TEST_ADDRESS_1, TEST_DATA_1, TEST_VALUE_1)
-        .add(TEST_ADDRESS_1, TEST_DATA_2, TEST_VALUE_2)
+        .add(TEST_ADDRESS_1, TEST_VALUE_1, TEST_DATA_1)
+        .add(TEST_ADDRESS_1, TEST_VALUE_2, TEST_DATA_2)
 
       expect(planner.calls).toEqual([
-        { to: TEST_ADDRESS_1, data: TEST_DATA_1, value: TEST_VALUE_1 },
-        { to: TEST_ADDRESS_1, data: TEST_DATA_2, value: TEST_VALUE_2 }
+        { to: TEST_ADDRESS_1, value: TEST_VALUE_1, data: TEST_DATA_1 },
+        { to: TEST_ADDRESS_1, value: TEST_VALUE_2, data: TEST_DATA_2 }
       ])
     })
   })

sdks/smart-wallet-sdk/src/utils/callPlanner.ts

@@ -3,13 +3,13 @@ import { encodeAbiParameters } from 'viem'
 import { Call } from '../types'
 
 // Define the ABI parameter type for the call tuple
-const CALL_ABI_PARAMS = [
+export const CALL_ABI_PARAMS = [
   {
     type: 'tuple[]',
     components: [
       { type: 'address', name: 'to' },
-      { type: 'bytes', name: 'data' },
-      { type: 'uint256', name: 'value' }
+      { type: 'uint256', name: 'value' },
+      { type: 'bytes', name: 'data' }
     ]
   }
 ] as const
@@ -57,11 +57,11 @@ export class CallPlanner {
   /**
    * Add a command to execute a call
    * @param to The target address of the call
-   * @param data The calldata for the call
    * @param value The ETH value to send with the call
+   * @param data The calldata for the call
    */
-  add(to: `0x${string}`, data: `0x${string}`, value: bigint): CallPlanner {
-    this.calls.push({ to, data, value })
+  add(to: `0x${string}`, value: bigint, data: `0x${string}`): CallPlanner {
+    this.calls.push({ to, value, data })
     return this
   }
 }