@0xsequence/wallet-core 3.0.0 → 3.0.2

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
 
-> @0xsequence/wallet-core@3.0.0 build /home/taylan/development/sequence/sequence.js/packages/wallet/core
+> @0xsequence/wallet-core@3.0.2 build /home/taylan/development/sequence/sequence.js/packages/wallet/core
 > tsc
 

package/.turbo/turbo-lint.log

@@ -1,4 +1,4 @@
 
-> @0xsequence/wallet-core@3.0.0 lint /home/taylan/development/sequence/sequence.js/packages/wallet/core
+> @0xsequence/wallet-core@3.0.2 lint /home/taylan/development/sequence/sequence.js/packages/wallet/core
 > eslint . --max-warnings 0
 

package/.turbo/turbo-typecheck.log

@@ -1,4 +1,4 @@
 
-> @0xsequence/wallet-core@3.0.0 typecheck /home/taylan/development/sequence/sequence.js/packages/wallet/core
+> @0xsequence/wallet-core@3.0.2 typecheck /home/taylan/development/sequence/sequence.js/packages/wallet/core
 > tsc --noEmit
 

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @0xsequence/wallet-core
 
+## 3.0.2
+
+### Patch Changes
+
+- allow native self transfer
+- Updated dependencies
+  - @0xsequence/guard@3.0.2
+  - @0xsequence/relayer@3.0.2
+  - @0xsequence/wallet-primitives@3.0.2
+
+## 3.0.1
+
+### Patch Changes
+
+- Network and session fixes
+- Updated dependencies
+  - @0xsequence/guard@3.0.1
+  - @0xsequence/relayer@3.0.1
+  - @0xsequence/wallet-primitives@3.0.1
+
 ## 3.0.0
 
 ### Patch Changes

