@ledgerhq/hw-app-eth 6.22.4 → 6.24.1

package/src/Eth.ts

@@ -120,6 +120,8 @@ export default class Eth {
         "eth2SetWithdrawalIndex",
         "setExternalPlugin",
         "setPlugin",
+        "getEIP1024PublicEncryptionKey",
+        "getEIP1024SharedSecret",
       ],
       scrambleKey
     );
@@ -1133,6 +1135,70 @@ export default class Eth {
     );
   }
 
+  /**
+   * get a public encryption key on Curve25519 according to EIP 1024
+   * @param path a path in BIP 32 format
+   * @option boolDisplay optionally enable or not the display
+   * @return an object with a publicKey
+   * @example
+   * eth.getEIP1024PublicEncryptionKey("44'/60'/0'/0/0").then(o => o.publicKey)
+   */
+  getEIP1024PublicEncryptionKey(
+    path: string,
+    boolDisplay?: boolean
+  ): Promise<{
+    publicKey: string;
+  }> {
+    const paths = splitPath(path);
+    const buffer = Buffer.alloc(1 + paths.length * 4);
+    buffer[0] = paths.length;
+    paths.forEach((element, index) => {
+      buffer.writeUInt32BE(element, 1 + 4 * index);
+    });
+    return this.transport
+      .send(0xe0, 0x18, boolDisplay ? 0x01 : 0x00, 0x00, buffer)
+      .then((response) => {
+        return {
+          publicKey: response.slice(0, -2).toString("hex"),
+        };
+      });
+  }
+
+  /**
+   * get a shared secret on Curve25519 according to EIP 1024
+   * @param path a path in BIP 32 format
+   * @param remotePublicKeyHex remote Curve25519 public key
+   * @option boolDisplay optionally enable or not the display
+   * @return an object with a shared secret
+   * @example
+   * eth.getEIP1024SharedSecret("44'/60'/0'/0/0", "87020e80af6e07a6e4697f091eacadb9e7e6629cb7e5a8a371689a3ed53b3d64").then(o => o.sharedSecret)
+   */
+  getEIP1024SharedSecret(
+    path: string,
+    remotePublicKeyHex: string,
+    boolDisplay?: boolean
+  ): Promise<{
+    sharedSecret: string;
+  }> {
+    const paths = splitPath(path);
+    const remotePublicKey = hexBuffer(remotePublicKeyHex);
+    const buffer = Buffer.alloc(1 + paths.length * 4 + 32);
+    let offset = 0;
+    buffer[0] = paths.length;
+    paths.forEach((element, index) => {
+      buffer.writeUInt32BE(element, 1 + 4 * index);
+    });
+    offset = 1 + 4 * paths.length;
+    remotePublicKey.copy(buffer, offset);
+    return this.transport
+      .send(0xe0, 0x18, boolDisplay ? 0x01 : 0x00, 0x01, buffer)
+      .then((response) => {
+        return {
+          sharedSecret: response.slice(0, -2).toString("hex"),
+        };
+      });
+  }
+
   provideERC20TokenInformation({ data }: { data: Buffer }): Promise<boolean> {
     console.warn(
       "hw-app-eth: eth.provideERC20TokenInformation is deprecated. signTransaction solves this for you when providing it in `resolution`."
@@ -1185,10 +1251,6 @@ function provideNFTInformation(
   return transport.send(0xe0, 0x14, 0x00, 0x00, data).then(
     () => true,
     (e) => {
-      if (e && e.statusCode === 0x6a80) {
-        // some issue with providing the data
-        return false;
-      }
       if (e && e.statusCode === 0x6d00) {
         // older version of ETH app => error because we don't allow blind sign when NFT is explicitly requested to be resolved.
         throw new EthAppNftNotSupported();

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) => {

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",
+  });
+});

package/.turbo/turbo-build.log

@@ -1,2 +0,0 @@
-@ledgerhq/hw-app-eth:build: cache hit, replaying output 715ee6b450935ba7
-@ledgerhq/hw-app-eth:build: $ NODE_ENV=production tsc && tsc -m ES6 --outDir lib-es