@ledgerhq/live-common 22.0.3 → 22.1.0

package/src/families/cosmos/__snapshots__/bridge.test.ts.snap

@@ -3,7 +3,7 @@
 exports[`cosmos currency bridge scanAccounts cosmos seed 1 1`] = `
 Array [
   Object {
-    "balance": "2467871",
+    "balance": "2264526",
     "cosmosResources": Object {
       "delegatedBalance": "2139044",
       "withdrawAddress": "cosmos1g84934jpu3v5de5yqukkkhxmcvsw3u2ajxvpdl",
@@ -22,7 +22,7 @@ Array [
     "index": 0,
     "name": "Cosmos 1",
     "nfts": undefined,
-    "operationsCount": 22,
+    "operationsCount": 23,
     "pendingOperations": Array [],
     "seedIdentifier": "0388459b2653519948b12492f1a0b464720110c147a8155d23d423a5cc3c21d89a",
     "starred": false,
@@ -33,7 +33,7 @@ Array [
     "xpub": "cosmos1g84934jpu3v5de5yqukkkhxmcvsw3u2ajxvpdl",
   },
   Object {
-    "balance": "0",
+    "balance": "300000",
     "cosmosResources": Object {
       "delegatedBalance": "0",
       "withdrawAddress": "cosmos108uy5q9jt59gwugq5yrdhkzcd9jryslmpcstk5",
@@ -52,7 +52,7 @@ Array [
     "index": 1,
     "name": "Cosmos 2",
     "nfts": undefined,
-    "operationsCount": 12,
+    "operationsCount": 14,
     "pendingOperations": Array [],
     "seedIdentifier": "0388459b2653519948b12492f1a0b464720110c147a8155d23d423a5cc3c21d89a",
     "starred": false,
@@ -63,9 +63,9 @@ Array [
     "xpub": "cosmos108uy5q9jt59gwugq5yrdhkzcd9jryslmpcstk5",
   },
   Object {
-    "balance": "478443",
+    "balance": "367382",
     "cosmosResources": Object {
-      "delegatedBalance": "1000",
+      "delegatedBalance": "0",
       "withdrawAddress": "cosmos1cgc696ay2pg6d4gcejek2y8la66j7e5y3c7kyw",
     },
     "currencyId": "cosmos",
@@ -82,7 +82,7 @@ Array [
     "index": 2,
     "name": "Cosmos 3",
     "nfts": undefined,
-    "operationsCount": 8,
+    "operationsCount": 10,
     "pendingOperations": Array [],
     "seedIdentifier": "0388459b2653519948b12492f1a0b464720110c147a8155d23d423a5cc3c21d89a",
     "starred": false,
@@ -224,6 +224,30 @@ Array [
       "type": "IN",
       "value": "1000",
     },
+    Object {
+      "accountId": "js:2:cosmos:cosmos1g84934jpu3v5de5yqukkkhxmcvsw3u2ajxvpdl:",
+      "blockHash": null,
+      "blockHeight": "10348199",
+      "contract": undefined,
+      "extra": Object {
+        "validators": Array [],
+      },
+      "fee": "3345",
+      "hash": "381E494804FFC8EBDBA17B457D7D666DCE377D6D757F6B298FD820250450D409",
+      "id": "js:2:cosmos:cosmos1g84934jpu3v5de5yqukkkhxmcvsw3u2ajxvpdl:-381E494804FFC8EBDBA17B457D7D666DCE377D6D757F6B298FD820250450D409-OUT",
+      "operator": undefined,
+      "recipients": Array [
+        "cosmos108uy5q9jt59gwugq5yrdhkzcd9jryslmpcstk5",
+      ],
+      "senders": Array [
+        "cosmos1g84934jpu3v5de5yqukkkhxmcvsw3u2ajxvpdl",
+      ],
+      "standard": undefined,
+      "tokenId": undefined,
+      "transactionSequenceNumber": 79,
+      "type": "OUT",
+      "value": "203345",
+    },
     Object {
       "accountId": "js:2:cosmos:cosmos1g84934jpu3v5de5yqukkkhxmcvsw3u2ajxvpdl:",
       "blockHash": null,
@@ -710,6 +734,30 @@ Array [
       "type": "IN",
       "value": "1000",
     },
+    Object {
+      "accountId": "js:2:cosmos:cosmos108uy5q9jt59gwugq5yrdhkzcd9jryslmpcstk5:",
+      "blockHash": null,
+      "blockHeight": "10348199",
+      "contract": undefined,
+      "extra": Object {
+        "validators": Array [],
+      },
+      "fee": "3345",
+      "hash": "381E494804FFC8EBDBA17B457D7D666DCE377D6D757F6B298FD820250450D409",
+      "id": "js:2:cosmos:cosmos108uy5q9jt59gwugq5yrdhkzcd9jryslmpcstk5:-381E494804FFC8EBDBA17B457D7D666DCE377D6D757F6B298FD820250450D409-IN",
+      "operator": undefined,
+      "recipients": Array [
+        "cosmos108uy5q9jt59gwugq5yrdhkzcd9jryslmpcstk5",
+      ],
+      "senders": Array [
+        "cosmos1g84934jpu3v5de5yqukkkhxmcvsw3u2ajxvpdl",
+      ],
+      "standard": undefined,
+      "tokenId": undefined,
+      "transactionSequenceNumber": 79,
+      "type": "IN",
+      "value": "200000",
+    },
     Object {
       "accountId": "js:2:cosmos:cosmos108uy5q9jt59gwugq5yrdhkzcd9jryslmpcstk5:",
       "blockHash": null,
@@ -950,6 +998,30 @@ Array [
       "type": "OUT",
       "value": "15050",
     },
+    Object {
+      "accountId": "js:2:cosmos:cosmos108uy5q9jt59gwugq5yrdhkzcd9jryslmpcstk5:",
+      "blockHash": null,
+      "blockHeight": "10348072",
+      "contract": undefined,
+      "extra": Object {
+        "validators": Array [],
+      },
+      "fee": "3342",
+      "hash": "E7F1D275353E097E0A19217A1D0BFE2DC8947100213E912EFCC896329D950981",
+      "id": "js:2:cosmos:cosmos108uy5q9jt59gwugq5yrdhkzcd9jryslmpcstk5:-E7F1D275353E097E0A19217A1D0BFE2DC8947100213E912EFCC896329D950981-IN",
+      "operator": undefined,
+      "recipients": Array [
+        "cosmos108uy5q9jt59gwugq5yrdhkzcd9jryslmpcstk5",
+      ],
+      "senders": Array [
+        "cosmos1cgc696ay2pg6d4gcejek2y8la66j7e5y3c7kyw",
+      ],
+      "standard": undefined,
+      "tokenId": undefined,
+      "transactionSequenceNumber": 28,
+      "type": "IN",
+      "value": "100000",
+    },
   ],
   Array [
     Object {
@@ -1121,6 +1193,31 @@ Array [
       "type": "OUT",
       "value": "6565",
     },
+    Object {
+      "accountId": "js:2:cosmos:cosmos1cgc696ay2pg6d4gcejek2y8la66j7e5y3c7kyw:",
+      "blockHash": null,
+      "blockHeight": "10337853",
+      "contract": undefined,
+      "extra": Object {
+        "validators": Array [
+          Object {
+            "address": "cosmosvaloper17zcpywlhgcpk7ff505vr8mnc4wwpv5fcta6enz",
+            "amount": "1000",
+          },
+        ],
+      },
+      "fee": "7719",
+      "hash": "DD5085AF922A2BAD032131A2F9168EB1498E615063ECBC6C86CE31D5B9981E2A",
+      "id": "js:2:cosmos:cosmos1cgc696ay2pg6d4gcejek2y8la66j7e5y3c7kyw:-DD5085AF922A2BAD032131A2F9168EB1498E615063ECBC6C86CE31D5B9981E2A-UNDELEGATE",
+      "operator": undefined,
+      "recipients": Array [],
+      "senders": Array [],
+      "standard": undefined,
+      "tokenId": undefined,
+      "transactionSequenceNumber": 27,
+      "type": "UNDELEGATE",
+      "value": "7719",
+    },
     Object {
       "accountId": "js:2:cosmos:cosmos1cgc696ay2pg6d4gcejek2y8la66j7e5y3c7kyw:",
       "blockHash": null,
@@ -1150,6 +1247,30 @@ Array [
       "type": "DELEGATE",
       "value": "8399",
     },
+    Object {
+      "accountId": "js:2:cosmos:cosmos1cgc696ay2pg6d4gcejek2y8la66j7e5y3c7kyw:",
+      "blockHash": null,
+      "blockHeight": "10348072",
+      "contract": undefined,
+      "extra": Object {
+        "validators": Array [],
+      },
+      "fee": "3342",
+      "hash": "E7F1D275353E097E0A19217A1D0BFE2DC8947100213E912EFCC896329D950981",
+      "id": "js:2:cosmos:cosmos1cgc696ay2pg6d4gcejek2y8la66j7e5y3c7kyw:-E7F1D275353E097E0A19217A1D0BFE2DC8947100213E912EFCC896329D950981-OUT",
+      "operator": undefined,
+      "recipients": Array [
+        "cosmos108uy5q9jt59gwugq5yrdhkzcd9jryslmpcstk5",
+      ],
+      "senders": Array [
+        "cosmos1cgc696ay2pg6d4gcejek2y8la66j7e5y3c7kyw",
+      ],
+      "standard": undefined,
+      "tokenId": undefined,
+      "transactionSequenceNumber": 28,
+      "type": "OUT",
+      "value": "103342",
+    },
   ],
   Array [],
 ]

package/src/families/cosmos/js-prepareTransaction.ts

@@ -2,7 +2,6 @@ import { Account } from "../../types";
 import { Transaction } from "./types";
 import BigNumber from "bignumber.js";
 import { simulate } from "./api/Cosmos";
-import { encodePubkey } from "@cosmjs/proto-signing";
 import { getEnv } from "../../env";
 import { buildTransaction, postBuildTransaction } from "./js-buildTransaction";
 import { getMaxEstimatedBalance } from "./logic";
@@ -50,10 +49,13 @@ const getEstimatedFees = async (
 
   // be sure payload is complete
   if (unsignedPayload) {
-    const pubkey = encodePubkey({
-      type: "tendermint/PubKeySecp256k1",
-      value: Buffer.from(account.seedIdentifier, "hex").toString("base64"),
-    });
+    const pubkey = {
+      typeUrl: "/cosmos.crypto.secp256k1.PubKey",
+      value: new Uint8Array([
+        ...new Uint8Array([10, 33]),
+        ...new Uint8Array(Buffer.from(account.seedIdentifier, "hex")),
+      ]),
+    };
 
     const tx_bytes = await postBuildTransaction(
       account,

package/src/families/cosmos/js-signOperation.ts

@@ -8,13 +8,12 @@ import type { Transaction } from "./types";
 import { getAccount, getChainId } from "./api/Cosmos";
 import { Observable } from "rxjs";
 import { withDevice } from "../../hw/deviceAccess";
-import { encodePubkey } from "@cosmjs/proto-signing";
 import { encodeOperationId } from "../../operation";
-import { LedgerSigner } from "@cosmjs/ledger-amino";
+import Cosmos from "@ledgerhq/hw-app-cosmos";
 import { AminoTypes } from "@cosmjs/stargate";
-import { stringToPath } from "@cosmjs/crypto";
 import { buildTransaction, postBuildTransaction } from "./js-buildTransaction";
 import BigNumber from "bignumber.js";
+import { Secp256k1Signature } from "@cosmjs/crypto";
 
 const aminoTypes = new AminoTypes({ prefix: "cosmos" });
 
@@ -32,52 +31,39 @@ const signOperation = ({
       let cancelled;
 
       async function main() {
+        const hwApp = new Cosmos(transport);
+
         const { accountNumber, sequence } = await getAccount(
           account.freshAddress
         );
 
         const chainId = await getChainId();
 
-        const hdPaths: any = stringToPath("m/" + account.freshAddressPath);
-
-        const ledgerSigner = new LedgerSigner(transport, {
-          hdPaths: [hdPaths],
-        });
-
         o.next({ type: "device-signature-requested" });
 
-        const accounts = await ledgerSigner.getAccounts();
-
-        let pubkey;
+        const { publicKey } = await hwApp.getAddress(
+          account.freshAddressPath,
+          "cosmos",
+          false
+        );
 
-        accounts.forEach((a) => {
-          if (a.address == account.freshAddress) {
-            pubkey = encodePubkey({
-              type: "tendermint/PubKeySecp256k1",
-              value: Buffer.from(a.pubkey).toString("base64"),
-            });
-          }
-        });
+        const pubkey = {
+          typeUrl: "/cosmos.crypto.secp256k1.PubKey",
+          value: new Uint8Array([
+            ...new Uint8Array([10, 33]),
+            ...new Uint8Array(Buffer.from(publicKey, "hex")),
+          ]),
+        };
 
         const unsignedPayload = await buildTransaction(account, transaction);
 
         const msgs = unsignedPayload.map((msg) => aminoTypes.toAmino(msg));
 
         // Note:
-        // We don't use Cosmos App,
-        // Cosmos App support legacy StdTx and required to be ordered in a strict way,
-        // Cosmos API expects a different sorting, resulting in a separate signature.
-        // https://github.com/LedgerHQ/app-cosmos/blob/6c194daa28936e273f9548eabca9e72ba04bb632/app/src/tx_parser.c#L52
-
-        // Cosmos App sign data in Amino way only, not Protobuf.
+        // Cosmos Nano App sign data in Amino way only, not Protobuf.
         // This is a legacy outdated standard and a long-term blocking point.
 
-        // @ledgerhq/hw-app-cosmos don't allow to push message to device message converted
-        // by the AminoConverter from @cosmjs/stargate. There's two things who don't work:
-        // 1st, the way who message is sorted.
-        // 2nd, cast of numeric value (integer/numeric versus string).
-
-        const signed = await ledgerSigner.signAmino(account.freshAddress, {
+        const message = {
           chain_id: chainId,
           account_number: accountNumber.toString(),
           sequence: sequence.toString(),
@@ -92,17 +78,30 @@ const signOperation = ({
           },
           msgs: msgs,
           memo: transaction.memo || "",
-        });
+        };
+
+        const { signature } = await hwApp.sign(
+          account.freshAddressPath,
+          JSON.stringify(sortedObject(message))
+        );
+
+        if (!signature) {
+          throw new Error("Cosmos: no Signature Found");
+        }
+
+        const secp256k1Signature = Secp256k1Signature.fromDer(
+          new Uint8Array(signature)
+        ).toFixedLength();
 
         const tx_bytes = await postBuildTransaction(
           account,
           transaction,
           pubkey,
           unsignedPayload,
-          new Uint8Array(Buffer.from(signed.signature.signature, "base64"))
+          secp256k1Signature
         );
 
-        const signature = Buffer.from(tx_bytes).toString("hex");
+        const signed = Buffer.from(tx_bytes).toString("hex");
 
         if (cancelled) {
           return;
@@ -169,7 +168,7 @@ const signOperation = ({
           type: "signed",
           signedOperation: {
             operation,
-            signature,
+            signature: signed,
             expirationDate: null,
           },
         });
@@ -186,4 +185,23 @@ const signOperation = ({
     })
   );
 
+const sortedObject = (obj) => {
+  if (typeof obj !== "object" || obj === null) {
+    return obj;
+  }
+
+  if (Array.isArray(obj)) {
+    return obj.map(sortedObject);
+  }
+
+  const sortedKeys = Object.keys(obj).sort();
+  const result = {};
+
+  sortedKeys.forEach((key) => {
+    result[key] = sortedObject(obj[key]);
+  });
+
+  return result;
+};
+
 export default signOperation;

package/src/families/cosmos/validators.ts

@@ -31,7 +31,7 @@ const cacheValidators = makeLRUCache(
     if (isStargate(currency)) {
       const url = `${getBaseApiUrl(
         currency
-      )}/${namespace}/staking/${version}/validators?status=BOND_STATUS_BONDED&pagination.limit=130`;
+      )}/${namespace}/staking/${version}/validators?status=BOND_STATUS_BONDED&pagination.limit=175`;
       const { data } = await network({
         url,
         method: "GET",