@argent/x-shared 1.39.0 → 1.40.0

package/dist/src/signer/index.d.ts

@@ -1,2 +1,3 @@
 export * from './seedphrase';
 export * from './multisigner';
+export * from './mergeOwnerGuardianSignatures';

package/dist/src/signer/mergeOwnerGuardianSignatures.cjs

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const l=require("lodash-es"),n=require("starknet"),d=require("../chains/starknet/services/deploymentData/getAccountClassHash.cjs"),S=require("../chains/starknet/address.cjs"),m=async({ownerPubKey:e,ownerSignature:t,guardianPubKey:r,guardianSignature:s,classHash:c})=>{const a=l.isEmpty(s);if(p(c)){const i=o(e,t);if(a)return u(i);const g=o(r,s);return u(i,g)}return a?[t].flatMap(n.stark.signatureToDecimalArray):[t,s].flatMap(n.stark.signatureToDecimalArray)},o=(e,t)=>{const r=n.stark.formatSignature(t);return new n.CairoCustomEnum({Starknet:{signer:e,r:r[0],s:r[1]},Secp256k1:void 0,Secp256r1:void 0,Eip191:void 0,Webauthn:void 0})},u=(...e)=>{const t=e.length.toString(),r=n.CallData.compile(e);return[t,...r]},p=e=>d.getArgentAccountWithMultiSignerClassHashes().some(t=>S.isEqualAddress(t,e));exports.mergeOwnerGuardianSignatures=m;

package/dist/src/signer/mergeOwnerGuardianSignatures.d.ts

@@ -0,0 +1,26 @@
+import { Signature } from 'starknet';
+interface MergeOwnerGuardianSignaturesParams {
+    ownerPubKey: string;
+    ownerSignature: Signature;
+    guardianPubKey: string;
+    guardianSignature: Signature;
+    classHash: string | undefined;
+}
+/**
+ * Merges the owner and guardian signatures into a single signature.
+ *
+ * @param {Object} params - The parameters for merging signatures.
+ * @param {string} params.ownerPubKey - The public key of the owner.
+ * @param {Signature} params.ownerSignature - The signature of the owner.
+ * @param {string} params.guardianPubKey - The public key of the guardian.
+ * @param {Signature} params.guardianSignature - The signature of the guardian.
+ * @param {string} params.classHash - The class hash of the account.
+ * @returns {Promise<Signature>} - A promise that resolves to the merged signature.
+ *
+ * @remarks
+ * - If the guardian signature is empty, it indicates that a co-signer is not required.
+ * - If multi-signer support is enabled, the signatures are formatted and prepended with their lengths.
+ * - If multi-signer support is not enabled, the signatures are converted to decimal arrays.
+ */
+declare const mergeOwnerGuardianSignatures: ({ ownerPubKey, ownerSignature, guardianPubKey, guardianSignature, classHash, }: MergeOwnerGuardianSignaturesParams) => Promise<Signature>;
+export { mergeOwnerGuardianSignatures };

package/dist/src/signer/mergeOwnerGuardianSignatures.js

@@ -0,0 +1,30 @@
+import { isEmpty as p } from "lodash-es";
+import { stark as i, CairoCustomEnum as g, CallData as l } from "starknet";
+import { getArgentAccountWithMultiSignerClassHashes as S } from "../chains/starknet/services/deploymentData/getAccountClassHash.js";
+import { isEqualAddress as d } from "../chains/starknet/address.js";
+const y = async ({ ownerPubKey: r, ownerSignature: t, guardianPubKey: n, guardianSignature: e, classHash: c }) => {
+  const o = p(e);
+  if (f(c)) {
+    const a = s(r, t);
+    if (o)
+      return u(a);
+    const m = s(n, e);
+    return u(a, m);
+  }
+  return o ? [t].flatMap(i.signatureToDecimalArray) : [t, e].flatMap(i.signatureToDecimalArray);
+}, s = (r, t) => {
+  const n = i.formatSignature(t);
+  return new g({
+    Starknet: { signer: r, r: n[0], s: n[1] },
+    Secp256k1: void 0,
+    Secp256r1: void 0,
+    Eip191: void 0,
+    Webauthn: void 0
+  });
+}, u = (...r) => {
+  const t = r.length.toString(), n = l.compile(r);
+  return [t, ...n];
+}, f = (r) => S().some((t) => d(t, r));
+export {
+  y as mergeOwnerGuardianSignatures
+};

