@ledgerhq/cryptoassets 13.31.0-nightly.0 → 13.31.0-nightly.1

package/src/data/sui.ts

@@ -1,9 +1,10 @@
 export type SuiToken = [
-  string, // CAL id
+  string, // id
   string, // name
   string, // ticker
   string, // address
   number, // decimals
+  string, // live_signature
 ];
 
 import tokens from "./sui.json";

package/src/legacy/legacy-state.ts

@@ -1,8 +1,6 @@
 import type { TokenCurrency } from "@ledgerhq/types-cryptoassets";
 
 // Legacy state variables that are used for the legacy implementation of CryptoAssetsStore contract
-export const tokensByTicker: Record<string, TokenCurrency> = {};
-export const tokensByAddress: Record<string, TokenCurrency> = {};
 export const tokensArray: TokenCurrency[] = [];
 export const tokensArrayWithDelisted: TokenCurrency[] = [];
 export const tokensByCryptoCurrency: Record<string, TokenCurrency[]> = {};

package/src/legacy/legacy-utils.ts

@@ -7,8 +7,6 @@ import {
   tokensByCryptoCurrencyWithDelisted,
   tokensById,
   tokensByCurrencyAddress,
-  tokensByTicker,
-  tokensByAddress,
   tokenListHashes,
 } from "./legacy-state";
 import {
@@ -276,13 +274,21 @@ export function convertAptFaTokens(token: AptosFAToken): TokenCurrency {
 /**
  * @deprecated
  */
-export function convertSuiTokens([id, name, ticker, address, decimals]: SuiToken): TokenCurrency {
+export function convertSuiTokens([
+  id,
+  name,
+  ticker,
+  address,
+  decimals,
+  ledgerSignature,
+]: SuiToken): TokenCurrency {
   return {
     type: "TokenCurrency",
     id,
     contractAddress: address,
     parentCurrency: getCryptoCurrencyById("sui"),
     name,
+    ledgerSignature,
     tokenType: "sui",
     ticker,
     disableCountervalue: false,
@@ -461,8 +467,6 @@ export function __clearAllLists(): void {
   __clearObject(tokensByCryptoCurrency);
   __clearObject(tokensByCryptoCurrencyWithDelisted);
   __clearObject(tokensById);
-  __clearObject(tokensByTicker);
-  __clearObject(tokensByAddress);
   __clearObject(tokensByCurrencyAddress);
   tokenListHashes.clear();
 }
@@ -485,13 +489,11 @@ function removeTokenFromRecord(record: Record<string, TokenCurrency>, key: strin
  * @param token
  */
 function removeTokenFromAllLists(token: TokenCurrency) {
-  const { id, contractAddress, parentCurrency, ticker } = token;
+  const { id, contractAddress, parentCurrency } = token;
   const lowCaseContract = contractAddress.toLowerCase();
 
   removeTokenFromRecord(tokensById, id);
   removeTokenFromRecord(tokensByCurrencyAddress, parentCurrency.id + ":" + lowCaseContract);
-  removeTokenFromRecord(tokensByAddress, lowCaseContract);
-  removeTokenFromRecord(tokensByTicker, ticker);
   removeTokenFromArray(tokensArray, id);
   removeTokenFromArray(tokensArrayWithDelisted, id);
   removeTokenFromArray(tokensByCryptoCurrency[parentCurrency.id], id);
@@ -512,7 +514,7 @@ export function addTokens(list: (TokenCurrency | undefined)[]): void {
      * Like this we can update any change from a already added token coming from Dynamic CAL
      * and maintain it up to date without having to release a new version of LLD or LLM
      */
-    const { id, contractAddress, parentCurrency, delisted, ticker } = token;
+    const { id, contractAddress, parentCurrency, delisted } = token;
     if (tokensById[id]) removeTokenFromAllLists(token);
     const lowCaseContract = contractAddress.toLowerCase();
 
@@ -520,11 +522,6 @@ export function addTokens(list: (TokenCurrency | undefined)[]): void {
     tokensArrayWithDelisted.push(token);
     tokensById[id] = token;
 
-    if (!tokensByTicker[ticker]) {
-      tokensByTicker[ticker] = token;
-    }
-
-    tokensByAddress[lowCaseContract] = token;
     tokensByCurrencyAddress[parentCurrency.id + ":" + lowCaseContract] = token;
 
     if (!(parentCurrency.id in tokensByCryptoCurrency)) {

package/src/legacy/legacy.test.ts

@@ -22,8 +22,6 @@ import {
 import { initializeLegacyTokens } from "./legacy-data";
 import { getEnv } from "@ledgerhq/live-env";
 import {
-  tokensByTicker,
-  tokensByAddress,
   tokensArray,
   tokensArrayWithDelisted,
   tokensByCryptoCurrency,
@@ -179,7 +177,7 @@ describe("Legacy Utils", () => {
     });
 
     it("should convert Sui token", () => {
-      const suiToken: SuiToken = ["sui/test", "Test Token", "TEST", "0x123", 9];
+      const suiToken: SuiToken = ["sui/test", "Test Token", "TEST", "0x123", 9, "signature"];
       const result = convertSuiTokens(suiToken);
       expect(result.type).toBe("TokenCurrency");
       expect(result.tokenType).toBe("sui");
@@ -282,8 +280,6 @@ describe("Legacy Utils", () => {
       expect(tokensArray).toContain(token);
       expect(tokensArrayWithDelisted).toContain(token);
       expect(tokensById[token.id]).toBe(token);
-      expect(tokensByTicker["TEST"]).toBe(token);
-      expect(tokensByAddress["0x123"]).toBe(token);
       expect(tokensByCurrencyAddress["ethereum:0x123"]).toBe(token);
       expect(tokensByCryptoCurrency["ethereum"]).toContain(token);
     });
@@ -352,7 +348,9 @@ describe("Legacy Utils", () => {
 
       addTokens([token1, token2]);
 
-      expect(tokensByTicker["TEST"]).toBe(token1); // First one wins
+      // Both tokens should be added successfully
+      expect(tokensById[token1.id]).toBe(token1);
+      expect(tokensById[token2.id]).toBe(token2);
     });
 
     it("should handle undefined tokens", () => {
@@ -513,8 +511,6 @@ describe("Legacy Utils", () => {
       expect(Object.keys(tokensByCryptoCurrency).length).toBe(0);
       expect(Object.keys(tokensByCryptoCurrencyWithDelisted).length).toBe(0);
       expect(Object.keys(tokensById).length).toBe(0);
-      expect(Object.keys(tokensByTicker).length).toBe(0);
-      expect(Object.keys(tokensByAddress).length).toBe(0);
       expect(Object.keys(tokensByCurrencyAddress).length).toBe(0);
       expect(tokenListHashes.size).toBe(0);
     });
@@ -573,8 +569,6 @@ describe("Legacy Data", () => {
 
 describe("Legacy State", () => {
   it("should export all state objects", () => {
-    expect(tokensByTicker).toBeDefined();
-    expect(tokensByAddress).toBeDefined();
     expect(tokensArray).toBeDefined();
     expect(tokensArrayWithDelisted).toBeDefined();
     expect(tokensByCryptoCurrency).toBeDefined();

package/src/tokens.ts

@@ -23,12 +23,7 @@ import {
   convertAptFaTokens,
   convertHederaTokens,
 } from "./legacy/legacy-utils";
-import {
-  tokensByAddress,
-  tokensByCurrencyAddress,
-  tokensById,
-  tokensByTicker,
-} from "./legacy/legacy-state";
+import { tokensByCurrencyAddress, tokensById } from "./legacy/legacy-state";
 import { initializeLegacyTokens } from "./legacy/legacy-data";
 
 export {
@@ -51,13 +46,6 @@ export {
 
 initializeLegacyTokens(addTokens);
 
-/**
- * @deprecated this function must not be used and will be replaced by `getCryptoAssetsStore().findTokenById(id)` in https://github.com/LedgerHQ/ledger-live/pull/11905
- */
-export function findTokenByTicker(ticker: string): TokenCurrency | undefined {
-  return tokensByTicker[ticker];
-}
-
 /**
  * @deprecated Please do `await getCryptoAssetsStore().findTokenById(id)` instead to anticipate https://github.com/LedgerHQ/ledger-live/pull/11905
  */
@@ -65,18 +53,6 @@ export function findTokenById(id: string): TokenCurrency | undefined {
   return tokensById[id];
 }
 
-let deprecatedDisplayed = false;
-/**
- * @deprecated This function will be removed when https://github.com/LedgerHQ/ledger-live/pull/11905 lands
- */
-export function findTokenByAddress(address: string): TokenCurrency | undefined {
-  if (!deprecatedDisplayed) {
-    deprecatedDisplayed = true;
-    console.warn("findTokenByAddress is deprecated. use findTokenByAddressInCurrency");
-  }
-  return tokensByAddress[address.toLowerCase()];
-}
-
 /**
  * @deprecated Please do `await getCryptoAssetsStore().findTokenByAddress(address, currencyId)` instead to anticipate https://github.com/LedgerHQ/ledger-live/pull/11905
  */