@ledgerhq/coin-celo 1.3.0-nightly.4 → 1.3.0

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

@@ -1 +1 @@
-{"version":3,"file":"prepareTransaction.js","sourceRoot":"","sources":["../../src/bridge/prepareTransaction.ts"],"names":[],"mappings":"AACA,OAAO,SAAS,MAAM,cAAc,CAAC;AACrC,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,qBAAqB,MAAM,yBAAyB,CAAC;AAE5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAC5E,OAAO,EAAE,kBAAkB,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AAC5E,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAEzC,MAAM,CAAC,MAAM,kBAAkB,GAGL,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,EAAE;IACvD,MAAM,GAAG,GAAG,OAAO,EAAE,CAAC;IAEtB,IAAI,WAAW,CAAC,SAAS,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,SAAS,CAAC;QAAE,OAAO,WAAW,CAAC;IAExF,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS;QAAE,OAAO,WAAW,CAAC;IAE9F,IACE,WAAW,CAAC,IAAI,KAAK,MAAM;QAC3B,CAAC,WAAW,CAAC,YAAY;QACzB,IAAI,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAExC,OAAO,WAAW,CAAC;IAErB,MAAM,IAAI,GAAG,MAAM,qBAAqB,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC;IAEnE,MAAM,YAAY,GAAG,kBAAkB,CAAC,OAAO,EAAE,WAAW,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC;IACjF,MAAM,kBAAkB,GAAG,YAAY,EAAE,IAAI,KAAK,cAAc,CAAC;IAEjE,MAAM,MAAM,GACV,WAAW,CAAC,YAAY,IAAI,kBAAkB,CAAC,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC;IAE7F,IAAI,KAAK,CAAC;IACV,IAAI,kBAAkB,EAAE,CAAC;QACvB,IAAI,kBAAkB,CAAC,QAAQ,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC;YACvD,KAAK,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,CAAC;QAC/C,CAAC;aAAM,CAAC;YACN,KAAK,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QAC3E,CAAC;IACH,CAAC;SAAM,CAAC;QACN,KAAK,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,YAAY,EAAE,CAAC;IAC7C,CAAC;IAED,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC/D,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,aAAa,IAAI,wBAAwB,CAAC,CAAC;IACxE,MAAM,YAAY,GAAG,OAAO,GAAG,wBAAwB,CAAC;IAExD,OAAO;QACL,GAAG,WAAW;QACd,MAAM;QACN,IAAI;QACJ,YAAY,EAAE,YAAY,CAAC,QAAQ,EAAE;QACrC,oBAAoB,EAAE,MAAM,GAAG,CAAC,UAAU,CAAC,uBAAuB,EAAE;QACpE,GAAG,CAAC,kBAAkB;YACpB,CAAC,CAAC;gBACE,IAAI,EAAE,MAAM,CAAC,IAAI,CACf,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,SAAS,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,CACxE;aACF;YACH,CAAC,CAAC,EAAE,CAAC;KACR,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,kBAAkB,CAAC"}
+{"version":3,"file":"prepareTransaction.js","sourceRoot":"","sources":["../../src/bridge/prepareTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAC;AAErC,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,qBAAqB,MAAM,yBAAyB,CAAC;AAG5D,MAAM,QAAQ,GAAG,CAAC,CAA+B,EAAE,CAAY,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;AAEnG,MAAM,CAAC,MAAM,kBAAkB,GAGL,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,EAAE;IACvD,IAAI,WAAW,CAAC,SAAS,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,SAAS,CAAC;QAAE,OAAO,WAAW,CAAC;IAExF,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS;QAAE,OAAO,WAAW,CAAC;IAE9F,IACE,WAAW,CAAC,IAAI,KAAK,MAAM;QAC3B,CAAC,WAAW,CAAC,YAAY;QACzB,IAAI,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAExC,OAAO,WAAW,CAAC;IAErB,MAAM,IAAI,GAAG,MAAM,qBAAqB,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC;IAEnE,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC;QACtC,OAAO,EAAE,GAAG,WAAW,EAAE,IAAI,EAAE,CAAC;IAClC,CAAC;IAED,OAAO,WAAW,CAAC;AACrB,CAAC,CAAC;AAEF,eAAe,kBAAkB,CAAC"}

package/lib-es/bridge/signOperation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"signOperation.d.ts","sourceRoot":"","sources":["../../src/bridge/signOperation.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAW,aAAa,EAAgC,MAAM,sBAAsB,CAAC;AAIjG,OAAO,KAAK,EAAE,WAAW,EAAe,MAAM,gBAAgB,CAAC;AAE/D,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAGhE,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAGvC;;GAEG;AACH,eAAO,MAAM,kBAAkB,kBACb,aAAa,CAAC,UAAU,CAAC,KAAG,aAAa,CAAC,WAAW,CAAC,CAAC,eAAe,CAuFlF,CAAC;AA6BP,eAAe,kBAAkB,CAAC"}
+{"version":3,"file":"signOperation.d.ts","sourceRoot":"","sources":["../../src/bridge/signOperation.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAW,aAAa,EAAgC,MAAM,sBAAsB,CAAC;AAIjG,OAAO,KAAK,EAAE,WAAW,EAAe,MAAM,gBAAgB,CAAC;AAE/D,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAGhE,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAEvC;;GAEG;AACH,eAAO,MAAM,kBAAkB,kBACb,aAAa,CAAC,UAAU,CAAC,KAAG,aAAa,CAAC,WAAW,CAAC,CAAC,eAAe,CAyElF,CAAC;AA6BP,eAAe,kBAAkB,CAAC"}

package/lib-es/bridge/signOperation.js

@@ -2,7 +2,6 @@ import { BigNumber } from "bignumber.js";
 import { Observable } from "rxjs";
 import { FeeNotLoaded } from "@ledgerhq/errors";
 import { encodeTransaction, recoverTransaction } from "@celo/wallet-base";
-import { findSubAccountById } from "@ledgerhq/coin-framework/account/index";
 import { buildOptimisticOperation } from "./buildOptimisticOperation";
 import buildTransaction from "./buildTransaction";
 import { determineFees } from "../network/sdk";
@@ -17,19 +16,12 @@ export const buildSignOperation = (signerContext) => ({ account, transaction, de
             throw new FeeNotLoaded();
         const unsignedTransaction = await buildTransaction(account, transaction);
         const { chainId, to } = unsignedTransaction;
-        const subAccount = findSubAccountById(account, transaction.subAccountId ?? "");
-        const isTokenTransaction = subAccount?.type === "TokenAccount";
         await signerContext(deviceId, signer => {
-            return signer.verifyTokenInfo(isTokenTransaction ? subAccount.token.contractAddress : to, chainId);
+            return signer.verifyTokenInfo(to, chainId);
         });
-        const finalTransaction = {
-            ...unsignedTransaction,
-            to: isTokenTransaction ? subAccount.token.contractAddress : to,
-            value: isTokenTransaction ? 0 : unsignedTransaction.value,
-        };
-        await determineFees(finalTransaction);
+        await determineFees(unsignedTransaction);
         const rlpEncodedTransaction = await signerContext(deviceId, signer => {
-            return signer.rlpEncodedTxForLedger(finalTransaction);
+            return signer.rlpEncodedTxForLedger(unsignedTransaction);
         });
         o.next({ type: "device-signature-requested" });
         const response = (await signerContext(deviceId, signer => {

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

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

package/lib-es/bridge/synchronisation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"synchronisation.d.ts","sourceRoot":"","sources":["../../src/bridge/synchronisation.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;AAGjF,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAM7C,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,WAAW,CAoDxD,CAAC;AAEF,eAAO,MAAM,IAAI,uJAAgC,CAAC"}
+{"version":3,"file":"synchronisation.d.ts","sourceRoot":"","sources":["../../src/bridge/synchronisation.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;AAGjF,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAK7C,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,WAAW,CA+CxD,CAAC;AAEF,eAAO,MAAM,IAAI,uJAAgC,CAAC"}

package/lib-es/bridge/synchronisation.js

@@ -3,9 +3,8 @@ import { makeSync, mergeOps } from "@ledgerhq/coin-framework/bridge/jsHelpers";
 import { encodeAccountId } from "@ledgerhq/coin-framework/account";
 import { getAccountDetails } from "../network";
 import { celoKit } from "../network/sdk";
-import { getAccountShape as evmGetAccountShape } from "@ledgerhq/coin-evm/bridge/synchronization";
 const kit = celoKit();
-export const getAccountShape = async (info, config) => {
+export const getAccountShape = async (info) => {
     const { address, currency, initialAccount, derivationMode } = info;
     const oldOperations = initialAccount?.operations || [];
     const election = await kit.contracts.getElection();
@@ -22,16 +21,13 @@ export const getAccountShape = async (info, config) => {
     const accountRegistrationStatus = await getAccountRegistrationStatus(address);
     const pendingWithdrawals = accountRegistrationStatus ? await getPendingWithdrawals(address) : [];
     const votes = accountRegistrationStatus ? await getVotes(address) : [];
-    const fromEvm = await evmGetAccountShape(info, config);
     const operations = mergeOps(oldOperations, newOperations);
     const shape = {
         id: accountId,
         balance,
-        blockHeight,
-        operationsCount: operations.length,
         spendableBalance,
-        subAccounts: fromEvm.subAccounts || [],
-        syncHash: fromEvm.syncHash,
+        operationsCount: operations.length,
+        blockHeight,
         celoResources: {
             registrationStatus: accountRegistrationStatus,
             lockedBalance,

package/lib-es/bridge/synchronisation.js.map

@@ -1 +1 @@
-{"version":3,"file":"synchronisation.js","sourceRoot":"","sources":["../../src/bridge/synchronisation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,4BAA4B,EAAE,qBAAqB,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/F,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,2CAA2C,CAAC;AAE/E,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAE/C,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,eAAe,IAAI,kBAAkB,EAAE,MAAM,2CAA2C,CAAC;AAElG,MAAM,GAAG,GAAG,OAAO,EAAE,CAAC;AAEtB,MAAM,CAAC,MAAM,eAAe,GAAiC,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE;IAClF,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC;IACnE,MAAM,aAAa,GAAG,cAAc,EAAE,UAAU,IAAI,EAAE,CAAC;IACvD,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;IACnD,MAAM,cAAc,GAAG,MAAM,QAAQ,CAAC,SAAS,EAAE,CAAC;IAClD,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC;IACvD,MAAM,SAAS,GAAG,eAAe,CAAC;QAChC,IAAI,EAAE,IAAI;QACV,OAAO,EAAE,GAAG;QACZ,UAAU,EAAE,QAAQ,CAAC,EAAE;QACvB,aAAa,EAAE,OAAO;QACtB,cAAc;KACf,CAAC,CAAC;IACH,MAAM,EACJ,WAAW,EACX,OAAO,EACP,gBAAgB,EAChB,UAAU,EAAE,aAAa,EACzB,aAAa,EACb,sBAAsB,GACvB,GAAG,MAAM,iBAAiB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAEhD,MAAM,yBAAyB,GAAG,MAAM,4BAA4B,CAAC,OAAO,CAAC,CAAC;IAE9E,MAAM,kBAAkB,GAAG,yBAAyB,CAAC,CAAC,CAAC,MAAM,qBAAqB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAEjG,MAAM,KAAK,GAAG,yBAAyB,CAAC,CAAC,CAAC,MAAM,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAEvE,MAAM,OAAO,GAAG,MAAM,kBAAkB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAEvD,MAAM,UAAU,GAAG,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;IAE1D,MAAM,KAAK,GAAyB;QAClC,EAAE,EAAE,SAAS;QACb,OAAO;QACP,WAAW;QACX,eAAe,EAAE,UAAU,CAAC,MAAM;QAClC,gBAAgB;QAChB,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,EAAE;QACtC,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,aAAa,EAAE;YACb,kBAAkB,EAAE,yBAAyB;YAC7C,aAAa;YACb,sBAAsB;YACtB,kBAAkB;YAClB,KAAK;YACL,eAAe,EAAE,QAAQ,CAAC,OAAO;YACjC,iBAAiB,EAAE,UAAU,CAAC,OAAO;YACrC,oBAAoB,EAAE,cAAc,CAAC,oBAAoB;SAC1D;KACF,CAAC;IACF,OAAO,EAAE,GAAG,KAAK,EAAE,UAAU,EAAE,CAAC;AAClC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,IAAI,GAAG,QAAQ,CAAC,EAAE,eAAe,EAAE,CAAC,CAAC"}
+{"version":3,"file":"synchronisation.js","sourceRoot":"","sources":["../../src/bridge/synchronisation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,4BAA4B,EAAE,qBAAqB,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/F,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,2CAA2C,CAAC;AAE/E,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAE/C,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAEzC,MAAM,GAAG,GAAG,OAAO,EAAE,CAAC;AAEtB,MAAM,CAAC,MAAM,eAAe,GAAiC,KAAK,EAAC,IAAI,EAAC,EAAE;IACxE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC;IACnE,MAAM,aAAa,GAAG,cAAc,EAAE,UAAU,IAAI,EAAE,CAAC;IACvD,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;IACnD,MAAM,cAAc,GAAG,MAAM,QAAQ,CAAC,SAAS,EAAE,CAAC;IAClD,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC;IACvD,MAAM,SAAS,GAAG,eAAe,CAAC;QAChC,IAAI,EAAE,IAAI;QACV,OAAO,EAAE,GAAG;QACZ,UAAU,EAAE,QAAQ,CAAC,EAAE;QACvB,aAAa,EAAE,OAAO;QACtB,cAAc;KACf,CAAC,CAAC;IACH,MAAM,EACJ,WAAW,EACX,OAAO,EACP,gBAAgB,EAChB,UAAU,EAAE,aAAa,EACzB,aAAa,EACb,sBAAsB,GACvB,GAAG,MAAM,iBAAiB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAEhD,MAAM,yBAAyB,GAAG,MAAM,4BAA4B,CAAC,OAAO,CAAC,CAAC;IAE9E,MAAM,kBAAkB,GAAG,yBAAyB,CAAC,CAAC,CAAC,MAAM,qBAAqB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAEjG,MAAM,KAAK,GAAG,yBAAyB,CAAC,CAAC,CAAC,MAAM,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAEvE,MAAM,UAAU,GAAG,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;IAC1D,MAAM,KAAK,GAAG;QACZ,EAAE,EAAE,SAAS;QACb,OAAO;QACP,gBAAgB;QAChB,eAAe,EAAE,UAAU,CAAC,MAAM;QAClC,WAAW;QACX,aAAa,EAAE;YACb,kBAAkB,EAAE,yBAAyB;YAC7C,aAAa;YACb,sBAAsB;YACtB,kBAAkB;YAClB,KAAK;YACL,eAAe,EAAE,QAAQ,CAAC,OAAO;YACjC,iBAAiB,EAAE,UAAU,CAAC,OAAO;YACrC,oBAAoB,EAAE,cAAc,CAAC,oBAAoB;SAC1D;KACF,CAAC;IACF,OAAO,EAAE,GAAG,KAAK,EAAE,UAAU,EAAE,CAAC;AAClC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,IAAI,GAAG,QAAQ,CAAC,EAAE,eAAe,EAAE,CAAC,CAAC"}

package/lib-es/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAE9D,eAAO,MAAM,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAiBjD,CAAC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAE9D,eAAO,MAAM,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CASjD,CAAC"}

package/lib-es/config.js

@@ -5,14 +5,6 @@ export const celoConfig = {
             status: {
                 type: "active",
             },
-            node: {
-                type: "external",
-                uri: "https://celo.coin.ledger.com/archive",
-            },
-            explorer: {
-                type: "blockscout",
-                uri: "https://celo.blockscout.com/api",
-            },
         },
     },
 };

package/lib-es/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,UAAU,GAA+B;IACpD,oBAAoB,EAAE;QACpB,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE;YACP,MAAM,EAAE;gBACN,IAAI,EAAE,QAAQ;aACf;YACD,IAAI,EAAE;gBACJ,IAAI,EAAE,UAAU;gBAChB,GAAG,EAAE,sCAAsC;aAC5C;YACD,QAAQ,EAAE;gBACR,IAAI,EAAE,YAAY;gBAClB,GAAG,EAAE,iCAAiC;aACvC;SACF;KACF;CACF,CAAC"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,UAAU,GAA+B;IACpD,oBAAoB,EAAE;QACpB,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE;YACP,MAAM,EAAE;gBACN,IAAI,EAAE,QAAQ;aACf;SACF;KACF;CACF,CAAC"}

package/lib-es/test/please-add-coverage.test.d.ts

@@ -0,0 +1 @@
+//# sourceMappingURL=please-add-coverage.test.d.ts.map

package/lib-es/test/please-add-coverage.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"please-add-coverage.test.d.ts","sourceRoot":"","sources":["../../src/test/please-add-coverage.test.ts"],"names":[],"mappings":""}

package/lib-es/test/please-add-coverage.test.js

@@ -0,0 +1,5 @@
+"use strict";
+describe("Celo", () => {
+    it.todo("should be tested");
+});
+//# sourceMappingURL=please-add-coverage.test.js.map

package/lib-es/test/please-add-coverage.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"please-add-coverage.test.js","sourceRoot":"","sources":["../../src/test/please-add-coverage.test.ts"],"names":[],"mappings":";AAAA,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE;IACpB,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;AAC9B,CAAC,CAAC,CAAC"}

package/lib-es/types/types.d.ts

@@ -38,7 +38,6 @@ export type Transaction = TransactionCommon & {
     fees: BigNumber | null | undefined;
     mode: CeloOperationMode;
     index: number | null | undefined;
-    data?: Buffer | null | undefined;
 };
 export type TransactionRaw = TransactionCommonRaw & {
     family: "celo";

package/lib-es/types/types.d.ts.map

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

package/lib-es/types/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/types/types.ts"],"names":[],"mappings":"AAkJA,MAAM,UAAU,oBAAoB,CAAC,EAAkB;IACrD,OAAO,EAAE,KAAK,IAAI,IAAI,OAAO,EAAE,KAAK,QAAQ,IAAI,oBAAoB,IAAI,EAAE,CAAC;AAC7E,CAAC;AAKD,MAAM,UAAU,uBAAuB,CAAC,EAAqB;IAC3D,OAAO,EAAE,KAAK,IAAI,IAAI,OAAO,EAAE,KAAK,QAAQ,IAAI,oBAAoB,IAAI,EAAE,CAAC;AAC7E,CAAC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/types/types.ts"],"names":[],"mappings":"AAiJA,MAAM,UAAU,oBAAoB,CAAC,EAAkB;IACrD,OAAO,EAAE,KAAK,IAAI,IAAI,OAAO,EAAE,KAAK,QAAQ,IAAI,oBAAoB,IAAI,EAAE,CAAC;AAC7E,CAAC;AAKD,MAAM,UAAU,uBAAuB,CAAC,EAAqB;IAC3D,OAAO,EAAE,KAAK,IAAI,IAAI,OAAO,EAAE,KAAK,QAAQ,IAAI,oBAAoB,IAAI,EAAE,CAAC;AAC7E,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ledgerhq/coin-celo",
-  "version": "1.3.0-nightly.4",
+  "version": "1.3.0",
   "description": "celo coin integration",
   "keywords": [
     "Ledger",
@@ -104,40 +104,39 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@celo/connect": "^7.0.0",
-    "@celo/contractkit": "^10.0.0",
-    "@celo/utils": "^8.0.3",
-    "@celo/wallet-base": "^8.0.0",
-    "@celo/wallet-ledger": "^8.0.0",
+    "@celo/connect": "^6.0.2",
+    "@celo/contractkit": "^8.3.1",
+    "@celo/utils": "^7.0.0",
+    "@celo/wallet-base": "^6.0.3",
+    "@celo/wallet-ledger": "^6.0.3",
     "bignumber.js": "^9.1.2",
     "eip55": "^2.1.1",
     "invariant": "^2.2.4",
     "lodash": "^4.17.21",
     "rxjs": "^7.8.1",
-    "@ledgerhq/coin-evm": "^2.29.0-nightly.4",
-    "@ledgerhq/coin-framework": "^6.3.0-nightly.2",
-    "@ledgerhq/cryptoassets": "^13.27.0-nightly.0",
-    "@ledgerhq/devices": "^8.5.1-nightly.0",
-    "@ledgerhq/errors": "^6.25.0-nightly.0",
-    "@ledgerhq/hw-app-eth": "^6.45.17-nightly.1",
-    "@ledgerhq/live-config": "^3.2.0-nightly.0",
-    "@ledgerhq/live-env": "^2.15.0-nightly.1",
-    "@ledgerhq/live-network": "^2.0.16-nightly.1",
+    "@ledgerhq/coin-evm": "^2.29.0",
+    "@ledgerhq/coin-framework": "^6.3.0",
+    "@ledgerhq/cryptoassets": "^13.27.0",
+    "@ledgerhq/devices": "^8.5.1",
+    "@ledgerhq/errors": "^6.25.0",
+    "@ledgerhq/hw-app-eth": "^6.45.17",
+    "@ledgerhq/live-config": "^3.2.0",
+    "@ledgerhq/live-env": "^2.15.0",
+    "@ledgerhq/live-network": "^2.0.16",
     "@ledgerhq/logs": "^6.13.0",
-    "@ledgerhq/types-live": "^6.83.0-nightly.1"
+    "@ledgerhq/types-live": "^6.83.0"
   },
   "devDependencies": {
     "@types/invariant": "^2.2.37",
     "@types/jest": "^29.5.12",
     "@types/lodash": "^4.14.179",
-    "@faker-js/faker": "^9.9.0",
     "dotenv": "^16.4.5",
     "expect": "^27.4.6",
     "jest": "^29.7.0",
     "ts-jest": "^29.1.1",
     "typescript": "^5.4.5",
     "@ledgerhq/disable-network-setup": "^0.0.0",
-    "@ledgerhq/types-cryptoassets": "^7.26.0-nightly.1"
+    "@ledgerhq/types-cryptoassets": "^7.26.0"
   },
   "scripts": {
     "clean": "rimraf lib lib-es",

package/src/bridge/buildOptimisticOperation.ts

@@ -2,7 +2,6 @@ import BigNumber from "bignumber.js";
 import { OperationType } from "@ledgerhq/types-live";
 import { CeloAccount, CeloOperation, CeloOperationMode, Transaction } from "../types";
 import { encodeOperationId } from "@ledgerhq/coin-framework/operation";
-import { findSubAccountById } from "@ledgerhq/coin-framework/account/index";
 
 const MODE_TO_TYPE: { [key in CeloOperationMode | "default"]: OperationType } = {
   send: "OUT",
@@ -23,12 +22,9 @@ export const buildOptimisticOperation = (
 ): CeloOperation => {
   const type = MODE_TO_TYPE[transaction.mode] ?? MODE_TO_TYPE.default;
 
-  const tokenAccount = findSubAccountById(account, transaction.subAccountId || "");
-  const isTokenTransaction = tokenAccount?.type === "TokenAccount";
-
   const value =
     type === "OUT" || type === "LOCK"
-      ? new BigNumber(transaction.amount).plus(isTokenTransaction ? 0 : fee)
+      ? new BigNumber(transaction.amount).plus(fee)
       : new BigNumber(transaction.amount);
 
   const operation: CeloOperation = {
@@ -41,7 +37,7 @@ export const buildOptimisticOperation = (
     blockHeight: null,
     senders: [account.freshAddress],
     recipients: [transaction.recipient].filter(Boolean),
-    accountId: isTokenTransaction ? tokenAccount.id : account.id,
+    accountId: account.id,
     date: new Date(),
     extra: {
       celoOperationValue: new BigNumber(transaction.amount),

package/src/bridge/buildTransaction.ts

@@ -3,21 +3,12 @@ import { CeloTx } from "@celo/connect";
 import { celoKit } from "../network/sdk";
 import { BigNumber } from "bignumber.js";
 import { getPendingStakingOperationAmounts, getVote } from "../logic";
-import { findSubAccountById } from "@ledgerhq/coin-framework/account/index";
-import {
-  CELO_STABLE_TOKENS,
-  getStableTokenEnum,
-  MAX_FEES_THRESHOLD_MULTIPLIER,
-  MAX_PRIORITY_FEE_PER_GAS,
-} from "../constants";
 
 const buildTransaction = async (account: CeloAccount, transaction: Transaction) => {
   const kit = celoKit();
 
-  const tokenAccount = findSubAccountById(account, transaction.subAccountId || "");
-  const isTokenTransaction = tokenAccount?.type === "TokenAccount";
+  const value = transactionValue(account, transaction);
 
-  let value = transactionValue(account, transaction);
   let celoTransaction: CeloTx;
 
   if (transaction.mode === "lock") {
@@ -114,45 +105,23 @@ const buildTransaction = async (account: CeloAccount, transaction: Transaction)
       data: accounts.createAccount().txo.encodeABI(),
       gas: await accounts.createAccount().txo.estimateGas({ from: account.freshAddress }),
     };
-  } else if (isTokenTransaction) {
-    value = transaction.useAllAmount ? tokenAccount.balance : transaction.amount;
-
-    const block = await kit.connection.web3.eth.getBlock("latest");
-    const baseFee = BigInt(block.baseFeePerGas || MAX_PRIORITY_FEE_PER_GAS);
-    const maxFeePerGas = baseFee + MAX_PRIORITY_FEE_PER_GAS;
-
-    let token;
-    if (CELO_STABLE_TOKENS.includes(tokenAccount.token.id)) {
-      token = await kit.contracts.getStableToken(getStableTokenEnum(tokenAccount.token.id));
-    } else {
-      token = await kit.contracts.getErc20(tokenAccount.token.contractAddress);
-    }
+  } else {
+    // Send
 
     celoTransaction = {
       from: account.freshAddress,
       to: transaction.recipient,
-      data: token.transfer(transaction.recipient, value.toFixed()).txo.encodeABI(),
-      maxFeePerGas: maxFeePerGas.toString(),
-      maxPriorityFeePerGas: await kit.connection.getMaxPriorityFeePerGas(),
       value: value.toFixed(),
     };
-  } else {
-    // Send
+    const gas = await kit.connection.estimateGasWithInflationFactor(celoTransaction);
+
     celoTransaction = {
-      from: account.freshAddress,
-      to: transaction.recipient,
-      value: value.toFixed(),
+      ...celoTransaction,
+      gas,
     };
   }
-
-  const gas = (
-    (await kit.connection.estimateGasWithInflationFactor(celoTransaction)) *
-    MAX_FEES_THRESHOLD_MULTIPLIER
-  ).toFixed();
-
   const tx: CeloTx = {
     ...celoTransaction,
-    gas,
     chainId: await kit.connection.chainId(),
     nonce: await kit.connection.nonce(account.freshAddress),
   };

package/src/bridge/estimateMaxSpendable.ts

@@ -3,36 +3,20 @@ import { CeloAccount, Transaction } from "../types";
 import getTransactionStatus from "./getTransactionStatus";
 import prepareTransaction from "./prepareTransaction";
 import createTransaction from "./createTransaction";
-import {
-  findSubAccountById,
-  getMainAccount,
-  isTokenAccount,
-} from "@ledgerhq/coin-framework/account/helpers";
-import BigNumber from "bignumber.js";
+import { getMainAccount } from "@ledgerhq/coin-framework/account/helpers";
 
 export const estimateMaxSpendable: AccountBridge<
   Transaction,
   CeloAccount
 >["estimateMaxSpendable"] = async ({ account, parentAccount, transaction }) => {
   const mainAccount = getMainAccount(account, parentAccount);
-
-  const tokenAccount = findSubAccountById(mainAccount, transaction?.subAccountId ?? "");
-  const fromTokenAccount = tokenAccount && isTokenAccount(tokenAccount);
-
   const t = await prepareTransaction(mainAccount, {
     ...createTransaction(account),
     ...transaction,
     useAllAmount: true,
   });
-
   const { amount } = await getTransactionStatus(mainAccount, t);
-  const fees = t.fees ?? BigNumber(0);
-
-  return fromTokenAccount
-    ? tokenAccount.spendableBalance
-    : account.spendableBalance.gt(fees)
-      ? amount.minus(fees)
-      : new BigNumber(0);
+  return amount;
 };
 
 export default estimateMaxSpendable;

package/src/bridge/getFeesForTransaction.ts

@@ -1,15 +1,7 @@
-import { findSubAccountById } from "@ledgerhq/coin-framework/account/index";
 import { BigNumber } from "bignumber.js";
 import type { CeloAccount, Transaction } from "../types";
 import { celoKit } from "../network/sdk";
 import { getPendingStakingOperationAmounts, getVote } from "../logic";
-import buildTransaction from "./buildTransaction";
-import {
-  CELO_STABLE_TOKENS,
-  getStableTokenEnum,
-  MAX_FEES_THRESHOLD_MULTIPLIER,
-  MAX_PRIORITY_FEE_PER_GAS,
-} from "../constants";
 
 const getFeesForTransaction = async ({
   account,
@@ -36,9 +28,6 @@ const getFeesForTransaction = async ({
   // Deduct pending lock operations from the spendable balance
   const totalSpendableBalance = account.spendableBalance.minus(pendingOperationAmounts.lock);
 
-  const tokenAccount = findSubAccountById(account, transaction.subAccountId || "");
-  const isTokenTransaction = tokenAccount?.type === "TokenAccount";
-
   if ((transaction.mode === "unlock" || transaction.mode === "vote") && account.celoResources) {
     value = transaction.useAllAmount
       ? totalNonVotingLockedBalance
@@ -107,39 +96,16 @@ const getFeesForTransaction = async ({
     const accounts = await kit.contracts.getAccounts();
 
     gas = await accounts.createAccount().txo.estimateGas({ from: account.freshAddress });
-  } else if (isTokenTransaction) {
-    value = transaction.useAllAmount ? tokenAccount.balance : transaction.amount;
-
-    const block = await kit.connection.web3.eth.getBlock("latest");
-    const baseFee = BigInt(block.baseFeePerGas || MAX_PRIORITY_FEE_PER_GAS);
-    const maxFeePerGas = baseFee + MAX_PRIORITY_FEE_PER_GAS;
-
-    let token;
-    if (CELO_STABLE_TOKENS.includes(tokenAccount.token.id)) {
-      token = await kit.contracts.getStableToken(getStableTokenEnum(tokenAccount.token.id));
-    } else {
-      token = await kit.contracts.getErc20(tokenAccount.token.contractAddress);
-    }
+  } else {
+    const celoToken = await kit.contracts.getGoldToken();
 
     const celoTransaction = {
       from: account.freshAddress,
-      to: transaction.recipient,
-      data: token.transfer(transaction.recipient, value.toFixed()).txo.encodeABI(),
-      maxFeePerGas: maxFeePerGas.toString(),
-      maxPriorityFeePerGas: await kit.connection.getMaxPriorityFeePerGas(),
-      value: value.toFixed(),
+      to: celoToken.address,
+      data: celoToken.transfer(transaction.recipient, value.toFixed()).txo.encodeABI(),
     };
 
-    gas = Number(
-      (
-        (await kit.connection.estimateGasWithInflationFactor(celoTransaction)) *
-        MAX_FEES_THRESHOLD_MULTIPLIER
-      ).toFixed(),
-    );
-  } else {
-    // Send
-    const tx = await buildTransaction(account, transaction);
-    gas = tx.gas ? Number(tx.gas) : 0;
+    gas = await kit.connection.estimateGasWithInflationFactor(celoTransaction);
   }
 
   const gasPrice = new BigNumber(await kit.connection.gasPrice());

package/src/bridge/getTransactionStatus.ts

@@ -13,7 +13,6 @@ import { getPendingStakingOperationAmounts, getVote } from "../logic";
 import { CeloAccount, Transaction, TransactionStatus } from "../types";
 import { CeloAllFundsWarning } from "../errors";
 import { celoKit } from "../network/sdk";
-import { findSubAccountById } from "@ledgerhq/coin-framework/account/index";
 
 const kit = celoKit();
 
@@ -46,14 +45,10 @@ export const getTransactionStatus: AccountBridge<
   const totalNonVotingLockedBalance = nonvotingLockedGoldBalance.minus(
     pendingOperationAmounts.vote,
   );
-
   // Deduct pending lock operations from the spendable balance
   const totalSpendableBalance = account.spendableBalance.minus(pendingOperationAmounts.lock);
   const estimatedFees = transaction.fees || new BigNumber(0);
 
-  const tokenAccount = findSubAccountById(account, transaction.subAccountId || "");
-  const isTokenTransaction = tokenAccount?.type === "TokenAccount";
-
   let amount: BigNumber = new BigNumber(0);
   if (useAllAmount && (transaction.mode === "unlock" || transaction.mode === "vote")) {
     amount = totalNonVotingLockedBalance ?? new BigNumber(0);
@@ -61,9 +56,7 @@ export const getTransactionStatus: AccountBridge<
     const revoke = getVote(account, transaction.recipient, transaction.index);
     if (revoke?.amount) amount = revoke.amount;
   } else if (useAllAmount) {
-    amount = isTokenTransaction
-      ? tokenAccount.spendableBalance
-      : totalSpendableBalance.minus(estimatedFees);
+    amount = totalSpendableBalance.minus(estimatedFees);
   } else {
     amount = new BigNumber(transaction.amount);
   }
@@ -80,7 +73,7 @@ export const getTransactionStatus: AccountBridge<
   }
 
   if (!["register", "withdraw", "activate"].includes(transaction.mode)) {
-    if (amount.lte(0) && !useAllAmount) {
+    if (!errors.amount && amount.lte(0) && !useAllAmount) {
       errors.amount = new AmountRequired();
     }
   }
@@ -106,23 +99,13 @@ export const getTransactionStatus: AccountBridge<
   }
 
   if (transaction.mode === "send") {
-    if (!transaction.recipient && !errors.recipient) {
+    if (!transaction.recipient) {
       errors.recipient = new RecipientRequired();
-    } else if (!isValidAddress(transaction.recipient) && !errors.recipient) {
+    } else if (!isValidAddress(transaction.recipient)) {
       errors.recipient = new InvalidAddress("", {
         currencyName: account.currency.name,
       });
     }
-
-    if (isTokenTransaction) {
-      return {
-        errors,
-        warnings,
-        estimatedFees,
-        amount,
-        totalSpent: amount,
-      };
-    }
   }
 
   return {

package/src/bridge/index.ts

@@ -21,6 +21,7 @@ import resolver from "../signer/hw-getAddress";
 import type { CeloAccount, Transaction, TransactionStatus } from "../types";
 import { broadcast } from "./broadcast";
 
+import { EvmSigner } from "@ledgerhq/coin-evm/types/signer";
 import getAddressWrapper from "@ledgerhq/coin-framework/bridge/getAddressWrapper";
 import { getAccountShape } from "./synchronisation";
 import { buildSignOperation } from "./signOperation";

package/src/bridge/prepareTransaction.ts

@@ -1,18 +1,15 @@
-import { AccountBridge } from "@ledgerhq/types-live";
 import BigNumber from "bignumber.js";
+import { AccountBridge } from "@ledgerhq/types-live";
 import { isValidAddress } from "@celo/utils/lib/address";
 import getFeesForTransaction from "./getFeesForTransaction";
 import { CeloAccount, Transaction } from "../types";
-import { findSubAccountById } from "@ledgerhq/coin-framework/account/index";
-import { CELO_STABLE_TOKENS, MAX_PRIORITY_FEE_PER_GAS } from "../constants";
-import { celoKit } from "../network/sdk";
+
+const sameFees = (a: BigNumber | null | undefined, b: BigNumber) => (!a || !b ? a === b : a.eq(b));
 
 export const prepareTransaction: AccountBridge<
   Transaction,
   CeloAccount
 >["prepareTransaction"] = async (account, transaction) => {
-  const kit = celoKit();
-
   if (transaction.recipient && !isValidAddress(transaction.recipient)) return transaction;
 
   if (["send", "vote"].includes(transaction.mode) && !transaction.recipient) return transaction;
@@ -26,41 +23,11 @@ export const prepareTransaction: AccountBridge<
 
   const fees = await getFeesForTransaction({ account, transaction });
 
-  const tokenAccount = findSubAccountById(account, transaction.subAccountId || "");
-  const isTokenTransaction = tokenAccount?.type === "TokenAccount";
-
-  const amount =
-    transaction.useAllAmount && isTokenTransaction ? tokenAccount.balance : transaction.amount;
-
-  let token;
-  if (isTokenTransaction) {
-    if (CELO_STABLE_TOKENS.includes(tokenAccount.token.id)) {
-      token = await kit.contracts.getStableToken();
-    } else {
-      token = await kit.contracts.getErc20(tokenAccount.token.contractAddress);
-    }
-  } else {
-    token = await kit.contracts.getGoldToken();
+  if (!sameFees(transaction.fees, fees)) {
+    return { ...transaction, fees };
   }
 
-  const block = await kit.connection.web3.eth.getBlock("latest");
-  const baseFee = BigInt(block.baseFeePerGas || MAX_PRIORITY_FEE_PER_GAS);
-  const maxFeePerGas = baseFee + MAX_PRIORITY_FEE_PER_GAS;
-
-  return {
-    ...transaction,
-    amount,
-    fees,
-    maxFeePerGas: maxFeePerGas.toString(),
-    maxPriorityFeePerGas: await kit.connection.getMaxPriorityFeePerGas(),
-    ...(isTokenTransaction
-      ? {
-          data: Buffer.from(
-            token.transfer(transaction.recipient, amount.toFixed()).txo.encodeABI(),
-          ),
-        }
-      : {}),
-  };
+  return transaction;
 };
 
 export default prepareTransaction;