@ledgerhq/coin-celo 1.3.0 → 1.4.0-nightly.1

package/src/bridge/prepareTransaction.ts

@@ -1,15 +1,18 @@
-import BigNumber from "bignumber.js";
 import { AccountBridge } from "@ledgerhq/types-live";
+import BigNumber from "bignumber.js";
 import { isValidAddress } from "@celo/utils/lib/address";
 import getFeesForTransaction from "./getFeesForTransaction";
 import { CeloAccount, Transaction } from "../types";
-
-const sameFees = (a: BigNumber | null | undefined, b: BigNumber) => (!a || !b ? a === b : a.eq(b));
+import { findSubAccountById } from "@ledgerhq/coin-framework/account/index";
+import { CELO_STABLE_TOKENS, MAX_PRIORITY_FEE_PER_GAS } from "../constants";
+import { celoKit } from "../network/sdk";
 
 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;
@@ -23,11 +26,41 @@ export const prepareTransaction: AccountBridge<
 
   const fees = await getFeesForTransaction({ account, transaction });
 
-  if (!sameFees(transaction.fees, fees)) {
-    return { ...transaction, fees };
+  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();
   }
 
-  return transaction;
+  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(),
+          ),
+        }
+      : {}),
+  };
 };
 
 export default prepareTransaction;

package/src/bridge/serialization.ts

