@argent/x-shared 1.62.2 → 1.62.4

package/dist/src/features/paymaster/IPaymasterService.d.ts

@@ -1,9 +1,6 @@
 import { TypedData } from 'starknet';
-import { PaymasterExecutionDataParams, PaymasterExecuteParams } from './types';
+import { PaymasterExecutionDataParams, PaymasterExecuteParams, PaymasterOptions } from './types';
 export interface IPaymasterService {
-    getExecutionData(params: PaymasterExecutionDataParams, useAvnu?: boolean): Promise<TypedData>;
-    execute(params: PaymasterExecuteParams, options?: {
-        useAvnu?: boolean;
-        isSubsidised?: boolean;
-    }): Promise<string>;
+    getExecutionData(params: PaymasterExecutionDataParams, options?: PaymasterOptions): Promise<TypedData>;
+    execute(params: PaymasterExecuteParams, options?: PaymasterOptions): Promise<string>;
 }

package/dist/src/features/paymaster/PaymasterService.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const s=require("starknet"),c=require("url-join"),u=require("./types.cjs"),p=require("../../utils/starknet/starknet.cjs");class y{constructor(e="",t){this.argentRelayerUrl=e,this.httpService=t}async getExecutionData(e,t=!1){const n=c(t?this.getAvnuUrl(e.networkId):this.argentRelayerUrl,"/build-typed-data"),r={calls:t?e.calls.map(a=>({contractAddress:s.num.toHex(a.contractAddress),calldata:s.CallData.toCalldata(a.calldata).map(l=>s.num.toHex(l)),entrypoint:a.entrypoint})):e.calls,userAddress:e.accountAddress,gasTokenAddress:s.num.toHex(e.feeTokenAddress),maxGasTokenAmount:s.num.toHex(e.maxFee),accountClassHash:e.accountClassHash},i=await this.httpService.post(n,{body:s.json.stringify(r),headers:{"Content-Type":"application/json"}}),o=p.typedDataSchema.safeParse(i);if(!o.success)throw new Error("Invalid response from paymaster");return o.data}getAvnuUrl(e){if(!e)throw new Error("Network id is required for Avnu paymaster");let t="";if(e==="mainnet"||e==="mainnet-alpha")t="starknet";else if(e==="sepolia"||e==="sepolia-alpha")t="sepolia";else throw new Error("Invalid network id");return`https://${t}.api.avnu.fi/paymaster/v1`}async execute(e,t){const{useAvnu:n,isSubsidised:d}=t??{};let r=c(n?this.getAvnuUrl(e.networkId):this.argentRelayerUrl,"/execute");d&&(r=c(r,"?isSubsidised=true"));const i={signature:e.signature,userAddress:e.accountAddress,typedData:n?s.json.stringify(e.typedData):e.typedData,deploymentData:e.deploymentData},o=await this.httpService.post(r,{body:s.json.stringify(i),headers:{"Content-Type":"application/json"}}),a=u.paymasterExecuteResponse.safeParse(o);if(!a.success)throw new Error("Invalid response from paymaster");return a.data.transactionHash}}exports.PaymasterService=y;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const s=require("starknet"),d=require("url-join"),y=require("./types.cjs"),h=require("../../utils/starknet/starknet.cjs");class f{constructor(e="",t){this.argentRelayerUrl=e,this.httpService=t}async getExecutionData(e,t={}){const{useAvnu:n,isSubsidised:a}=t,r=d(n?this.getAvnuUrl(e.networkId):this.argentRelayerUrl,"/build-typed-data"),i={calls:n?e.calls.map(c=>({contractAddress:s.num.toHex(c.contractAddress),calldata:s.CallData.toCalldata(c.calldata).map(p=>s.num.toHex(p)),entrypoint:c.entrypoint})):e.calls,userAddress:e.accountAddress,gasTokenAddress:a?null:s.num.toHex(e.feeTokenAddress),maxGasTokenAmount:a?null:s.num.toHex(e.feeTokenAddress),accountClassHash:e.accountClassHash},o=await this.httpService.post(r,{body:s.json.stringify(i),headers:{"Content-Type":"application/json"}}),u=h.typedDataSchema.safeParse(o);if(!u.success)throw new Error("Invalid response from paymaster");return u.data}getAvnuUrl(e){if(!e)throw new Error("Network id is required for Avnu paymaster");let t="";if(e==="mainnet"||e==="mainnet-alpha")t="starknet";else if(e==="sepolia"||e==="sepolia-alpha")t="sepolia";else throw new Error("Invalid network id");return`https://${t}.api.avnu.fi/paymaster/v1`}async execute(e,t={}){const{useAvnu:n,isSubsidised:a}=t;let r=d(n?this.getAvnuUrl(e.networkId):this.argentRelayerUrl,"/execute");a&&(r=d(r,"?isSubsidised=true"));const l={signature:e.signature,userAddress:e.accountAddress,typedData:n?s.json.stringify(e.typedData):e.typedData,deploymentData:e.deploymentData},i=await this.httpService.post(r,{body:s.json.stringify(l),headers:{"Content-Type":"application/json"}}),o=y.paymasterExecuteResponse.safeParse(i);if(!o.success)throw new Error("Invalid response from paymaster");return o.data.transactionHash}}exports.PaymasterService=f;

