@ledgerhq/live-common 34.47.0 → 34.48.0-nightly.1

package/lib-es/bridge/crypto-assets/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/bridge/crypto-assets/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAY9D,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,iBAAiB,QAE5D;AAED,wBAAgB,oBAAoB,IAAI,iBAAiB,CAYxD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/bridge/crypto-assets/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAa9D,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,iBAAiB,QAE5D;AAED,wBAAgB,oBAAoB,IAAI,iBAAiB,CAgBxD"}

package/lib-es/bridge/crypto-assets/index.js

@@ -1,5 +1,6 @@
 import { LiveConfig } from "@ledgerhq/live-config/LiveConfig";
 import * as legacy from "@ledgerhq/cryptoassets/tokens";
+import { isCALIntegrationEnabled, getCALStore } from "./cal-integration";
 const legacyStore = {
     findTokenByAddress: legacy.findTokenByAddress,
     getTokenById: legacy.getTokenById,
@@ -12,6 +13,9 @@ export function setCryptoAssetsStore(store) {
     cryptoAssetsStore = store;
 }
 export function getCryptoAssetsStore() {
+    if (isCALIntegrationEnabled()) {
+        return getCALStore();
+    }
     const featureEnabled = LiveConfig.isConfigSet() && LiveConfig.getValueByKey("feature_cal_lazy_loading");
     if (!featureEnabled) {
         return legacyStore;

package/lib-es/bridge/crypto-assets/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/bridge/crypto-assets/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAC9D,OAAO,KAAK,MAAM,MAAM,+BAA+B,CAAC;AAGxD,MAAM,WAAW,GAAsB;IACrC,kBAAkB,EAAE,MAAM,CAAC,kBAAkB;IAC7C,YAAY,EAAE,MAAM,CAAC,YAAY;IACjC,aAAa,EAAE,MAAM,CAAC,aAAa;IACnC,4BAA4B,EAAE,MAAM,CAAC,4BAA4B;IACjE,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;CAC5C,CAAC;AAEF,IAAI,iBAAiB,GAAkC,SAAS,CAAC;AAEjE,MAAM,UAAU,oBAAoB,CAAC,KAAwB;IAC3D,iBAAiB,GAAG,KAAK,CAAC;AAC5B,CAAC;AAED,MAAM,UAAU,oBAAoB;IAClC,MAAM,cAAc,GAClB,UAAU,CAAC,WAAW,EAAE,IAAI,UAAU,CAAC,aAAa,CAAC,0BAA0B,CAAC,CAAC;IACnF,IAAI,CAAC,cAAc,EAAE;QACnB,OAAO,WAAW,CAAC;KACpB;IAED,IAAI,CAAC,iBAAiB,EAAE;QACtB,MAAM,IAAI,KAAK,CAAC,uEAAuE,CAAC,CAAC;KAC1F;IAED,OAAO,iBAAiB,CAAC;AAC3B,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/bridge/crypto-assets/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAC9D,OAAO,KAAK,MAAM,MAAM,+BAA+B,CAAC;AAExD,OAAO,EAAE,uBAAuB,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEzE,MAAM,WAAW,GAAsB;IACrC,kBAAkB,EAAE,MAAM,CAAC,kBAAkB;IAC7C,YAAY,EAAE,MAAM,CAAC,YAAY;IACjC,aAAa,EAAE,MAAM,CAAC,aAAa;IACnC,4BAA4B,EAAE,MAAM,CAAC,4BAA4B;IACjE,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;CAC5C,CAAC;AAEF,IAAI,iBAAiB,GAAkC,SAAS,CAAC;AAEjE,MAAM,UAAU,oBAAoB,CAAC,KAAwB;IAC3D,iBAAiB,GAAG,KAAK,CAAC;AAC5B,CAAC;AAED,MAAM,UAAU,oBAAoB;IAClC,IAAI,uBAAuB,EAAE,EAAE;QAC7B,OAAO,WAAW,EAAE,CAAC;KACtB;IAED,MAAM,cAAc,GAClB,UAAU,CAAC,WAAW,EAAE,IAAI,UAAU,CAAC,aAAa,CAAC,0BAA0B,CAAC,CAAC;IACnF,IAAI,CAAC,cAAc,EAAE;QACnB,OAAO,WAAW,CAAC;KACpB;IAED,IAAI,CAAC,iBAAiB,EAAE;QACtB,MAAM,IAAI,KAAK,CAAC,uEAAuE,CAAC,CAAC;KAC1F;IAED,OAAO,iBAAiB,CAAC;AAC3B,CAAC"}

package/lib-es/bridge/crypto-assets/index.test.js

@@ -1,7 +1,19 @@
 import { LiveConfig } from "@ledgerhq/live-config/LiveConfig";
 import { getCryptoAssetsStore, setCryptoAssetsStore } from ".";
 import * as legacy from "@ledgerhq/cryptoassets/tokens";
+import * as calIntegration from "./cal-integration";
 describe("Testing CryptoAssetStore", () => {
+    let isCALIntegrationEnabledSpy;
+    let getCALStoreSpy;
+    beforeEach(() => {
+        isCALIntegrationEnabledSpy = jest
+            .spyOn(calIntegration, "isCALIntegrationEnabled")
+            .mockReturnValue(false);
+        getCALStoreSpy = jest.spyOn(calIntegration, "getCALStore");
+    });
+    afterEach(() => {
+        jest.restoreAllMocks();
+    });
     it("should return the default methods from cryptoassets libs when feature flag does not exists", () => {
         LiveConfig.setConfig({
             some_other_feature: {
@@ -56,5 +68,29 @@ describe("Testing CryptoAssetStore", () => {
         const store = getCryptoAssetsStore();
         expect(store).toBe(newStore);
     });
+    it("should return CAL store when CAL integration is enabled", () => {
+        isCALIntegrationEnabledSpy.mockReturnValue(true);
+        const mockCALStore = {};
+        getCALStoreSpy.mockReturnValue(mockCALStore);
+        const store = getCryptoAssetsStore();
+        expect(isCALIntegrationEnabledSpy).toHaveBeenCalled();
+        expect(getCALStoreSpy).toHaveBeenCalled();
+        expect(store).toBe(mockCALStore);
+    });
+    it("should prioritize CAL integration over feature flags", () => {
+        isCALIntegrationEnabledSpy.mockReturnValue(true);
+        LiveConfig.setConfig({
+            feature_cal_lazy_loading: {
+                type: "boolean",
+                default: true,
+            },
+        });
+        const mockCALStore = {};
+        getCALStoreSpy.mockReturnValue(mockCALStore);
+        const store = getCryptoAssetsStore();
+        expect(store).toBe(mockCALStore);
+        expect(isCALIntegrationEnabledSpy).toHaveBeenCalled();
+        expect(getCALStoreSpy).toHaveBeenCalled();
+    });
 });
 //# sourceMappingURL=index.test.js.map

package/lib-es/bridge/crypto-assets/index.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../../src/bridge/crypto-assets/index.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,GAAG,CAAC;AAC/D,OAAO,KAAK,MAAM,MAAM,+BAA+B,CAAC;AAGxD,QAAQ,CAAC,0BAA0B,EAAE,GAAG,EAAE;IACxC,EAAE,CAAC,4FAA4F,EAAE,GAAG,EAAE;QACpG,UAAU,CAAC,SAAS,CAAC;YACnB,kBAAkB,EAAE;gBAClB,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,IAAI;aACd;SACF,CAAC,CAAC;QAEH,MAAM,KAAK,GAAG,oBAAoB,EAAE,CAAC;QACrC,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC;YACpB,kBAAkB,EAAE,MAAM,CAAC,kBAAkB;YAC7C,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,aAAa,EAAE,MAAM,CAAC,aAAa;YACnC,4BAA4B,EAAE,MAAM,CAAC,4BAA4B;YACjE,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;SAC5C,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wFAAwF,EAAE,GAAG,EAAE;QAChG,UAAU,CAAC,SAAS,CAAC;YACnB,wBAAwB,EAAE;gBACxB,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,KAAK;aACf;SACF,CAAC,CAAC;QAEH,MAAM,KAAK,GAAG,oBAAoB,EAAE,CAAC;QACrC,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC;YACpB,kBAAkB,EAAE,MAAM,CAAC,kBAAkB;YAC7C,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,aAAa,EAAE,MAAM,CAAC,aAAa;YACnC,4BAA4B,EAAE,MAAM,CAAC,4BAA4B;YACjE,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;SAC5C,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wEAAwE,EAAE,GAAG,EAAE;QAChF,UAAU,CAAC,SAAS,CAAC;YACnB,wBAAwB,EAAE;gBACxB,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,IAAI;aACd;SACF,CAAC,CAAC;QAEH,MAAM,CAAC,GAAG,EAAE,CAAC,oBAAoB,EAAE,CAAC,CAAC,OAAO,CAC1C,uEAAuE,CACxE,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gEAAgE,EAAE,GAAG,EAAE;QACxE,UAAU,CAAC,SAAS,CAAC;YACnB,wBAAwB,EAAE;gBACxB,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,IAAI;aACd;SACF,CAAC,CAAC;QAEH,yEAAyE;QACzE,MAAM,QAAQ,GAAG,EAAkC,CAAC;QACpD,oBAAoB,CAAC,QAAQ,CAAC,CAAC;QAE/B,MAAM,KAAK,GAAG,oBAAoB,EAAE,CAAC;QACrC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC/B,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../../src/bridge/crypto-assets/index.test.ts"],"names":[],"mappings":"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"}

package/lib-es/bridge/generic-alpaca/alpaca/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/bridge/generic-alpaca/alpaca/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,GAAG,EAAE,MAAM,oCAAoC,CAAC;AAIzD,wBAAgB,YAAY,CAAC,OAAO,KAAA,EAAE,IAAI,KAAA,GAAG,GAAG,CAAC,GAAG,CAAC,CAepD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/bridge/generic-alpaca/alpaca/index.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,GAAG,EAAE,MAAM,oCAAoC,CAAC;AAMzD,wBAAgB,YAAY,CAAC,OAAO,KAAA,EAAE,IAAI,KAAA,GAAG,GAAG,CAAC,GAAG,CAAC,CAwBpD"}

package/lib-es/bridge/generic-alpaca/alpaca/index.js

@@ -1,16 +1,21 @@
 import { createApi as createXrpApi } from "@ledgerhq/coin-xrp/api/index";
 import { createApi as createStellarApi } from "@ledgerhq/coin-stellar/api/index";
+import { createApi as createCantonApi } from "@ledgerhq/coin-canton/api/index";
+import { createApi as createTronApi } from "@ledgerhq/coin-tron/api/index";
 import { getCurrencyConfiguration } from "../../../config";
 import { getCryptoCurrencyById } from "@ledgerhq/cryptoassets/currencies";
 import { getNetworkAlpacaApi } from "./network/network-alpaca";
 export function getAlpacaApi(network, kind) {
     if (kind === "local") {
         switch (network) {
-            case "ripple":
             case "xrp":
                 return createXrpApi(getCurrencyConfiguration(getCryptoCurrencyById("ripple"))); // FIXME: createXrpApi returns a strongly typed Api<XrpSender>, fix Api<any> to allow it
             case "stellar":
                 return createStellarApi(getCurrencyConfiguration(getCryptoCurrencyById("stellar")));
+            case "canton":
+                return createCantonApi(getCurrencyConfiguration(getCryptoCurrencyById("canton_network_devnet")));
+            case "tron":
+                return createTronApi(getCurrencyConfiguration(getCryptoCurrencyById("tron")));
         }
     }
     return getNetworkAlpacaApi(network);

package/lib-es/bridge/generic-alpaca/alpaca/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/bridge/generic-alpaca/alpaca/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,IAAI,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACzE,OAAO,EAAE,SAAS,IAAI,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACjF,OAAO,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAK/D,MAAM,UAAU,YAAY,CAAC,OAAO,EAAE,IAAI;IACxC,IAAI,IAAI,KAAK,OAAO,EAAE;QACpB,QAAQ,OAAO,EAAE;YACf,KAAK,QAAQ,CAAC;YACd,KAAK,KAAK;gBACR,OAAO,YAAY,CACjB,wBAAwB,CAAgB,qBAAqB,CAAC,QAAQ,CAAC,CAAC,CAC7D,CAAC,CAAC,wFAAwF;YACzG,KAAK,SAAS;gBACZ,OAAO,gBAAgB,CACrB,wBAAwB,CAAoB,qBAAqB,CAAC,SAAS,CAAC,CAAC,CAClE,CAAC;SACjB;KACF;IACD,OAAO,mBAAmB,CAAC,OAAO,CAAyC,CAAC;AAC9E,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/bridge/generic-alpaca/alpaca/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,IAAI,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACzE,OAAO,EAAE,SAAS,IAAI,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACjF,OAAO,EAAE,SAAS,IAAI,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAC/E,OAAO,EAAE,SAAS,IAAI,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC3E,OAAO,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAO/D,MAAM,UAAU,YAAY,CAAC,OAAO,EAAE,IAAI;IACxC,IAAI,IAAI,KAAK,OAAO,EAAE;QACpB,QAAQ,OAAO,EAAE;YACf,KAAK,KAAK;gBACR,OAAO,YAAY,CACjB,wBAAwB,CAAgB,qBAAqB,CAAC,QAAQ,CAAC,CAAC,CAC7D,CAAC,CAAC,wFAAwF;YACzG,KAAK,SAAS;gBACZ,OAAO,gBAAgB,CACrB,wBAAwB,CAAoB,qBAAqB,CAAC,SAAS,CAAC,CAAC,CAClE,CAAC;YAChB,KAAK,QAAQ;gBACX,OAAO,eAAe,CACpB,wBAAwB,CACtB,qBAAqB,CAAC,uBAAuB,CAAC,CAC/C,CACU,CAAC;YAChB,KAAK,MAAM;gBACT,OAAO,aAAa,CAClB,wBAAwB,CAAiB,qBAAqB,CAAC,MAAM,CAAC,CAAC,CAC5D,CAAC;SACjB;KACF;IACD,OAAO,mBAAmB,CAAC,OAAO,CAAyC,CAAC;AAC9E,CAAC"}

package/lib-es/bridge/generic-alpaca/alpaca/index.unit.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=index.unit.test.d.ts.map

package/lib-es/bridge/generic-alpaca/alpaca/index.unit.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.unit.test.d.ts","sourceRoot":"","sources":["../../../../src/bridge/generic-alpaca/alpaca/index.unit.test.ts"],"names":[],"mappings":""}

package/lib-es/bridge/generic-alpaca/alpaca/index.unit.test.js

@@ -0,0 +1,64 @@
+import { getAlpacaApi } from "./index";
+import * as xrpModule from "@ledgerhq/coin-xrp/api/index";
+import * as stellarModule from "@ledgerhq/coin-stellar/api/index";
+import * as cantonModule from "@ledgerhq/coin-canton/api/index";
+import * as tronModule from "@ledgerhq/coin-tron/api/index";
+import * as config from "../../../config";
+import * as networkApi from "./network/network-alpaca";
+import * as cryptoAssets from "@ledgerhq/cryptoassets/currencies";
+const mockApiInstance = { mock: "api" };
+jest.mock("@ledgerhq/cryptoassets/currencies", () => ({
+    getCryptoCurrencyById: jest.fn(),
+}));
+jest.mock("../../../config", () => ({
+    getCurrencyConfiguration: jest.fn(),
+}));
+jest.mock("@ledgerhq/coin-xrp/api/index", () => ({
+    createApi: jest.fn(),
+}));
+jest.mock("@ledgerhq/coin-stellar/api/index", () => ({
+    createApi: jest.fn(),
+}));
+jest.mock("@ledgerhq/coin-canton/api/index", () => ({
+    createApi: jest.fn(),
+}));
+jest.mock("@ledgerhq/coin-tron/api/index", () => ({
+    createApi: jest.fn(),
+}));
+jest.mock("./network/network-alpaca", () => ({
+    getNetworkAlpacaApi: jest.fn(),
+}));
+describe("getAlpacaApi", () => {
+    const mockCurrency = { id: "mock-currency" };
+    beforeEach(() => {
+        jest.clearAllMocks();
+        // Common mocks
+        cryptoAssets.getCryptoCurrencyById.mockReturnValue(mockCurrency);
+        config.getCurrencyConfiguration.mockReturnValue({ config: true });
+        // API mocks
+        jest.spyOn(xrpModule, "createApi").mockReturnValue(mockApiInstance);
+        jest.spyOn(stellarModule, "createApi").mockReturnValue(mockApiInstance);
+        jest.spyOn(cantonModule, "createApi").mockReturnValue(mockApiInstance);
+        jest.spyOn(tronModule, "createApi").mockReturnValue(mockApiInstance);
+        jest.spyOn(networkApi, "getNetworkAlpacaApi").mockReturnValue(mockApiInstance);
+    });
+    const testCases = [
+        { network: "xrp", module: xrpModule, label: "XRP" },
+        { network: "stellar", module: stellarModule, label: "Stellar" },
+        { network: "tron", module: tronModule, label: "Tron" },
+        { network: "canton", module: cantonModule, label: "Canton" },
+    ];
+    testCases.forEach(({ network, module, label }) => {
+        it(`should return ${label} API for network "${network}" and kind "local"`, () => {
+            const result = getAlpacaApi(network, "local");
+            expect(result).toEqual(mockApiInstance);
+            expect(module.createApi).toHaveBeenCalledWith({ config: true });
+        });
+    });
+    it("should return network API for kind !== 'local'", () => {
+        const result = getAlpacaApi("xrp", "remote");
+        expect(networkApi.getNetworkAlpacaApi).toHaveBeenCalledWith("xrp");
+        expect(result).toEqual(mockApiInstance);
+    });
+});
+//# sourceMappingURL=index.unit.test.js.map

package/lib-es/bridge/generic-alpaca/alpaca/index.unit.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.unit.test.js","sourceRoot":"","sources":["../../../../src/bridge/generic-alpaca/alpaca/index.unit.test.ts"],"names":[],"mappings":"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"}

package/lib-es/bridge/generic-alpaca/alpaca/network/network-alpaca.d.ts

@@ -1,4 +1,4 @@
-import type { Balance, Block, BlockInfo, Operation, FeeEstimation, Pagination, TransactionIntent, TransactionValidation, Cursor, Page, Stake, Reward } from "@ledgerhq/coin-framework/api/index";
+import type { Balance, Block, BlockInfo, Operation, FeeEstimation, Pagination, TransactionIntent, TransactionValidation, Cursor, Page, Stake, Reward, CraftedTransaction } from "@ledgerhq/coin-framework/api/index";
 export declare const getNetworkAlpacaApi: (networkFamily: string) => {
     broadcast: (signedOperation: string) => Promise<string>;
     combine: (tx: string, signature: string, pubKey?: string) => Promise<string>;
@@ -8,7 +8,7 @@ export declare const getNetworkAlpacaApi: (networkFamily: string) => {
     getSequence: (address: string) => Promise<number>;
     listOperations: (address: string, pagination?: Pagination) => Promise<[Operation<any>[], string]>;
     lastBlock: () => Promise<BlockInfo>;
-    craftTransaction: (intent: TransactionIntent<any>) => Promise<string>;
+    craftTransaction: (intent: TransactionIntent<any>) => Promise<CraftedTransaction>;
     getBlock(_height: number): Promise<Block>;
     getBlockInfo(_height: number): Promise<BlockInfo>;
     getStakes(_address: string, _cursor?: Cursor): Promise<Page<Stake>>;

package/lib-es/bridge/generic-alpaca/alpaca/network/network-alpaca.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"network-alpaca.d.ts","sourceRoot":"","sources":["../../../../../src/bridge/generic-alpaca/alpaca/network/network-alpaca.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,KAAK,EACL,SAAS,EACT,SAAS,EACT,aAAa,EACb,UAAU,EACV,iBAAiB,EACjB,qBAAqB,EAGrB,MAAM,EACN,IAAI,EACJ,KAAK,EACL,MAAM,EACP,MAAM,oCAAoC,CAAC;AAiK5C,eAAO,MAAM,mBAAmB,kBAAmB,MAAM;iCAhJb,MAAM,KAAG,QAAQ,MAAM,CAAC;kBAmBvC,MAAM,aAAa,MAAM,WAAW,MAAM,KAAG,QAAQ,MAAM,CAAC;kCAoC5C,iBAAiB,KAAG,QAAQ,qBAAqB,CAAC;2BAjBzD,kBAAkB,GAAG,CAAC,KAAG,QAAQ,aAAa,CAAC;0BAsChD,MAAM,KAAG,QAAQ,OAAO,EAAE,CAAC;2BAgB1B,MAAM,KAAG,QAAQ,MAAM,CAAC;8BAWjD,MAAM,eACH,UAAU,KACrB,QAAQ,CAAC,UAAU,GAAG,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;qBAYV,QAAQ,SAAS,CAAC;+BAaN,kBAAkB,GAAG,CAAC,KAAG,QAAQ,MAAM,CAAC;+BAyB3D,QAAQ,KAAK,CAAC;0BAGX,MAAM,GAAG,QAAQ,SAAS,CAAC;wBAG7B,MAAM,YAAY,MAAM,GAAG,QAAQ,KAAK,KAAK,CAAC,CAAC;yBAG9C,MAAM,YAAY,MAAM,GAAG,QAAQ,KAAK,MAAM,CAAC,CAAC;CAGlD,CAAC"}
+{"version":3,"file":"network-alpaca.d.ts","sourceRoot":"","sources":["../../../../../src/bridge/generic-alpaca/alpaca/network/network-alpaca.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,KAAK,EACL,SAAS,EACT,SAAS,EACT,aAAa,EACb,UAAU,EACV,iBAAiB,EACjB,qBAAqB,EAGrB,MAAM,EACN,IAAI,EACJ,KAAK,EACL,MAAM,EACN,kBAAkB,EACnB,MAAM,oCAAoC,CAAC;AAiK5C,eAAO,MAAM,mBAAmB,kBAAmB,MAAM;iCAhJb,MAAM,KAAG,QAAQ,MAAM,CAAC;kBAmBvC,MAAM,aAAa,MAAM,WAAW,MAAM,KAAG,QAAQ,MAAM,CAAC;kCAoC5C,iBAAiB,KAAG,QAAQ,qBAAqB,CAAC;2BAjBzD,kBAAkB,GAAG,CAAC,KAAG,QAAQ,aAAa,CAAC;0BAsChD,MAAM,KAAG,QAAQ,OAAO,EAAE,CAAC;2BAgB1B,MAAM,KAAG,QAAQ,MAAM,CAAC;8BAWjD,MAAM,eACH,UAAU,KACrB,QAAQ,CAAC,UAAU,GAAG,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;qBAYV,QAAQ,SAAS,CAAC;+BAaN,kBAAkB,GAAG,CAAC,KAAG,QAAQ,kBAAkB,CAAC;+BAyBvE,QAAQ,KAAK,CAAC;0BAGX,MAAM,GAAG,QAAQ,SAAS,CAAC;wBAG7B,MAAM,YAAY,MAAM,GAAG,QAAQ,KAAK,KAAK,CAAC,CAAC;yBAG9C,MAAM,YAAY,MAAM,GAAG,QAAQ,KAAK,MAAM,CAAC,CAAC;CAGlD,CAAC"}

package/lib-es/bridge/generic-alpaca/alpaca/network/network-alpaca.js

@@ -76,7 +76,7 @@ const buildGetSequence = (networkFamily) => async function getSequence(address)
     });
     return data;
 };
-const buildListOperations = networkFamily => async function listOperations(address, pagination = { minHeight: 0 }) {
+const buildListOperations = networkFamily => async function listOperations(address, pagination = { minHeight: 0, order: "asc" }) {
     const { data } = await network({
         method: "GET",
         url: `${ALPACA_URL}/${networkFamily}/account/${address}/operations`,
@@ -108,7 +108,7 @@ const buildCraftTransaction = networkFamily => async function craftTransaction(i
             },
         },
     });
-    return data.rawTransaction;
+    return data;
 };
 export const getNetworkAlpacaApi = (networkFamily) => ({
     broadcast: buildBroadcast(networkFamily),

package/lib-es/bridge/generic-alpaca/alpaca/network/network-alpaca.js.map

@@ -1 +1 @@
-{"version":3,"file":"network-alpaca.js","sourceRoot":"","sources":["../../../../../src/bridge/generic-alpaca/alpaca/network/network-alpaca.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"network-alpaca.js","sourceRoot":"","sources":["../../../../../src/bridge/generic-alpaca/alpaca/network/network-alpaca.ts"],"names":[],"mappings":"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"}

package/lib-es/bridge/generic-alpaca/buildSubAccounts.d.ts

@@ -5,13 +5,12 @@ export interface OperationCommon extends Operation {
     extra: Record<string, any>;
 }
 export declare const getAssetIdFromTokenId: (tokenId: string) => string;
-export declare const getAssetIdFromAsset: (asset: AssetInfo) => string;
-export declare function buildSubAccounts({ currency, accountId, assetsBalance, syncConfig, operations, }: {
+export declare function buildSubAccounts({ currency, accountId, assetsBalance, syncConfig, operations, getTokenFromAsset, }: {
     currency: CryptoCurrency;
     accountId: string;
     assetsBalance: Balance[];
     syncConfig: SyncConfig;
     operations: OperationCommon[];
+    getTokenFromAsset?: (asset: AssetInfo) => TokenCurrency | undefined;
 }): TokenAccount[] | undefined;
-export declare function findToken(currency: CryptoCurrency, balance: Balance): TokenCurrency | undefined;
 //# sourceMappingURL=buildSubAccounts.d.ts.map

package/lib-es/bridge/generic-alpaca/buildSubAccounts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildSubAccounts.d.ts","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/buildSubAccounts.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAClF,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGhF,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,oCAAoC,CAAC;AAGxE,MAAM,WAAW,eAAgB,SAAQ,SAAS;IAChD,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC5B;AAED,eAAO,MAAM,qBAAqB,YAAa,MAAM,KAAG,MAA+B,CAAC;AAExF,eAAO,MAAM,mBAAmB,UAAW,SAAS,WAG5C,CAAC;AA8CT,wBAAgB,gBAAgB,CAAC,EAC/B,QAAQ,EACR,SAAS,EACT,aAAa,EACb,UAAU,EACV,UAAU,GACX,EAAE;IACD,QAAQ,EAAE,cAAc,CAAC;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,OAAO,EAAE,CAAC;IACzB,UAAU,EAAE,UAAU,CAAC;IACvB,UAAU,EAAE,eAAe,EAAE,CAAC;CAC/B,GAAG,YAAY,EAAE,GAAG,SAAS,CA6B7B;AAED,wBAAgB,SAAS,CAAC,QAAQ,EAAE,cAAc,EAAE,OAAO,EAAE,OAAO,GAAG,aAAa,GAAG,SAAS,CAE/F"}
+{"version":3,"file":"buildSubAccounts.d.ts","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/buildSubAccounts.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAClF,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGhF,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,oCAAoC,CAAC;AAExE,MAAM,WAAW,eAAgB,SAAQ,SAAS;IAChD,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC5B;AAED,eAAO,MAAM,qBAAqB,YAAa,MAAM,KAAG,MAA+B,CAAC;AA6CxF,wBAAgB,gBAAgB,CAAC,EAC/B,QAAQ,EACR,SAAS,EACT,aAAa,EACb,UAAU,EACV,UAAU,EACV,iBAAiB,GAClB,EAAE;IACD,QAAQ,EAAE,cAAc,CAAC;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,OAAO,EAAE,CAAC;IACzB,UAAU,EAAE,UAAU,CAAC;IACvB,UAAU,EAAE,eAAe,EAAE,CAAC;IAC9B,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,aAAa,GAAG,SAAS,CAAC;CACrE,GAAG,YAAY,EAAE,GAAG,SAAS,CA6B7B"}

package/lib-es/bridge/generic-alpaca/buildSubAccounts.js

@@ -1,15 +1,10 @@
 import BigNumber from "bignumber.js";
-import { emptyHistoryCache } from "@ledgerhq/coin-framework/account/index";
+import { emptyHistoryCache, encodeTokenAccountId } from "@ledgerhq/coin-framework/account/index";
 import { encodeOperationId } from "@ledgerhq/coin-framework/operation";
 import { listTokensForCryptoCurrency } from "@ledgerhq/cryptoassets";
-import { findTokenById } from "@ledgerhq/cryptoassets/tokens";
 export const getAssetIdFromTokenId = (tokenId) => tokenId.split("/")[2];
-export const getAssetIdFromAsset = (asset) => asset.type !== "native" && "assetReference" in asset && "assetOwner" in asset
-    ? `${asset.assetReference}:${asset.assetOwner}`
-    : "";
 function buildTokenAccount({ parentAccountId, assetBalance, token, operations, }) {
-    const assetId = getAssetIdFromTokenId(token.id);
-    const id = `${parentAccountId}+${assetId}`;
+    const id = encodeTokenAccountId(parentAccountId, token);
     const balance = new BigNumber(assetBalance.value.toString() || "0");
     // TODO: recheck this logic
     const spendableBalance = new BigNumber(assetBalance.value.toString()).minus(new BigNumber(assetBalance.locked?.toString() || "0"));
@@ -35,7 +30,7 @@ function buildTokenAccount({ parentAccountId, assetBalance, token, operations, }
         balanceHistoryCache: emptyHistoryCache, // calculated in the jsHelpers
     };
 }
-export function buildSubAccounts({ currency, accountId, assetsBalance, syncConfig, operations, }) {
+export function buildSubAccounts({ currency, accountId, assetsBalance, syncConfig, operations, getTokenFromAsset, }) {
     const { blacklistedTokenIds = [] } = syncConfig;
     const allTokens = listTokensForCryptoCurrency(currency);
     if (allTokens.length === 0 || assetsBalance.length === 0) {
@@ -45,7 +40,7 @@ export function buildSubAccounts({ currency, accountId, assetsBalance, syncConfi
     assetsBalance
         .filter(b => b.asset.type !== "native") // NOTE: this could be removed, keeping here while fixing things up
         .map(balance => {
-        const token = findToken(currency, balance);
+        const token = getTokenFromAsset && getTokenFromAsset(balance.asset);
         // NOTE: for future tokens, will need to check over currencyName/standard(erc20,trc10,trc20, etc)/id
         if (token && !blacklistedTokenIds.includes(token.id)) {
             tokenAccounts.push(buildTokenAccount({
@@ -59,7 +54,4 @@ export function buildSubAccounts({ currency, accountId, assetsBalance, syncConfi
     });
     return tokenAccounts;
 }
-export function findToken(currency, balance) {
-    return findTokenById(`${currency.family}/asset/${getAssetIdFromAsset(balance.asset)}`);
-}
 //# sourceMappingURL=buildSubAccounts.js.map

package/lib-es/bridge/generic-alpaca/buildSubAccounts.js.map

@@ -1 +1 @@
-{"version":3,"file":"buildSubAccounts.js","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/buildSubAccounts.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"buildSubAccounts.js","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/buildSubAccounts.ts"],"names":[],"mappings":"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"}

package/lib-es/bridge/generic-alpaca/getAccountShape.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getAccountShape.d.ts","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/getAccountShape.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAY,MAAM,2CAA2C,CAAC;AAQtF,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,eAAe,CAyFrF"}
+{"version":3,"file":"getAccountShape.d.ts","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/getAccountShape.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAY,MAAM,2CAA2C,CAAC;AAOtF,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,eAAe,CAyFrF"}

package/lib-es/bridge/generic-alpaca/getAccountShape.js

@@ -4,7 +4,6 @@ import BigNumber from "bignumber.js";
 import { getAlpacaApi } from "./alpaca";
 import { adaptCoreOperationToLiveOperation, extractBalance } from "./utils";
 import { inferSubOperations } from "@ledgerhq/coin-framework/serialization";
-import { findToken } from "./buildSubAccounts";
 import { buildSubAccounts } from "./buildSubAccounts";
 export function genericGetAccountShape(network, kind) {
     return async (info, syncConfig) => {
@@ -28,13 +27,13 @@ export function genericGetAccountShape(network, kind) {
         const nativeAsset = extractBalance(balanceRes, "native");
         const assetsBalance = balanceRes
             .filter(b => b.asset.type !== "native")
-            .filter(b => findToken(currency, b));
+            .filter(b => alpacaApi.getTokenFromAsset && alpacaApi.getTokenFromAsset(b.asset));
         const nativeBalance = BigInt(nativeAsset?.value ?? "0");
         const spendableBalance = BigInt(nativeBalance - BigInt(nativeAsset?.locked ?? "0"));
         const oldOps = (initialAccount?.operations || []);
         const lastPagingToken = oldOps[0]?.extra?.pagingToken || "";
         const blockHeight = oldOps.length ? (oldOps[0].blockHeight ?? 0) + 1 : 0;
-        const paginationParams = { minHeight: blockHeight };
+        const paginationParams = { minHeight: blockHeight, order: "asc" };
         if (lastPagingToken) {
             paginationParams.lastPagingToken = lastPagingToken;
         }
@@ -55,6 +54,7 @@ export function genericGetAccountShape(network, kind) {
             assetsBalance,
             syncConfig,
             operations: assetOperations,
+            getTokenFromAsset: alpacaApi.getTokenFromAsset,
         }) || [];
         const operationsWithSubs = mergedOps.map(op => {
             const subOperations = inferSubOperations(op.hash, subAccounts);

package/lib-es/bridge/generic-alpaca/getAccountShape.js.map

@@ -1 +1 @@
-{"version":3,"file":"getAccountShape.js","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/getAccountShape.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"getAccountShape.js","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/getAccountShape.ts"],"names":[],"mappings":"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"}

package/lib-es/bridge/generic-alpaca/getTransactionStatus.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getTransactionStatus.d.ts","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/getTransactionStatus.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAqB,MAAM,sBAAsB,CAAC;AAQxE,wBAAgB,2BAA2B,CACzC,OAAO,KAAA,EACP,IAAI,KAAA,GACH,aAAa,CAAC,GAAG,CAAC,CAAC,sBAAsB,CAAC,CAmD5C"}
+{"version":3,"file":"getTransactionStatus.d.ts","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/getTransactionStatus.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAqB,MAAM,sBAAsB,CAAC;AAOxE,wBAAgB,2BAA2B,CACzC,OAAO,KAAA,EACP,IAAI,KAAA,GACH,aAAa,CAAC,GAAG,CAAC,CAAC,sBAAsB,CAAC,CAmD5C"}

package/lib-es/bridge/generic-alpaca/getTransactionStatus.js

@@ -2,7 +2,6 @@ import { AccountAwaitingSendPendingOperations } from "@ledgerhq/errors";
 import BigNumber from "bignumber.js";
 import { getAlpacaApi } from "./alpaca";
 import { transactionToIntent } from "./utils";
-// import { FeeEstimation } from "@ledgerhq/coin-framework/api/types";
 // => alpaca validateIntent
 export function genericGetTransactionStatus(network, kind) {
     return async (account, transaction) => {

package/lib-es/bridge/generic-alpaca/getTransactionStatus.js.map

@@ -1 +1 @@
-{"version":3,"file":"getTransactionStatus.js","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/getTransactionStatus.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oCAAoC,EAAE,MAAM,kBAAkB,CAAC;AACxE,OAAO,SAAS,MAAM,cAAc,CAAC;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAC9C,sEAAsE;AAEtE,2BAA2B;AAC3B,MAAM,UAAU,2BAA2B,CACzC,OAAO,EACP,IAAI;IAEJ,OAAO,KAAK,EACV,OAAO,EACP,WAQC,EACD,EAAE;QACF,MAAM,SAAS,GAAG,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAC9C,MAAM,gBAAgB,GAAG;YACvB,IAAI,EAAE,WAAW,EAAE,IAAI;YACvB,SAAS,EAAE,WAAW,CAAC,SAAS;YAChC,MAAM,EAAE,WAAW,CAAC,MAAM,IAAI,IAAI,SAAS,CAAC,CAAC,CAAC;YAC9C,YAAY,EAAE,CAAC,CAAC,WAAW,CAAC,YAAY;YACxC,cAAc,EAAE,WAAW,CAAC,cAAc,IAAI,EAAE;YAChD,UAAU,EAAE,WAAW,CAAC,UAAU,IAAI,EAAE;YACxC,YAAY,EAAE,WAAW,CAAC,YAAY,IAAI,EAAE;YAC5C,QAAQ,EAAE,WAAW,CAAC,QAAQ,IAAI,EAAE;YACpC,SAAS,EAAE,WAAW,CAAC,SAAS,IAAI,EAAE;SACvC,CAAC;QAEF,IAAI,SAAS,CAAC,qBAAqB,EAAE;YACnC,MAAM,uBAAuB,GAAG,SAAS,CAAC,qBAAqB,EAAE,CAAC;YAClE,IAAI,uBAAuB,CAAC,oBAAoB,CAAC,uBAAuB,EAAE;gBACxE,IAAI,OAAO,CAAC,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE;oBACxC,MAAM,IAAI,oCAAoC,EAAE,CAAC;iBAClD;aACF;SACF;QAED,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,SAAS,CAAC,cAAc,CAC5F,mBAAmB,CAAC,OAAO,EAAE,gBAAgB,CAAC,EAC9C,EAAE,KAAK,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CACvE,CAAC;QAEF,OAAO,OAAO,CAAC,OAAO,CAAC;YACrB,MAAM;YACN,QAAQ;YACR,aAAa,EACX,CAAC,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE;gBAC5C,CAAC,CAAC,IAAI,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC;gBACzC,CAAC,CAAC,WAAW,CAAC,IAAI;YACtB,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM;YACxF,UAAU,EAAE,IAAI,SAAS,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;SACjD,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"getTransactionStatus.js","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/getTransactionStatus.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oCAAoC,EAAE,MAAM,kBAAkB,CAAC;AACxE,OAAO,SAAS,MAAM,cAAc,CAAC;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAE9C,2BAA2B;AAC3B,MAAM,UAAU,2BAA2B,CACzC,OAAO,EACP,IAAI;IAEJ,OAAO,KAAK,EACV,OAAO,EACP,WAQC,EACD,EAAE;QACF,MAAM,SAAS,GAAG,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAC9C,MAAM,gBAAgB,GAAG;YACvB,IAAI,EAAE,WAAW,EAAE,IAAI;YACvB,SAAS,EAAE,WAAW,CAAC,SAAS;YAChC,MAAM,EAAE,WAAW,CAAC,MAAM,IAAI,IAAI,SAAS,CAAC,CAAC,CAAC;YAC9C,YAAY,EAAE,CAAC,CAAC,WAAW,CAAC,YAAY;YACxC,cAAc,EAAE,WAAW,CAAC,cAAc,IAAI,EAAE;YAChD,UAAU,EAAE,WAAW,CAAC,UAAU,IAAI,EAAE;YACxC,YAAY,EAAE,WAAW,CAAC,YAAY,IAAI,EAAE;YAC5C,QAAQ,EAAE,WAAW,CAAC,QAAQ,IAAI,EAAE;YACpC,SAAS,EAAE,WAAW,CAAC,SAAS,IAAI,EAAE;SACvC,CAAC;QAEF,IAAI,SAAS,CAAC,qBAAqB,EAAE;YACnC,MAAM,uBAAuB,GAAG,SAAS,CAAC,qBAAqB,EAAE,CAAC;YAClE,IAAI,uBAAuB,CAAC,oBAAoB,CAAC,uBAAuB,EAAE;gBACxE,IAAI,OAAO,CAAC,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE;oBACxC,MAAM,IAAI,oCAAoC,EAAE,CAAC;iBAClD;aACF;SACF;QAED,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,SAAS,CAAC,cAAc,CAC5F,mBAAmB,CAAC,OAAO,EAAE,gBAAgB,CAAC,EAC9C,EAAE,KAAK,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CACvE,CAAC;QAEF,OAAO,OAAO,CAAC,OAAO,CAAC;YACrB,MAAM;YACN,QAAQ;YACR,aAAa,EACX,CAAC,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE;gBAC5C,CAAC,CAAC,IAAI,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC;gBACzC,CAAC,CAAC,WAAW,CAAC,IAAI;YACtB,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM;YACxF,UAAU,EAAE,IAAI,SAAS,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;SACjD,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC"}

package/lib-es/bridge/generic-alpaca/prepareTransaction.d.ts

@@ -1,7 +1,18 @@
 import { Account, AccountBridge, TransactionCommon } from "@ledgerhq/types-live";
-export declare function genericPrepareTransaction(network: string, kind: any): AccountBridge<TransactionCommon, Account, any, any>["prepareTransaction"];
-export declare function getAssetInfos(tr: TransactionCommon & {
+import BigNumber from "bignumber.js";
+import { AssetInfo, FeeEstimation } from "@ledgerhq/coin-framework/api/types";
+import { TokenCurrency } from "@ledgerhq/types-cryptoassets";
+type TransactionParam = TransactionCommon & {
+    fees: BigNumber | null | undefined;
+    customFees?: FeeEstimation;
     assetReference?: string;
     assetOwner?: string;
-}): string[];
+    subAccountId?: string;
+};
+export declare function genericPrepareTransaction(network: string, kind: any): AccountBridge<TransactionCommon, Account, any, any>["prepareTransaction"];
+export declare function getAssetInfos(tr: TransactionParam, owner: string, getAssetFromToken: (token: TokenCurrency, owner: string) => AssetInfo): {
+    assetReference: string;
+    assetOwner: string;
+};
+export {};
 //# sourceMappingURL=prepareTransaction.d.ts.map

package/lib-es/bridge/generic-alpaca/prepareTransaction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prepareTransaction.d.ts","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/prepareTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAUjF,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,MAAM,EACf,IAAI,KAAA,GACH,aAAa,CAAC,iBAAiB,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,oBAAoB,CAAC,CAwC3E;AAED,wBAAgB,aAAa,CAC3B,EAAE,EAAE,iBAAiB,GAAG;IAAE,cAAc,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,GACvE,MAAM,EAAE,CAMV"}
+{"version":3,"file":"prepareTransaction.d.ts","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/prepareTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAGjF,OAAO,SAAS,MAAM,cAAc,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAE9E,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAM7D,KAAK,gBAAgB,GAAG,iBAAiB,GAAG;IAC1C,IAAI,EAAE,SAAS,GAAG,IAAI,GAAG,SAAS,CAAC;IACnC,UAAU,CAAC,EAAE,aAAa,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAYF,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,MAAM,EACf,IAAI,KAAA,GACH,aAAa,CAAC,iBAAiB,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,oBAAoB,CAAC,CAkC3E;AAED,wBAAgB,aAAa,CAC3B,EAAE,EAAE,gBAAgB,EACpB,KAAK,EAAE,MAAM,EACb,iBAAiB,EAAE,CAAC,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,KAAK,SAAS,GACpE;IACD,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;CACpB,CAcA"}

package/lib-es/bridge/generic-alpaca/prepareTransaction.js

@@ -1,12 +1,22 @@
 import { getAlpacaApi } from "./alpaca";
 import { transactionToIntent } from "./utils";
 import BigNumber from "bignumber.js";
+import { decodeTokenAccountId } from "@ledgerhq/coin-framework/account/index";
 function bnEq(a, b) {
     return !a && !b ? true : !a || !b ? false : a.eq(b);
 }
+function assetInfosFallback(transaction) {
+    return {
+        assetReference: transaction.assetReference ?? "",
+        assetOwner: transaction.assetOwner ?? "",
+    };
+}
 export function genericPrepareTransaction(network, kind) {
     return async (account, transaction) => {
-        const [assetReference, assetOwner] = getAssetInfos(transaction);
+        const { getAssetFromToken } = getAlpacaApi(network, kind);
+        const { assetReference, assetOwner } = getAssetFromToken
+            ? getAssetInfos(transaction, account.freshAddress, getAssetFromToken)
+            : assetInfosFallback(transaction);
         let fees = transaction.customFees?.parameters?.fees || null;
         if (fees === null) {
             fees = (await getAlpacaApi(network, kind).estimateFees(transactionToIntent(account, {
@@ -29,11 +39,17 @@ export function genericPrepareTransaction(network, kind) {
         return transaction;
     };
 }
-export function getAssetInfos(tr) {
+export function getAssetInfos(tr, owner, getAssetFromToken) {
     if (tr.subAccountId) {
-        const assetString = tr.subAccountId.split("+")[1];
-        return assetString.split(":");
+        const { token } = decodeTokenAccountId(tr.subAccountId);
+        if (!token)
+            return assetInfosFallback(tr);
+        const asset = getAssetFromToken(token, owner);
+        return {
+            assetOwner: ("assetOwner" in asset && asset.assetOwner) || "",
+            assetReference: ("assetReference" in asset && asset.assetReference) || "",
+        };
     }
-    return [tr.assetReference || "", tr.assetOwner || ""];
+    return assetInfosFallback(tr);
 }
 //# sourceMappingURL=prepareTransaction.js.map

package/lib-es/bridge/generic-alpaca/prepareTransaction.js.map

@@ -1 +1 @@
-{"version":3,"file":"prepareTransaction.js","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/prepareTransaction.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAC9C,OAAO,SAAS,MAAM,cAAc,CAAC;AAGrC,SAAS,IAAI,CAAC,CAA+B,EAAE,CAA+B;IAC5E,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AACtD,CAAC;AAED,MAAM,UAAU,yBAAyB,CACvC,OAAe,EACf,IAAI;IAEJ,OAAO,KAAK,EACV,OAAO,EACP,WAMC,EACD,EAAE;QACF,MAAM,CAAC,cAAc,EAAE,UAAU,CAAC,GAAG,aAAa,CAAC,WAAW,CAAC,CAAC;QAEhE,IAAI,IAAI,GAAG,WAAW,CAAC,UAAU,EAAE,UAAU,EAAE,IAAI,IAAI,IAAI,CAAC;QAC5D,IAAI,IAAI,KAAK,IAAI,EAAE;YACjB,IAAI,GAAG,CACL,MAAM,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,YAAY,CAC5C,mBAAmB,CAAC,OAAO,EAAE;gBAC3B,GAAG,WAAW;aACf,CAAC,CACH,CACF,CAAC,KAAK,CAAC;SACT;QAED,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE;YAC3D,OAAO;gBACL,GAAG,WAAW;gBACd,IAAI,EAAE,IAAI,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACpC,cAAc;gBACd,UAAU;gBACV,UAAU,EAAE;oBACV,UAAU,EAAE;wBACV,IAAI,EAAE,IAAI,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;qBACrC;iBACF;aACF,CAAC;SACH;QAED,OAAO,WAAW,CAAC;IACrB,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,aAAa,CAC3B,EAAwE;IAExE,IAAI,EAAE,CAAC,YAAY,EAAE;QACnB,MAAM,WAAW,GAAG,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAClD,OAAO,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;KAC/B;IACD,OAAO,CAAC,EAAE,CAAC,cAAc,IAAI,EAAE,EAAE,EAAE,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC;AACxD,CAAC"}
+{"version":3,"file":"prepareTransaction.js","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/prepareTransaction.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAC9C,OAAO,SAAS,MAAM,cAAc,CAAC;AAErC,OAAO,EAAE,oBAAoB,EAAE,MAAM,wCAAwC,CAAC;AAG9E,SAAS,IAAI,CAAC,CAA+B,EAAE,CAA+B;IAC5E,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AACtD,CAAC;AAUD,SAAS,kBAAkB,CAAC,WAA6B;IAIvD,OAAO;QACL,cAAc,EAAE,WAAW,CAAC,cAAc,IAAI,EAAE;QAChD,UAAU,EAAE,WAAW,CAAC,UAAU,IAAI,EAAE;KACzC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,yBAAyB,CACvC,OAAe,EACf,IAAI;IAEJ,OAAO,KAAK,EAAE,OAAO,EAAE,WAA6B,EAAE,EAAE;QACtD,MAAM,EAAE,iBAAiB,EAAE,GAAG,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAC1D,MAAM,EAAE,cAAc,EAAE,UAAU,EAAE,GAAG,iBAAiB;YACtD,CAAC,CAAC,aAAa,CAAC,WAAW,EAAE,OAAO,CAAC,YAAY,EAAE,iBAAiB,CAAC;YACrE,CAAC,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;QAEpC,IAAI,IAAI,GAAG,WAAW,CAAC,UAAU,EAAE,UAAU,EAAE,IAAI,IAAI,IAAI,CAAC;QAC5D,IAAI,IAAI,KAAK,IAAI,EAAE;YACjB,IAAI,GAAG,CACL,MAAM,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,YAAY,CAC5C,mBAAmB,CAAC,OAAO,EAAE;gBAC3B,GAAG,WAAW;aACf,CAAC,CACH,CACF,CAAC,KAAK,CAAC;SACT;QAED,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE;YAC3D,OAAO;gBACL,GAAG,WAAW;gBACd,IAAI,EAAE,IAAI,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACpC,cAAc;gBACd,UAAU;gBACV,UAAU,EAAE;oBACV,UAAU,EAAE;wBACV,IAAI,EAAE,IAAI,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;qBACrC;iBACF;aACF,CAAC;SACH;QAED,OAAO,WAAW,CAAC;IACrB,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,aAAa,CAC3B,EAAoB,EACpB,KAAa,EACb,iBAAqE;IAKrE,IAAI,EAAE,CAAC,YAAY,EAAE;QACnB,MAAM,EAAE,KAAK,EAAE,GAAG,oBAAoB,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC;QAExD,IAAI,CAAC,KAAK;YAAE,OAAO,kBAAkB,CAAC,EAAE,CAAC,CAAC;QAE1C,MAAM,KAAK,GAAG,iBAAiB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAE9C,OAAO;YACL,UAAU,EAAE,CAAC,YAAY,IAAI,KAAK,IAAI,KAAK,CAAC,UAAU,CAAC,IAAI,EAAE;YAC7D,cAAc,EAAE,CAAC,gBAAgB,IAAI,KAAK,IAAI,KAAK,CAAC,cAAc,CAAC,IAAI,EAAE;SAC1E,CAAC;KACH;IACD,OAAO,kBAAkB,CAAC,EAAE,CAAC,CAAC;AAChC,CAAC"}

package/lib-es/bridge/generic-alpaca/signOperation.js

@@ -75,7 +75,7 @@ export const genericSignOperation = (network, kind) => (signerContext) => ({ acc
             const sequenceNumber = await getAlpacaApi(network, kind).getSequence(transactionIntent.sender);
             transactionIntent.sequence = sequenceNumber;
             /* Craft unsigned blob via Alpaca */
-            const unsigned = await getAlpacaApi(network, kind).craftTransaction(transactionIntent, { value: fees });
+            const { transaction: unsigned } = await getAlpacaApi(network, kind).craftTransaction(transactionIntent, { value: fees });
             /* Notify UI that the device is now showing the tx */
             o.next({ type: "device-signature-requested" });
             /* Sign on Ledger device */

package/lib-es/bridge/generic-alpaca/signOperation.js.map

@@ -1 +1 @@
-{"version":3,"file":"signOperation.js","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/signOperation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AASlC,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,EAAE,wBAAwB,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAIhD,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AACrC,OAAO,SAAS,MAAM,cAAc,CAAC;AAErC;;;GAGG;AACH,SAAS,iBAAiB,CACxB,iBAAyC,EACzC,WAA8B;IAE9B,oDAAoD;IACpD,IAAI,WAAW,CAAC,KAAK,CAAC,EAAE;QACtB,MAAM,aAAa,GAAG,iBAA+D,CAAC;QACtF,MAAM,MAAM,GAAG,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;QAE1C,aAAa,CAAC,IAAI,GAAG;YACnB,IAAI,EAAE,KAAK;YACX,KAAK,EAAE,IAAI,GAAG,EAAE;SACjB,CAAC;QACF,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC;QAEvD,OAAO,aAAa,CAAC;KACtB;IAED,4BAA4B;IAC5B,IAAI,WAAW,CAAC,UAAU,CAAC,IAAI,WAAW,CAAC,WAAW,CAAC,EAAE;QACvD,MAAM,UAAU,GAAG,iBAAmD,CAAC;QACvE,MAAM,UAAU,GAAG,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC;QACnD,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,CAAC;QAErD,UAAU,CAAC,IAAI,GAAG;YAChB,IAAI,EAAE,UAA+E;YACrF,KAAK,EAAE,WAAW;SACnB,CAAC;QAEF,OAAO,UAAU,CAAC;KACnB;IAED,OAAO,iBAAiB,CAAC;AAC3B,CAAC;AAED;;GAEG;AACH,SAAS,uBAAuB,CAC9B,iBAAyC,EACzC,WAA8B,EAC9B,SAAiB;IAEjB,wBAAwB;IACxB,iBAAiB,CAAC,eAAe,GAAG,SAAS,CAAC;IAE9C,yBAAyB;IACzB,iBAAiB,GAAG,iBAAiB,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC;IAEtE,OAAO,iBAAiB,CAAC;AAC3B,CAAC;AACD;;GAEG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAC/B,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,CAClB,CAAC,aAAiC,EAAqD,EAAE,CACzF,CAAC,EACC,OAAO,EACP,WAAW,EACX,QAAQ,GAKT,EAAkC,EAAE,CACnC,IAAI,UAAU,CAAC,CAAC,CAAC,EAAE;IACjB,KAAK,UAAU,IAAI;QACjB,oEAAoE;QACpE,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC;YAAE,MAAM,IAAI,YAAY,EAAE,CAAC;QACnD,MAAM,IAAI,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,IAAI,GAAG,CAAC,CAAC;QAC5D,IAAI,WAAW,CAAC,cAAc,CAAC,EAAE;YAC/B,MAAM,gBAAgB,GAAG;gBACvB,SAAS,EAAE,WAAW,CAAC,SAAS;gBAChC,MAAM,EAAE,WAAW,CAAC,MAAM,IAAI,CAAC;gBAC/B,YAAY,EAAE,CAAC,CAAC,WAAW,CAAC,YAAY;gBACxC,cAAc,EAAE,WAAW,EAAE,CAAC,gBAAgB,CAAC,IAAI,EAAE;gBACrD,UAAU,EAAE,WAAW,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE;gBAC7C,YAAY,EAAE,WAAW,CAAC,YAAY,IAAI,EAAE;aAC7C,CAAC;YACF,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,cAAc,CACjE,mBAAmB,CAAC,OAAO,EAAE,gBAAgB,CAAC,EAC9C,EAAE,KAAK,EAAE,IAAI,EAAE,CAChB,CAAC;YACF,WAAW,CAAC,MAAM,GAAG,IAAI,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;SACvD;QACD,MAAM,UAAU,GAAG,MAAM,aAAa,CAAC,QAAQ,EAAE,KAAK,EAAC,MAAM,EAAC,EAAE;YAC9D,MAAM,cAAc,GAAG,OAAO,CAAC,gBAAgB,CAAC;YAChD,MAAM,EAAE,SAAS,EAAE,GAAG,CAAC,MAAM,MAAM,CAAC,UAAU,CAAC,cAAc,CAAC,CAAW,CAAC;YAE1E,IAAI,iBAAiB,GAAG,mBAAmB,CAAC,OAAO,EAAE,EAAE,GAAG,WAAW,EAAE,CAAC,CAAC;YACzE,iBAAiB,CAAC,eAAe,GAAG,SAAS,CAAC;YAE9C,yCAAyC;YACzC,iBAAiB,GAAG,uBAAuB,CAAC,iBAAiB,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;YAEvF,0FAA0F;YAC1F,MAAM,cAAc,GAAG,MAAM,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,WAAW,CAClE,iBAAiB,CAAC,MAAM,CACzB,CAAC;YACF,iBAAiB,CAAC,QAAQ,GAAG,cAAc,CAAC;YAE5C,oCAAoC;YACpC,MAAM,QAAQ,GAAW,MAAM,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,gBAAgB,CACzE,iBAAiB,EACjB,EAAE,KAAK,EAAE,IAAI,EAAE,CAChB,CAAC;YAEF,qDAAqD;YACrD,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,4BAA4B,EAAE,CAAC,CAAC;YAC/C,2BAA2B;YAC3B,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,eAAe,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;YACtE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,iBAAiB,CAAC,QAAQ,EAAE,CAAC;QAC/E,CAAC,CAAC,CAAC;QAEH,gDAAgD;QAChD,IAAI,CAAC,UAAU;YAAE,OAAO;QACxB,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,0BAA0B,EAAE,CAAC,CAAC;QAE7C,+CAA+C;QAC/C,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,OAAO,CACxD,UAAU,CAAC,QAAQ,EACnB,UAAU,CAAC,MAAM,EACjB,UAAU,CAAC,SAAS,CACrB,CAAC;QACF,MAAM,SAAS,GAAG,wBAAwB,CAAC,OAAO,EAAE,WAAW,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC;QACtF,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE;YACjB,GAAG,CAAC,gBAAgB,EAAE,0BAA0B,EAAE,SAAS,CAAC,CAAC;SAC9D;QACD,qEAAqE;QACrE,wGAAwG;QACxG,CAAC,CAAC,IAAI,CAAC;YACL,IAAI,EAAE,QAAQ;YACd,eAAe,EAAE;gBACf,SAAS;gBACT,SAAS,EAAE,QAAQ;aACpB;SACF,CAAC,CAAC;IACL,CAAC;IAED,IAAI,EAAE,CAAC,IAAI,CACT,GAAG,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,EAClB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAChB,CAAC;AACJ,CAAC,CAAC,CAAC"}
+{"version":3,"file":"signOperation.js","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/signOperation.ts"],"names":[],"mappings":"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"}

package/lib-es/bridge/generic-alpaca/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAiB,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAG5F,OAAO,EACL,OAAO,EACP,SAAS,IAAI,aAAa,EAC1B,iBAAiB,EAClB,MAAM,oCAAoC,CAAC;AAE5C,wBAAgB,cAAc,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAOzE;AAED,wBAAgB,iCAAiC,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,aAAa,GAAG,SAAS,CA+CjG;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,iBAAiB,GAAG;IAC/B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,GACA,iBAAiB,CAAC,GAAG,CAAC,GAAG;IAAE,IAAI,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,CA+CtE;AAED,eAAO,MAAM,wBAAwB,YAC1B,OAAO,eACH,iBAAiB,mBACb,MAAM,KACtB,SAkDF,CAAC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAiB,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAG5F,OAAO,EACL,OAAO,EACP,SAAS,IAAI,aAAa,EAC1B,iBAAiB,EAClB,MAAM,oCAAoC,CAAC;AAE5C,wBAAgB,cAAc,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAOzE;AAED,wBAAgB,iCAAiC,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,aAAa,GAAG,SAAS,CAiDjG;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,iBAAiB,GAAG;IAC/B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,GACA,iBAAiB,CAAC,GAAG,CAAC,GAAG;IAAE,IAAI,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,CA+CtE;AAED,eAAO,MAAM,wBAAwB,YAC1B,OAAO,eACH,iBAAiB,mBACb,MAAM,KACtB,SAkDF,CAAC"}