@@ -82,13 +82,15 @@ export function assignFromAccountRaw(accountRaw: AccountRaw, account: Account) {
 }
 
 export function fromOperationExtraRaw(extraRaw: OperationExtraRaw): OperationExtra {
+  const extra: CeloOperationExtra = {};
+
   if (!isCeloOperationExtraRaw(extraRaw)) {
-    throw new Error("Unsupported OperationExtra");
+    return extra;
   }
 
-  const extra: CeloOperationExtra = {
-    celoOperationValue: new BigNumber(extraRaw.celoOperationValue),
-  };
+  if (extraRaw.celoOperationValue) {
+    extra.celoOperationValue = BigNumber(extraRaw.celoOperationValue);
+  }
 
   if (extraRaw.celoSourceValidator) {
     extra.celoSourceValidator = extraRaw.celoSourceValidator;
@@ -98,13 +100,15 @@ export function fromOperationExtraRaw(extraRaw: OperationExtraRaw): OperationExt
 }
 
 export function toOperationExtraRaw(extra: OperationExtra): OperationExtraRaw {
+  const extraRaw: CeloOperationExtraRaw = {};
+
   if (!isCeloOperationExtra(extra)) {
-    throw new Error("Unsupported OperationExtra");
+    return extraRaw;
   }
 
-  const extraRaw: CeloOperationExtraRaw = {
-    celoOperationValue: extra.celoOperationValue.toString(),
-  };
+  if (extra.celoOperationValue) {
+    extraRaw.celoOperationValue = extra.celoOperationValue.toString();
+  }
 
   if (extra.celoSourceValidator) {
     extraRaw.celoSourceValidator = extra.celoSourceValidator;

package/src/bridge/signOperation.ts

@@ -3,7 +3,7 @@ import { Observable } from "rxjs";
 import { FeeNotLoaded } from "@ledgerhq/errors";
 import type { Account, AccountBridge, DeviceId, SignOperationEvent } from "@ledgerhq/types-live";
 import { encodeTransaction, recoverTransaction } from "@celo/wallet-base";
-
+import { findSubAccountById } from "@ledgerhq/coin-framework/account/index";
 import { buildOptimisticOperation } from "./buildOptimisticOperation";
 import type { Transaction, CeloAccount } from "../types/types";
 import buildTransaction from "./buildTransaction";
@@ -11,6 +11,7 @@ import { SignerContext } from "@ledgerhq/coin-framework/signer";
 import { EvmSignature } from "@ledgerhq/coin-evm/types/signer";
 import { determineFees } from "../network/sdk";
 import { CeloSigner } from "../signer";
+import { CeloTx } from "@celo/connect";
 
 /**
  * Sign Transaction with Ledger hardware
@@ -33,15 +34,29 @@ export const buildSignOperation =
         const { fees } = transaction;
         if (!fees) throw new FeeNotLoaded();
         const unsignedTransaction = await buildTransaction(account as CeloAccount, transaction);
+
         const { chainId, to } = unsignedTransaction;
 
+        const subAccount = findSubAccountById(account, transaction.subAccountId ?? "");
+        const isTokenTransaction = subAccount?.type === "TokenAccount";
+
         await signerContext(deviceId, signer => {
-          return signer.verifyTokenInfo(to!, chainId!);
+          return signer.verifyTokenInfo(
+            isTokenTransaction ? subAccount.token.contractAddress : to!,
+            chainId!,
+          );
         });
-        await determineFees(unsignedTransaction);
+
+        const finalTransaction: CeloTx = {
+          ...unsignedTransaction,
+          to: isTokenTransaction ? subAccount.token.contractAddress : to!,
+          value: isTokenTransaction ? 0 : unsignedTransaction.value!,
+        };
+
+        await determineFees(finalTransaction);
 
         const rlpEncodedTransaction = await signerContext(deviceId, signer => {
-          return signer.rlpEncodedTxForLedger(unsignedTransaction);
+          return signer.rlpEncodedTxForLedger(finalTransaction);
         });
         o.next({ type: "device-signature-requested" });
 

package/src/bridge/synchronisation.ts

@@ -2,13 +2,15 @@ import { getAccountRegistrationStatus, getPendingWithdrawals, getVotes } from ".
 import { makeSync, mergeOps } from "@ledgerhq/coin-framework/bridge/jsHelpers";
 import type { GetAccountShape } from "@ledgerhq/coin-framework/bridge/jsHelpers";
 import { encodeAccountId } from "@ledgerhq/coin-framework/account";
+import { getEnv } from "@ledgerhq/live-env";
 import { getAccountDetails } from "../network";
 import { CeloAccount } from "../types/types";
 import { celoKit } from "../network/sdk";
+import { getAccountShape as evmGetAccountShape } from "@ledgerhq/coin-evm/bridge/synchronization";
 
 const kit = celoKit();
 
-export const getAccountShape: GetAccountShape<CeloAccount> = async info => {
+export const getAccountShape: GetAccountShape<CeloAccount> = async (info, config) => {
   const { address, currency, initialAccount, derivationMode } = info;
   const oldOperations = initialAccount?.operations || [];
   const election = await kit.contracts.getElection();
@@ -36,13 +38,18 @@ export const getAccountShape: GetAccountShape<CeloAccount> = async info => {
 
   const votes = accountRegistrationStatus ? await getVotes(address) : [];
 
+  const fromEvm = await evmGetAccountShape(info, config);
+
   const operations = mergeOps(oldOperations, newOperations);
-  const shape = {
+
+  const shape: Partial<CeloAccount> = {
     id: accountId,
     balance,
-    spendableBalance,
-    operationsCount: operations.length,
     blockHeight,
+    operationsCount: operations.length,
+    spendableBalance,
+    subAccounts: getEnv("ENABLE_CELO_TOKENS") === false ? [] : fromEvm.subAccounts || [],
+    syncHash: fromEvm.syncHash,
     celoResources: {
       registrationStatus: accountRegistrationStatus,
       lockedBalance,

package/src/config.ts

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

package/src/constants.ts

@@ -0,0 +1,15 @@
+import { StableToken } from "@celo/contractkit";
+
+const CELO_STAKE_TOKENS_PAIR: Record<string, StableToken> = {
+  cEUR: StableToken.cEUR,
+  cREAL: StableToken.cREAL,
+  cUSD: StableToken.cUSD,
+};
+
+export const CELO_STABLE_TOKENS = Object.keys(CELO_STAKE_TOKENS_PAIR);
+
+export const getStableTokenEnum = (tokenTicker: string): StableToken =>
+  CELO_STAKE_TOKENS_PAIR[tokenTicker];
+
+export const MAX_PRIORITY_FEE_PER_GAS = 1_000_000_000n;
+export const MAX_FEES_THRESHOLD_MULTIPLIER = 4;

package/src/logic.ts

@@ -7,7 +7,7 @@ import {
   PendingStakingOperationAmounts,
 } from "./types/types";
 import { BigNumber } from "bignumber.js";
-import { Operation } from "@ledgerhq/types-live";
+import { Account, Operation, TokenAccount } from "@ledgerhq/types-live";
 
 export const PRELOAD_MAX_AGE = 10 * 60 * 1000; // 10 minutes, used for max age in preload strategy
 const LEDGER_BY_FIGMENT_VALIDATOR_GROUP_ADDRESS = "0x0861a61Bf679A30680510EcC238ee43B82C5e843";

package/src/network/hubble.ts

@@ -99,9 +99,9 @@ const transactionToOperation = (
     hasFailed,
     blockHash: null,
     extra: {
-      celoOperationValue: new BigNumber(transaction.amount),
       ...(["ACTIVATE", "VOTE", "REVOKE"].includes(type)
         ? {
+            celoOperationValue: new BigNumber(transaction.amount),
             celoSourceValidator: recipient ? recipient : "",
           }
         : {}),

package/src/types/types.ts

@@ -60,6 +60,7 @@ export type Transaction = TransactionCommon & {
   fees: BigNumber | null | undefined;
   mode: CeloOperationMode;
   index: number | null | undefined;
+  data?: Buffer | null | undefined;
 };
 export type TransactionRaw = TransactionCommonRaw & {
   family: "celo";
@@ -140,14 +141,14 @@ export type CeloOperation = Operation<CeloOperationExtra>;
 export type CeloOperationRaw = OperationRaw<CeloOperationExtraRaw>;
 
 export type CeloOperationExtra = {
-  celoOperationValue: BigNumber;
+  celoOperationValue?: BigNumber;
   celoSourceValidator?: string;
 };
 export function isCeloOperationExtra(op: OperationExtra): op is CeloOperationExtra {
   return op !== null && typeof op === "object" && "celoOperationValue" in op;
 }
 export type CeloOperationExtraRaw = {
-  celoOperationValue: string;
+  celoOperationValue?: string;
   celoSourceValidator?: string;
 };
 export function isCeloOperationExtraRaw(op: OperationExtraRaw): op is CeloOperationExtraRaw {

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

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

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

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

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

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-describe("Celo", () => {
-    it.todo("should be tested");
-});
-//# sourceMappingURL=please-add-coverage.test.js.map

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

@@ -1 +0,0 @@
-{"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/test/please-add-coverage.test.d.ts

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

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

@@ -1 +0,0 @@
-{"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

@@ -1,5 +0,0 @@
-"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

@@ -1 +0,0 @@
-{"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/src/test/please-add-coverage.test.ts

@@ -1,3 +0,0 @@
-describe("Celo", () => {
-  it.todo("should be tested");
-});