@rhinestone/sdk 2.0.0-beta.0 → 2.0.0-beta.2

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

@@ -10,6 +10,7 @@ import { getChainById, getWrappedTokenAddress, } from '../../orchestrator/regist
 import smartSessionEmissaryAbi from '../abi/smart-session-emissary.js';
 import { MODULE_TYPE_ID_VALIDATOR } from '../common.js';
 import { getOwnerValidator, getValidator, SMART_SESSION_EMISSARY_ADDRESS, SMART_SESSION_EMISSARY_ADDRESS_DEV, } from './core.js';
+import { resolvePermissions } from './permissions.js';
 import { encodePermit2ClaimPolicyInitData, PERMIT2_CLAIM_POLICY_ADDRESS, } from './policies/claim/permit2.js';
 const types = {
     PolicyData: [
@@ -62,12 +63,10 @@ const SMART_SESSIONS_FALLBACK_TARGET_SELECTOR_FLAG = '0x00000001';
 const SMART_SESSIONS_FALLBACK_TARGET_SELECTOR_FLAG_PERMITTED_TO_CALL_SMARTSESSION = '0x00000002';
 // Dummy preclaimop action injected into every session so that the filler can trigger
 // verifyExecution (ENABLE mode) using an injected dummy preclaimop when there are no
-// real preclaimops. Target 0x...0001 is the ecRecover precompile; calls to it fail
+// real preclaimops. Target 0x...0420 is the ecRecover precompile; calls to it fail
 // silently because preclaimops are failure-tolerant. Selector 0x69123456 is
-// intentionally uncommon. Note: this address is the same as
-// SMART_SESSIONS_FALLBACK_TARGET_FLAG — that is harmless because they operate in
-// different contexts (action matching vs. literal execution target).
-const DUMMY_PRECLAIMOP_TARGET = '0x0000000000000000000000000000000000000001';
+// intentionally uncommon.
+const DUMMY_PRECLAIMOP_TARGET = '0x0000000000000000000000000000000000000420';
 const DUMMY_PRECLAIMOP_SELECTOR = '0x69123456';
 const SPENDING_LIMITS_POLICY_ADDRESS = '0x00000088d48cf102a8cdb0137a9b173f957c6343';
 const TIME_FRAME_POLICY_ADDRESS = '0x8177451511de0577b911c254e9551d981c26dc72';
@@ -232,7 +231,7 @@ function packSignature(signers, validatorSignature) {
 async function getSessionDetails(account, sessions, provider, useDevContracts) {
     const lockTag = '0x000000000000000000000000';
     const sessionNonces = await Promise.all(sessions.map((session) => getSessionNonce(account, session, lockTag, provider, useDevContracts)));
-    const sessionDatas = sessions.map((session) => getSessionData(session, useDevContracts));
+    const sessionDatas = sessions.map((session) => getSessionData(session));
     const signedSessions = sessionDatas.map((session, index) => getSignedSession(account, lockTag, session, sessionNonces[index], useDevContracts));
     const chains = sessions.map((session) => session.chain);
     const hashesAndChainIds = signedSessions.map((session, index) => ({
@@ -361,7 +360,7 @@ function getSignedSession(account, lockTag, session, nonce, useDevContracts) {
     };
 }
 async function getEnableSessionCall(account, session, enableSessionSignature, hashesAndChainIds, sessionToEnableIndex, useDevContracts) {
-    const sessionData = getSessionData(session, useDevContracts);
+    const sessionData = getSessionData(session);
     const permissionId = getPermissionId(session);
     return {
         to: getSmartSessionEmissaryAddress(useDevContracts),
@@ -390,7 +389,47 @@ async function getEnableSessionCall(account, session, enableSessionSignature, ha
         }),
     };
 }
-function getSessionData(session, useDevContracts) {
+function toSession(definition, options = {}) {
+    const sessionData = resolveSessionData(definition, options.useDevContracts);
+    return {
+        chain: definition.chain,
+        owners: definition.owners,
+        hasExplicitPermissions: !!definition.permissions?.length,
+        permissionId: getPermissionIdFromData(sessionData),
+        sessionValidator: sessionData.sessionValidator,
+        sessionValidatorInitData: sessionData.sessionValidatorInitData,
+        salt: sessionData.salt,
+        erc7739Policies: sessionData.erc7739Policies,
+        actions: sessionData.actions,
+        claimPolicies: definition.claimPolicies ?? [],
+    };
+}
+function resolvePermit2ClaimPolicy(policy) {
+    return {
+        type: 'permit2-claim',
+        arbiters: policy.spenders,
+        tokensIn: policy.sourceTokens?.map(({ chain, address }) => ({
+            chainId: chain.id,
+            token: address,
+        })),
+        tokensOut: policy.destinationTokens?.map(({ chain, address }) => ({
+            chainId: chain.id,
+            token: address,
+        })),
+        recipients: policy.recipients?.map(({ chain, address }) => ({
+            chainId: chain.id,
+            recipient: address,
+        })),
+        recipientIsSponsor: policy.recipientIsAccount,
+        expiryBounds: policy.permitDeadline,
+        fillExpiryBounds: policy.fillDeadline?.map(({ chain, min, max }) => ({
+            chainId: chain.id,
+            min,
+            max,
+        })),
+    };
+}
+function resolveSessionData(session, useDevContracts) {
     const validator = getValidator(session.owners);
     const allowedContent = [
         {
@@ -417,7 +456,9 @@ function getSessionData(session, useDevContracts) {
             },
         ],
     };
-    const userHasFallbackAction = session.actions?.some((action) => !('target' in action) && !('selector' in action));
+    const userActions = session.permissions?.length
+        ? resolvePermissions(session.permissions)
+        : [];
     const injectedActions = [
         // Native token wrapping
         {
@@ -430,12 +471,8 @@ function getSessionData(session, useDevContracts) {
                 stateMutability: 'payable',
             }),
         },
-        // Only inject the intent-execution fallback if the user hasn't defined their own
-        // fallback action — otherwise both map to the same actionId and their policies merge,
-        // causing IntentExecutionPolicy to be required for all fallback calls
-        ...(!userHasFallbackAction
-            ? [{ policies: [{ type: 'intent-execution' }] }]
-            : []),
+        // Intent-execution fallback for any non-scoped call.
+        { policies: [{ type: 'intent-execution' }] },
         // Dummy action: allows the filler to call verifyExecution in ENABLE mode using
         // an injected dummy preclaimop so any session can be enabled on-chain without
         // a separate UserOp, regardless of whether it has claim or action policies.
@@ -445,8 +482,9 @@ function getSessionData(session, useDevContracts) {
             policies: [{ type: 'sudo' }],
         },
     ];
-    const actions = session.actions?.length
-        ? [...session.actions, ...injectedActions].map((action) => ({
+    const allActions = [...userActions, ...injectedActions];
+    const actions = userActions.length
+        ? allActions.map((action) => ({
             actionTargetSelector: 'selector' in action
                 ? action.selector
                 : SMART_SESSIONS_FALLBACK_TARGET_SELECTOR_FLAG,
@@ -467,15 +505,29 @@ function getSessionData(session, useDevContracts) {
         sessionValidatorInitData: validator.initData,
         erc7739Policies: erc7739Data,
         actions,
-        // Note: Permit2ClaimPolicy has no dev deployment — same address in all environments
-        claimPolicies: session.claimPolicies?.map((p) => ({
+        claimPolicies: session.claimPolicies?.map((policy) => ({
             policy: PERMIT2_CLAIM_POLICY_ADDRESS,
-            initData: encodePermit2ClaimPolicyInitData(p),
+            initData: encodePermit2ClaimPolicyInitData(resolvePermit2ClaimPolicy(policy)),
         })) ?? [],
     };
 }
+function getSessionData(session) {
+    return {
+        sessionValidator: session.sessionValidator,
+        salt: session.salt,
+        sessionValidatorInitData: session.sessionValidatorInitData,
+        erc7739Policies: session.erc7739Policies,
+        actions: session.actions,
+        claimPolicies: session.claimPolicies.map((policy) => ({
+            policy: PERMIT2_CLAIM_POLICY_ADDRESS,
+            initData: encodePermit2ClaimPolicyInitData(resolvePermit2ClaimPolicy(policy)),
+        })),
+    };
+}
 function getPermissionId(session) {
-    const sessionData = getSessionData(session);
+    return session.permissionId;
+}
+function getPermissionIdFromData(sessionData) {
     return keccak256(encodeAbiParameters([
         {
             type: 'address',
@@ -717,4 +769,4 @@ function buildMockSignature(session, useDevContracts, chainCount = 1, targetChai
 function createFixedArray(length, getValue) {
     return Array.from({ length }, (_, i) => getValue(i));
 }
-export { SMART_SESSION_EMISSARY_ADDRESS, SMART_SESSION_EMISSARY_ADDRESS_DEV, SMART_SESSIONS_FALLBACK_TARGET_FLAG, SMART_SESSIONS_FALLBACK_TARGET_SELECTOR_FLAG, SMART_SESSIONS_FALLBACK_TARGET_SELECTOR_FLAG_PERMITTED_TO_CALL_SMARTSESSION, DUMMY_PRECLAIMOP_TARGET, DUMMY_PRECLAIMOP_SELECTOR, SPENDING_LIMITS_POLICY_ADDRESS, TIME_FRAME_POLICY_ADDRESS, SUDO_POLICY_ADDRESS, UNIVERSAL_ACTION_POLICY_ADDRESS, USAGE_LIMIT_POLICY_ADDRESS, VALUE_LIMIT_POLICY_ADDRESS, INTENT_EXECUTION_POLICY_ADDRESS, packSignature, getSessionData, getPolicyData, getEnableSessionCall, getPermissionId, getSmartSessionValidator, getSessionDetails, isSessionEnabled, signEnableSession, buildMockSignature, };
+export { SMART_SESSION_EMISSARY_ADDRESS, SMART_SESSION_EMISSARY_ADDRESS_DEV, SMART_SESSIONS_FALLBACK_TARGET_FLAG, SMART_SESSIONS_FALLBACK_TARGET_SELECTOR_FLAG, SMART_SESSIONS_FALLBACK_TARGET_SELECTOR_FLAG_PERMITTED_TO_CALL_SMARTSESSION, DUMMY_PRECLAIMOP_TARGET, DUMMY_PRECLAIMOP_SELECTOR, SPENDING_LIMITS_POLICY_ADDRESS, TIME_FRAME_POLICY_ADDRESS, SUDO_POLICY_ADDRESS, UNIVERSAL_ACTION_POLICY_ADDRESS, USAGE_LIMIT_POLICY_ADDRESS, VALUE_LIMIT_POLICY_ADDRESS, INTENT_EXECUTION_POLICY_ADDRESS, packSignature, toSession, resolvePermit2ClaimPolicy, getSessionData, getPolicyData, getEnableSessionCall, getPermissionId, getSmartSessionValidator, getSessionDetails, isSessionEnabled, signEnableSession, buildMockSignature, };

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

@@ -0,0 +1,7 @@
+type Caip2ChainId = `eip155:${number}`;
+declare function toCaip2(chainId: number): Caip2ChainId;
+declare function fromCaip2(chainId: string): number;
+declare function isCaip2(chainId: string): chainId is Caip2ChainId;
+export type { Caip2ChainId };
+export { fromCaip2, isCaip2, toCaip2 };
+//# sourceMappingURL=caip2.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"caip2.d.ts","sourceRoot":"","sources":["../../../orchestrator/caip2.ts"],"names":[],"mappings":"AAAA,KAAK,YAAY,GAAG,UAAU,MAAM,EAAE,CAAA;AAItC,iBAAS,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,CAK9C;AAED,iBAAS,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAK1C;AAED,iBAAS,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,IAAI,YAAY,CAEzD;AAED,YAAY,EAAE,YAAY,EAAE,CAAA;AAC5B,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,CAAA"}

package/dist/src/orchestrator/caip2.js

@@ -0,0 +1,17 @@
+const EIP155_CAIP2_REGEX = /^eip155:\d+$/;
+function toCaip2(chainId) {
+    if (!Number.isInteger(chainId) || chainId < 0) {
+        throw new Error(`Invalid EVM chain id: ${chainId}`);
+    }
+    return `eip155:${chainId}`;
+}
+function fromCaip2(chainId) {
+    if (!EIP155_CAIP2_REGEX.test(chainId)) {
+        throw new Error(`Invalid CAIP-2 chain id: ${chainId}`);
+    }
+    return Number(chainId.slice('eip155:'.length));
+}
+function isCaip2(chainId) {
+    return EIP155_CAIP2_REGEX.test(chainId);
+}
+export { fromCaip2, isCaip2, toCaip2 };

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

@@ -1,28 +1,28 @@
 import type { Address } from 'viem';
 import type { AuthProvider } from '../auth/provider.js';
-import type { IntentInput, IntentOpStatus, IntentResult, IntentRoute, Portfolio, SignedIntentOp, SplitIntentsInput, SplitIntentsResult } from './types.js';
+import type { IntentInput, IntentOpStatus, IntentSubmitRequestInternal, IntentSubmitResponse, Portfolio, QuoteResponse, SplitIntentsInput, SplitIntentsResult } from './types.js';
+interface PolicyContext {
+    intentInput: unknown;
+    isSponsored: boolean;
+}
 export declare class Orchestrator {
     private serverUrl;
     private authProvider;
     private extraHeaders?;
     constructor(serverUrl: string, authProvider: AuthProvider, headers?: Record<string, string>);
-    getPortfolio(userAddress: Address, filter?: {
+    getPortfolio(accountAddress: Address, filter?: {
         chainIds?: number[];
         tokens?: {
             [chainId: number]: Address[];
         };
     }): Promise<Portfolio>;
-    getIntentRoute(input: IntentInput): Promise<IntentRoute>;
-    splitIntents(input: SplitIntentsInput): Promise<SplitIntentsResult>;
-    submitIntent(signedIntentOpUnformatted: SignedIntentOp, dryRun: boolean, policyContext?: {
-        intentInput: unknown;
-        isSponsored: boolean;
-    }): Promise<IntentResult>;
-    getIntentOpStatus(intentId: bigint): Promise<IntentOpStatus>;
+    createQuote(input: IntentInput): Promise<QuoteResponse>;
+    getSplit(input: SplitIntentsInput): Promise<SplitIntentsResult>;
+    createIntent(request: IntentSubmitRequestInternal, policyContext?: PolicyContext): Promise<IntentSubmitResponse>;
+    getIntent(intentId: string): Promise<IntentOpStatus>;
     private getHeaders;
     private getSubmitHeaders;
     private fetch;
-    private parseError;
-    private parseErrorMessage;
 }
+export {};
 //# 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":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AACnC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AA2BpD,OAAO,KAAK,EACV,WAAW,EACX,cAAc,EACd,YAAY,EACZ,WAAW,EACX,SAAS,EAET,cAAc,EACd,iBAAiB,EACjB,kBAAkB,EACnB,MAAM,SAAS,CAAA;AAchB,qBAAa,YAAY;IACvB,OAAO,CAAC,SAAS,CAAQ;IACzB,OAAO,CAAC,YAAY,CAAc;IAClC,OAAO,CAAC,YAAY,CAAC,CAAwB;gBAG3C,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,YAAY,EAC1B,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAO5B,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;IA+Cf,cAAc,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;IASxD,YAAY,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAwDnE,YAAY,CAChB,yBAAyB,EAAE,cAAc,EACzC,MAAM,EAAE,OAAO,EACf,aAAa,CAAC,EAAE;QAAE,WAAW,EAAE,OAAO,CAAC;QAAC,WAAW,EAAE,OAAO,CAAA;KAAE,GAC7D,OAAO,CAAC,YAAY,CAAC;IAqBlB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;YASpD,UAAU;YAWV,gBAAgB;YAgBhB,KAAK;IA4BnB,OAAO,CAAC,UAAU;IA6GlB,OAAO,CAAC,iBAAiB;CAmG1B"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../orchestrator/client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AACnC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAQpD,OAAO,KAAK,EAKV,WAAW,EACX,cAAc,EAEd,2BAA2B,EAC3B,oBAAoB,EACpB,SAAS,EAET,aAAa,EACb,iBAAiB,EACjB,kBAAkB,EAEnB,MAAM,SAAS,CAAA;AAGhB,UAAU,aAAa;IACrB,WAAW,EAAE,OAAO,CAAA;IACpB,WAAW,EAAE,OAAO,CAAA;CACrB;AAED,qBAAa,YAAY;IACvB,OAAO,CAAC,SAAS,CAAQ;IACzB,OAAO,CAAC,YAAY,CAAc;IAClC,OAAO,CAAC,YAAY,CAAC,CAAwB;gBAG3C,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,YAAY,EAC1B,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAO5B,YAAY,CAChB,cAAc,EAAE,OAAO,EACvB,MAAM,CAAC,EAAE;QACP,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;QACnB,MAAM,CAAC,EAAE;YAAE,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,EAAE,CAAA;SAAE,CAAA;KAC1C,GACA,OAAO,CAAC,SAAS,CAAC;IA0Cf,WAAW,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC;IAUvD,QAAQ,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAkB/D,YAAY,CAChB,OAAO,EAAE,2BAA2B,EACpC,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,oBAAoB,CAAC;IAe1B,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;YAoB5C,UAAU;YAWV,gBAAgB;YAiBhB,KAAK;CAwBpB"}