@rhinestone/sdk 2.0.0-beta.1 → 2.0.0-beta.11

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

@@ -0,0 +1,111 @@
+import { isAddress, isHex, size, toFunctionSelector, } from 'viem';
+function isStaticAbiType(type) {
+    if (type === 'address' || type === 'bool')
+        return true;
+    if (/^u?int\d*$/.test(type))
+        return true;
+    if (/^bytes\d+$/.test(type)) {
+        const n = Number.parseInt(type.slice(5), 10);
+        return n >= 1 && n <= 32;
+    }
+    return false;
+}
+function toReferenceValue(value, abiType) {
+    if (abiType === 'address') {
+        if (typeof value === 'string' && isAddress(value))
+            return value;
+        throw new Error(`Expected address value, got: ${typeof value}`);
+    }
+    if (abiType === 'bool') {
+        if (typeof value === 'boolean')
+            return value ? 1n : 0n;
+        throw new Error(`Expected boolean value, got: ${typeof value}`);
+    }
+    if (abiType.startsWith('uint') || abiType.startsWith('int')) {
+        if (typeof value === 'bigint')
+            return value;
+        if (typeof value === 'number')
+            return BigInt(value);
+        throw new Error(`Expected bigint value for ${abiType}, got: ${typeof value}`);
+    }
+    if (/^bytes\d+$/.test(abiType)) {
+        const expectedSize = Number.parseInt(abiType.slice(5), 10);
+        if (typeof value === 'string' &&
+            isHex(value) &&
+            size(value) === expectedSize) {
+            return value;
+        }
+        throw new Error(`Expected ${expectedSize}-byte hex string for ${abiType}`);
+    }
+    throw new Error(`Unsupported ABI type: ${abiType}`);
+}
+function resolvePermission(permission) {
+    const { abi, address, functions } = permission;
+    const actions = [];
+    for (const [fnName, fnConfig] of Object.entries(functions)) {
+        if (!fnConfig)
+            continue;
+        const config = fnConfig;
+        const abiEntries = abi.filter((entry) => entry.type === 'function' &&
+            entry.name === fnName);
+        if (abiEntries.length === 0) {
+            throw new Error(`Function "${fnName}" not found in the provided ABI.`);
+        }
+        if (abiEntries.length > 1) {
+            throw new Error(`Function "${fnName}" is overloaded (${abiEntries.length} variants). ` +
+                'Permission entries do not support overloaded functions. ' +
+                'Pre-filter the ABI to a single overload before passing it.');
+        }
+        const abiEntry = abiEntries[0];
+        const selector = toFunctionSelector(abiEntry);
+        const policies = config.policies ? [...config.policies] : [];
+        const params = config.params ?? {};
+        const paramEntries = Object.entries(params).filter(([, v]) => v !== undefined);
+        if (paramEntries.length > 0) {
+            const rules = paramEntries.map(([paramName, rule]) => {
+                const paramIndex = abiEntry.inputs.findIndex((p) => p.name === paramName);
+                if (paramIndex === -1) {
+                    throw new Error(`Parameter "${paramName}" not found in function "${fnName}". ` +
+                        `Available: ${abiEntry.inputs.map((i) => i.name).join(', ')}`);
+                }
+                const param = abiEntry.inputs[paramIndex];
+                if (!isStaticAbiType(param.type)) {
+                    throw new Error(`Parameter "${paramName}" has dynamic type "${param.type}". ` +
+                        'Permission rules only support static types ' +
+                        '(address, bool, uint*, int*, bytes1–bytes32).');
+                }
+                const calldataOffset = BigInt(paramIndex) * 32n;
+                const referenceValue = toReferenceValue(rule.value, param.type);
+                return {
+                    condition: rule.condition,
+                    calldataOffset,
+                    referenceValue,
+                    ...(rule.usageLimit !== undefined
+                        ? { usageLimit: rule.usageLimit }
+                        : {}),
+                };
+            });
+            policies.push({
+                type: 'universal-action',
+                valueLimitPerUse: config.valueLimitPerUse ?? 0n,
+                rules: rules,
+            });
+        }
+        else if (config.valueLimitPerUse !== undefined) {
+            policies.push({
+                type: 'value-limit',
+                limit: config.valueLimitPerUse,
+            });
+        }
+        actions.push({
+            target: address,
+            selector,
+            ...(policies.length > 0 ? { policies } : {}),
+        });
+    }
+    return actions;
+}
+function resolvePermissions(permissions) {
+    return permissions.flatMap(resolvePermission);
+}
+export { resolvePermissions, resolvePermission };

