@ledgerhq/hw-app-eth 6.22.3 → 6.24.0

package/src/services/ledger/index.ts

@@ -1,6 +1,6 @@
 // This implements the resolution of a Transaction using Ledger's own API
 import { log } from "@ledgerhq/logs";
-import { ethers } from "ethers";
+import { Interface } from "@ethersproject/abi";
 
 import {
   LedgerEthTransactionResolution,
@@ -99,7 +99,7 @@ const ledgerService: LedgerEthTransactionService = {
             setExternalPlugin(payload, signature);
           }
           if (erc20OfInterest && erc20OfInterest.length && abi) {
-            const contract = new ethers.utils.Interface(abi);
+            const contract = new Interface(abi);
             const args = contract.parseTransaction(decodedTx).args;
             for (const path of erc20OfInterest) {
               const address = path.split(".").reduce((value, seg) => {
@@ -108,14 +108,14 @@ const ledgerService: LedgerEthTransactionService = {
                 }
                 return value[seg];
               }, args);
-              provideForContract(address);
+              await provideForContract(address);
             }
           }
         } else {
           log("ethereum", "no infos for selector " + selector);
         }
       }
-      provideForContract(decodedTx.to);
+      await provideForContract(decodedTx.to);
     }
 
     return resolution;

package/src/services/ledger/nfts.ts

@@ -32,12 +32,21 @@ export const getNFTInfo = async (
     .catch(axiosErrorHandling);
   if (!response) return;
 
+  // APDU response specification: https://ledgerhq.atlassian.net/wiki/spaces/WALLETCO/pages/3269984297/NFT-1+NFT+Backend+design#NFT-Metadata-BLOB
   const payload = response["payload"];
-  const collectionNameLength = Number(payload.slice(2, 3));
-  const collectionName = payload.slice(3, 3 + collectionNameLength).toString();
+  // Collection name length position: 3rd byte -> caracter 4 to 6
+  const collectionNameLength = parseInt(payload.slice(4, 6), 16);
+  const collectionNameHex = payload.substr(6, collectionNameLength * 2);
+  const collectionName = collectionNameHex
+    .match(/.{2}/g) // split every 2 characters
+    ?.reduce(
+      (acc, curr) => (acc += String.fromCharCode(parseInt(curr, 16))),
+      ""
+    ); // convert hex to string
+
   return {
     contractAddress: contractAddress,
-    collectionName: collectionName,
+    collectionName: collectionName || "",
     data: payload,
   };
 };

package/src/utils.ts

@@ -1,15 +1,13 @@
-import { ethers } from "ethers";
+import { encode, decode } from "@ethersproject/rlp";
 import { BigNumber } from "bignumber.js";
 
 export function decodeTxInfo(rawTx: Buffer) {
   const VALID_TYPES = [1, 2];
   const txType = VALID_TYPES.includes(rawTx[0]) ? rawTx[0] : null;
   const rlpData = txType === null ? rawTx : rawTx.slice(1);
-  const rlpTx = ethers.utils.RLP.decode(rlpData).map((hex) =>
-    Buffer.from(hex.slice(2), "hex")
-  );
+  const rlpTx = decode(rlpData).map((hex) => Buffer.from(hex.slice(2), "hex"));
   let chainIdTruncated = 0;
-  const rlpDecoded = ethers.utils.RLP.decode(rlpData);
+  const rlpDecoded = decode(rlpData);
 
   let decodedTx;
   if (txType === 2) {
@@ -52,10 +50,7 @@ export function decodeTxInfo(rawTx: Buffer) {
 
   let vrsOffset = 0;
   if (txType === null && rlpTx.length > 6) {
-    const rlpVrs = Buffer.from(
-      ethers.utils.RLP.encode(rlpTx.slice(-3)).slice(2),
-      "hex"
-    );
+    const rlpVrs = Buffer.from(encode(rlpTx.slice(-3)).slice(2), "hex");
 
     vrsOffset = rawTx.length - (rlpVrs.length - 1);
 

package/tests/Eth.test.ts

@@ -889,3 +889,31 @@ test("eth2SetWithdrawalIndex", async () => {
   const result = await eth.eth2SetWithdrawalIndex(1);
   expect(result).toEqual(true);
 });
+test("getEIP1024PublicEncryptionKey", async () => {
+  const transport = await openTransportReplayer(
+    RecordStore.fromString(`
+    => e018000015058000002c8000003c800000000000000000000000
+    <= 2f720080750797da95a41b052cf5694be1be81c0a662d449cd15f946f376e76d9000
+    `)
+  );
+  const eth = new Eth(transport);
+  const result = await eth.getEIP1024PublicEncryptionKey("44'/60'/0'/0/0", false);
+  expect(result).toEqual({
+    publicKey:
+      "2f720080750797da95a41b052cf5694be1be81c0a662d449cd15f946f376e76d",
+  });
+});
+test("getEIP1024SharedSecret", async () => {
+  const transport = await openTransportReplayer(
+    RecordStore.fromString(`
+    => e018000135058000002c8000003c8000000000000000000000009ee8bf81321bc2a9e74de286621e13c013b5e4187b1c2fe42b686000672c6f33
+    <= 241dc9af8ecae08df6cf899a73a750b43117b50a7f1470405b5ff10adcf49f769000
+    `)
+  );
+  const eth = new Eth(transport);
+  const result = await eth.getEIP1024SharedSecret("44'/60'/0'/0/0", "9ee8bf81321bc2a9e74de286621e13c013b5e4187b1c2fe42b686000672c6f33", false);
+  expect(result).toEqual({
+    sharedSecret:
+      "241dc9af8ecae08df6cf899a73a750b43117b50a7f1470405b5ff10adcf49f76",
+  });
+});