package/dist/signers/session/explicit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"explicit.d.ts","sourceRoot":"","sources":["../../../src/signers/session/explicit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAA;AAC/G,OAAO,EAA8B,OAAO,EAAe,GAAG,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAA;AACpF,OAAO,EAAiB,OAAO,EAAE,MAAM,gBAAgB,CAAA;AACvD,OAAO,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAEvF,MAAM,MAAM,cAAc,GAAG,IAAI,CAAC,UAAU,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAA;AAI1E,qBAAa,QAAS,YAAW,qBAAqB;IACpD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IAErC,SAAgB,OAAO,EAAE,OAAO,CAAC,OAAO,CAAA;IACxC,SAAgB,kBAAkB,EAAE,UAAU,CAAC,kBAAkB,CAAA;gBAErD,UAAU,EAAE,GAAG,CAAC,GAAG,GAAG,OAAO,EAAE,kBAAkB,EAAE,cAAc;IAS7E,OAAO,CAAC,eAAe,EAAE,aAAa,CAAC,gBAAgB,EAAE,OAAO,EAAE,MAAM,GAAG,qBAAqB;IA+C1F,uBAAuB,CAC3B,MAAM,EAAE,OAAO,CAAC,OAAO,EACvB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,OAAO,CAAC,IAAI,EAClB,qBAAqB,EAAE,OAAO,CAAC,OAAO,EACtC,QAAQ,CAAC,EAAE,QAAQ,CAAC,QAAQ,GAC3B,OAAO,CAAC,UAAU,CAAC,UAAU,GAAG,SAAS,CAAC;IAmC7C,OAAO,CAAC,sBAAsB;IAmB9B,OAAO,CAAC,iBAAiB;IAYnB,kBAAkB,CACtB,UAAU,EAAE,UAAU,CAAC,UAAU,EACjC,IAAI,EAAE,OAAO,CAAC,IAAI,EAClB,MAAM,EAAE,OAAO,CAAC,OAAO,EACvB,qBAAqB,EAAE,OAAO,CAAC,OAAO,EACtC,QAAQ,CAAC,EAAE,QAAQ,CAAC,QAAQ,GAC3B,OAAO,CAAC,OAAO,CAAC;IAsDb,aAAa,CACjB,MAAM,EAAE,OAAO,CAAC,OAAO,EACvB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,OAAO,CAAC,IAAI,EAClB,qBAAqB,EAAE,OAAO,CAAC,OAAO,EACtC,QAAQ,CAAC,EAAE,QAAQ,CAAC,QAAQ,GAC3B,OAAO,CAAC,OAAO,CAAC;IAiBb,QAAQ,CACZ,MAAM,EAAE,OAAO,CAAC,OAAO,EACvB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,CAAC,KAAK,EACtB,OAAO,EAAE,MAAM,EACf,qBAAqB,EAAE,OAAO,CAAC,OAAO,EACtC,QAAQ,CAAC,EAAE,QAAQ,CAAC,QAAQ,GAC3B,OAAO,CAAC,gBAAgB,CAAC,oBAAoB,CAAC;YAiCnC,qBAAqB;IAwB7B,iBAAiB,CACrB,MAAM,EAAE,OAAO,CAAC,OAAO,EACvB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,OAAO,CAAC,IAAI,EAAE,EACrB,qBAAqB,EAAE,OAAO,CAAC,OAAO,EACtC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,GAC1B,OAAO,CAAC,UAAU,EAAE,CAAC;CA8EzB"}
+{"version":3,"file":"explicit.d.ts","sourceRoot":"","sources":["../../../src/signers/session/explicit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAA;AAC/G,OAAO,EAA8B,OAAO,EAAe,GAAG,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAA;AACpF,OAAO,EAAiB,OAAO,EAAE,MAAM,gBAAgB,CAAA;AACvD,OAAO,EAAE,qBAAqB,EAAmB,qBAAqB,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAExG,MAAM,MAAM,cAAc,GAAG,IAAI,CAAC,UAAU,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAA;AAI1E,qBAAa,QAAS,YAAW,qBAAqB;IACpD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IAErC,SAAgB,OAAO,EAAE,OAAO,CAAC,OAAO,CAAA;IACxC,SAAgB,kBAAkB,EAAE,UAAU,CAAC,kBAAkB,CAAA;gBAErD,UAAU,EAAE,GAAG,CAAC,GAAG,GAAG,OAAO,EAAE,kBAAkB,EAAE,cAAc;IAS7E,OAAO,CAAC,eAAe,EAAE,aAAa,CAAC,gBAAgB,EAAE,OAAO,EAAE,MAAM,GAAG,qBAAqB;IA+C1F,uBAAuB,CAC3B,MAAM,EAAE,OAAO,CAAC,OAAO,EACvB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,OAAO,CAAC,IAAI,EAClB,qBAAqB,EAAE,OAAO,CAAC,OAAO,EACtC,QAAQ,CAAC,EAAE,QAAQ,CAAC,QAAQ,GAC3B,OAAO,CAAC,UAAU,CAAC,UAAU,GAAG,SAAS,CAAC;IAmC7C,OAAO,CAAC,sBAAsB;IAmB9B,OAAO,CAAC,iBAAiB;IAYnB,kBAAkB,CACtB,UAAU,EAAE,UAAU,CAAC,UAAU,EACjC,IAAI,EAAE,OAAO,CAAC,IAAI,EAClB,MAAM,EAAE,OAAO,CAAC,OAAO,EACvB,qBAAqB,EAAE,OAAO,CAAC,OAAO,EACtC,QAAQ,CAAC,EAAE,QAAQ,CAAC,QAAQ,GAC3B,OAAO,CAAC,OAAO,CAAC;IAsDb,aAAa,CACjB,MAAM,EAAE,OAAO,CAAC,OAAO,EACvB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,OAAO,CAAC,IAAI,EAClB,qBAAqB,EAAE,OAAO,CAAC,OAAO,EACtC,QAAQ,CAAC,EAAE,QAAQ,CAAC,QAAQ,GAC3B,OAAO,CAAC,OAAO,CAAC;IAab,QAAQ,CACZ,MAAM,EAAE,OAAO,CAAC,OAAO,EACvB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,CAAC,KAAK,EACtB,OAAO,EAAE,MAAM,EACf,qBAAqB,EAAE,OAAO,CAAC,OAAO,EACtC,QAAQ,CAAC,EAAE,QAAQ,CAAC,QAAQ,GAC3B,OAAO,CAAC,gBAAgB,CAAC,oBAAoB,CAAC;YA6BnC,qBAAqB;IAwB7B,iBAAiB,CACrB,MAAM,EAAE,OAAO,CAAC,OAAO,EACvB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,OAAO,CAAC,IAAI,EAAE,EACrB,qBAAqB,EAAE,OAAO,CAAC,OAAO,EACtC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,GAC1B,OAAO,CAAC,UAAU,EAAE,CAAC;CA8EzB"}

package/dist/signers/session/explicit.js

@@ -1,6 +1,7 @@
 import { Constants, Permission, SessionConfig, SessionSignature } from '@0xsequence/wallet-primitives';
 import { AbiFunction, AbiParameters, Address, Bytes, Hash, Hex } from 'ox';
 import { MemoryPkStore } from '../pk/index.js';
+import { isIncrementCall } from './session.js';
 const VALUE_TRACKING_ADDRESS = '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE';
 export class Explicit {
     _privateKey;
@@ -143,9 +144,7 @@ export class Explicit {
         return true;
     }
     async supportedCall(wallet, chainId, call, sessionManagerAddress, provider) {
-        if (Address.isEqual(call.to, sessionManagerAddress) &&
-            Hex.size(call.data) > 4 &&
-            Hex.isEqual(Hex.slice(call.data, 0, 4), AbiFunction.getSelector(Constants.INCREMENT_USAGE_LIMIT))) {
+        if (isIncrementCall(call, sessionManagerAddress)) {
             // Can sign increment usage calls
             return true;
         }
@@ -158,9 +157,7 @@ export class Explicit {
     async signCall(wallet, chainId, payload, callIdx, sessionManagerAddress, provider) {
         const call = payload.calls[callIdx];
         let permissionIndex;
-        if (Address.isEqual(call.to, sessionManagerAddress) &&
-            Hex.size(call.data) > 4 &&
-            Hex.isEqual(Hex.slice(call.data, 0, 4), AbiFunction.getSelector(Constants.INCREMENT_USAGE_LIMIT))) {
+        if (isIncrementCall(call, sessionManagerAddress)) {
             // Permission check not required. Use the first permission
             permissionIndex = 0;
         }

package/dist/signers/session/session.d.ts

@@ -23,4 +23,5 @@ export interface ImplicitSessionSigner extends SessionSigner {
 }
 export declare function isExplicitSessionSigner(signer: SessionSigner): signer is ExplicitSessionSigner;
 export declare function isImplicitSessionSigner(signer: SessionSigner): signer is ImplicitSessionSigner;
+export declare function isIncrementCall(call: Payload.Call, sessionManagerAddress: Address.Address): boolean;
 //# sourceMappingURL=session.d.ts.map

package/dist/signers/session/session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/signers/session/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAA;AACxF,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAA;AAE3C,MAAM,MAAM,0BAA0B,GAClC,SAAS,GACT,mBAAmB,GACnB,sBAAsB,GACtB,qBAAqB,GACrB,0BAA0B,GAC1B,2BAA2B,GAC3B,0BAA0B,GAC1B,aAAa,CAAA;AAEjB,MAAM,MAAM,qBAAqB,GAAG;IAClC,OAAO,EAAE,OAAO,CAAA;IAChB,aAAa,CAAC,EAAE,0BAA0B,CAAA;CAC3C,CAAA;AAED,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;IAGnD,OAAO,EAAE,CAAC,eAAe,EAAE,aAAa,CAAC,gBAAgB,EAAE,OAAO,EAAE,MAAM,KAAK,qBAAqB,CAAA;IAGpG,aAAa,EAAE,CACb,MAAM,EAAE,OAAO,CAAC,OAAO,EACvB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,OAAO,CAAC,IAAI,EAClB,qBAAqB,EAAE,OAAO,CAAC,OAAO,EACtC,QAAQ,CAAC,EAAE,QAAQ,CAAC,QAAQ,KACzB,OAAO,CAAC,OAAO,CAAC,CAAA;IAGrB,QAAQ,EAAE,CACR,MAAM,EAAE,OAAO,CAAC,OAAO,EACvB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,CAAC,KAAK,EACtB,OAAO,EAAE,MAAM,EACf,qBAAqB,EAAE,OAAO,CAAC,OAAO,EACtC,QAAQ,CAAC,EAAE,QAAQ,CAAC,QAAQ,KACzB,OAAO,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,CAAA;CACpD;AAED,MAAM,MAAM,UAAU,GAAG;IACvB,SAAS,EAAE,GAAG,CAAC,GAAG,CAAA;IAClB,WAAW,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,MAAM,WAAW,qBAAsB,SAAQ,aAAa;IAC1D,iBAAiB,EAAE,CACjB,MAAM,EAAE,OAAO,CAAC,OAAO,EACvB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,OAAO,CAAC,IAAI,EAAE,EACrB,qBAAqB,EAAE,OAAO,CAAC,OAAO,EACtC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,KACxB,OAAO,CAAC,UAAU,EAAE,CAAC,CAAA;CAC3B;AAED,MAAM,WAAW,qBAAsB,SAAQ,aAAa;IAC1D,cAAc,EAAE,OAAO,CAAC,OAAO,CAAA;CAChC;AAED,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,aAAa,GAAG,MAAM,IAAI,qBAAqB,CAE9F;AAED,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,aAAa,GAAG,MAAM,IAAI,qBAAqB,CAE9F"}
+{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/signers/session/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAA;AACnG,OAAO,EAAe,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAA;AAExD,MAAM,MAAM,0BAA0B,GAClC,SAAS,GACT,mBAAmB,GACnB,sBAAsB,GACtB,qBAAqB,GACrB,0BAA0B,GAC1B,2BAA2B,GAC3B,0BAA0B,GAC1B,aAAa,CAAA;AAEjB,MAAM,MAAM,qBAAqB,GAAG;IAClC,OAAO,EAAE,OAAO,CAAA;IAChB,aAAa,CAAC,EAAE,0BAA0B,CAAA;CAC3C,CAAA;AAED,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;IAGnD,OAAO,EAAE,CAAC,eAAe,EAAE,aAAa,CAAC,gBAAgB,EAAE,OAAO,EAAE,MAAM,KAAK,qBAAqB,CAAA;IAGpG,aAAa,EAAE,CACb,MAAM,EAAE,OAAO,CAAC,OAAO,EACvB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,OAAO,CAAC,IAAI,EAClB,qBAAqB,EAAE,OAAO,CAAC,OAAO,EACtC,QAAQ,CAAC,EAAE,QAAQ,CAAC,QAAQ,KACzB,OAAO,CAAC,OAAO,CAAC,CAAA;IAGrB,QAAQ,EAAE,CACR,MAAM,EAAE,OAAO,CAAC,OAAO,EACvB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,CAAC,KAAK,EACtB,OAAO,EAAE,MAAM,EACf,qBAAqB,EAAE,OAAO,CAAC,OAAO,EACtC,QAAQ,CAAC,EAAE,QAAQ,CAAC,QAAQ,KACzB,OAAO,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,CAAA;CACpD;AAED,MAAM,MAAM,UAAU,GAAG;IACvB,SAAS,EAAE,GAAG,CAAC,GAAG,CAAA;IAClB,WAAW,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,MAAM,WAAW,qBAAsB,SAAQ,aAAa;IAC1D,iBAAiB,EAAE,CACjB,MAAM,EAAE,OAAO,CAAC,OAAO,EACvB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,OAAO,CAAC,IAAI,EAAE,EACrB,qBAAqB,EAAE,OAAO,CAAC,OAAO,EACtC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,KACxB,OAAO,CAAC,UAAU,EAAE,CAAC,CAAA;CAC3B;AAED,MAAM,WAAW,qBAAsB,SAAQ,aAAa;IAC1D,cAAc,EAAE,OAAO,CAAC,OAAO,CAAA;CAChC;AAED,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,aAAa,GAAG,MAAM,IAAI,qBAAqB,CAE9F;AAED,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,aAAa,GAAG,MAAM,IAAI,qBAAqB,CAE9F;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,qBAAqB,EAAE,OAAO,CAAC,OAAO,GAAG,OAAO,CAMnG"}

package/dist/signers/session/session.js

@@ -1,6 +1,13 @@
+import { Constants } from '@0xsequence/wallet-primitives';
+import { AbiFunction, Address, Hex } from 'ox';
 export function isExplicitSessionSigner(signer) {
     return 'prepareIncrements' in signer;
 }
 export function isImplicitSessionSigner(signer) {
     return 'identitySigner' in signer;
 }
+export function isIncrementCall(call, sessionManagerAddress) {
+    return (Address.isEqual(call.to, sessionManagerAddress) &&
+        Hex.size(call.data) >= 4 &&
+        Hex.isEqual(Hex.slice(call.data, 0, 4), AbiFunction.getSelector(Constants.INCREMENT_USAGE_LIMIT)));
+}

package/dist/signers/session-manager.d.ts

@@ -31,6 +31,10 @@ export declare class SessionManager implements SapientSigner {
         isValid: boolean;
         invalidReason?: SessionSignerInvalidReason;
     }[]>;
+    /**
+     * Find one signer per call from the given candidate list (first that supports each call).
+     */
+    private findSignersForCallsWithCandidates;
     findSignersForCalls(wallet: Address.Address, chainId: number, calls: Payload.Call[]): Promise<SessionSigner[]>;
     prepareIncrement(wallet: Address.Address, chainId: number, calls: Payload.Call[]): Promise<Payload.Call | null>;
     signSapient(wallet: Address.Address, chainId: number, payload: Payload.Parented, imageHash: Hex.Hex): Promise<SignatureTypes.SignatureOfSapientSignerLeaf>;

package/dist/signers/session-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-manager.d.ts","sourceRoot":"","sources":["../../src/signers/session-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,OAAO,EACP,aAAa,EAEb,SAAS,IAAI,cAAc,EAC5B,MAAM,+BAA+B,CAAA;AACtC,OAAO,EAAe,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAA;AACxD,OAAO,KAAK,KAAK,MAAM,mBAAmB,CAAA;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAC1C,OAAO,EACL,QAAQ,EACR,QAAQ,EAER,aAAa,EACb,0BAA0B,EAG3B,MAAM,oBAAoB,CAAA;AAE3B,MAAM,MAAM,qBAAqB,GAAG;IAClC,qBAAqB,EAAE,OAAO,CAAC,OAAO,CAAA;IACtC,aAAa,CAAC,EAAE,KAAK,CAAC,QAAQ,CAAA;IAC9B,eAAe,CAAC,EAAE,QAAQ,EAAE,CAAA;IAC5B,eAAe,CAAC,EAAE,QAAQ,EAAE,CAAA;IAC5B,QAAQ,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAA;CAC7B,CAAA;AAID,qBAAa,cAAe,YAAW,aAAa;IAShD,QAAQ,CAAC,MAAM,EAAE,MAAM;IARzB,SAAgB,aAAa,EAAE,KAAK,CAAC,QAAQ,CAAA;IAC7C,SAAgB,OAAO,EAAE,OAAO,CAAC,OAAO,CAAA;IAExC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAY;IAC7C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAY;IAC7C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAmB;gBAGnC,MAAM,EAAE,MAAM,EACvB,OAAO,EAAE,qBAAqB;IAShC,IAAI,SAAS,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,SAAS,CAAC,CAE5C;IAEK,YAAY,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,SAAS,CAAC;IASlD,IAAI,QAAQ,IAAI,OAAO,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAEtD;IAEK,WAAW,IAAI,OAAO,CAAC,aAAa,CAAC,gBAAgB,CAAC;IAY5D,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,GAAG,cAAc;IAUzD,kBAAkB,CAAC,MAAM,EAAE,QAAQ,GAAG,cAAc;IAWpD,kBAAkB,CAAC,MAAM,EAAE,QAAQ,GAAG,cAAc;IAY9C,kBAAkB,CACtB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC;QAAE,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC;QAAC,OAAO,EAAE,OAAO,CAAC;QAAC,aAAa,CAAC,EAAE,0BAA0B,CAAA;KAAE,EAAE,CAAC;IAgBjG,mBAAmB,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,IAAI,EAAE,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAmD9G,gBAAgB,CACpB,MAAM,EAAE,OAAO,CAAC,OAAO,EACvB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,OAAO,CAAC,IAAI,EAAE,GACpB,OAAO,CAAC,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IAmDzB,WAAW,CACf,MAAM,EAAE,OAAO,CAAC,OAAO,EACvB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,CAAC,QAAQ,EACzB,SAAS,EAAE,GAAG,CAAC,GAAG,GACjB,OAAO,CAAC,cAAc,CAAC,4BAA4B,CAAC;IAgHjD,uBAAuB,CAC3B,MAAM,EAAE,OAAO,CAAC,OAAO,EACvB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,CAAC,QAAQ,EACzB,SAAS,EAAE,cAAc,CAAC,4BAA4B,GACrD,OAAO,CAAC,OAAO,CAAC;CAsCpB"}
+{"version":3,"file":"session-manager.d.ts","sourceRoot":"","sources":["../../src/signers/session-manager.ts"],"names":[],"mappings":"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"}

package/dist/signers/session-manager.js

@@ -1,6 +1,6 @@
 import { Config, Constants, Extensions, Payload, SessionConfig, SessionSignature, } from '@0xsequence/wallet-primitives';
 import { AbiFunction, Address, Hex } from 'ox';
-import { isExplicitSessionSigner, isImplicitSessionSigner, } from './session/index.js';
+import { isExplicitSessionSigner, isImplicitSessionSigner, isIncrementCall, } from './session/index.js';
 const MAX_SPACE = 2n ** 80n - 1n;
 export class SessionManager {
     wallet;
@@ -86,19 +86,10 @@ export class SessionManager {
             invalidReason,
         }));
     }
-    async findSignersForCalls(wallet, chainId, calls) {
-        // Only use signers that match the topology
-        const topology = await this.topology;
-        const identitySigners = SessionConfig.getIdentitySigners(topology);
-        if (identitySigners.length === 0) {
-            throw new Error('Identity signers not found');
-        }
-        // Prioritize implicit signers
-        const availableSigners = [...this._implicitSigners, ...this._explicitSigners];
-        if (availableSigners.length === 0) {
-            throw new Error('No signers match the topology');
-        }
-        // Find supported signers for each call
+    /**
+     * Find one signer per call from the given candidate list (first that supports each call).
+     */
+    async findSignersForCallsWithCandidates(wallet, chainId, calls, topology, availableSigners) {
         const signers = [];
         for (const call of calls) {
             let supported = false;
@@ -128,7 +119,56 @@ export class SessionManager {
                 if (expiredSupportedSigner) {
                     throw new Error(`Signer supporting call is expired: ${expiredSupportedSigner.address}`);
                 }
-                throw new Error(`No signer supported for call. ` + `Call: to=${call.to}, data=${call.data}, value=${call.value}, `);
+                throw new Error(`No signer supported for call. Call: to=${call.to}, data=${call.data}, value=${call.value}, `);
+            }
+        }
+        return signers;
+    }
+    async findSignersForCalls(wallet, chainId, calls) {
+        const topology = await this.topology;
+        const identitySigners = SessionConfig.getIdentitySigners(topology);
+        if (identitySigners.length === 0) {
+            throw new Error('Identity signers not found');
+        }
+        const availableSigners = [...this._implicitSigners, ...this._explicitSigners];
+        if (availableSigners.length === 0) {
+            throw new Error('No signers match the topology');
+        }
+        const nonIncrementCalls = [];
+        const incrementCalls = [];
+        for (const call of calls) {
+            if (isIncrementCall(call, this.address)) {
+                incrementCalls.push(call);
+            }
+            else {
+                nonIncrementCalls.push(call);
+            }
+        }
+        // Find signers for non-increment calls
+        const nonIncrementSigners = nonIncrementCalls.length > 0
+            ? await this.findSignersForCallsWithCandidates(wallet, chainId, nonIncrementCalls, topology, availableSigners)
+            : [];
+        let incrementSigners = [];
+        if (incrementCalls.length > 0) {
+            // Find signers for increment calls, preferring signers that signed non-increment calls
+            const incrementCandidates = [
+                ...nonIncrementSigners,
+                ...availableSigners.filter((s) => !nonIncrementSigners.includes(s)),
+            ];
+            incrementSigners = await this.findSignersForCallsWithCandidates(wallet, chainId, incrementCalls, topology, incrementCandidates);
+        }
+        // Merge back in original call order
+        const signers = [];
+        let nonIncrementIndex = 0;
+        let incrementIndex = 0;
+        for (const call of calls) {
+            if (isIncrementCall(call, this.address)) {
+                signers.push(incrementSigners[incrementIndex]);
+                incrementIndex++;
+            }
+            else {
+                signers.push(nonIncrementSigners[nonIncrementIndex]);
+                nonIncrementIndex++;
             }
         }
         return signers;
@@ -138,17 +178,20 @@ export class SessionManager {
             throw new Error('No calls provided');
         }
         const signers = await this.findSignersForCalls(wallet, chainId, calls);
-        // Create a map of signers to their associated calls
-        const signerToCalls = new Map();
+        // Map each signer to only their non-increment calls
+        const signerToNonIncrementCalls = new Map();
         signers.forEach((signer, index) => {
             const call = calls[index];
-            const existingCalls = signerToCalls.get(signer) || [];
-            signerToCalls.set(signer, [...existingCalls, call]);
+            if (isIncrementCall(call, this.address)) {
+                return;
+            }
+            const existing = signerToNonIncrementCalls.get(signer) || [];
+            signerToNonIncrementCalls.set(signer, [...existing, call]);
         });
-        // Prepare increments for each explicit signer with their associated calls
-        const increments = (await Promise.all(Array.from(signerToCalls.entries()).map(async ([signer, associatedCalls]) => {
+        // Prepare increments for each explicit signer from their non-increment calls only
+        const increments = (await Promise.all(Array.from(signerToNonIncrementCalls.entries()).map(async ([signer, nonIncrementCalls]) => {
             if (isExplicitSessionSigner(signer)) {
-                return signer.prepareIncrements(wallet, chainId, associatedCalls, this.address, this._provider);
+                return signer.prepareIncrements(wallet, chainId, nonIncrementCalls, this.address, this._provider);
             }
             return [];
         }))).flat();

package/dist/wallet.js

@@ -243,7 +243,7 @@ export class Wallet {
                 if (call.delegateCall) {
                     throw new Error('delegate calls are not allowed in safe mode');
                 }
-                if (Address.isEqual(call.to, this.address)) {
+                if (Address.isEqual(call.to, this.address) && call.data !== '0x') {
                     throw new Error('calls to the wallet contract itself are not allowed in safe mode');
                 }
             }
@@ -326,7 +326,7 @@ export class Wallet {
                 if (call.delegateCall) {
                     throw new Error('delegate calls are not allowed in safe mode');
                 }
-                if (Address.isEqual(call.to, this.address)) {
+                if (Address.isEqual(call.to, this.address) && call.data !== '0x') {
                     throw new Error('calls to the wallet contract itself are not allowed in safe mode');
                 }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xsequence/wallet-core",
-  "version": "3.0.0",
+  "version": "3.0.2",
   "license": "Apache-2.0",
   "type": "module",
   "publishConfig": {
@@ -27,9 +27,9 @@
     "mipd": "^0.0.7",
     "ox": "^0.9.17",
     "viem": "^2.40.3",
-    "@0xsequence/guard": "^3.0.0",
-    "@0xsequence/wallet-primitives": "^3.0.0",
-    "@0xsequence/relayer": "^3.0.0"
+    "@0xsequence/relayer": "^3.0.2",
+    "@0xsequence/guard": "^3.0.2",
+    "@0xsequence/wallet-primitives": "^3.0.2"
   },
   "scripts": {
     "build": "tsc",

package/src/signers/session/explicit.ts

@@ -1,7 +1,7 @@
 import { Constants, Payload, Permission, SessionConfig, SessionSignature } from '@0xsequence/wallet-primitives'
 import { AbiFunction, AbiParameters, Address, Bytes, Hash, Hex, Provider } from 'ox'
 import { MemoryPkStore, PkStore } from '../pk/index.js'
-import { ExplicitSessionSigner, SessionSignerValidity, UsageLimit } from './session.js'
+import { ExplicitSessionSigner, isIncrementCall, SessionSignerValidity, UsageLimit } from './session.js'
 
 export type ExplicitParams = Omit<Permission.SessionPermissions, 'signer'>
 
@@ -208,11 +208,7 @@ export class Explicit implements ExplicitSessionSigner {
     sessionManagerAddress: Address.Address,
     provider?: Provider.Provider,
   ): Promise<boolean> {
-    if (
-      Address.isEqual(call.to, sessionManagerAddress) &&
-      Hex.size(call.data) > 4 &&
-      Hex.isEqual(Hex.slice(call.data, 0, 4), AbiFunction.getSelector(Constants.INCREMENT_USAGE_LIMIT))
-    ) {
+    if (isIncrementCall(call, sessionManagerAddress)) {
       // Can sign increment usage calls
       return true
     }
@@ -234,11 +230,7 @@ export class Explicit implements ExplicitSessionSigner {
   ): Promise<SessionSignature.SessionCallSignature> {
     const call = payload.calls[callIdx]!
     let permissionIndex: number
-    if (
-      Address.isEqual(call.to, sessionManagerAddress) &&
-      Hex.size(call.data) > 4 &&
-      Hex.isEqual(Hex.slice(call.data, 0, 4), AbiFunction.getSelector(Constants.INCREMENT_USAGE_LIMIT))
-    ) {
+    if (isIncrementCall(call, sessionManagerAddress)) {
       // Permission check not required. Use the first permission
       permissionIndex = 0
     } else {

package/src/signers/session/session.ts

@@ -1,5 +1,5 @@
-import { Payload, SessionConfig, SessionSignature } from '@0xsequence/wallet-primitives'
-import { Address, Hex, Provider } from 'ox'
+import { Constants, Payload, SessionConfig, SessionSignature } from '@0xsequence/wallet-primitives'
+import { AbiFunction, Address, Hex, Provider } from 'ox'
 
 export type SessionSignerInvalidReason =
   | 'Expired'
@@ -68,3 +68,11 @@ export function isExplicitSessionSigner(signer: SessionSigner): signer is Explic
 export function isImplicitSessionSigner(signer: SessionSigner): signer is ImplicitSessionSigner {
   return 'identitySigner' in signer
 }
+
+export function isIncrementCall(call: Payload.Call, sessionManagerAddress: Address.Address): boolean {
+  return (
+    Address.isEqual(call.to, sessionManagerAddress) &&
+    Hex.size(call.data) >= 4 &&
+    Hex.isEqual(Hex.slice(call.data, 0, 4), AbiFunction.getSelector(Constants.INCREMENT_USAGE_LIMIT))
+  )
+}

package/src/signers/session-manager.ts

@@ -18,6 +18,7 @@ import {
   SessionSigner,
   SessionSignerInvalidReason,
   isImplicitSessionSigner,
+  isIncrementCall,
   UsageLimit,
 } from './session/index.js'
 
@@ -130,21 +131,16 @@ export class SessionManager implements SapientSigner {
     }))
   }
 
-  async findSignersForCalls(wallet: Address.Address, chainId: number, calls: Payload.Call[]): Promise<SessionSigner[]> {
-    // Only use signers that match the topology
-    const topology = await this.topology
-    const identitySigners = SessionConfig.getIdentitySigners(topology)
-    if (identitySigners.length === 0) {
-      throw new Error('Identity signers not found')
-    }
-
-    // Prioritize implicit signers
-    const availableSigners = [...this._implicitSigners, ...this._explicitSigners]
-    if (availableSigners.length === 0) {
-      throw new Error('No signers match the topology')
-    }
-
-    // Find supported signers for each call
+  /**
+   * Find one signer per call from the given candidate list (first that supports each call).
+   */
+  private async findSignersForCallsWithCandidates(
+    wallet: Address.Address,
+    chainId: number,
+    calls: Payload.Call[],
+    topology: SessionConfig.SessionsTopology,
+    availableSigners: SessionSigner[],
+  ): Promise<SessionSigner[]> {
     const signers: SessionSigner[] = []
     for (const call of calls) {
       let supported = false
@@ -173,9 +169,67 @@ export class SessionManager implements SapientSigner {
         if (expiredSupportedSigner) {
           throw new Error(`Signer supporting call is expired: ${expiredSupportedSigner.address}`)
         }
-        throw new Error(
-          `No signer supported for call. ` + `Call: to=${call.to}, data=${call.data}, value=${call.value}, `,
-        )
+        throw new Error(`No signer supported for call. Call: to=${call.to}, data=${call.data}, value=${call.value}, `)
+      }
+    }
+    return signers
+  }
+
+  async findSignersForCalls(wallet: Address.Address, chainId: number, calls: Payload.Call[]): Promise<SessionSigner[]> {
+    const topology = await this.topology
+    const identitySigners = SessionConfig.getIdentitySigners(topology)
+    if (identitySigners.length === 0) {
+      throw new Error('Identity signers not found')
+    }
+
+    const availableSigners = [...this._implicitSigners, ...this._explicitSigners]
+    if (availableSigners.length === 0) {
+      throw new Error('No signers match the topology')
+    }
+
+    const nonIncrementCalls: Payload.Call[] = []
+    const incrementCalls: Payload.Call[] = []
+    for (const call of calls) {
+      if (isIncrementCall(call, this.address)) {
+        incrementCalls.push(call)
+      } else {
+        nonIncrementCalls.push(call)
+      }
+    }
+
+    // Find signers for non-increment calls
+    const nonIncrementSigners =
+      nonIncrementCalls.length > 0
+        ? await this.findSignersForCallsWithCandidates(wallet, chainId, nonIncrementCalls, topology, availableSigners)
+        : []
+
+    let incrementSigners: SessionSigner[] = []
+    if (incrementCalls.length > 0) {
+      // Find signers for increment calls, preferring signers that signed non-increment calls
+      const incrementCandidates = [
+        ...nonIncrementSigners,
+        ...availableSigners.filter((s) => !nonIncrementSigners.includes(s)),
+      ]
+      incrementSigners = await this.findSignersForCallsWithCandidates(
+        wallet,
+        chainId,
+        incrementCalls,
+        topology,
+        incrementCandidates,
+      )
+    }
+
+    // Merge back in original call order
+    const signers: SessionSigner[] = []
+    let nonIncrementIndex = 0
+    let incrementIndex = 0
+    for (const call of calls) {
+      if (isIncrementCall(call, this.address)) {
+        signers.push(incrementSigners[incrementIndex]!)
+        incrementIndex++
+      } else {
+        signers.push(nonIncrementSigners[nonIncrementIndex]!)
+        nonIncrementIndex++
       }
     }
     return signers
@@ -191,20 +245,23 @@ export class SessionManager implements SapientSigner {
     }
     const signers = await this.findSignersForCalls(wallet, chainId, calls)
 
-    // Create a map of signers to their associated calls
-    const signerToCalls = new Map<SessionSigner, Payload.Call[]>()
+    // Map each signer to only their non-increment calls
+    const signerToNonIncrementCalls = new Map<SessionSigner, Payload.Call[]>()
     signers.forEach((signer, index) => {
       const call = calls[index]!
-      const existingCalls = signerToCalls.get(signer) || []
-      signerToCalls.set(signer, [...existingCalls, call])
+      if (isIncrementCall(call, this.address)) {
+        return
+      }
+      const existing = signerToNonIncrementCalls.get(signer) || []
+      signerToNonIncrementCalls.set(signer, [...existing, call])
     })
 
-    // Prepare increments for each explicit signer with their associated calls
+    // Prepare increments for each explicit signer from their non-increment calls only
     const increments: UsageLimit[] = (
       await Promise.all(
-        Array.from(signerToCalls.entries()).map(async ([signer, associatedCalls]) => {
+        Array.from(signerToNonIncrementCalls.entries()).map(async ([signer, nonIncrementCalls]) => {
           if (isExplicitSessionSigner(signer)) {
-            return signer.prepareIncrements(wallet, chainId, associatedCalls, this.address, this._provider!)
+            return signer.prepareIncrements(wallet, chainId, nonIncrementCalls, this.address, this._provider!)
           }
           return []
         }),

package/src/wallet.ts

@@ -342,7 +342,7 @@ export class Wallet {
         if (call.delegateCall) {
           throw new Error('delegate calls are not allowed in safe mode')
         }
-        if (Address.isEqual(call.to, this.address)) {
+        if (Address.isEqual(call.to, this.address) && call.data !== '0x') {
           throw new Error('calls to the wallet contract itself are not allowed in safe mode')
         }
       }
@@ -455,7 +455,7 @@ export class Wallet {
         if (call.delegateCall) {
           throw new Error('delegate calls are not allowed in safe mode')
         }
-        if (Address.isEqual(call.to, this.address)) {
+        if (Address.isEqual(call.to, this.address) && call.data !== '0x') {
           throw new Error('calls to the wallet contract itself are not allowed in safe mode')
         }
       }

package/test/constants.ts

@@ -5,6 +5,8 @@ import { Abi, AbiEvent, Address } from 'ox'
 const envFile = process.env.CI ? '.env.test' : '.env.test.local'
 dotenvConfig({ path: envFile })
 
+// Contracts are deployed on Arbitrum
+
 // Requires https://example.com redirectUrl
 export const EMITTER_ADDRESS1: Address.Address = '0xad90eB52BC180Bd9f66f50981E196f3E996278D3'
 // Requires https://another-example.com redirectUrl

package/test/session-manager.test.ts

@@ -1,4 +1,4 @@
-import { Extensions } from '@0xsequence/wallet-primitives'
+import { Constants, Extensions } from '@0xsequence/wallet-primitives'
 import { AbiEvent, AbiFunction, Address, Bytes, Hex, Provider, RpcTransport, Secp256k1 } from 'ox'
 import { describe, expect, it } from 'vitest'
 import { Attestation, GenericTree, Payload, Permission, SessionConfig } from '../../primitives/src/index.js'
@@ -731,7 +731,7 @@ for (const extension of ALL_EXTENSIONS) {
     )
 
     it(
-      'signs a payload using an explicit session',
+      'signs a payload using an explicit session with allowAll and value limit',
       async () => {
         const provider = Provider.from(RpcTransport.fromHttp(LOCAL_RPC_URL))
         const chainId = Number(await provider.request({ method: 'eth_chainId' }))
@@ -804,7 +804,7 @@ for (const extension of ALL_EXTENSIONS) {
     )
 
     it(
-      'signs a payload using an explicit session',
+      'signs using explicit session with onlyOnce, consumes usage and rejects second call',
       async () => {
         const provider = Provider.from(RpcTransport.fromHttp(LOCAL_RPC_URL))
         const chainId = Number(await provider.request({ method: 'eth_chainId' }))
@@ -1357,5 +1357,347 @@ for (const extension of ALL_EXTENSIONS) {
       },
       timeout,
     )
+
+    it(
+      'two explicit sessions with same value limit: exhaust first then second send uses second session (increment from non-increment calls only)',
+      async () => {
+        const provider = Provider.from(RpcTransport.fromHttp(LOCAL_RPC_URL))
+        const chainId = Number(await provider.request({ method: 'eth_chainId' }))
+
+        const identityPrivateKey = Secp256k1.randomPrivateKey()
+        const identityAddress = Address.fromPublicKey(Secp256k1.getPublicKey({ privateKey: identityPrivateKey }))
+        const stateProvider = new State.Local.Provider()
+
+        const targetAddress = randomAddress()
+        const valueLimit = 500000000000000000n // 0.5 ETH per session
+
+        const sessionPermission: ExplicitSessionConfig = {
+          chainId,
+          valueLimit,
+          deadline: BigInt(Math.floor(Date.now() / 1000) + 3600),
+          permissions: [PermissionBuilder.for(targetAddress).allowAll().build()],
+        }
+
+        const explicitPrivateKey1 = Secp256k1.randomPrivateKey()
+        const explicitSigner1 = new Signers.Session.Explicit(explicitPrivateKey1, {
+          ...sessionPermission,
+        })
+
+        const explicitPrivateKey2 = Secp256k1.randomPrivateKey()
+        const explicitSigner2 = new Signers.Session.Explicit(explicitPrivateKey2, {
+          ...sessionPermission,
+        })
+
+        let sessionTopology = SessionConfig.addExplicitSession(SessionConfig.emptySessionsTopology(identityAddress), {
+          ...sessionPermission,
+          signer: explicitSigner1.address,
+        })
+        sessionTopology = SessionConfig.addExplicitSession(sessionTopology, {
+          ...sessionPermission,
+          signer: explicitSigner2.address,
+        })
+        await stateProvider.saveTree(SessionConfig.sessionsTopologyToConfigurationTree(sessionTopology))
+        const imageHash = GenericTree.hash(SessionConfig.sessionsTopologyToConfigurationTree(sessionTopology))
+
+        const wallet = await Wallet.fromConfiguration(
+          {
+            threshold: 1n,
+            checkpoint: 0n,
+            topology: [{ type: 'sapient-signer', address: extension.sessions, weight: 1n, imageHash }, Hex.random(32)],
+          },
+          { stateProvider },
+        )
+        // Fund wallet with 2 ETH so we can send 0.5 ETH twice (each tx needs value + gas)
+        await provider.request({
+          method: 'anvil_setBalance',
+          params: [wallet.address, Hex.fromNumber(2n * 1000000000000000000n)],
+        })
+
+        const sessionManager = new Signers.SessionManager(wallet, {
+          provider,
+          sessionManagerAddress: extension.sessions,
+          explicitSigners: [explicitSigner1, explicitSigner2],
+        })
+
+        const call: Payload.Call = {
+          to: targetAddress,
+          value: valueLimit, // one full limit
+          data: '0x' as Hex.Hex,
+          gasLimit: 0n,
+          delegateCall: false,
+          onlyFallback: false,
+          behaviorOnError: 'revert',
+        }
+
+        // First send: uses first session (exhausts it)
+        const increment1 = await sessionManager.prepareIncrement(wallet.address, chainId, [call])
+        expect(increment1).not.toBeNull()
+        const calls1 = includeIncrement([call], increment1!, extension.sessions)
+        const tx1 = await buildAndSignCall(wallet, sessionManager, calls1, provider, chainId)
+        await simulateTransaction(provider, tx1)
+
+        // Second send: same call. First session is exhausted so findSignersForCalls picks second session.
+        // Payload is [call, increment] (or [increment, call]). signSapient must derive expectedIncrement
+        // from non-increment calls only so it matches the increment we built for the second session.
+        const increment2 = await sessionManager.prepareIncrement(wallet.address, chainId, [call])
+        expect(increment2).not.toBeNull()
+        const calls2 = includeIncrement([call], increment2!, extension.sessions)
+        const tx2 = await buildAndSignCall(wallet, sessionManager, calls2, provider, chainId)
+        await simulateTransaction(provider, tx2)
+      },
+      timeout,
+    )
+
+    describe('increment built from non-increment calls only', () => {
+      it(
+        'prepareIncrement returns null when calls contain only an increment call (no non-increment calls)',
+        async () => {
+          const provider = Provider.from(RpcTransport.fromHttp(LOCAL_RPC_URL))
+          const chainId = Number(await provider.request({ method: 'eth_chainId' }))
+
+          const identityPrivateKey = Secp256k1.randomPrivateKey()
+          const identityAddress = Address.fromPublicKey(Secp256k1.getPublicKey({ privateKey: identityPrivateKey }))
+          const stateProvider = new State.Local.Provider()
+
+          const sessionPermission: ExplicitSessionConfig = {
+            chainId,
+            valueLimit: 0n,
+            deadline: BigInt(Math.floor(Date.now() / 1000) + 3600),
+            permissions: [PermissionBuilder.for(EMITTER_ADDRESS1).allowAll().build()],
+          }
+          const explicitSigner = new Signers.Session.Explicit(Secp256k1.randomPrivateKey(), sessionPermission)
+          const sessionTopology = SessionConfig.addExplicitSession(
+            SessionConfig.emptySessionsTopology(identityAddress),
+            {
+              ...sessionPermission,
+              signer: explicitSigner.address,
+            },
+          )
+          await stateProvider.saveTree(SessionConfig.sessionsTopologyToConfigurationTree(sessionTopology))
+          const imageHash = GenericTree.hash(SessionConfig.sessionsTopologyToConfigurationTree(sessionTopology))
+
+          const wallet = await Wallet.fromConfiguration(
+            {
+              threshold: 1n,
+              checkpoint: 0n,
+              topology: [
+                { type: 'sapient-signer', address: extension.sessions, weight: 1n, imageHash },
+                Hex.random(32),
+              ],
+            },
+            { stateProvider },
+          )
+          const sessionManager = new Signers.SessionManager(wallet, {
+            provider,
+            sessionManagerAddress: extension.sessions,
+            explicitSigners: [explicitSigner],
+          })
+
+          // Only an increment call (no non-increment calls). Contract would reject payload with only self-call; we return null.
+          const incrementOnlyCall: Payload.Call = {
+            to: extension.sessions,
+            data: AbiFunction.encodeData(Constants.INCREMENT_USAGE_LIMIT, [[]]),
+            value: 0n,
+            gasLimit: 0n,
+            delegateCall: false,
+            onlyFallback: false,
+            behaviorOnError: 'revert',
+          }
+          const result = await sessionManager.prepareIncrement(wallet.address, chainId, [incrementOnlyCall])
+          expect(result).toBeNull()
+        },
+        timeout,
+      )
+
+      it(
+        'prepareIncrement([increment, nonIncrementCall]) produces same increment data as prepareIncrement([nonIncrementCall])',
+        async () => {
+          const provider = Provider.from(RpcTransport.fromHttp(LOCAL_RPC_URL))
+          const chainId = Number(await provider.request({ method: 'eth_chainId' }))
+
+          const identityPrivateKey = Secp256k1.randomPrivateKey()
+          const identityAddress = Address.fromPublicKey(Secp256k1.getPublicKey({ privateKey: identityPrivateKey }))
+          const stateProvider = new State.Local.Provider()
+
+          const sessionPermission: ExplicitSessionConfig = {
+            chainId,
+            valueLimit: 0n,
+            deadline: BigInt(Math.floor(Date.now() / 1000) + 3600),
+            permissions: [PermissionBuilder.for(EMITTER_ADDRESS1).forFunction(EMITTER_FUNCTIONS[0]).onlyOnce().build()],
+          }
+          const explicitSigner = new Signers.Session.Explicit(Secp256k1.randomPrivateKey(), sessionPermission)
+          const sessionTopology = SessionConfig.addExplicitSession(
+            SessionConfig.emptySessionsTopology(identityAddress),
+            {
+              ...sessionPermission,
+              signer: explicitSigner.address,
+            },
+          )
+          await stateProvider.saveTree(SessionConfig.sessionsTopologyToConfigurationTree(sessionTopology))
+          const imageHash = GenericTree.hash(SessionConfig.sessionsTopologyToConfigurationTree(sessionTopology))
+
+          const wallet = await Wallet.fromConfiguration(
+            {
+              threshold: 1n,
+              checkpoint: 0n,
+              topology: [
+                { type: 'sapient-signer', address: extension.sessions, weight: 1n, imageHash },
+                Hex.random(32),
+              ],
+            },
+            { stateProvider },
+          )
+          const sessionManager = new Signers.SessionManager(wallet, {
+            provider,
+            sessionManagerAddress: extension.sessions,
+            explicitSigners: [explicitSigner],
+          })
+
+          const nonIncrementCall: Payload.Call = {
+            to: EMITTER_ADDRESS1,
+            value: 0n,
+            data: AbiFunction.encodeData(EMITTER_FUNCTIONS[0]),
+            gasLimit: 0n,
+            delegateCall: false,
+            onlyFallback: false,
+            behaviorOnError: 'revert',
+          }
+
+          const fromNonIncrementOnly = await sessionManager.prepareIncrement(wallet.address, chainId, [
+            nonIncrementCall,
+          ])
+          expect(fromNonIncrementOnly).not.toBeNull()
+
+          // Pass [staleIncrement, nonIncrementCall] — increment is ignored when building; result should match
+          const withStaleIncrement = await sessionManager.prepareIncrement(wallet.address, chainId, [
+            fromNonIncrementOnly!,
+            nonIncrementCall,
+          ])
+          expect(withStaleIncrement).not.toBeNull()
+          expect(withStaleIncrement!.data).toEqual(fromNonIncrementOnly!.data)
+        },
+        timeout,
+      )
+
+      it(
+        'payload with implicit and explicit: increment built only from explicit non-increment call',
+        async () => {
+          const provider = Provider.from(RpcTransport.fromHttp(LOCAL_RPC_URL))
+          const chainId = Number(await provider.request({ method: 'eth_chainId' }))
+
+          const identityPrivateKey = Secp256k1.randomPrivateKey()
+          const identityAddress = Address.fromPublicKey(Secp256k1.getPublicKey({ privateKey: identityPrivateKey }))
+          const stateProvider = new State.Local.Provider()
+
+          const redirectUrl = 'https://example.com'
+          const implicitSigner = await createImplicitSigner(redirectUrl, identityPrivateKey)
+          const sessionPermission: ExplicitSessionConfig = {
+            chainId,
+            valueLimit: 0n,
+            deadline: BigInt(Math.floor(Date.now() / 1000) + 3600),
+            permissions: [PermissionBuilder.for(EMITTER_ADDRESS1).forFunction(EMITTER_FUNCTIONS[0]).onlyOnce().build()],
+          }
+          const explicitSigner = new Signers.Session.Explicit(Secp256k1.randomPrivateKey(), sessionPermission)
+
+          // Topology: identity + blacklist (implicit) + explicit session
+          let sessionTopology = SessionConfig.emptySessionsTopology(identityAddress)
+          sessionTopology = SessionConfig.addExplicitSession(sessionTopology, {
+            ...sessionPermission,
+            signer: explicitSigner.address,
+          })
+          await stateProvider.saveTree(SessionConfig.sessionsTopologyToConfigurationTree(sessionTopology))
+          const imageHash = GenericTree.hash(SessionConfig.sessionsTopologyToConfigurationTree(sessionTopology))
+
+          const wallet = await Wallet.fromConfiguration(
+            {
+              threshold: 1n,
+              checkpoint: 0n,
+              topology: [
+                { type: 'sapient-signer', address: extension.sessions, weight: 1n, imageHash },
+                Hex.random(32),
+              ],
+            },
+            { stateProvider },
+          )
+          const sessionManager = new Signers.SessionManager(wallet, {
+            provider,
+            sessionManagerAddress: extension.sessions,
+            implicitSigners: [implicitSigner],
+            explicitSigners: [explicitSigner],
+          })
+
+          // Explicit call only (onlyOnce produces an increment; implicit does not match this target)
+          const call: Payload.Call = {
+            to: EMITTER_ADDRESS1,
+            value: 0n,
+            data: AbiFunction.encodeData(EMITTER_FUNCTIONS[0]),
+            gasLimit: 0n,
+            delegateCall: false,
+            onlyFallback: false,
+            behaviorOnError: 'revert',
+          }
+          const increment = await sessionManager.prepareIncrement(wallet.address, chainId, [call])
+          expect(increment).not.toBeNull()
+          const calls = includeIncrement([call], increment!, extension.sessions)
+          const transaction = await buildAndSignCall(wallet, sessionManager, calls, provider, chainId)
+          await simulateTransaction(provider, transaction, EMITTER_EVENT_TOPICS[0])
+        },
+        timeout,
+      )
+
+      it('signSapient handles selector-only self increment call consistently', async () => {
+        const identityPrivateKey = Secp256k1.randomPrivateKey()
+        const identityAddress = Address.fromPublicKey(Secp256k1.getPublicKey({ privateKey: identityPrivateKey }))
+        const stateProvider = new State.Local.Provider()
+
+        const explicitSigner = new Signers.Session.Explicit(Secp256k1.randomPrivateKey(), {
+          chainId: 0,
+          valueLimit: 0n,
+          deadline: BigInt(Math.floor(Date.now() / 1000) + 3600),
+          permissions: [PermissionBuilder.for(EMITTER_ADDRESS1).allowAll().build()],
+        })
+
+        const sessionTopology = SessionConfig.addExplicitSession(SessionConfig.emptySessionsTopology(identityAddress), {
+          ...explicitSigner.sessionPermissions,
+          signer: explicitSigner.address,
+        })
+        await stateProvider.saveTree(SessionConfig.sessionsTopologyToConfigurationTree(sessionTopology))
+        const imageHash = GenericTree.hash(SessionConfig.sessionsTopologyToConfigurationTree(sessionTopology))
+
+        const wallet = await Wallet.fromConfiguration(
+          {
+            threshold: 1n,
+            checkpoint: 0n,
+            topology: [{ type: 'sapient-signer', address: extension.sessions, weight: 1n, imageHash }, Hex.random(32)],
+          },
+          { stateProvider },
+        )
+        const sessionManager = new Signers.SessionManager(wallet, {
+          sessionManagerAddress: extension.sessions,
+          explicitSigners: [explicitSigner],
+        })
+
+        const payload: Payload.Parented = {
+          type: 'call',
+          nonce: 0n,
+          space: 0n,
+          calls: [
+            {
+              to: extension.sessions,
+              data: AbiFunction.getSelector(Constants.INCREMENT_USAGE_LIMIT),
+              value: 0n,
+              gasLimit: 0n,
+              delegateCall: false,
+              onlyFallback: false,
+              behaviorOnError: 'revert',
+            },
+          ],
+          parentWallets: [wallet.address],
+        }
+
+        const signature = await sessionManager.signSapient(wallet.address, 0, payload, imageHash)
+        expect(signature.type).toBe('sapient')
+      })
+    })
   })
 }