package/dist/src/modules/validators/policies/claim/permit2.d.ts

@@ -1,5 +1,30 @@
 import { type Address, type Hex } from 'viem';
-import type { Permit2ClaimPolicy } from '../../../../types.js';
+interface InternalPermit2ClaimPolicy {
+    type: 'permit2-claim';
+    arbiters?: Address[];
+    tokensIn?: {
+        chainId: number;
+        token: Address;
+    }[];
+    tokensOut?: {
+        chainId: number;
+        token: Address;
+    }[];
+    recipients?: {
+        chainId: number;
+        recipient: Address | 'any';
+    }[];
+    recipientIsSponsor?: boolean;
+    expiryBounds?: {
+        min?: bigint;
+        max?: bigint;
+    };
+    fillExpiryBounds?: {
+        chainId: number;
+        min?: bigint;
+        max?: bigint;
+    }[];
+}
 /** Typed representation of the Permit2 message fields used for calldata building */
 export interface Permit2ClaimMessage {
     permitted: readonly {
@@ -49,7 +74,8 @@ export interface Permit2ClaimMessage {
  *            else — pre-computed mandateHash [32]
  *
  */
-export declare function buildPermit2ClaimPolicyCalldata(policy: Permit2ClaimPolicy, message: Permit2ClaimMessage): Hex;
+export declare function buildPermit2ClaimPolicyCalldata(policy: InternalPermit2ClaimPolicy, message: Permit2ClaimMessage): Hex;
 export declare const PERMIT2_CLAIM_POLICY_ADDRESS: Address;
-export declare function encodePermit2ClaimPolicyInitData(policy: Permit2ClaimPolicy): Hex;
+export declare function encodePermit2ClaimPolicyInitData(policy: InternalPermit2ClaimPolicy): Hex;
+export type { InternalPermit2ClaimPolicy };
 //# sourceMappingURL=permit2.d.ts.map

package/dist/src/modules/validators/policies/claim/permit2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"permit2.d.ts","sourceRoot":"","sources":["../../../../../../modules/validators/policies/claim/permit2.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,OAAO,EAIZ,KAAK,GAAG,EAKT,MAAM,MAAM,CAAA;AACb,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AAiD3D,oFAAoF;AACpF,MAAM,WAAW,mBAAmB;IAClC,SAAS,EAAE,SAAS;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;IACxD,OAAO,EAAE,OAAO,CAAA;IAChB,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE;QACP,MAAM,EAAE;YACN,SAAS,EAAE,OAAO,CAAA;YAClB,QAAQ,EAAE,SAAS;gBAAE,KAAK,EAAE,OAAO,CAAC;gBAAC,MAAM,EAAE,MAAM,CAAA;aAAE,EAAE,CAAA;YACvD,WAAW,EAAE,MAAM,CAAA;YACnB,UAAU,EAAE,MAAM,CAAA;SACnB,CAAA;QACD,MAAM,EAAE,MAAM,CAAA;QACd,SAAS,EAAE;YACT,EAAE,EAAE,GAAG,CAAA;YACP,GAAG,EAAE,SAAS;gBAAE,EAAE,EAAE,OAAO,CAAC;gBAAC,KAAK,EAAE,MAAM,CAAC;gBAAC,IAAI,EAAE,GAAG,CAAA;aAAE,EAAE,CAAA;SAC1D,CAAA;QACD,OAAO,EAAE;YACP,EAAE,EAAE,GAAG,CAAA;YACP,GAAG,EAAE,SAAS;gBAAE,EAAE,EAAE,OAAO,CAAC;gBAAC,KAAK,EAAE,MAAM,CAAC;gBAAC,IAAI,EAAE,GAAG,CAAA;aAAE,EAAE,CAAA;SAC1D,CAAA;QACD,CAAC,EAAE,GAAG,CAAA;KACP,CAAA;CACF;AA+ED;;;;;;;;;GASG;AACH,wBAAgB,+BAA+B,CAC7C,MAAM,EAAE,kBAAkB,EAC1B,OAAO,EAAE,mBAAmB,GAC3B,GAAG,CA2EL;AAED,eAAO,MAAM,4BAA4B,EAAE,OACG,CAAA;AAE9C,wBAAgB,gCAAgC,CAC9C,MAAM,EAAE,kBAAkB,GACzB,GAAG,CA2FL"}
+{"version":3,"file":"permit2.d.ts","sourceRoot":"","sources":["../../../../../../modules/validators/policies/claim/permit2.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,OAAO,EAIZ,KAAK,GAAG,EAKT,MAAM,MAAM,CAAA;AAab,UAAU,0BAA0B;IAClC,IAAI,EAAE,eAAe,CAAA;IACrB,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAA;IACpB,QAAQ,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,OAAO,CAAA;KAAE,EAAE,CAAA;IAChD,SAAS,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,OAAO,CAAA;KAAE,EAAE,CAAA;IACjD,UAAU,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,OAAO,GAAG,KAAK,CAAA;KAAE,EAAE,CAAA;IAC9D,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAC5B,YAAY,CAAC,EAAE;QAAE,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;IAC7C,gBAAgB,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;CACrE;AAsCD,oFAAoF;AACpF,MAAM,WAAW,mBAAmB;IAClC,SAAS,EAAE,SAAS;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;IACxD,OAAO,EAAE,OAAO,CAAA;IAChB,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE;QACP,MAAM,EAAE;YACN,SAAS,EAAE,OAAO,CAAA;YAClB,QAAQ,EAAE,SAAS;gBAAE,KAAK,EAAE,OAAO,CAAC;gBAAC,MAAM,EAAE,MAAM,CAAA;aAAE,EAAE,CAAA;YACvD,WAAW,EAAE,MAAM,CAAA;YACnB,UAAU,EAAE,MAAM,CAAA;SACnB,CAAA;QACD,MAAM,EAAE,MAAM,CAAA;QACd,SAAS,EAAE;YACT,EAAE,EAAE,GAAG,CAAA;YACP,GAAG,EAAE,SAAS;gBAAE,EAAE,EAAE,OAAO,CAAC;gBAAC,KAAK,EAAE,MAAM,CAAC;gBAAC,IAAI,EAAE,GAAG,CAAA;aAAE,EAAE,CAAA;SAC1D,CAAA;QACD,OAAO,EAAE;YACP,EAAE,EAAE,GAAG,CAAA;YACP,GAAG,EAAE,SAAS;gBAAE,EAAE,EAAE,OAAO,CAAC;gBAAC,KAAK,EAAE,MAAM,CAAC;gBAAC,IAAI,EAAE,GAAG,CAAA;aAAE,EAAE,CAAA;SAC1D,CAAA;QACD,CAAC,EAAE,GAAG,CAAA;KACP,CAAA;CACF;AA+ED;;;;;;;;;GASG;AACH,wBAAgB,+BAA+B,CAC7C,MAAM,EAAE,0BAA0B,EAClC,OAAO,EAAE,mBAAmB,GAC3B,GAAG,CA2EL;AAED,eAAO,MAAM,4BAA4B,EAAE,OACG,CAAA;AAE9C,wBAAgB,gCAAgC,CAC9C,MAAM,EAAE,0BAA0B,GACjC,GAAG,CA2FL;AAED,YAAY,EAAE,0BAA0B,EAAE,CAAA"}

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

@@ -1,35 +1,18 @@
-import { type Address, type Hex, type TypedDataDefinition } from 'viem';
-import type { Policy, ProviderConfig, RhinestoneAccountConfig, RhinestoneConfig, Session, SessionEnableData } from '../../types.js';
+import { type Abi, type Address, type Hex, type TypedDataDefinition } from 'viem';
+import type { Permit2ClaimPolicy, Policy, ProviderConfig, ResolvedAction, ResolvedERC7739Policies, ResolvedPolicy, RhinestoneAccountConfig, RhinestoneConfig, Session, SessionDefinition, SessionEnableData } from '../../types.js';
 import { type Module } from '../common.js';
 import { SMART_SESSION_EMISSARY_ADDRESS, SMART_SESSION_EMISSARY_ADDRESS_DEV } from './core.js';
+import { type InternalPermit2ClaimPolicy } from './policies/claim/permit2.js';
 interface SessionData {
     sessionValidator: Address;
     sessionValidatorInitData: Hex;
     salt: Hex;
-    erc7739Policies: {
-        allowedERC7739Content: readonly AllowedERC7739Content[];
-        erc1271Policies: readonly ERC1271Policy[];
-    };
-    actions: readonly ActionData[];
-    claimPolicies: readonly PolicyData[];
-}
-interface ERC1271Policy {
-    policy: Address;
-    initData: Hex;
-}
-interface AllowedERC7739Content {
-    appDomainSeparator: Hex;
-    contentNames: readonly string[];
-}
-interface ActionData {
-    actionTargetSelector: Hex;
-    actionTarget: Address;
-    actionPolicies: readonly PolicyData[];
-}
-interface PolicyData {
-    policy: Address;
-    initData: Hex;
+    erc7739Policies: ResolvedERC7739Policies;
+    actions: readonly ResolvedAction[];
+    claimPolicies: readonly ResolvedPolicy[];
 }
+type ActionData = ResolvedAction;
+type PolicyData = ResolvedPolicy;
 type SmartSessionModeType = typeof SMART_SESSION_MODE_USE | typeof SMART_SESSION_MODE_ENABLE;
 interface ChainDigest {
     chainId: bigint;
@@ -191,7 +174,11 @@ declare function getEnableSessionCall(account: Address, session: Session, enable
     to: `0x${string}`;
     data: `0x${string}`;
 }>;
-declare function getSessionData(session: Session, useDevContracts?: boolean): SessionData;
+declare function toSession<const TAbis extends readonly Abi[]>(definition: SessionDefinition<TAbis>, options?: {
+    useDevContracts?: boolean;
+}): Session;
+declare function resolvePermit2ClaimPolicy(policy: Permit2ClaimPolicy): InternalPermit2ClaimPolicy;
+declare function getSessionData(session: Session): SessionData;
 declare function getPermissionId(session: Session): `0x${string}`;
 declare function getPolicyData(policy: Policy, useDevContracts?: boolean): PolicyData;
 declare function getSmartSessionValidator(config: RhinestoneConfig): Module | null;
@@ -204,6 +191,6 @@ declare function getSmartSessionValidator(config: RhinestoneConfig): Module | nu
  * simulates verifyExecution with the mock emissary to estimate gas before the user signs.
  */
 declare function buildMockSignature(session: Session, useDevContracts?: boolean, chainCount?: number, targetChainId?: number): Hex;
-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, };
 export type { ChainSession, ChainDigest, ResolvedSessionSignerSet, SessionData, SmartSessionModeType, SessionDetails, };
 //# sourceMappingURL=smart-sessions.d.ts.map

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":"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"}
+{"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

@@ -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: [
@@ -230,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) => ({
@@ -359,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),
@@ -388,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 = [
         {
@@ -415,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
         {
@@ -428,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.
@@ -443,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,
@@ -465,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',
@@ -715,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

@@ -1,7 +1,13 @@
-type Caip2ChainId = `eip155:${number}`;
+type EvmCaip2ChainId = `eip155:${number}`;
+type SolanaCaip2ChainId = `solana:${string}`;
+type TronCaip2ChainId = `tron:${string}`;
+type Caip2ChainId = EvmCaip2ChainId | SolanaCaip2ChainId | TronCaip2ChainId;
 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 };
+declare function isEvmCaip2(chainId: string): chainId is EvmCaip2ChainId;
+/** True when a numeric chain id corresponds to a known non-eip155 namespace. */
+declare function isNonEvmChainId(chainId: number): boolean;
+export type { Caip2ChainId, EvmCaip2ChainId, SolanaCaip2ChainId, TronCaip2ChainId, };
+export { fromCaip2, isCaip2, isEvmCaip2, isNonEvmChainId, toCaip2 };
 //# sourceMappingURL=caip2.d.ts.map

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

@@ -1 +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"}
+{"version":3,"file":"caip2.d.ts","sourceRoot":"","sources":["../../../orchestrator/caip2.ts"],"names":[],"mappings":"AAOA,KAAK,eAAe,GAAG,UAAU,MAAM,EAAE,CAAA;AACzC,KAAK,kBAAkB,GAAG,UAAU,MAAM,EAAE,CAAA;AAC5C,KAAK,gBAAgB,GAAG,QAAQ,MAAM,EAAE,CAAA;AACxC,KAAK,YAAY,GAAG,eAAe,GAAG,kBAAkB,GAAG,gBAAgB,CAAA;AAmB3E,iBAAS,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,CAO9C;AAED,iBAAS,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAS1C;AAED,iBAAS,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,IAAI,YAAY,CAGzD;AAED,iBAAS,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,IAAI,eAAe,CAE/D;AAED,gFAAgF;AAChF,iBAAS,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAEjD;AAED,YAAY,EACV,YAAY,EACZ,eAAe,EACf,kBAAkB,EAClB,gBAAgB,GACjB,CAAA;AACD,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,OAAO,EAAE,CAAA"}

package/dist/src/orchestrator/caip2.js

@@ -1,17 +1,52 @@
+// CAIP-2 wire format. Mirrors the orchestrator's caip2.ts namespace registry
+// — Solana / Tron synthetic numeric ids round-trip through the same CAIP-2
+// strings the orchestrator emits, so the SDK and orchestrator agree on the
+// wire shape without needing the user to think about CAIP-2 themselves.
+//
+// Spec: https://chainagnostic.org/CAIPs/caip-2
 const EIP155_CAIP2_REGEX = /^eip155:\d+$/;
+const NON_EIP155_CAIP2_REGEX = /^(?:solana|tron):[-_a-zA-Z0-9]{1,32}$/;
+// Synthetic numeric ids ↔ CAIP-2 strings for non-eip155 chains. Must match
+// the orchestrator's NON_EIP155_CAIP2_TO_ID exactly — these flow over the
+// wire and any drift would cause routing failures.
+const NON_EIP155_ID_TO_CAIP2 = {
+    792703809: 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp',
+    728126428: 'tron:0x2b6653dc',
+};
+const NON_EIP155_CAIP2_TO_ID = Object.fromEntries(Object.entries(NON_EIP155_ID_TO_CAIP2).map(([id, caip2]) => [
+    caip2,
+    Number(id),
+]));
 function toCaip2(chainId) {
     if (!Number.isInteger(chainId) || chainId < 0) {
-        throw new Error(`Invalid EVM chain id: ${chainId}`);
+        throw new Error(`Invalid chain id: ${chainId}`);
     }
+    const nonEvm = NON_EIP155_ID_TO_CAIP2[chainId];
+    if (nonEvm)
+        return nonEvm;
     return `eip155:${chainId}`;
 }
 function fromCaip2(chainId) {
-    if (!EIP155_CAIP2_REGEX.test(chainId)) {
-        throw new Error(`Invalid CAIP-2 chain id: ${chainId}`);
+    if (EIP155_CAIP2_REGEX.test(chainId)) {
+        return Number(chainId.slice('eip155:'.length));
     }
-    return Number(chainId.slice('eip155:'.length));
+    if (NON_EIP155_CAIP2_REGEX.test(chainId)) {
+        const id = NON_EIP155_CAIP2_TO_ID[chainId];
+        if (id !== undefined)
+            return id;
+    }
+    throw new Error(`Invalid CAIP-2 chain id: ${chainId}`);
 }
 function isCaip2(chainId) {
+    if (EIP155_CAIP2_REGEX.test(chainId))
+        return true;
+    return chainId in NON_EIP155_CAIP2_TO_ID;
+}
+function isEvmCaip2(chainId) {
     return EIP155_CAIP2_REGEX.test(chainId);
 }
-export { fromCaip2, isCaip2, toCaip2 };
+/** True when a numeric chain id corresponds to a known non-eip155 namespace. */
+function isNonEvmChainId(chainId) {
+    return chainId in NON_EIP155_ID_TO_CAIP2;
+}
+export { fromCaip2, isCaip2, isEvmCaip2, isNonEvmChainId, toCaip2 };

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

@@ -1,6 +1,6 @@
 import type { Address } from 'viem';
 import type { AuthProvider } from '../auth/provider.js';
-import type { IntentInput, IntentOpStatus, IntentSubmitRequestInternal, IntentSubmitResponse, Portfolio, QuoteResponse, SplitIntentsInput, SplitIntentsResult } from './types.js';
+import type { IntentInput, IntentOpStatus, IntentSubmitRequestInternal, IntentSubmitResponse, Portfolio, QuoteResponse, SettlementLayerFilter, SplitIntentsInput, SplitIntentsResult } from './types.js';
 interface PolicyContext {
     intentInput: unknown;
     isSponsored: boolean;
@@ -24,5 +24,6 @@ export declare class Orchestrator {
     private getSubmitHeaders;
     private fetch;
 }
+export declare function encodeSettlementLayers(filter: SettlementLayerFilter): readonly string[];
 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;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"}
+{"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,EAMV,WAAW,EACX,cAAc,EAEd,2BAA2B,EAC3B,oBAAoB,EACpB,SAAS,EAET,aAAa,EACb,qBAAqB,EACrB,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;IAyCf,WAAW,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC;IAUvD,QAAQ,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAoB/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;YAe5C,UAAU;YAWV,gBAAgB;YAiBhB,KAAK;CAwBpB;AA4HD,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,qBAAqB,GAC5B,SAAS,MAAM,EAAE,CAInB"}

package/dist/src/orchestrator/client.js

@@ -1,4 +1,4 @@
-import { fromCaip2, toCaip2 } from './caip2.js';
+import { fromCaip2, isCaip2, toCaip2 } from './caip2.js';
 import { API_VERSION, SDK_VERSION } from './consts.js';
 import { OrchestratorError, parseErrorEnvelope, } from './error.js';
 import { convertBigIntFields } from './utils.js';
@@ -37,8 +37,7 @@ export class Orchestrator {
                 chain: parseChainId(c.chainId),
                 address: c.address,
                 decimals: c.decimals,
-                locked: BigInt(c.balance.locked),
-                unlocked: BigInt(c.balance.unlocked),
+                amount: BigInt(c.amount),
             })),
         }));
     }
@@ -55,7 +54,9 @@ export class Orchestrator {
         const body = convertBigIntFields({
             chainId: toCaip2(input.chain.id),
             tokens: input.tokens,
-            settlementLayers: input.settlementLayers,
+            settlementLayers: input.settlementLayers
+                ? encodeSettlementLayers(input.settlementLayers)
+                : undefined,
         });
         const json = await this.fetch(`${this.serverUrl}/intents/splits`, {
             method: 'POST',
@@ -83,17 +84,12 @@ export class Orchestrator {
         });
         return {
             status: json.status,
-            claims: (json.claims ?? []).map((claim) => ({
-                depositId: claim.depositId !== undefined ? BigInt(claim.depositId) : 0n,
-                chainId: parseChainId(claim.chainId),
-                status: claim.status,
-                claimTimestamp: claim.claimTimestamp,
-                claimTransactionHash: claim.claimTransactionHash,
-            })),
-            destinationChainId: parseChainId(json.destinationChainId),
             accountAddress: json.accountAddress,
-            fillTimestamp: json.fillTimestamp,
-            fillTransactionHash: json.fillTransactionHash,
+            // Flatten orchestrator's per-chain items[] to one entry per chain.
+            operations: (json.operations ?? []).map((op) => {
+                const item = op.items?.[0] ?? {};
+                return { chain: op.chain, ...item };
+            }),
         };
     }
     async getHeaders() {
@@ -146,9 +142,11 @@ function parseChainId(value) {
     if (typeof value === 'number')
         return value;
     if (typeof value === 'string') {
-        if (value.startsWith('eip155:'))
+        if (isCaip2(value))
             return fromCaip2(value);
-        return Number(value);
+        const numeric = Number(value);
+        if (Number.isFinite(numeric))
+            return numeric;
     }
     throw new OrchestratorError({
         message: `Invalid chain id value: ${String(value)}`,
@@ -207,12 +205,31 @@ function encodeAuxiliaryFunds(funds) {
     ]));
 }
 function encodeOptions(options) {
-    if (!options.auxiliaryFunds)
-        return options;
-    return {
-        ...options,
-        auxiliaryFunds: encodeAuxiliaryFunds(options.auxiliaryFunds),
-    };
+    const wire = { ...options };
+    if (options.auxiliaryFunds) {
+        wire.auxiliaryFunds = encodeAuxiliaryFunds(options.auxiliaryFunds);
+    }
+    if (options.settlementLayers) {
+        wire.settlementLayers = encodeSettlementLayers(options.settlementLayers);
+    }
+    return wire;
+}
+// Inversion universe for `{ exclude }`. Drop once the orchestrator accepts the
+// union natively; RHINO/CCTP are listed despite not being in `SettlementLayer`.
+const KNOWN_SETTLEMENT_LAYERS = [
+    'ACROSS',
+    'ECO',
+    'RELAY',
+    'OFT',
+    'NEAR',
+    'RHINO',
+    'CCTP',
+];
+export function encodeSettlementLayers(filter) {
+    if ('include' in filter)
+        return filter.include;
+    const excluded = new Set(filter.exclude);
+    return KNOWN_SETTLEMENT_LAYERS.filter((layer) => !excluded.has(layer));
 }
 function decodeQuoteResponse(json) {
     const routes = (json.routes ?? []);
@@ -229,18 +246,19 @@ function decodeQuote(route) {
         tokenRequirements: route.tokenRequirements
             ? decodeTokenRequirements(route.tokenRequirements)
             : undefined,
+        bridgeFill: decodeBridgeFill(route.bridgeFill),
     };
 }
+// Normalizes CAIP-2 strings to numeric IDs for consistency with BridgeFill decodeCostTokenEntry, and getIntent
+function decodeBridgeFill(bf) {
+    if (!bf)
+        return undefined;
+    return { ...bf, destinationChainId: parseChainId(bf.destinationChainId) };
+}
 function decodeCost(cost) {
     return {
         input: cost.input.map(decodeCostTokenEntry),
         output: cost.output.map(decodeCostTokenEntry),
-        feeToken: cost.feeToken
-            ? {
-                chainId: parseChainId(cost.feeToken.chainId),
-                tokenAddress: cost.feeToken.tokenAddress,
-            }
-            : undefined,
         fees: cost.fees,
     };
 }

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

@@ -1,6 +1,6 @@
 declare const PROD_ORCHESTRATOR_URL = "https://v1.orchestrator.rhinestone.dev";
 declare const RHINESTONE_SPOKE_POOL_ADDRESS = "0x000000000060f6e853447881951574cdd0663530";
-declare const SDK_VERSION = "2.0.0-beta.1";
+declare const SDK_VERSION = "2.0.0-beta.11";
 declare const API_VERSION = "2026-04.blanc";
 export { PROD_ORCHESTRATOR_URL, RHINESTONE_SPOKE_POOL_ADDRESS, SDK_VERSION, API_VERSION, };
 //# sourceMappingURL=consts.d.ts.map