@rhinestone/sdk 1.0.0-alpha.2 → 1.0.0-alpha.21

package/dist/src/modules/validators/core.js

@@ -1,52 +1,89 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WEBAUTHN_VALIDATOR_ADDRESS = exports.OWNABLE_VALIDATOR_ADDRESS = void 0;
+exports.OWNABLE_V0_VALIDATOR_ADDRESS = exports.MULTI_FACTOR_VALIDATOR_ADDRESS = exports.WEBAUTHN_VALIDATOR_ADDRESS = exports.OWNABLE_VALIDATOR_ADDRESS = void 0;
 exports.getOwnerValidator = getOwnerValidator;
 exports.getOwnableValidator = getOwnableValidator;
 exports.getWebAuthnValidator = getWebAuthnValidator;
+exports.getMultiFactorValidator = getMultiFactorValidator;
 exports.getSocialRecoveryValidator = getSocialRecoveryValidator;
 exports.getValidator = getValidator;
 exports.getMockSignature = getMockSignature;
 const viem_1 = require("viem");
 const common_1 = require("../common");
-const OWNABLE_VALIDATOR_ADDRESS = '0x2483DA3A338895199E5e538530213157e931Bf06';
+const OWNABLE_VALIDATOR_ADDRESS = '0x000000000013fdB5234E4E3162a810F54d9f7E98';
 exports.OWNABLE_VALIDATOR_ADDRESS = OWNABLE_VALIDATOR_ADDRESS;
-const WEBAUTHN_VALIDATOR_ADDRESS = '0x2f167e55d42584f65e2e30a748f41ee75a311414';
+const WEBAUTHN_VALIDATOR_ADDRESS = '0x0000000000578c4cB0e472a5462da43C495C3F33';
 exports.WEBAUTHN_VALIDATOR_ADDRESS = WEBAUTHN_VALIDATOR_ADDRESS;
 const SOCIAL_RECOVERY_VALIDATOR_ADDRESS = '0xA04D053b3C8021e8D5bF641816c42dAA75D8b597';
+const MULTI_FACTOR_VALIDATOR_ADDRESS = '0xf6bDf42c9BE18cEcA5C06c42A43DAf7FBbe7896b';
+exports.MULTI_FACTOR_VALIDATOR_ADDRESS = MULTI_FACTOR_VALIDATOR_ADDRESS;
+const OWNABLE_V0_VALIDATOR_ADDRESS = '0x2483DA3A338895199E5e538530213157e931Bf06';
+exports.OWNABLE_V0_VALIDATOR_ADDRESS = OWNABLE_V0_VALIDATOR_ADDRESS;
 const ECDSA_MOCK_SIGNATURE = '0x81d4b4981670cb18f99f0b4a66446df1bf5b204d24cfcb659bf38ba27a4359b5711649ec2423c5e1247245eba2964679b6a1dbb85c992ae40b9b00c6935b02ff1b';
