@charterlabs/rhinestone-sdk 0.1.12 → 0.2.0

package/dist/src/actions/index.test.js

@@ -10,7 +10,7 @@ const MOCK_OWNER_A = '0xd1aefebdceefc094f1805b241fa5e6db63a9181a';
 const MOCK_OWNER_B = '0xeddfcb50d18f6d3d51c4f7cbca5ed6bdebc59817';
 const MOCK_OWNER_C = '0xb31e76f19defe76edc4b7eceeb4b0a2d6ddaca39';
 const MOCK_ACCOUNT_ADDRESS = '0x1234567890123456789012345678901234567890';
-const accountAddress = '0x464aae2512ead54fffad07fdf1f13d513050678b';
+const accountAddress = '0xc1b6c46c220dbc0ce6d13f4fb5adf70ccc1eb423';
 // Mock viem
 vitest_1.vi.mock('viem', async (importOriginal) => {
     const actual = await importOriginal();
@@ -37,7 +37,7 @@ vitest_1.vi.mock('viem', async (importOriginal) => {
                 {
                     to: accountAddress,
                     value: 0n,
-                    data: '0x9517e29f00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000e9e6e96bcaa3c113187cdb7e38aed900000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000001000000000000000000000000d1aefebdceefc094f1805b241fa5e6db63a9181a',
+                    data: '0x9517e29f000000000000000000000000000000000000000000000000000000000000000100000000000000000000000020c008719ba9d8aa14c7d07d122cd5e965aa8da500000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000001000000000000000000000000d1aefebdceefc094f1805b241fa5e6db63a9181a',
                 },
             ]);
         });
@@ -49,7 +49,7 @@ vitest_1.vi.mock('viem', async (importOriginal) => {
                 {
                     to: accountAddress,
                     value: 0n,
-                    data: '0x9517e29f00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000e9e6e96bcaa3c113187cdb7e38aed9000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000002000000000000000000000000d1aefebdceefc094f1805b241fa5e6db63a9181a000000000000000000000000eddfcb50d18f6d3d51c4f7cbca5ed6bdebc59817',
+                    data: '0x9517e29f000000000000000000000000000000000000000000000000000000000000000100000000000000000000000020c008719ba9d8aa14c7d07d122cd5e965aa8da5000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000002000000000000000000000000d1aefebdceefc094f1805b241fa5e6db63a9181a000000000000000000000000eddfcb50d18f6d3d51c4f7cbca5ed6bdebc59817',
                 },
             ]);
         });
@@ -62,7 +62,7 @@ vitest_1.vi.mock('viem', async (importOriginal) => {
                 {
                     to: accountAddress,
                     value: 0n,
-                    data: '0x9517e29f00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000e9e6e96bcaa3c113187cdb7e38aed9000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000003000000000000000000000000b31e76f19defe76edc4b7eceeb4b0a2d6ddaca39000000000000000000000000d1aefebdceefc094f1805b241fa5e6db63a9181a000000000000000000000000eddfcb50d18f6d3d51c4f7cbca5ed6bdebc59817',
+                    data: '0x9517e29f000000000000000000000000000000000000000000000000000000000000000100000000000000000000000020c008719ba9d8aa14c7d07d122cd5e965aa8da5000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000003000000000000000000000000b31e76f19defe76edc4b7eceeb4b0a2d6ddaca39000000000000000000000000d1aefebdceefc094f1805b241fa5e6db63a9181a000000000000000000000000eddfcb50d18f6d3d51c4f7cbca5ed6bdebc59817',
                 },
             ]);
         });
@@ -104,7 +104,7 @@ vitest_1.vi.mock('viem', async (importOriginal) => {
                 {
                     to: accountAddress,
                     value: 0n,
-                    data: '0xa71763a800000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000e9e6e96bcaa3c113187cdb7e38aed900000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000',
+                    data: '0xa71763a8000000000000000000000000000000000000000000000000000000000000000100000000000000000000000020c008719ba9d8aa14c7d07d122cd5e965aa8da500000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000',
                 },
             ]);
         });
