@argent/x-shared 1.62.6 → 1.62.7

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

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

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

@@ -7,6 +7,7 @@ export declare class PaymasterService implements IPaymasterService {
     private readonly httpService;
     constructor(argentRelayerUrl: string | undefined, httpService: IHttpService);
     getExecutionData(params: PaymasterExecutionDataParams, options?: PaymasterOptions): Promise<TypedData>;
+    getArgentNetwork(networkId: string): string;
     getAvnuUrl(networkId?: string): string;
     execute(params: PaymasterExecuteParams, options?: PaymasterOptions): Promise<string>;
 }

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

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

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("zod"),e=require("../../chains/starknet/address.cjs"),t=require("../../utils/starknet/starknet.cjs"),r=require("../../backend/schema.cjs"),s=a.z.object({calls:a.z.array(t.callSchema),accountAddress:e.addressSchema,networkId:r.argentNetworkIdSchema.or(r.argentBackendNetworkIdSchema).optional(),feeTokenAddress:e.addressSchema,maxFee:t.bigNumberishSchema,accountClassHash:a.z.string().optional()}),o=a.z.object({signature:a.z.string().array(),accountAddress:e.addressSchema,typedData:t.typedDataSchema,networkId:r.argentNetworkIdSchema.optional(),deploymentData:a.z.object({class_hash:a.z.string().optional(),salt:a.z.string().or(a.z.number()).or(a.z.bigint()).optional(),unique:a.z.string(),calldata:a.z.array(a.z.string())}).optional()}),n=a.z.object({transactionHash:a.z.string()});exports.paymasterExecuteParams=o;exports.paymasterExecuteResponse=n;exports.paymasterExecutionDataParams=s;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("zod"),t=require("../../chains/starknet/address.cjs"),r=require("../../utils/starknet/starknet.cjs"),e=require("../../backend/schema.cjs"),s=a.z.object({calls:a.z.array(r.callSchema),accountAddress:t.addressSchema,networkId:e.argentNetworkIdSchema.or(e.argentBackendNetworkIdSchema).optional(),feeTokenAddress:t.addressSchema,maxFee:r.bigNumberishSchema,accountClassHash:a.z.string().optional()}),o=a.z.object({signature:a.z.string().array(),accountAddress:t.addressSchema,typedData:r.typedDataSchema,networkId:e.argentNetworkIdSchema.or(e.argentBackendNetworkIdSchema).optional(),deploymentData:a.z.object({class_hash:a.z.string().optional(),salt:a.z.string().or(a.z.number()).or(a.z.bigint()).optional(),unique:a.z.string(),calldata:a.z.array(a.z.string())}).optional()}),n=a.z.object({transactionHash:a.z.string()});exports.paymasterExecuteParams=o;exports.paymasterExecuteResponse=n;exports.paymasterExecutionDataParams=s;

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

@@ -96,7 +96,7 @@ export declare const paymasterExecuteParams: z.ZodObject<{
         primaryType: string;
         domain: Record<string, unknown>;
     }>;
-    networkId: z.ZodOptional<z.ZodEnum<["mainnet-alpha", "sepolia-alpha"]>>;
+    networkId: z.ZodOptional<z.ZodUnion<[z.ZodEnum<["mainnet-alpha", "sepolia-alpha"]>, z.ZodEnum<["mainnet", "sepolia"]>]>>;
     deploymentData: z.ZodOptional<z.ZodObject<{
         class_hash: z.ZodOptional<z.ZodString>;
         salt: z.ZodOptional<z.ZodUnion<[z.ZodUnion<[z.ZodString, z.ZodNumber]>, z.ZodBigInt]>>;
@@ -133,7 +133,7 @@ export declare const paymasterExecuteParams: z.ZodObject<{
         primaryType: string;
         domain: Record<string, unknown>;
     };
-    networkId?: "mainnet-alpha" | "sepolia-alpha" | undefined;
+    networkId?: "mainnet-alpha" | "sepolia-alpha" | "mainnet" | "sepolia" | undefined;
     deploymentData?: {
         calldata: string[];
         unique: string;
@@ -160,7 +160,7 @@ export declare const paymasterExecuteParams: z.ZodObject<{
         primaryType: string;
         domain: Record<string, unknown>;
     };
-    networkId?: "mainnet-alpha" | "sepolia-alpha" | undefined;
+    networkId?: "mainnet-alpha" | "sepolia-alpha" | "mainnet" | "sepolia" | undefined;
     deploymentData?: {
         calldata: string[];
         unique: string;

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

@@ -1,19 +1,19 @@
 import { z as a } from "zod";
 import { addressSchema as t } from "../../chains/starknet/address.js";
-import { bigNumberishSchema as r, callSchema as o, typedDataSchema as s } from "../../utils/starknet/starknet.js";
-import { argentNetworkIdSchema as e, argentBackendNetworkIdSchema as n } from "../../backend/schema.js";
+import { bigNumberishSchema as o, callSchema as s, typedDataSchema as n } from "../../utils/starknet/starknet.js";
+import { argentNetworkIdSchema as e, argentBackendNetworkIdSchema as r } from "../../backend/schema.js";
 const d = a.object({
-  calls: a.array(o),
+  calls: a.array(s),
   accountAddress: t,
-  networkId: e.or(n).optional(),
+  networkId: e.or(r).optional(),
   feeTokenAddress: t,
-  maxFee: r,
+  maxFee: o,
   accountClassHash: a.string().optional()
 }), l = a.object({
   signature: a.string().array(),
   accountAddress: t,
-  typedData: s,
-  networkId: e.optional(),
+  typedData: n,
+  networkId: e.or(r).optional(),
   deploymentData: a.object({
     class_hash: a.string().optional(),
     salt: a.string().or(a.number()).or(a.bigint()).optional(),

package/package.json

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