package/dist/src/features/paymaster/PaymasterService.d.ts

@@ -1,15 +1,12 @@
 import { TypedData } from '@starknet-io/types-js';
 import { IHttpService } from '../../http';
 import { IPaymasterService } from './IPaymasterService';
-import { PaymasterExecuteParams, PaymasterExecutionDataParams } from './types';
+import { PaymasterOptions, PaymasterExecuteParams, PaymasterExecutionDataParams } from './types';
 export declare class PaymasterService implements IPaymasterService {
     private readonly argentRelayerUrl;
     private readonly httpService;
     constructor(argentRelayerUrl: string | undefined, httpService: IHttpService);
-    getExecutionData(params: PaymasterExecutionDataParams, useAvnu?: boolean): Promise<TypedData>;
+    getExecutionData(params: PaymasterExecutionDataParams, options?: PaymasterOptions): Promise<TypedData>;
     getAvnuUrl(networkId?: string): string;
-    execute(params: PaymasterExecuteParams, options?: {
-        useAvnu?: boolean;
-        isSubsidised?: boolean;
-    }): Promise<string>;
+    execute(params: PaymasterExecuteParams, options?: PaymasterOptions): Promise<string>;
 }

package/dist/src/features/paymaster/PaymasterService.js

@@ -1,31 +1,31 @@
-import { CallData as u, num as o, json as c } from "starknet";
-import d from "url-join";
-import { paymasterExecuteResponse as y } from "./types.js";
-import { typedDataSchema as h } from "../../utils/starknet/starknet.js";
-class x {
+import { CallData as h, num as o, json as l } from "starknet";
+import c from "url-join";
+import { paymasterExecuteResponse as f } from "./types.js";
+import { typedDataSchema as A } from "../../utils/starknet/starknet.js";
+class b {
   constructor(e = "", t) {
     this.argentRelayerUrl = e, this.httpService = t;
   }
-  async getExecutionData(e, t = !1) {
-    const r = d(t ? this.getAvnuUrl(e.networkId) : this.argentRelayerUrl, "/build-typed-data"), a = {
-      calls: t ? e.calls.map((s) => ({
-        contractAddress: o.toHex(s.contractAddress),
-        calldata: u.toCalldata(s.calldata).map((p) => o.toHex(p)),
-        entrypoint: s.entrypoint
+  async getExecutionData(e, t = {}) {
+    const { useAvnu: s, isSubsidised: a } = t, r = c(s ? this.getAvnuUrl(e.networkId) : this.argentRelayerUrl, "/build-typed-data"), i = {
+      calls: s ? e.calls.map((d) => ({
+        contractAddress: o.toHex(d.contractAddress),
+        calldata: h.toCalldata(d.calldata).map((y) => o.toHex(y)),
+        entrypoint: d.entrypoint
       })) : e.calls,
       userAddress: e.accountAddress,
-      gasTokenAddress: o.toHex(e.feeTokenAddress),
-      maxGasTokenAmount: o.toHex(e.maxFee),
+      gasTokenAddress: a ? null : o.toHex(e.feeTokenAddress),
+      maxGasTokenAmount: a ? null : o.toHex(e.feeTokenAddress),
       accountClassHash: e.accountClassHash
-    }, i = await this.httpService.post(r, {
-      body: c.stringify(a),
+    }, n = await this.httpService.post(r, {
+      body: l.stringify(i),
       headers: {
         "Content-Type": "application/json"
       }
-    }), n = h.safeParse(i);
-    if (!n.success)
+    }), p = A.safeParse(n);
+    if (!p.success)
       throw new Error("Invalid response from paymaster");
-    return n.data;
+    return p.data;
   }
   getAvnuUrl(e) {
     if (!e)
@@ -39,26 +39,26 @@ class x {
       throw new Error("Invalid network id");
     return `https://${t}.api.avnu.fi/paymaster/v1`;
   }
-  async execute(e, t) {
-    const { useAvnu: r, isSubsidised: l } = t ?? {};
-    let a = d(r ? this.getAvnuUrl(e.networkId) : this.argentRelayerUrl, "/execute");
-    l && (a = d(a, "?isSubsidised=true"));
-    const i = {
+  async execute(e, t = {}) {
+    const { useAvnu: s, isSubsidised: a } = t;
+    let r = c(s ? this.getAvnuUrl(e.networkId) : this.argentRelayerUrl, "/execute");
+    a && (r = c(r, "?isSubsidised=true"));
+    const u = {
       signature: e.signature,
       userAddress: e.accountAddress,
-      typedData: r ? c.stringify(e.typedData) : e.typedData,
+      typedData: s ? l.stringify(e.typedData) : e.typedData,
       deploymentData: e.deploymentData
-    }, n = await this.httpService.post(a, {
-      body: c.stringify(i),
+    }, i = await this.httpService.post(r, {
+      body: l.stringify(u),
       headers: {
         "Content-Type": "application/json"
       }
-    }), s = y.safeParse(n);
-    if (!s.success)
+    }), n = f.safeParse(i);
+    if (!n.success)
       throw new Error("Invalid response from paymaster");
-    return s.data.transactionHash;
+    return n.data.transactionHash;
   }
 }
 export {
-  x as PaymasterService
+  b as PaymasterService
 };

package/dist/src/features/paymaster/types.d.ts

@@ -177,3 +177,7 @@ export declare const paymasterExecuteResponse: z.ZodObject<{
     transactionHash: string;
 }>;
 export type PaymasterExecuteResponse = z.infer<typeof paymasterExecuteResponse>;
+export type PaymasterOptions = {
+    useAvnu?: boolean;
+    isSubsidised?: boolean;
+};

package/dist/src/onchainRecovery/schema.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("zod"),n=require("../chains/starknet/address.cjs"),c=require("../utils/hex.cjs");exports.RecoveryStatusEnum=void 0;(function(r){r.NOT_STARTED="NOT_STARTED",r.ONGOING="ONGOING",r.AWAITING_FUNDS="AWAITING_FUNDS",r.AWAITING_COMPLETION="AWAITING_COMPLETION",r.COMPLETED="COMPLETED",r.CANCELLED="CANCELLED",r.ERROR="ERROR"})(exports.RecoveryStatusEnum||(exports.RecoveryStatusEnum={}));const i=e.z.object({recoveryId:e.z.number()}),s=e.z.object({feeToken:n.addressSchema,signerSignature:e.z.object({type:e.z.literal("StarknetKey"),signer:e.z.object({publicKey:c.hexSchema,r:c.hexSchema,s:c.hexSchema})})}),t=e.z.nativeEnum(exports.RecoveryStatusEnum),o=e.z.object({recoveryId:e.z.number(),status:t,completionTime:e.z.array(e.z.number()).optional()}),h=e.z.object({activeRecovery:o.optional().or(e.z.null()).optional(),minFees:e.z.record(e.z.number()).optional()}),S=e.z.object({recovery:o.optional().or(e.z.null()).optional(),minFees:e.z.record(e.z.number()).optional()});exports.StartOnchainRecoveryErrorStatusEnum=void 0;(function(r){r.UNDEPLOYED_ACCOUNT="undeployedAccount",r.NOT_ENOUGH_TO_PAY_FEES="notEnoughToPayFees",r.RECOVERY_ALREADY_EXISTS="recoveryAlreadyExists"})(exports.StartOnchainRecoveryErrorStatusEnum||(exports.StartOnchainRecoveryErrorStatusEnum={}));const a=e.z.nativeEnum(exports.StartOnchainRecoveryErrorStatusEnum),E=e.z.object({status:a});exports.activeOnchainRecoverySchema=h;exports.onchainRecoverySchema=S;exports.recoveryBaseSchema=o;exports.recoveryBodySchema=s;exports.recoveryStatusSchema=t;exports.startOnchainRecoveryErrorSchema=E;exports.startOnchainRecoveryErrorStatusSchema=a;exports.startOnchainRecoverySchema=i;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("zod"),a=require("../chains/starknet/address.cjs"),c=require("../utils/hex.cjs");exports.RecoveryStatusEnum=void 0;(function(r){r.NOT_STARTED="NOT_STARTED",r.ONGOING="ONGOING",r.AWAITING_FUNDS="AWAITING_FUNDS",r.AWAITING_COMPLETION="AWAITING_COMPLETION",r.COMPLETED="COMPLETED",r.CANCELLED="CANCELLED",r.ERROR="ERROR"})(exports.RecoveryStatusEnum||(exports.RecoveryStatusEnum={}));const i=e.z.object({recoveryId:e.z.number()}),s=e.z.object({feeToken:a.addressSchema,signerSignature:e.z.object({type:e.z.literal("StarknetKey"),signer:e.z.object({publicKey:c.hexSchema,r:c.hexSchema,s:c.hexSchema})})}),t=e.z.nativeEnum(exports.RecoveryStatusEnum),o=e.z.object({recoveryId:e.z.number(),status:t,completionTime:e.z.string().optional()}),h=e.z.object({activeRecovery:o.optional().or(e.z.null()).optional(),minFees:e.z.record(e.z.number()).optional()}),S=e.z.object({recovery:o.optional().or(e.z.null()).optional(),minFees:e.z.record(e.z.number()).optional()});exports.StartOnchainRecoveryErrorStatusEnum=void 0;(function(r){r.UNDEPLOYED_ACCOUNT="undeployedAccount",r.NOT_ENOUGH_TO_PAY_FEES="notEnoughToPayFees",r.RECOVERY_ALREADY_EXISTS="recoveryAlreadyExists"})(exports.StartOnchainRecoveryErrorStatusEnum||(exports.StartOnchainRecoveryErrorStatusEnum={}));const n=e.z.nativeEnum(exports.StartOnchainRecoveryErrorStatusEnum),E=e.z.object({status:n});exports.activeOnchainRecoverySchema=h;exports.onchainRecoverySchema=S;exports.recoveryBaseSchema=o;exports.recoveryBodySchema=s;exports.recoveryStatusSchema=t;exports.startOnchainRecoveryErrorSchema=E;exports.startOnchainRecoveryErrorStatusSchema=n;exports.startOnchainRecoverySchema=i;

package/dist/src/onchainRecovery/schema.d.ts

@@ -72,43 +72,43 @@ export declare const recoveryStatusSchema: z.ZodNativeEnum<typeof RecoveryStatus
 export declare const recoveryBaseSchema: z.ZodObject<{
     recoveryId: z.ZodNumber;
     status: z.ZodNativeEnum<typeof RecoveryStatusEnum>;
-    completionTime: z.ZodOptional<z.ZodArray<z.ZodNumber, "many">>;
+    completionTime: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
     status: RecoveryStatusEnum;
     recoveryId: number;
-    completionTime?: number[] | undefined;
+    completionTime?: string | undefined;
 }, {
     status: RecoveryStatusEnum;
     recoveryId: number;
-    completionTime?: number[] | undefined;
+    completionTime?: string | undefined;
 }>;
 export declare const activeOnchainRecoverySchema: z.ZodObject<{
     activeRecovery: z.ZodOptional<z.ZodUnion<[z.ZodOptional<z.ZodObject<{
         recoveryId: z.ZodNumber;
         status: z.ZodNativeEnum<typeof RecoveryStatusEnum>;
-        completionTime: z.ZodOptional<z.ZodArray<z.ZodNumber, "many">>;
+        completionTime: z.ZodOptional<z.ZodString>;
     }, "strip", z.ZodTypeAny, {
         status: RecoveryStatusEnum;
         recoveryId: number;
-        completionTime?: number[] | undefined;
+        completionTime?: string | undefined;
     }, {
         status: RecoveryStatusEnum;
         recoveryId: number;
-        completionTime?: number[] | undefined;
+        completionTime?: string | undefined;
     }>>, z.ZodNull]>>;
     minFees: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodNumber>>;
 }, "strip", z.ZodTypeAny, {
     activeRecovery?: {
         status: RecoveryStatusEnum;
         recoveryId: number;
-        completionTime?: number[] | undefined;
+        completionTime?: string | undefined;
     } | null | undefined;
     minFees?: Record<string, number> | undefined;
 }, {
     activeRecovery?: {
         status: RecoveryStatusEnum;
         recoveryId: number;
-        completionTime?: number[] | undefined;
+        completionTime?: string | undefined;
     } | null | undefined;
     minFees?: Record<string, number> | undefined;
 }>;
@@ -116,15 +116,15 @@ export declare const onchainRecoverySchema: z.ZodObject<{
     recovery: z.ZodOptional<z.ZodUnion<[z.ZodOptional<z.ZodObject<{
         recoveryId: z.ZodNumber;
         status: z.ZodNativeEnum<typeof RecoveryStatusEnum>;
-        completionTime: z.ZodOptional<z.ZodArray<z.ZodNumber, "many">>;
+        completionTime: z.ZodOptional<z.ZodString>;
     }, "strip", z.ZodTypeAny, {
         status: RecoveryStatusEnum;
         recoveryId: number;
-        completionTime?: number[] | undefined;
+        completionTime?: string | undefined;
     }, {
         status: RecoveryStatusEnum;
         recoveryId: number;
-        completionTime?: number[] | undefined;
+        completionTime?: string | undefined;
     }>>, z.ZodNull]>>;
     minFees: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodNumber>>;
 }, "strip", z.ZodTypeAny, {
@@ -132,14 +132,14 @@ export declare const onchainRecoverySchema: z.ZodObject<{
     recovery?: {
         status: RecoveryStatusEnum;
         recoveryId: number;
-        completionTime?: number[] | undefined;
+        completionTime?: string | undefined;
     } | null | undefined;
 }, {
     minFees?: Record<string, number> | undefined;
     recovery?: {
         status: RecoveryStatusEnum;
         recoveryId: number;
-        completionTime?: number[] | undefined;
+        completionTime?: string | undefined;
     } | null | undefined;
 }>;
 export declare enum StartOnchainRecoveryErrorStatusEnum {

package/dist/src/onchainRecovery/schema.js

@@ -1,26 +1,26 @@
 import { z as e } from "zod";
 import { addressSchema as a } from "../chains/starknet/address.js";
-import { hexSchema as r } from "../utils/hex.js";
-var c;
+import { hexSchema as c } from "../utils/hex.js";
+var r;
 (function(o) {
   o.NOT_STARTED = "NOT_STARTED", o.ONGOING = "ONGOING", o.AWAITING_FUNDS = "AWAITING_FUNDS", o.AWAITING_COMPLETION = "AWAITING_COMPLETION", o.COMPLETED = "COMPLETED", o.CANCELLED = "CANCELLED", o.ERROR = "ERROR";
-})(c || (c = {}));
-const T = e.object({
+})(r || (r = {}));
+const m = e.object({
   recoveryId: e.number()
 }), N = e.object({
   feeToken: a,
   signerSignature: e.object({
     type: e.literal("StarknetKey"),
     signer: e.object({
-      publicKey: r,
-      r,
-      s: r
+      publicKey: c,
+      r: c,
+      s: c
     })
   })
-}), i = e.nativeEnum(c), t = e.object({
+}), i = e.nativeEnum(r), t = e.object({
   recoveryId: e.number(),
   status: i,
-  completionTime: e.array(e.number()).optional()
+  completionTime: e.string().optional()
 }), A = e.object({
   activeRecovery: t.optional().or(e.null()).optional(),
   minFees: e.record(e.number()).optional()
@@ -32,11 +32,11 @@ var n;
 (function(o) {
   o.UNDEPLOYED_ACCOUNT = "undeployedAccount", o.NOT_ENOUGH_TO_PAY_FEES = "notEnoughToPayFees", o.RECOVERY_ALREADY_EXISTS = "recoveryAlreadyExists";
 })(n || (n = {}));
-const O = e.nativeEnum(n), h = e.object({
-  status: O
+const s = e.nativeEnum(n), h = e.object({
+  status: s
 });
 export {
-  c as RecoveryStatusEnum,
+  r as RecoveryStatusEnum,
   n as StartOnchainRecoveryErrorStatusEnum,
   A as activeOnchainRecoverySchema,
   l as onchainRecoverySchema,
@@ -44,6 +44,6 @@ export {
   N as recoveryBodySchema,
   i as recoveryStatusSchema,
   h as startOnchainRecoveryErrorSchema,
-  O as startOnchainRecoveryErrorStatusSchema,
-  T as startOnchainRecoverySchema
+  s as startOnchainRecoveryErrorStatusSchema,
+  m as startOnchainRecoverySchema
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@argent/x-shared",
-  "version": "1.62.2",
+  "version": "1.62.4",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/argentlabs/x-shared.git"