@@ -132,7 +132,7 @@ vitest_1.vi.mock('viem', async (importOriginal) => {
     (0, vitest_1.describe)('Add Owner', () => {
         (0, vitest_1.test)('', () => {
             (0, vitest_1.expect)((0, _1.addOwner)(MOCK_OWNER_A)).toEqual({
-                to: '0x0000000000E9E6E96Bcaa3c113187CdB7E38AED9',
+                to: '0x20C008719Ba9D8aA14C7d07D122cd5E965aA8da5',
                 value: 0n,
                 data: '0x7065cb48000000000000000000000000d1aefebdceefc094f1805b241fa5e6db63a9181a',
             });
@@ -141,7 +141,7 @@ vitest_1.vi.mock('viem', async (importOriginal) => {
     (0, vitest_1.describe)('Remove Owner', () => {
         (0, vitest_1.test)('', () => {
             (0, vitest_1.expect)((0, _1.removeOwner)(MOCK_OWNER_A, MOCK_OWNER_B)).toEqual({
-                to: '0x0000000000E9E6E96Bcaa3c113187CdB7E38AED9',
+                to: '0x20C008719Ba9D8aA14C7d07D122cd5E965aA8da5',
                 value: 0n,
                 data: '0xfbe5ce0a000000000000000000000000d1aefebdceefc094f1805b241fa5e6db63a9181a000000000000000000000000eddfcb50d18f6d3d51c4f7cbca5ed6bdebc59817',
             });
@@ -150,7 +150,7 @@ vitest_1.vi.mock('viem', async (importOriginal) => {
     (0, vitest_1.describe)('Set Threshold', () => {
         (0, vitest_1.test)('', () => {
             (0, vitest_1.expect)((0, _1.changeThreshold)(1)).toEqual({
-                to: '0x0000000000E9E6E96Bcaa3c113187CdB7E38AED9',
+                to: '0x20C008719Ba9D8aA14C7d07D122cd5E965aA8da5',
                 value: 0n,
                 data: '0x960bfe040000000000000000000000000000000000000000000000000000000000000001',
             });
@@ -216,12 +216,12 @@ vitest_1.vi.mock('viem', async (importOriginal) => {
             (0, vitest_1.expect)(mockPublicClient.multicall).toHaveBeenCalledTimes(1);
             (0, vitest_1.expect)(result).toEqual([
                 {
-                    to: '0x0000000000E9E6E96Bcaa3c113187CdB7E38AED9',
+                    to: '0x20C008719Ba9D8aA14C7d07D122cd5E965aA8da5',
                     value: 0n,
                     data: '0x7065cb480000000000000000000000006092086a3dc0020cd604a68fcf5d430007d51bb7',
                 },
                 {
-                    to: '0x0000000000E9E6E96Bcaa3c113187CdB7E38AED9',
+                    to: '0x20C008719Ba9D8aA14C7d07D122cd5E965aA8da5',
                     value: 0n,
                     data: '0xfbe5ce0a0000000000000000000000006092086a3dc0020cd604a68fcf5d430007d51bb7000000000000000000000000f6c02c78ded62973b43bfa523b247da099486936',
                 },
@@ -249,12 +249,12 @@ vitest_1.vi.mock('viem', async (importOriginal) => {
             (0, vitest_1.expect)(mockPublicClient.multicall).toHaveBeenCalledTimes(1);
             (0, vitest_1.expect)(result).toEqual([
                 {
-                    to: '0x0000000000E9E6E96Bcaa3c113187CdB7E38AED9',
+                    to: '0x20C008719Ba9D8aA14C7d07D122cd5E965aA8da5',
                     value: 0n,
                     data: '0x7065cb48000000000000000000000000c5587d912c862252599b61926adaef316ba06da0',
                 },
                 {
-                    to: '0x0000000000E9E6E96Bcaa3c113187CdB7E38AED9',
+                    to: '0x20C008719Ba9D8aA14C7d07D122cd5E965aA8da5',
                     value: 0n,
                     data: '0xfbe5ce0a000000000000000000000000c5587d912c862252599b61926adaef316ba06da0000000000000000000000000f6c02c78ded62973b43bfa523b247da099486936',
                 },
@@ -282,17 +282,17 @@ vitest_1.vi.mock('viem', async (importOriginal) => {
             (0, vitest_1.expect)(mockPublicClient.multicall).toHaveBeenCalledTimes(1);
             (0, vitest_1.expect)(result).toEqual([
                 {
-                    to: '0x0000000000E9E6E96Bcaa3c113187CdB7E38AED9',
+                    to: '0x20C008719Ba9D8aA14C7d07D122cd5E965aA8da5',
                     value: 0n,
                     data: '0x7065cb48000000000000000000000000c5587d912c862252599b61926adaef316ba06da0',
                 },
                 {
-                    to: '0x0000000000E9E6E96Bcaa3c113187CdB7E38AED9',
+                    to: '0x20C008719Ba9D8aA14C7d07D122cd5E965aA8da5',
                     value: 0n,
                     data: '0xfbe5ce0a000000000000000000000000c5587d912c862252599b61926adaef316ba06da0000000000000000000000000f6c02c78ded62973b43bfa523b247da099486936',
                 },
                 {
-                    to: '0x0000000000E9E6E96Bcaa3c113187CdB7E38AED9',
+                    to: '0x20C008719Ba9D8aA14C7d07D122cd5E965aA8da5',
                     value: 0n,
                     data: '0xfbe5ce0a0000000000000000000000006092086a3dc0020cd604a68fcf5d430007d51bb7000000000000000000000000c27b7578151c5ef713c62c65db09763d57ac3596',
                 },

package/dist/src/actions/smart-session.d.ts

@@ -1,5 +1,11 @@
 import type { Hex } from 'viem';
 import type { SessionDetails } from '../execution/smart-session';
+/**
+ * Encode a smart session signature
+ * @param sessionDetails Session details
+ * @param sessionSignature Session signature
+ * @returns Encoded smart session signature
+ */
 declare function encodeSmartSessionSignature(sessionDetails: SessionDetails, sessionSignature: Hex): `0x${string}`;
 export { encodeSmartSessionSignature };
 //# sourceMappingURL=smart-session.d.ts.map

package/dist/src/actions/smart-session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"smart-session.d.ts","sourceRoot":"","sources":["../../../actions/smart-session.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,MAAM,CAAA;AAC/B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAGhE,iBAAS,2BAA2B,CAClC,cAAc,EAAE,cAAc,EAC9B,gBAAgB,EAAE,GAAG,iBAQtB;AAED,OAAO,EAAE,2BAA2B,EAAE,CAAA"}
+{"version":3,"file":"smart-session.d.ts","sourceRoot":"","sources":["../../../actions/smart-session.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,MAAM,CAAA;AAC/B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAGhE;;;;;GAKG;AACH,iBAAS,2BAA2B,CAClC,cAAc,EAAE,cAAc,EAC9B,gBAAgB,EAAE,GAAG,iBAQtB;AAED,OAAO,EAAE,2BAA2B,EAAE,CAAA"}

package/dist/src/actions/smart-session.js

@@ -2,6 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.encodeSmartSessionSignature = encodeSmartSessionSignature;
 const smart_sessions_1 = require("../modules/validators/smart-sessions");
+/**
+ * Encode a smart session signature
+ * @param sessionDetails Session details
+ * @param sessionSignature Session signature
+ * @returns Encoded smart session signature
+ */
 function encodeSmartSessionSignature(sessionDetails, sessionSignature) {
     return (0, smart_sessions_1.encodeSmartSessionSignature)(sessionDetails.mode, sessionDetails.enableSessionData.permissionId, sessionSignature, sessionDetails.enableSessionData);
 }

package/dist/src/execution/compact.d.ts

@@ -1,8 +1,135 @@
 import { type Address } from 'viem';
+import type { IntentOp } from '../orchestrator/types';
 import type { Call } from '../types';
 declare const COMPACT_ADDRESS = "0xa2E6C7Ba8613E1534dCB990e7e4962216C0a5d58";
 declare function getDepositEtherCall(account: Address, value: bigint): Call;
 declare function getDepositErc20Call(account: Address, tokenAddress: Address, amount: bigint): Call;
 declare function getApproveErc20Call(tokenAddress: Address, amount: bigint): Call;
-export { COMPACT_ADDRESS, getDepositEtherCall, getDepositErc20Call, getApproveErc20Call, };
+declare function getIntentData(intentOp: IntentOp): {
+    readonly domain: {
+        readonly name: "The Compact";
+        readonly version: "1";
+        readonly chainId: bigint;
+        readonly verifyingContract: "0x73d2dc0c21fca4ec1601895d50df7f5624f07d3f";
+    };
+    readonly types: {
+        readonly MultichainCompact: readonly [{
+            readonly name: "sponsor";
+            readonly type: "address";
+        }, {
+            readonly name: "nonce";
+            readonly type: "uint256";
+        }, {
+            readonly name: "expires";
+            readonly type: "uint256";
+        }, {
+            readonly name: "elements";
+            readonly type: "Element[]";
+        }];
+        readonly Element: readonly [{
+            readonly name: "arbiter";
+            readonly type: "address";
+        }, {
+            readonly name: "chainId";
+            readonly type: "uint256";
+        }, {
+            readonly name: "commitments";
+            readonly type: "Lock[]";
+        }, {
+            readonly name: "mandate";
+            readonly type: "Mandate";
+        }];
+        readonly Lock: readonly [{
+            readonly name: "lockTag";
+            readonly type: "bytes12";
+        }, {
+            readonly name: "token";
+            readonly type: "address";
+        }, {
+            readonly name: "amount";
+            readonly type: "uint256";
+        }];
+        readonly Mandate: readonly [{
+            readonly name: "target";
+            readonly type: "Target";
+        }, {
+            readonly name: "originOps";
+            readonly type: "Op[]";
+        }, {
+            readonly name: "destOps";
+            readonly type: "Op[]";
+        }, {
+            readonly name: "q";
+            readonly type: "bytes32";
+        }];
+        readonly Target: readonly [{
+            readonly name: "recipient";
+            readonly type: "address";
+        }, {
+            readonly name: "tokenOut";
+            readonly type: "Token[]";
+        }, {
+            readonly name: "targetChain";
+            readonly type: "uint256";
+        }, {
+            readonly name: "fillExpiry";
+            readonly type: "uint256";
+        }];
+        readonly Token: readonly [{
+            readonly name: "token";
+            readonly type: "address";
+        }, {
+            readonly name: "amount";
+            readonly type: "uint256";
+        }];
+        readonly Op: readonly [{
+            readonly name: "to";
+            readonly type: "address";
+        }, {
+            readonly name: "value";
+            readonly type: "uint256";
+        }, {
+            readonly name: "data";
+            readonly type: "bytes";
+        }];
+    };
+    readonly primaryType: "MultichainCompact";
+    readonly message: {
+        readonly sponsor: `0x${string}`;
+        readonly nonce: bigint;
+        readonly expires: bigint;
+        readonly elements: {
+            arbiter: `0x${string}`;
+            chainId: bigint;
+            commitments: {
+                lockTag: `0x${string}`;
+                token: `0x${string}`;
+                amount: bigint;
+            }[];
+            mandate: {
+                target: {
+                    recipient: `0x${string}`;
+                    tokenOut: {
+                        token: `0x${string}`;
+                        amount: bigint;
+                    }[];
+                    targetChain: bigint;
+                    fillExpiry: bigint;
+                };
+                originOps: {
+                    to: `0x${string}`;
+                    value: bigint;
+                    data: `0x${string}`;
+                }[];
+                destOps: {
+                    to: `0x${string}`;
+                    value: bigint;
+                    data: `0x${string}`;
+                }[];
+                q: `0x${string}`;
+            };
+        }[];
+    };
+};
+export { COMPACT_ADDRESS, getDepositEtherCall, getDepositErc20Call, getApproveErc20Call, getIntentData, };
 //# sourceMappingURL=compact.d.ts.map

package/dist/src/execution/compact.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compact.d.ts","sourceRoot":"","sources":["../../../execution/compact.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAA0C,MAAM,MAAM,CAAA;AAC3E,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,UAAU,CAAA;AAcpC,QAAA,MAAM,eAAe,+CAA+C,CAAA;AAKpE,iBAAS,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAqBlE;AAED,iBAAS,mBAAmB,CAC1B,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,OAAO,EACrB,MAAM,EAAE,MAAM,GACb,IAAI,CA2BN;AAED,iBAAS,mBAAmB,CAAC,YAAY,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAUxE;AAoCD,OAAO,EACL,eAAe,EACf,mBAAmB,EACnB,mBAAmB,EACnB,mBAAmB,GACpB,CAAA"}
+{"version":3,"file":"compact.d.ts","sourceRoot":"","sources":["../../../execution/compact.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,OAAO,EAOb,MAAM,MAAM,CAAA;AACb,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAA;AACrD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,UAAU,CAAA;AAcpC,QAAA,MAAM,eAAe,+CAA+C,CAAA;AAKpE,iBAAS,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAqBlE;AAED,iBAAS,mBAAmB,CAC1B,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,OAAO,EACrB,MAAM,EAAE,MAAM,GACb,IAAI,CA2BN;AAED,iBAAS,mBAAmB,CAAC,YAAY,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAUxE;AA8ED,iBAAS,aAAa,CAAC,QAAQ,EAAE,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAiDxC;AAED,OAAO,EACL,eAAe,EACf,mBAAmB,EACnB,mBAAmB,EACnB,mBAAmB,EACnB,aAAa,GACd,CAAA"}

package/dist/src/execution/compact.js

@@ -4,6 +4,7 @@ exports.COMPACT_ADDRESS = void 0;
 exports.getDepositEtherCall = getDepositEtherCall;
 exports.getDepositErc20Call = getDepositErc20Call;
 exports.getApproveErc20Call = getApproveErc20Call;
+exports.getIntentData = getIntentData;
 const viem_1 = require("viem");
 const COMPACT_ADDRESS = '0xa2E6C7Ba8613E1534dCB990e7e4962216C0a5d58';
 exports.COMPACT_ADDRESS = COMPACT_ADDRESS;
@@ -103,3 +104,93 @@ function lockTag() {
     const hex = tagBig.toString(16).slice(0, 24);
     return `0x${hex}`;
 }
+// Define the typed data structure as const to preserve type safety
+const COMPACT_TYPED_DATA_TYPES = {
+    MultichainCompact: [
+        { name: 'sponsor', type: 'address' },
+        { name: 'nonce', type: 'uint256' },
+        { name: 'expires', type: 'uint256' },
+        { name: 'elements', type: 'Element[]' },
+    ],
+    Element: [
+        { name: 'arbiter', type: 'address' },
+        { name: 'chainId', type: 'uint256' },
+        { name: 'commitments', type: 'Lock[]' },
+        { name: 'mandate', type: 'Mandate' },
+    ],
+    Lock: [
+        { name: 'lockTag', type: 'bytes12' },
+        { name: 'token', type: 'address' },
+        { name: 'amount', type: 'uint256' },
+    ],
+    Mandate: [
+        { name: 'target', type: 'Target' },
+        { name: 'originOps', type: 'Op[]' },
+        { name: 'destOps', type: 'Op[]' },
+        { name: 'q', type: 'bytes32' },
+    ],
+    Target: [
+        { name: 'recipient', type: 'address' },
+        { name: 'tokenOut', type: 'Token[]' },
+        { name: 'targetChain', type: 'uint256' },
+        { name: 'fillExpiry', type: 'uint256' },
+    ],
+    Token: [
+        { name: 'token', type: 'address' },
+        { name: 'amount', type: 'uint256' },
+    ],
+    Op: [
+        { name: 'to', type: 'address' },
+        { name: 'value', type: 'uint256' },
+        { name: 'data', type: 'bytes' },
+    ],
+};
+function getIntentData(intentOp) {
+    const typedData = {
+        domain: {
+            name: 'The Compact',
+            version: '1',
+            chainId: BigInt(intentOp.elements[0].chainId),
+            verifyingContract: '0x73d2dc0c21fca4ec1601895d50df7f5624f07d3f',
+        },
+        types: COMPACT_TYPED_DATA_TYPES,
+        primaryType: 'MultichainCompact',
+        message: {
+            sponsor: intentOp.sponsor,
+            nonce: BigInt(intentOp.nonce),
+            expires: BigInt(intentOp.expires),
+            elements: intentOp.elements.map((element) => ({
+                arbiter: element.arbiter,
+                chainId: BigInt(element.chainId),
+                commitments: element.idsAndAmounts.map((token) => ({
+                    lockTag: (0, viem_1.slice)((0, viem_1.toHex)(BigInt(token[0])), 0, 12),
+                    token: (0, viem_1.slice)((0, viem_1.toHex)(BigInt(token[0])), 12, 32),
+                    amount: BigInt(token[1]),
+                })),
+                mandate: {
+                    target: {
+                        recipient: element.mandate.recipient,
+                        tokenOut: element.mandate.tokenOut.map((token) => ({
+                            token: (0, viem_1.slice)((0, viem_1.toHex)(BigInt(token[0])), 12, 32),
+                            amount: BigInt(token[1]),
+                        })),
+                        targetChain: BigInt(element.mandate.destinationChainId),
+                        fillExpiry: BigInt(element.mandate.fillDeadline),
+                    },
+                    originOps: element.mandate.preClaimOps.map((op) => ({
+                        to: op.to,
+                        value: BigInt(op.value),
+                        data: op.data,
+                    })),
+                    destOps: element.mandate.destinationOps.map((op) => ({
+                        to: op.to,
+                        value: BigInt(op.value),
+                        data: op.data,
+                    })),
+                    q: (0, viem_1.keccak256)(element.mandate.qualifier?.encodedVal ?? '0x'),
+                },
+            })),
+        },
+    };
+    return typedData;
+}

package/dist/src/execution/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../execution/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,KAAK,EAAmC,MAAM,MAAM,CAAA;AAKhF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAQrD,OAAO,KAAK,EAEV,uBAAuB,EAGvB,WAAW,EACZ,MAAM,UAAU,CAAA;AACjB,OAAO,EACL,cAAc,EACd,iBAAiB,EACjB,gBAAgB,EAChB,gCAAgC,EAChC,yBAAyB,EACzB,0CAA0C,EAC1C,0CAA0C,EAC3C,MAAM,SAAS,CAAA;AAEhB,OAAO,KAAK,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAA;AAa5D,iBAAe,eAAe,CAC5B,MAAM,EAAE,uBAAuB,EAC/B,WAAW,EAAE,WAAW,8BA2BzB;AAqID,iBAAe,gBAAgB,CAC7B,MAAM,EAAE,uBAAuB,EAC/B,MAAM,EAAE,iBAAiB,EACzB,uBAAuB,EAAE,OAAO;;;;;;;;;;;;GA2CjC;AAED,iBAAe,qBAAqB,CAClC,MAAM,EAAE,uBAAuB,EAC/B,KAAK,EAAE,KAAK,EACZ,YAAY,EAAE,OAAO,EACrB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,CAAC,CASjB;AAED,iBAAe,YAAY,CACzB,MAAM,EAAE,uBAAuB,EAC/B,UAAU,EAAE,OAAO,gDAMpB;AAED,OAAO,EACL,eAAe,EACf,gBAAgB,EAChB,qBAAqB,EACrB,YAAY,EAEZ,gBAAgB,EAChB,iBAAiB,EACjB,cAAc,EACd,0CAA0C,EAC1C,0CAA0C,EAC1C,gCAAgC,EAChC,yBAAyB,GAC1B,CAAA;AACD,YAAY,EAAE,UAAU,EAAE,iBAAiB,EAAE,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../execution/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,KAAK,EAAmC,MAAM,MAAM,CAAA;AAKhF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAQrD,OAAO,KAAK,EAEV,uBAAuB,EAGvB,WAAW,EACZ,MAAM,UAAU,CAAA;AACjB,OAAO,EACL,cAAc,EACd,iBAAiB,EACjB,gBAAgB,EAChB,gCAAgC,EAChC,yBAAyB,EACzB,0CAA0C,EAC1C,0CAA0C,EAC3C,MAAM,SAAS,CAAA;AAEhB,OAAO,KAAK,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAA;AAa5D,iBAAe,eAAe,CAC5B,MAAM,EAAE,uBAAuB,EAC/B,WAAW,EAAE,WAAW,8BA2BzB;AAyID,iBAAe,gBAAgB,CAC7B,MAAM,EAAE,uBAAuB,EAC/B,MAAM,EAAE,iBAAiB,EACzB,uBAAuB,EAAE,OAAO;;;;;;;;;;;;GA2CjC;AAED,iBAAe,qBAAqB,CAClC,MAAM,EAAE,uBAAuB,EAC/B,KAAK,EAAE,KAAK,EACZ,YAAY,EAAE,OAAO,EACrB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,CAAC,CASjB;AAED,iBAAe,YAAY,CACzB,MAAM,EAAE,uBAAuB,EAC/B,UAAU,EAAE,OAAO,gDAMpB;AAED,OAAO,EACL,eAAe,EACf,gBAAgB,EAChB,qBAAqB,EACrB,YAAY,EAEZ,gBAAgB,EAChB,iBAAiB,EACjB,cAAc,EACd,0CAA0C,EAC1C,0CAA0C,EAC1C,gCAAgC,EAChC,yBAAyB,GAC1B,CAAA;AACD,YAAY,EAAE,UAAU,EAAE,iBAAiB,EAAE,CAAA"}

package/dist/src/execution/index.js

@@ -84,16 +84,15 @@ async function sendTransactionAsUserOp(config, chain, callInputs, signers) {
     };
 }
 async function sendTransactionAsIntent(config, sourceChains, targetChain, callInputs, gasLimit, tokenRequests, accountAddress, signers, sponsored) {
-    const { intentRoute, hash: intentHash } = await (0, utils_2.prepareTransactionAsIntent)(config, sourceChains, targetChain, callInputs, gasLimit, tokenRequests, accountAddress, sponsored ?? false);
+    const { intentRoute } = await (0, utils_2.prepareTransactionAsIntent)(config, sourceChains, targetChain, callInputs, gasLimit, tokenRequests, accountAddress, sponsored ?? false);
     if (!intentRoute) {
         throw new error_1.OrderPathRequiredForIntentsError();
     }
-    const signature = await (0, utils_2.signIntent)(config, targetChain, intentHash, signers);
+    const signature = await (0, utils_2.signIntent)(config, targetChain, intentRoute.intentOp, signers);
     const authorizations = config.eoa
         ? await (0, utils_2.signAuthorizationsInternal)(config, {
             type: 'intent',
             intentRoute,
-            hash: intentHash,
         })
         : [];
     return await (0, utils_2.submitIntentInternal)(config, sourceChains, targetChain, intentRoute.intentOp, signature, authorizations);

package/dist/src/execution/utils.d.ts

@@ -1,4 +1,4 @@
-import { type Address, type Chain, type Hex, type PublicClient, type SignedAuthorization, type SignedAuthorizationList } from 'viem';
+import { type Address, type Chain, type HashTypedDataParameters, type Hex, type PublicClient, type SignableMessage, type SignedAuthorization, type SignedAuthorizationList, type TypedData } from 'viem';
 import { type UserOperation } from 'viem/account-abstraction';
 import { type IntentOp, type IntentRoute } from '../orchestrator';
 import type { Call, CallInput, RhinestoneAccountConfig, SignerSet, TokenRequest, Transaction } from '../types';
@@ -9,12 +9,11 @@ type TransactionResult = {
 } | {
     type: 'intent';
     id: bigint;
-    sourceChain?: number;
+    sourceChains?: number[];
     targetChain: number;
 };
 interface IntentData {
     type: 'intent';
-    hash: Hex;
     intentRoute: IntentRoute;
 }
 interface UserOpData {
@@ -32,14 +31,16 @@ interface SignedTransactionData extends PreparedTransactionData {
 declare function prepareTransaction(config: RhinestoneAccountConfig, transaction: Transaction): Promise<PreparedTransactionData>;
 declare function signTransaction(config: RhinestoneAccountConfig, preparedTransaction: PreparedTransactionData): Promise<SignedTransactionData>;
 declare function signAuthorizations(config: RhinestoneAccountConfig, preparedTransaction: PreparedTransactionData): Promise<SignedAuthorization[]>;
+declare function signMessage(config: RhinestoneAccountConfig, message: SignableMessage, chain: Chain, signers: SignerSet | undefined): Promise<`0x${string}`>;
+declare function signTypedData<typedData extends TypedData | Record<string, unknown> = TypedData, primaryType extends keyof typedData | 'EIP712Domain' = keyof typedData>(config: RhinestoneAccountConfig, parameters: HashTypedDataParameters<typedData, primaryType>, chain: Chain, signers: SignerSet | undefined): Promise<`0x${string}`>;
 declare function signAuthorizationsInternal(config: RhinestoneAccountConfig, data: IntentData | UserOpData): Promise<SignedAuthorization[]>;
 declare function submitTransaction(config: RhinestoneAccountConfig, signedTransaction: SignedTransactionData, authorizations: SignedAuthorizationList): Promise<TransactionResult>;
 declare function prepareTransactionAsIntent(config: RhinestoneAccountConfig, sourceChains: Chain[] | undefined, targetChain: Chain, callInputs: CallInput[], gasLimit: bigint | undefined, tokenRequests: TokenRequest[], accountAddress: Address, isSponsored: boolean, eip7702InitSignature?: Hex): Promise<IntentData>;
-declare function signIntent(config: RhinestoneAccountConfig, targetChain: Chain, intentHash: Hex, signers?: SignerSet): Promise<`0x${string}`>;
+declare function signIntent(config: RhinestoneAccountConfig, targetChain: Chain, intentOp: IntentOp, signers?: SignerSet): Promise<`0x${string}`>;
 declare function getOrchestratorByChain(chainId: number, apiKey: string): import("../orchestrator").Orchestrator;
 declare function submitIntentInternal(config: RhinestoneAccountConfig, sourceChains: Chain[] | undefined, targetChain: Chain, intentOp: IntentOp, signature: Hex, authorizations: SignedAuthorizationList): Promise<TransactionResult>;
 declare function getValidatorAccount(config: RhinestoneAccountConfig, signers: SignerSet | undefined, publicClient: PublicClient, chain: Chain): Promise<import("viem/account-abstraction").SmartAccount<import("viem/account-abstraction").SmartAccountImplementation<import("viem").Abi, "0.7">> | null | undefined>;
 declare function parseCalls(calls: CallInput[], chainId: number): Call[];
-export { prepareTransaction, signTransaction, signAuthorizations, signAuthorizationsInternal, submitTransaction, getOrchestratorByChain, signIntent, prepareTransactionAsIntent, submitIntentInternal, getValidatorAccount, parseCalls, };
+export { prepareTransaction, signTransaction, signAuthorizations, signAuthorizationsInternal, signMessage, signTypedData, submitTransaction, getOrchestratorByChain, signIntent, prepareTransactionAsIntent, submitIntentInternal, getValidatorAccount, parseCalls, };
 export type { IntentData, TransactionResult, PreparedTransactionData, SignedTransactionData, };
 //# sourceMappingURL=utils.d.ts.map

package/dist/src/execution/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../execution/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../execution/utils.ts"],"names":[],"mappings":"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"}

package/dist/src/execution/utils.js

@@ -4,6 +4,8 @@ exports.prepareTransaction = prepareTransaction;
 exports.signTransaction = signTransaction;
 exports.signAuthorizations = signAuthorizations;
 exports.signAuthorizationsInternal = signAuthorizationsInternal;
+exports.signMessage = signMessage;
+exports.signTypedData = signTypedData;
 exports.submitTransaction = submitTransaction;
 exports.getOrchestratorByChain = getOrchestratorByChain;
 exports.signIntent = signIntent;
@@ -20,6 +22,7 @@ const core_1 = require("../modules/validators/core");
 const orchestrator_1 = require("../orchestrator");
 const consts_1 = require("../orchestrator/consts");
 const registry_1 = require("../orchestrator/registry");
+const compact_1 = require("./compact");
 const error_1 = require("./error");
 async function prepareTransaction(config, transaction) {
     const { sourceChains, targetChain, tokenRequests, signers, sponsored, eip7702InitSignature, } = getTransactionParams(transaction);
@@ -56,7 +59,7 @@ async function signTransaction(config, preparedTransaction) {
         signature = await signUserOp(config, chain, signers, userOp);
     }
     else {
-        signature = await signIntent(config, targetChain, data.hash, signers);
+        signature = await signIntent(config, targetChain, data.intentRoute.intentOp, signers);
     }
     return {
         data,
@@ -67,6 +70,33 @@ async function signTransaction(config, preparedTransaction) {
 async function signAuthorizations(config, preparedTransaction) {
     return await signAuthorizationsInternal(config, preparedTransaction.data);
 }
+async function signMessage(config, message, chain, signers) {
+    const validator = getValidator(config, signers);
+    if (!validator) {
+        throw new Error('Validator not available');
+    }
+    const ownerValidator = (0, validators_1.getOwnerValidator)(config);
+    const isRoot = validator.address === ownerValidator.address;
+    const hash = (0, viem_1.hashMessage)(message);
+    const signature = await (0, accounts_1.getPackedSignature)(config, signers, chain, {
+        address: validator.address,
+        isRoot,
+    }, hash);
+    return await (0, accounts_1.toErc6492Signature)(config, signature, chain);
+}
+async function signTypedData(config, parameters, chain, signers) {
+    const validator = getValidator(config, signers);
+    if (!validator) {
+        throw new Error('Validator not available');
+    }
+    const ownerValidator = (0, validators_1.getOwnerValidator)(config);
+    const isRoot = validator.address === ownerValidator.address;
+    const signature = await (0, accounts_1.getTypedDataPackedSignature)(config, signers, chain, {
+        address: validator.address,
+        isRoot,
+    }, parameters);
+    return await (0, accounts_1.toErc6492Signature)(config, signature, chain);
+}
 async function signAuthorizationsInternal(config, data) {
     const eoa = config.eoa;
     if (!eoa) {
@@ -193,7 +223,7 @@ async function prepareTransactionAsIntent(config, sourceChains, targetChain, cal
         account: {
             address: accountAddress,
             accountType: 'ERC7579',
-            setupOps: setupOps || [],
+            setupOps,
             delegations,
         },
         destinationExecutions: calls,
@@ -210,24 +240,23 @@ async function prepareTransactionAsIntent(config, sourceChains, targetChain, cal
     };
     const orchestrator = getOrchestratorByChain(targetChain.id, config.rhinestoneApiKey);
     const intentRoute = await orchestrator.getIntentRoute(metaIntent);
-    const intentHash = (0, orchestrator_1.getIntentOpHash)(intentRoute.intentOp);
     return {
         type: 'intent',
         intentRoute,
-        hash: intentHash,
     };
 }
-async function signIntent(config, targetChain, intentHash, signers) {
+async function signIntent(config, targetChain, intentOp, signers) {
     const validator = getValidator(config, signers);
     if (!validator) {
         throw new Error('Validator not available');
     }
     const ownerValidator = (0, validators_1.getOwnerValidator)(config);
     const isRoot = validator.address === ownerValidator.address;
-    const signature = await (0, accounts_1.getPackedSignature)(config, signers, targetChain, {
+    const typedData = (0, compact_1.getIntentData)(intentOp);
+    const signature = await (0, accounts_1.getTypedDataPackedSignature)(config, signers, targetChain, {
         address: validator.address,
         isRoot,
-    }, intentHash);
+    }, typedData);
     return signature;
 }
 async function signUserOp(config, chain, signers, userOp) {
@@ -359,16 +388,7 @@ function getValidator(config, signers) {
         }
         // Multi-factor
         if (withOwner.kind === 'multi-factor') {
-            // Convert validators to proper format
-            const validators = withOwner.validators.map(validator => {
-                if (validator.type === 'ecdsa') {
-                    return { type: 'ecdsa', accounts: validator.accounts, threshold: 1 };
-                }
-                else {
-                    return { type: 'passkey', account: validator.account, credentialIds: [] };
-                }
-            });
-            return (0, core_1.getMultiFactorValidator)(1, validators);
+            return (0, core_1.getMultiFactorValidator)(1, withOwner.validators);
         }
     }
     // Smart sessions