-const WEBAUTHN_MOCK_SIGNATURE = '0x00000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000001635bc6d0f68ff895cae8a288ecf7542a6a9cd555df784b73e1e2ea7e9104b1db15e9015d280cb19527881c625fee43fd3a405d5b0d199a8c8e6589a7381209e40000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002549960de5880e8c687434170f6476605b8fe4aeb9a28632c7995cf3ba831d97631d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f47b2274797065223a22776562617574686e2e676574222c226368616c6c656e6765223a22746278584e465339585f3442797231634d77714b724947422d5f3330613051685a36793775634d30424f45222c226f726967696e223a22687474703a2f2f6c6f63616c686f73743a33303030222c2263726f73734f726967696e223a66616c73652c20226f746865725f6b6579735f63616e5f62655f61646465645f68657265223a22646f206e6f7420636f6d7061726520636c69656e74446174614a534f4e20616761696e737420612074656d706c6174652e205365652068747470733a2f2f676f6f2e676c2f796162506578227d000000000000000000000000';
+const WEBAUTHN_MOCK_SIGNATURE = '0x0000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000001b9b86eb98fda3ed4d797d9e690588dfadf17b329a76a47cec935bebf92d7ddc80000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000120000000000000000000000000000000000000000000000000000000000000001700000000000000000000000000000000000000000000000000000000000000019b2e9410bb6850f9f660a03d609d5a844fb96bcdc87a15139b03ee22c70f469100d2b865a215c3bf786387064effa8fcedcb1d625b5148f8a1236d5e3ff11acf000000000000000000000000000000000000000000000000000000000000002549960de5880e8c687434170f6476605b8fe4aeb9a28632c7995cf3ba831d9763050000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000867b2274797065223a22776562617574686e2e676574222c226368616c6c656e6765223a22396a4546696a75684557724d34534f572d7443684a625545484550343456636a634a2d42716f3166544d38222c226f726967696e223a22687474703a2f2f6c6f63616c686f73743a38303830222c2263726f73734f726967696e223a66616c73657d0000000000000000000000000000000000000000000000000000';
 function getOwnerValidator(config) {
     return getValidator(config.owners);
 }
 function getMockSignature(ownerSet) {
     switch (ownerSet.type) {
-        case 'ecdsa': {
+        case 'ecdsa':
+        case 'ecdsa-v0': {
             const owners = ownerSet.accounts.map((account) => account.address);
             const signatures = owners.map(() => ECDSA_MOCK_SIGNATURE);
             return (0, viem_1.concat)(signatures);
         }
         case 'passkey':
             return WEBAUTHN_MOCK_SIGNATURE;
+        case 'multi-factor': {
+            const mockValidators = ownerSet.validators.map((validator, index) => {
+                const validatorModule = getValidator(validator);
+                const signature = getMockSignature(validator);
+                return {
+                    packedValidatorAndId: (0, viem_1.encodePacked)(['bytes12', 'address'], [
+                        (0, viem_1.pad)((0, viem_1.toHex)(index), {
+                            size: 12,
+                        }),
+                        validatorModule.address,
+                    ]),
+                    data: signature,
+                };
+            });
+            return (0, viem_1.encodeAbiParameters)([
+                {
+                    components: [
+                        {
+                            internalType: 'bytes32',
+                            name: 'packedValidatorAndId',
+                            type: 'bytes32',
+                        },
+                        { internalType: 'bytes', name: 'data', type: 'bytes' },
+                    ],
+                    name: 'validators',
+                    type: 'tuple[]',
+                },
+            ], [mockValidators]);
+        }
     }
 }
 function getValidator(owners) {
     switch (owners.type) {
         case 'ecdsa':
-            return getOwnableValidator({
-                threshold: owners.threshold ?? 1,
-                owners: owners.accounts.map((account) => account.address),
-            });
+            return getOwnableValidator(owners.threshold ?? 1, owners.accounts.map((account) => account.address));
+        case 'ecdsa-v0':
+            return getOwnableValidator(owners.threshold ?? 1, owners.accounts.map((account) => account.address), OWNABLE_V0_VALIDATOR_ADDRESS);
         case 'passkey':
-            return getWebAuthnValidator({
-                pubKey: owners.account.publicKey,
-                authenticatorId: owners.account.id,
-            });
+            return getWebAuthnValidator(owners.threshold ?? 1, owners.accounts.map((account) => ({
+                pubKey: account.publicKey,
+                authenticatorId: account.id,
+            })));
+        case 'multi-factor': {
+            return getMultiFactorValidator(owners.threshold ?? 1, owners.validators);
+        }
     }
 }
-function getOwnableValidator({ threshold, owners, }) {
+function getOwnableValidator(threshold, owners, address) {
     return {
-        address: OWNABLE_VALIDATOR_ADDRESS,
+        address: address ?? OWNABLE_VALIDATOR_ADDRESS,
         initData: (0, viem_1.encodeAbiParameters)([
             { name: 'threshold', type: 'uint256' },
             { name: 'owners', type: 'address[]' },
@@ -59,29 +96,33 @@ function getOwnableValidator({ threshold, owners, }) {
         type: common_1.MODULE_TYPE_ID_VALIDATOR,
     };
 }
-function getWebAuthnValidator(webAuthnCredential) {
-    let pubKeyX;
-    let pubKeyY;
-    // Distinguish between PublicKey and Hex / byte encoded public key
-    if (typeof webAuthnCredential.pubKey === 'string' ||
-        webAuthnCredential.pubKey instanceof Uint8Array) {
-        // It's a P256Credential
-        const { x, y, prefix } = parsePublicKey(webAuthnCredential.pubKey);
-        pubKeyX = x;
-        pubKeyY = y;
-        if (prefix && prefix !== 4) {
-            throw new Error('Only uncompressed public keys are supported');
+function getWebAuthnValidator(threshold, webAuthnCredentials) {
+    function getPublicKey(webAuthnCredential) {
+        if (typeof webAuthnCredential.pubKey === 'string' ||
+            webAuthnCredential.pubKey instanceof Uint8Array) {
+            // It's a P256Credential
+            const { x, y, prefix } = parsePublicKey(webAuthnCredential.pubKey);
+            if (prefix && prefix !== 4) {
+                throw new Error('Only uncompressed public keys are supported');
+            }
+            return {
+                x,
+                y,
+            };
+        }
+        else {
+            // It's already a PublicKey
+            return webAuthnCredential.pubKey;
         }
     }
-    else {
-        // It's already a PublicKey
-        pubKeyX = webAuthnCredential.pubKey.x;
-        pubKeyY = webAuthnCredential.pubKey.y;
-    }
+    const publicKeys = webAuthnCredentials.map(getPublicKey);
     return {
         address: WEBAUTHN_VALIDATOR_ADDRESS,
         initData: (0, viem_1.encodeAbiParameters)([
+            { name: 'threshold', type: 'uint256' },
             {
+                name: 'credentials',
+                type: 'tuple[]',
                 components: [
                     {
                         name: 'pubKeyX',
@@ -91,19 +132,62 @@ function getWebAuthnValidator(webAuthnCredential) {
                         name: 'pubKeyY',
                         type: 'uint256',
                     },
+                    {
+                        name: 'requireUV',
+                        type: 'bool',
+                    },
                 ],
-                type: 'tuple',
-            },
-            {
-                type: 'bytes32',
-                name: 'authenticatorIdHash',
             },
         ], [
-            {
-                pubKeyX,
-                pubKeyY,
-            },
-            (0, viem_1.keccak256)((0, viem_1.toHex)(webAuthnCredential.authenticatorId)),
+            BigInt(threshold),
+            publicKeys.map((publicKey) => ({
+                pubKeyX: publicKey.x,
+                pubKeyY: publicKey.y,
+                requireUV: false,
+            })),
+        ]),
+        deInitData: '0x',
+        additionalContext: '0x',
+        type: common_1.MODULE_TYPE_ID_VALIDATOR,
+    };
+}
+function getMultiFactorValidator(threshold, validators) {
+    return {
+        address: MULTI_FACTOR_VALIDATOR_ADDRESS,
+        initData: (0, viem_1.encodePacked)(['uint8', 'bytes'], [
+            threshold,
+            (0, viem_1.encodeAbiParameters)([
+                {
+                    components: [
+                        {
+                            internalType: 'bytes32',
+                            name: 'packedValidatorAndId',
+                            type: 'bytes32',
+                        },
+                        { internalType: 'bytes', name: 'data', type: 'bytes' },
+                    ],
+                    name: 'validators',
+                    type: 'tuple[]',
+                },
+            ], [
+                validators
+                    .map((validator, index) => {
+                    if (validator === null) {
+                        return null;
+                    }
+                    const validatorModule = getValidator(validator);
+                    return {
+                        packedValidatorAndId: (0, viem_1.concat)([
+                            (0, viem_1.pad)((0, viem_1.toHex)(index), {
+                                size: 12,
+                            }),
+                            validatorModule.address,
+                        ]),
+                        data: validatorModule.initData,
+                    };
+                })
+                    .filter((validator) => validator !== null),
+            ]),
         ]),
         deInitData: '0x',
         additionalContext: '0x',

package/dist/src/modules/validators/core.test.js

@@ -14,7 +14,7 @@ const core_1 = require("./core");
             });
             (0, vitest_1.expect)(validator.type).toEqual(common_1.MODULE_TYPE_ID_VALIDATOR);
             (0, vitest_1.expect)((0, viem_1.isAddress)(validator.address)).toEqual(true);
-            (0, vitest_1.expect)(validator.address).toEqual('0x2483DA3A338895199E5e538530213157e931Bf06');
+            (0, vitest_1.expect)(validator.address).toEqual('0x000000000013fdB5234E4E3162a810F54d9f7E98');
             (0, vitest_1.expect)(validator.initData).toEqual('0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000001000000000000000000000000f6c02c78ded62973b43bfa523b247da099486936');
         });
         (0, vitest_1.test)('ECDSA: two addresses', () => {
@@ -24,7 +24,7 @@ const core_1 = require("./core");
             });
             (0, vitest_1.expect)(validator.type).toEqual(common_1.MODULE_TYPE_ID_VALIDATOR);
             (0, vitest_1.expect)((0, viem_1.isAddress)(validator.address)).toEqual(true);
-            (0, vitest_1.expect)(validator.address).toEqual('0x2483DA3A338895199E5e538530213157e931Bf06');
+            (0, vitest_1.expect)(validator.address).toEqual('0x000000000013fdB5234E4E3162a810F54d9f7E98');
             (0, vitest_1.expect)(validator.initData).toEqual('0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000020000000000000000000000006092086a3dc0020cd604a68fcf5d430007d51bb7000000000000000000000000f6c02c78ded62973b43bfa523b247da099486936');
         });
         (0, vitest_1.test)('ECDSA: three addresses, custom threshold', () => {
@@ -35,18 +35,18 @@ const core_1 = require("./core");
             });
             (0, vitest_1.expect)(validator.type).toEqual(common_1.MODULE_TYPE_ID_VALIDATOR);
             (0, vitest_1.expect)((0, viem_1.isAddress)(validator.address)).toEqual(true);
-            (0, vitest_1.expect)(validator.address).toEqual('0x2483DA3A338895199E5e538530213157e931Bf06');
+            (0, vitest_1.expect)(validator.address).toEqual('0x000000000013fdB5234E4E3162a810F54d9f7E98');
             (0, vitest_1.expect)(validator.initData).toEqual('0x0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000030000000000000000000000006092086a3dc0020cd604a68fcf5d430007d51bb7000000000000000000000000c27b7578151c5ef713c62c65db09763d57ac3596000000000000000000000000f6c02c78ded62973b43bfa523b247da099486936');
         });
         (0, vitest_1.test)('Passkey', () => {
             const validator = (0, core_1.getValidator)({
                 type: 'passkey',
-                account: consts_1.passkeyAccount,
+                accounts: [consts_1.passkeyAccount],
             });
             (0, vitest_1.expect)(validator.type).toEqual(common_1.MODULE_TYPE_ID_VALIDATOR);
             (0, vitest_1.expect)((0, viem_1.isAddress)(validator.address)).toEqual(true);
-            (0, vitest_1.expect)(validator.address).toEqual('0x2f167e55d42584f65e2e30a748f41ee75a311414');
-            (0, vitest_1.expect)(validator.initData).toEqual('0x580a9af0569ad3905b26a703201b358aa0904236642ebe79b22a19d00d3737637d46f725a5427ae45a9569259bf67e1e16b187d7b3ad1ed70138c4f0409677d19c9a01073b202db2ed56e604ad11db557d8c3ad75181619597f21b830f2da82a');
+            (0, vitest_1.expect)(validator.address).toEqual('0x0000000000578c4cB0e472a5462da43C495C3F33');
+            (0, vitest_1.expect)(validator.initData).toEqual('0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000001580a9af0569ad3905b26a703201b358aa0904236642ebe79b22a19d00d3737637d46f725a5427ae45a9569259bf67e1e16b187d7b3ad1ed70138c4f0409677d10000000000000000000000000000000000000000000000000000000000000000');
         });
     });
     (0, vitest_1.describe)('Mock Signature', () => {
@@ -67,7 +67,7 @@ const core_1 = require("./core");
         (0, vitest_1.test)('Passkey', () => {
             const signature = (0, core_1.getMockSignature)({
                 type: 'passkey',
-                account: consts_1.passkeyAccount,
+                accounts: [consts_1.passkeyAccount],
             });
             // Should have the proper schema
             (0, viem_1.decodeAbiParameters)([

package/dist/src/modules/validators/smart-sessions.d.ts

@@ -1,5 +1,5 @@
 import { type Address, type Chain, type Hex, type PublicClient } from 'viem';
-import type { AccountType, RhinestoneAccountConfig, Session } from '../../types';
+import type { AccountType, ProviderConfig, RhinestoneAccountConfig, Session } from '../../types';
 import { type Module } from '../common';
 interface SessionData {
     sessionValidator: Address;
@@ -82,8 +82,8 @@ declare const SMART_SESSIONS_VALIDATOR_ADDRESS: Address;
 declare const SMART_SESSION_MODE_USE = "0x00";
 declare const SMART_SESSION_MODE_ENABLE = "0x01";
 declare const SMART_SESSION_MODE_UNSAFE_ENABLE = "0x02";
-declare function getSessionData(chain: Chain, session: Session): Promise<SessionData>;
-declare function getEnableSessionCall(chain: Chain, session: Session): Promise<{
+declare function getSessionData(chain: Chain, session: Session, provider?: ProviderConfig): Promise<SessionData>;
+declare function getEnableSessionCall(chain: Chain, session: Session, provider?: ProviderConfig): Promise<{
     to: `0x${string}`;
     data: `0x${string}`;
 }>;

package/dist/src/modules/validators/smart-sessions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"smart-sessions.d.ts","sourceRoot":"","sources":["../../../../modules/validators/smart-sessions.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,OAAO,EACZ,KAAK,KAAK,EAKV,KAAK,GAAG,EAIR,KAAK,YAAY,EAKlB,MAAM,MAAM,CAAA;AAKb,OAAO,KAAK,EACV,WAAW,EAEX,uBAAuB,EACvB,OAAO,EAER,MAAM,aAAa,CAAA;AAEpB,OAAO,EAA4B,KAAK,MAAM,EAAE,MAAM,WAAW,CAAA;AAUjE,UAAU,WAAW;IACnB,gBAAgB,EAAE,OAAO,CAAA;IACzB,wBAAwB,EAAE,GAAG,CAAA;IAC7B,IAAI,EAAE,GAAG,CAAA;IACT,cAAc,EAAE,SAAS,YAAY,EAAE,CAAA;IACvC,eAAe,EAAE;QACf,qBAAqB,EAAE,SAAS,qBAAqB,EAAE,CAAA;QACvD,eAAe,EAAE,SAAS,aAAa,EAAE,CAAA;KAC1C,CAAA;IACD,OAAO,EAAE,SAAS,UAAU,EAAE,CAAA;IAC9B,sBAAsB,EAAE,OAAO,CAAA;CAChC;AAED,UAAU,YAAY;IACpB,MAAM,EAAE,OAAO,CAAA;IACf,QAAQ,EAAE,GAAG,CAAA;CACd;AAED,UAAU,aAAa;IACrB,MAAM,EAAE,OAAO,CAAA;IACf,QAAQ,EAAE,GAAG,CAAA;CACd;AAED,UAAU,qBAAqB;IAC7B,kBAAkB,EAAE,GAAG,CAAA;IACvB,WAAW,EAAE,SAAS,MAAM,EAAE,CAAA;CAC/B;AAED,UAAU,UAAU;IAClB,oBAAoB,EAAE,GAAG,CAAA;IACzB,YAAY,EAAE,OAAO,CAAA;IACrB,cAAc,EAAE,SAAS,UAAU,EAAE,CAAA;CACtC;AAED,UAAU,UAAU;IAClB,MAAM,EAAE,OAAO,CAAA;IACf,QAAQ,EAAE,GAAG,CAAA;CACd;AAaD,KAAK,oBAAoB,GACrB,OAAO,sBAAsB,GAC7B,OAAO,yBAAyB,GAChC,OAAO,gCAAgC,CAAA;AAE3C,UAAU,WAAW;IACnB,OAAO,EAAE,MAAM,CAAA;IACf,aAAa,EAAE,GAAG,CAAA;CACnB;AAED,UAAU,iBAAiB;IACzB,mBAAmB,EAAE,OAAO,CAAA;IAC5B,iBAAiB,EAAE,OAAO,CAAA;IAC1B,0BAA0B,EAAE,OAAO,CAAA;IACnC,sBAAsB,EAAE,OAAO,CAAA;IAC/B,cAAc,EAAE,SAAS,UAAU,EAAE,CAAA;IACrC,eAAe,EAAE,WAAW,CAAA;IAC5B,OAAO,EAAE,SAAS,UAAU,EAAE,CAAA;CAC/B;AAED,UAAU,aAAa;IACrB,OAAO,EAAE,OAAO,CAAA;IAChB,WAAW,EAAE,iBAAiB,CAAA;IAC9B,gBAAgB,EAAE,OAAO,CAAA;IACzB,wBAAwB,EAAE,GAAG,CAAA;IAC7B,IAAI,EAAE,GAAG,CAAA;IACT,YAAY,EAAE,OAAO,CAAA;IACrB,KAAK,EAAE,MAAM,CAAA;CACd;AAED,UAAU,YAAY;IACpB,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,aAAa,CAAA;CACvB;AAED,UAAU,WAAW;IACnB,qBAAqB,EAAE,SAAS,cAAc,EAAE,CAAA;IAChD,eAAe,EAAE,SAAS,UAAU,EAAE,CAAA;CACvC;AAED,UAAU,cAAc;IACtB,kBAAkB,EAAE,GAAG,CAAA;IACvB,WAAW,EAAE,SAAS,MAAM,EAAE,CAAA;CAC/B;AAED,UAAU,iBAAiB;IACzB,YAAY,EAAE,GAAG,CAAA;IACjB,WAAW,EAAE,WAAW,CAAA;IACxB,gBAAgB,EAAE,MAAM,CAAA;IACxB,iBAAiB,EAAE,WAAW,EAAE,CAAA;IAChC,eAAe,EAAE,WAAW,CAAA;IAC5B,SAAS,EAAE,GAAG,CAAA;IACd,SAAS,EAAE,OAAO,CAAA;CACnB;AAED,QAAA,MAAM,gCAAgC,EAAE,OACM,CAAA;AAE9C,QAAA,MAAM,sBAAsB,SAAS,CAAA;AACrC,QAAA,MAAM,yBAAyB,SAAS,CAAA;AACxC,QAAA,MAAM,gCAAgC,SAAS,CAAA;AAyB/C,iBAAe,cAAc,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,wBAU3D;AAED,iBAAe,oBAAoB,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO;;;GAkBjE;AAuGD,iBAAS,wBAAwB,CAC/B,MAAM,EAAE,uBAAuB,GAC9B,MAAM,GAAG,IAAI,CAWf;AA8KD,iBAAe,gBAAgB,CAC7B,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,GAAG,oBAiClB;AAED,iBAAS,2BAA2B,CAClC,IAAI,EAAE,oBAAoB,EAC1B,YAAY,EAAE,GAAG,EACjB,SAAS,EAAE,GAAG,EACd,iBAAiB,CAAC,EAAE,iBAAiB,iBAyBtC;AAoKD,iBAAS,eAAe,CAAC,OAAO,EAAE,OAAO,iBAyBxC;AAED,OAAO,EACL,sBAAsB,EACtB,yBAAyB,EACzB,gCAAgC,EAChC,cAAc,EACd,wBAAwB,EACxB,oBAAoB,EACpB,2BAA2B,EAC3B,eAAe,EACf,gBAAgB,GACjB,CAAA;AACD,YAAY,EACV,iBAAiB,EACjB,YAAY,EACZ,WAAW,EACX,WAAW,EACX,oBAAoB,GACrB,CAAA"}
+{"version":3,"file":"smart-sessions.d.ts","sourceRoot":"","sources":["../../../../modules/validators/smart-sessions.ts"],"names":[],"mappings":"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"}

package/dist/src/modules/validators/smart-sessions.js

@@ -9,6 +9,7 @@ exports.getPermissionId = getPermissionId;
 exports.isSessionEnabled = isSessionEnabled;
 const solady_1 = require("solady");
 const viem_1 = require("viem");
+const utils_1 = require("../../accounts/utils");
 const orchestrator_1 = require("../../orchestrator");
 const smart_sessions_1 = require("../abi/smart-sessions");
 const common_1 = require("../common");
@@ -36,8 +37,8 @@ const ACTION_CONDITION_GREATER_THAN_OR_EQUAL = 3;
 const ACTION_CONDITION_LESS_THAN_OR_EQUAL = 4;
 const ACTION_CONDITION_NOT_EQUAL = 5;
 const ACTION_CONDITION_IN_RANGE = 6;
-async function getSessionData(chain, session) {
-    const { appDomainSeparator, contentsType } = await getSessionAllowedERC7739Content(chain);
+async function getSessionData(chain, session, provider) {
+    const { appDomainSeparator, contentsType } = await getSessionAllowedERC7739Content(chain, provider);
     const allowedERC7739Content = [
         {
             appDomainSeparator,
@@ -46,8 +47,8 @@ async function getSessionData(chain, session) {
     ];
     return getSmartSessionData(chain, session, allowedERC7739Content);
 }
-async function getEnableSessionCall(chain, session) {
-    const { appDomainSeparator, contentsType } = await getSessionAllowedERC7739Content(chain);
+async function getEnableSessionCall(chain, session, provider) {
+    const { appDomainSeparator, contentsType } = await getSessionAllowedERC7739Content(chain, provider);
     const allowedERC7739Content = [
         {
             appDomainSeparator,
@@ -90,10 +91,10 @@ function getOmniAccountActions(chain) {
     ];
     return omniActions;
 }
-async function getSessionAllowedERC7739Content(chain) {
+async function getSessionAllowedERC7739Content(chain, provider) {
     const publicClient = (0, viem_1.createPublicClient)({
         chain,
-        transport: (0, viem_1.http)(),
+        transport: (0, utils_1.createTransport)(chain, provider),
     });
     const appDomainSeparator = await publicClient.readContract({
         address: omni_account_1.HOOK_ADDRESS,
@@ -293,9 +294,9 @@ function getPolicyData(policy) {
         case 'time-frame': {
             return {
                 policy: TIME_FRAME_POLICY_ADDRESS,
-                initData: (0, viem_1.encodePacked)(['uint128', 'uint128'], [
-                    BigInt(policy.validUntil) / 1000n,
-                    BigInt(policy.validAfter) / 1000n,
+                initData: (0, viem_1.encodePacked)(['uint48', 'uint48'], [
+                    Math.floor(policy.validUntil / 1000),
+                    Math.floor(policy.validAfter / 1000),
                 ]),
             };
         }

package/dist/src/modules/validators/smart-sessions.test.js

@@ -15,7 +15,7 @@ const smart_sessions_2 = require("./smart-sessions");
                     type: 'ecdsa',
                     accounts: [consts_1.accountA, consts_1.accountB],
                 },
-            })).toBe('0xa16d89135da22ae1b97b6ac6ebc047dce282640bbbf56059958d96527b720344');
+            })).toBe('0xd3b39024e437b4cac278e33965b9a9326e81ee46bd45d890adbfc8eb45412fa1');
         });
         (0, vitest_1.test)('with salt', () => {
             (0, vitest_1.expect)((0, smart_sessions_2.getPermissionId)({
@@ -24,7 +24,7 @@ const smart_sessions_2 = require("./smart-sessions");
                     accounts: [consts_1.accountA, consts_1.accountB],
                 },
                 salt: '0x97340e1cfff3319c76ef22b2bc9d3231071d550125d68c9d4a8972823f166320',
-            })).toBe('0x85ff7cd77e7e0f8fbc2e42c86cdb948e4c79ac5a5e4595def4c38d7ed804eef9');
+            })).toBe('0xeb47b4699298a847a0f6fb7365e56aefcc95630e7d0e3d9ca5917620c7dc3d08');
         });
     });
     (0, vitest_1.describe)('Smart Session Validator', () => {
@@ -217,10 +217,10 @@ const smart_sessions_2 = require("./smart-sessions");
     });
     (0, vitest_1.describe)('Encode Smart Session Signature', () => {
         (0, vitest_1.test)('use mode', () => {
-            const permissionId = '0xa16d89135da22ae1b97b6ac6ebc047dce282640bbbf56059958d96527b720344';
+            const permissionId = '0xd3b39024e437b4cac278e33965b9a9326e81ee46bd45d890adbfc8eb45412fa1';
             const signature = '0xabcdef';
             const sessionSignature = (0, smart_sessions_2.encodeSmartSessionSignature)(smart_sessions_2.SMART_SESSION_MODE_USE, permissionId, signature);
-            (0, vitest_1.expect)(sessionSignature).toEqual('0x00a16d89135da22ae1b97b6ac6ebc047dce282640bbbf56059958d96527b720344abcdef');
+            (0, vitest_1.expect)(sessionSignature).toEqual('0x00d3b39024e437b4cac278e33965b9a9326e81ee46bd45d890adbfc8eb45412fa1abcdef');
         });
     });
 });

package/dist/src/orchestrator/client.d.ts

@@ -2,19 +2,21 @@ import { type Address } from 'viem';
 import type { IntentCost, IntentInput, IntentOpStatus, IntentResult, IntentRoute, Portfolio, SignedIntentOp } from './types';
 export declare class Orchestrator {
     private serverUrl;
-    private apiKey;
-    constructor(serverUrl: string, apiKey: string);
+    private apiKey?;
+    constructor(serverUrl: string, apiKey?: string);
     getPortfolio(userAddress: Address, filter?: {
         chainIds?: number[];
         tokens?: {
             [chainId: number]: Address[];
         };
     }): Promise<Portfolio>;
-    getMaxTokenAmount(userAddress: Address, destinationChainId: number, destinationTokenAddress: Address, destinationGasUnits: bigint): Promise<bigint>;
+    getMaxTokenAmount(userAddress: Address, destinationChainId: number, destinationTokenAddress: Address, destinationGasUnits: bigint, sponsored: boolean): Promise<bigint>;
     getIntentCost(input: IntentInput): Promise<IntentCost>;
     getIntentRoute(input: IntentInput): Promise<IntentRoute>;
     submitIntent(signedIntentOp: SignedIntentOp): Promise<IntentResult>;
+    simulateIntent(signedIntentOp: SignedIntentOp): Promise<IntentResult>;
     getIntentOpStatus(intentId: bigint): Promise<IntentOpStatus>;
     private parseError;
+    private parseErrorMessage;
 }
 //# sourceMappingURL=client.d.ts.map

package/dist/src/orchestrator/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../orchestrator/client.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,OAAO,EAAU,MAAM,MAAM,CAAA;AAe3C,OAAO,KAAK,EACV,UAAU,EACV,WAAW,EACX,cAAc,EACd,YAAY,EACZ,WAAW,EACX,SAAS,EAGT,cAAc,EACf,MAAM,SAAS,CAAA;AAGhB,qBAAa,YAAY;IACvB,OAAO,CAAC,SAAS,CAAQ;IACzB,OAAO,CAAC,MAAM,CAAQ;gBAEV,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAKvC,YAAY,CAChB,WAAW,EAAE,OAAO,EACpB,MAAM,CAAC,EAAE;QACP,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;QACnB,MAAM,CAAC,EAAE;YACP,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,EAAE,CAAA;SAC7B,CAAA;KACF,GACA,OAAO,CAAC,SAAS,CAAC;IAmDf,iBAAiB,CACrB,WAAW,EAAE,OAAO,EACpB,kBAAkB,EAAE,MAAM,EAC1B,uBAAuB,EAAE,OAAO,EAChC,mBAAmB,EAAE,MAAM,GAC1B,OAAO,CAAC,MAAM,CAAC;IAmCZ,aAAa,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC;IAqBtD,cAAc,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;IAgBxD,YAAY,CAAC,cAAc,EAAE,cAAc,GAAG,OAAO,CAAC,YAAY,CAAC;IAgBnE,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAalE,OAAO,CAAC,UAAU;CAwHnB"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../orchestrator/client.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,OAAO,EAAuB,MAAM,MAAM,CAAA;AAexD,OAAO,KAAK,EACV,UAAU,EACV,WAAW,EACX,cAAc,EACd,YAAY,EACZ,WAAW,EACX,SAAS,EAET,cAAc,EACf,MAAM,SAAS,CAAA;AAGhB,qBAAa,YAAY;IACvB,OAAO,CAAC,SAAS,CAAQ;IACzB,OAAO,CAAC,MAAM,CAAC,CAAQ;gBAEX,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM;IAKxC,YAAY,CAChB,WAAW,EAAE,OAAO,EACpB,MAAM,CAAC,EAAE;QACP,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;QACnB,MAAM,CAAC,EAAE;YACP,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,EAAE,CAAA;SAC7B,CAAA;KACF,GACA,OAAO,CAAC,SAAS,CAAC;IAmDf,iBAAiB,CACrB,WAAW,EAAE,OAAO,EACpB,kBAAkB,EAAE,MAAM,EAC1B,uBAAuB,EAAE,OAAO,EAChC,mBAAmB,EAAE,MAAM,EAC3B,SAAS,EAAE,OAAO,GACjB,OAAO,CAAC,MAAM,CAAC;IAqDZ,aAAa,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC;IAqBtD,cAAc,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;IAqBxD,YAAY,CAAC,cAAc,EAAE,cAAc,GAAG,OAAO,CAAC,YAAY,CAAC;IAqBnE,cAAc,CAAC,cAAc,EAAE,cAAc,GAAG,OAAO,CAAC,YAAY,CAAC;IAqBrE,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAkBlE,OAAO,CAAC,UAAU;IA0ElB,OAAO,CAAC,iBAAiB;CAmD1B"}