package/dist/src/tokens/service/implementation.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const p=require("async-retry"),c=require("url-join"),r=require("./types/backend.model.cjs"),d=require("../../utils/schemas.cjs");class u{constructor(s,e){this.apiBase=s,this.httpService=e,this.TOKENS_INFO_URL="/tokens/info",this.TOKENS_DEFI_DECOMPOSITION_URL="/tokens/defi/decomposition"}async fetchTokensInfoFromBackend(s){const e=c(this.apiBase,this.TOKENS_INFO_URL,s??"","?chain=starknet"),t=await this.httpService.get(e),n=r.apiTokensInfoResponseSchema.safeParse(t);if(n.success)return n.data.tokens;const o=r.apiTokenInfoResponseSchema.safeParse(t);if(o.success)return[o.data]}async fetchAddressTokenBalancesFromBackend(s,e,t){const n=c(this.apiBase,"activity","starknet",e,"account",s,"balance");return(await p(async a=>{let h;try{h=await this.httpService.get(n)}catch{return a(new Error("Error fetching")),[]}const i=r.apiAccountTokenBalancesSchema.safeParse(h);if(!i.success)return a(new Error("Error parsing response")),[];if(i.data.status!=="initialised")throw new Error("Not initialised yet");return i.data.balances},{retries:5,minTimeout:5e3,...t})).map(a=>({address:a.tokenAddress,balance:a.tokenBalance,networkId:e}))}async fetchDefiDecomposition(s){const e=c(this.apiBase,this.TOKENS_DEFI_DECOMPOSITION_URL,s,"?chain=starknet"),t=await this.httpService.get(e);return d.safeParseAndWarn(r.apiDefiPositionsSchema,t).success||console.error("Backend schema has changed. Make the changes to the models to prevent unknown/unhandled errors."),t.dapps}}exports.TokenServiceWeb=u;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const h=require("async-retry"),c=require("url-join"),o=require("./types/backend.model.cjs"),d=require("../../utils/schemas.cjs");class u{constructor(s,e){this.apiBase=s,this.httpService=e,this.TOKENS_INFO_URL="/tokens/info"}async fetchTokensInfoFromBackend(s){const e=c(this.apiBase,this.TOKENS_INFO_URL,s??"","?chain=starknet"),t=await this.httpService.get(e),n=o.apiTokensInfoResponseSchema.safeParse(t);if(n.success)return n.data.tokens;const r=o.apiTokenInfoResponseSchema.safeParse(t);if(r.success)return[r.data]}async fetchAddressTokenBalancesFromBackend(s,e,t){const n=c(this.apiBase,"activity","starknet",e,"account",s,"balance");return(await h(async a=>{let p;try{p=await this.httpService.get(n)}catch{return a(new Error("Error fetching")),[]}const i=o.apiAccountTokenBalancesSchema.safeParse(p);if(!i.success)return a(new Error("Error parsing response")),[];if(i.data.status!=="initialised")throw new Error("Not initialised yet");return i.data.balances},{retries:5,minTimeout:5e3,...t})).map(a=>({address:a.tokenAddress,balance:a.tokenBalance,networkId:e}))}async fetchDefiDecomposition(s,e){const t=c(this.apiBase,"tokens/defi",s,"investments","?chain=starknet",`&application=${e}`),n=await this.httpService.get(t);return d.safeParseAndWarn(o.apiDefiPositionsSchema,n).success||console.error("Backend schema has changed. Make the changes to the models to prevent unknown/unhandled errors."),n.dapps}}exports.TokenServiceWeb=u;

