@argent/x-shared 1.62.2 → 1.62.3

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/package.json

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