package/dist/src/tokens/service/implementation.d.ts

@@ -12,7 +12,6 @@ export declare class TokenServiceWeb implements ITokenServiceWeb {
     protected readonly apiBase: string;
     protected readonly httpService: IHttpService;
     private readonly TOKENS_INFO_URL;
-    private readonly TOKENS_DEFI_DECOMPOSITION_URL;
     constructor(apiBase: string, httpService: IHttpService);
     /**
      * Fetch tokens info from backend
@@ -26,7 +25,7 @@ export declare class TokenServiceWeb implements ITokenServiceWeb {
      * @returns {Promise<WebBaseTokenWithBalance[]>} - The fetched balances for the account address.
      */
     fetchAddressTokenBalancesFromBackend(address: string, network: ArgentBackendNetworkId, opts?: retry.Options): Promise<WebBaseTokenWithBalance[]>;
-    fetchDefiDecomposition(address: Address): Promise<{
+    fetchDefiDecomposition(address: Address, application: "mobile" | "webwallet" | "argentx"): Promise<{
         dappId: string;
         products: import('zod').objectOutputType<{
             name: import('zod').ZodString;

package/dist/src/tokens/service/implementation.js

@@ -2,9 +2,9 @@ import p from "async-retry";
 import i from "url-join";
 import { apiTokensInfoResponseSchema as h, apiTokenInfoResponseSchema as d, apiAccountTokenBalancesSchema as u, apiDefiPositionsSchema as f } from "./types/backend.model.js";
 import { safeParseAndWarn as k } from "../../utils/schemas.js";
-class O {
+class R {
   constructor(s, e) {
-    this.apiBase = s, this.httpService = e, this.TOKENS_INFO_URL = "/tokens/info", this.TOKENS_DEFI_DECOMPOSITION_URL = "/tokens/defi/decomposition";
+    this.apiBase = s, this.httpService = e, this.TOKENS_INFO_URL = "/tokens/info";
   }
   /**
    * Fetch tokens info from backend
@@ -12,41 +12,41 @@ class O {
    * @returns {Promise<ApiTokenInfo[]>} - The fetched tokens or undefined if there was an error or not default network
    */
   async fetchTokensInfoFromBackend(s) {
-    const e = i(this.apiBase, this.TOKENS_INFO_URL, s ?? "", "?chain=starknet"), t = await this.httpService.get(e), n = h.safeParse(t);
-    if (n.success)
-      return n.data.tokens;
-    const o = d.safeParse(t);
-    if (o.success)
-      return [o.data];
+    const e = i(this.apiBase, this.TOKENS_INFO_URL, s ?? "", "?chain=starknet"), n = await this.httpService.get(e), t = h.safeParse(n);
+    if (t.success)
+      return t.data.tokens;
+    const r = d.safeParse(n);
+    if (r.success)
+      return [r.data];
   }
   /**
    * Fetch list of tokens and balances for given account from backend
    * @param {Address} address - The account address.
    * @returns {Promise<WebBaseTokenWithBalance[]>} - The fetched balances for the account address.
    */
-  async fetchAddressTokenBalancesFromBackend(s, e, t) {
-    const n = i(this.apiBase, "activity", "starknet", e, "account", s, "balance");
+  async fetchAddressTokenBalancesFromBackend(s, e, n) {
+    const t = i(this.apiBase, "activity", "starknet", e, "account", s, "balance");
     return (await p(
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       async (a) => {
         let c;
         try {
-          c = await this.httpService.get(n);
+          c = await this.httpService.get(t);
         } catch {
           return a(new Error("Error fetching")), [];
         }
-        const r = u.safeParse(c);
-        if (!r.success)
+        const o = u.safeParse(c);
+        if (!o.success)
           return a(new Error("Error parsing response")), [];
-        if (r.data.status !== "initialised")
+        if (o.data.status !== "initialised")
           throw new Error("Not initialised yet");
-        return r.data.balances;
+        return o.data.balances;
       },
       {
         /** seems to take 5-10 sec for initialised state */
         retries: 5,
         minTimeout: 5e3,
-        ...t
+        ...n
       }
     )).map((a) => ({
       address: a.tokenAddress,
@@ -54,11 +54,11 @@ class O {
       networkId: e
     }));
   }
-  async fetchDefiDecomposition(s) {
-    const e = i(this.apiBase, this.TOKENS_DEFI_DECOMPOSITION_URL, s, "?chain=starknet"), t = await this.httpService.get(e);
+  async fetchDefiDecomposition(s, e) {
+    const n = i(this.apiBase, "tokens/defi", s, "investments", "?chain=starknet", `&application=${e}`), t = await this.httpService.get(n);
     return k(f, t).success || console.error("Backend schema has changed. Make the changes to the models to prevent unknown/unhandled errors."), t.dapps;
   }
 }
 export {
-  O as TokenServiceWeb
+  R as TokenServiceWeb
 };

package/dist/src/tokens/service/interface.d.ts

@@ -5,7 +5,7 @@ import { ApiDefiDecompositionSchema, ApiTokenInfo } from './types/backend.model'
 import { WebBaseTokenWithBalance } from './types/webToken.model';
 export type SelectorFn<T> = (value: T) => boolean;
 export interface ITokenServiceDefiDecomposition {
-    fetchDefiDecomposition: (address: Address) => Promise<ApiDefiDecompositionSchema[]>;
+    fetchDefiDecomposition: (address: Address, application: "mobile" | "webwallet" | "argentx") => Promise<ApiDefiDecompositionSchema[]>;
 }
 /**
  * ITokenService interface provides methods for managing tokens, including storage methods, fetch methods, and get methods.

package/dist/src/tokens/service/types/defiPosition.model.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("zod"),o=require("../../../chains/starknet/address.cjs"),p=require("./backend.model.cjs"),z=require("./defiPositionType.model.cjs"),t=require("./webToken.model.cjs"),c=t.webTokenWithBalanceAndPriceSchema.extend({accruedFees:e.z.string(),currentPrice:e.z.string(),maxPrice:e.z.string(),minPrice:e.z.string(),principal:e.z.string()}),n=e.z.object({address:o.addressSchema.optional(),currencyValue:e.z.string().default("0")}),a=n.extend({poolFeePercentage:e.z.string(),tickSpacingPercentage:e.z.string().optional(),tokenId:e.z.string().optional(),unitCurrencyValueToken0:e.z.string().optional(),unitCurrencyValueToken1:e.z.string().optional(),token0:c,token1:c}),m=e.z.array(a),h=e.z.object({name:e.z.string().optional(),healthRatio:e.z.string().optional(),accountAddress:o.addressSchema.optional()}),i=n.extend({totalBalances:e.z.record(e.z.string()),collateral:e.z.boolean(),debt:e.z.boolean(),lending:e.z.boolean(),apy:e.z.string().optional(),group:e.z.string().optional(),unitCurrencyValue:e.z.string().optional(),positionToken:p.apiTokenInfoSchema.or(e.z.undefined()),token:t.webTokenWithBalanceAndPriceSchema.optional(),accountAddress:o.addressSchema.optional(),accountAddressGroup:e.z.string().optional()}),g=e.z.array(i),r=n.extend({delegatingTo:o.addressSchema,token:t.webTokenWithBalanceAndPriceSchema.optional(),balance:e.z.string(),unitCurrencyValue:e.z.string().optional().default("0")}),S=e.z.array(r),s=a.or(i).or(r),d=e.z.record(e.z.object({name:e.z.string().optional(),healthRatio:e.z.string().optional(),accountAddress:o.addressSchema.optional()})),l=e.z.object({type:z.defiPositionTypeSchema,manageUrl:e.z.string().url().optional(),name:e.z.string(),positions:e.z.array(s),positionsTotalValue:e.z.string(),brandColor:e.z.string().optional(),groups:d.optional(),accountAddress:o.addressSchema}),u=e.z.array(l),P=e.z.object({dappId:e.z.string(),products:u});exports.collateralizedDebtGroupSchema=h;exports.collateralizedDebtPositionSchema=i;exports.collateralizedDebtPositionsSchema=g;exports.concentratedLiquidityPositionSchema=a;exports.concentratedLiquidityPositionsSchema=m;exports.defiDappsProductsSchema=P;exports.defiPositionSchema=s;exports.defiProductSchema=l;exports.defiProductsSchema=u;exports.delegatedTokensArraySchema=S;exports.delegatedTokensSchema=r;exports.productGroupsSchema=d;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("zod"),o=require("../../../chains/starknet/address.cjs"),p=require("./backend.model.cjs"),z=require("./defiPositionType.model.cjs"),t=require("./webToken.model.cjs"),c=t.webTokenWithBalanceAndPriceSchema.extend({accruedFees:e.z.string(),currentPrice:e.z.string(),maxPrice:e.z.string(),minPrice:e.z.string(),principal:e.z.string()}),n=e.z.object({id:e.z.string(),address:o.addressSchema.optional(),currencyValue:e.z.string().default("0")}),a=n.extend({poolFeePercentage:e.z.string(),tickSpacingPercentage:e.z.string().optional(),tokenId:e.z.string().optional(),unitCurrencyValueToken0:e.z.string().optional(),unitCurrencyValueToken1:e.z.string().optional(),token0:c,token1:c}),m=e.z.array(a),h=e.z.object({name:e.z.string().optional(),healthRatio:e.z.string().optional(),accountAddress:o.addressSchema.optional()}),i=n.extend({totalBalances:e.z.record(e.z.string()),collateral:e.z.boolean(),debt:e.z.boolean(),lending:e.z.boolean(),apy:e.z.string().optional(),group:e.z.string().optional(),unitCurrencyValue:e.z.string().optional(),positionToken:p.apiTokenInfoSchema.or(e.z.undefined()),token:t.webTokenWithBalanceAndPriceSchema.optional(),accountAddress:o.addressSchema.optional(),accountAddressGroup:e.z.string().optional()}),g=e.z.array(i),r=n.extend({delegatingTo:o.addressSchema,token:t.webTokenWithBalanceAndPriceSchema.optional(),balance:e.z.string(),unitCurrencyValue:e.z.string().optional().default("0")}),S=e.z.array(r),s=a.or(i).or(r),d=e.z.record(e.z.object({name:e.z.string().optional(),healthRatio:e.z.string().optional(),accountAddress:o.addressSchema.optional()})),l=e.z.object({type:z.defiPositionTypeSchema,manageUrl:e.z.string().url().optional(),name:e.z.string(),positions:e.z.array(s),positionsTotalValue:e.z.string(),brandColor:e.z.string().optional(),groups:d.optional(),accountAddress:o.addressSchema}),u=e.z.array(l),P=e.z.object({dappId:e.z.string(),products:u});exports.collateralizedDebtGroupSchema=h;exports.collateralizedDebtPositionSchema=i;exports.collateralizedDebtPositionsSchema=g;exports.concentratedLiquidityPositionSchema=a;exports.concentratedLiquidityPositionsSchema=m;exports.defiDappsProductsSchema=P;exports.defiPositionSchema=s;exports.defiProductSchema=l;exports.defiProductsSchema=u;exports.delegatedTokensArraySchema=S;exports.delegatedTokensSchema=r;exports.productGroupsSchema=d;