Changes to work with newest hardware wallet app version

NicolasFlamel1 · Dec 20, 2022 · 147748a · 147748a
1 parent 1be5ff7
commit 147748a
Show file tree

Hide file tree

Showing 18 changed files with 86 additions and 99 deletions.
diff --git a/apps/ledger-live-desktop/src/internal/commands/prepareTransaction.js b/apps/ledger-live-desktop/src/internal/commands/prepareTransaction.js
@@ -23,7 +23,7 @@ const cmd = ({
   id: string,
   offset: string,
   proof: string | undefined,
-  encryptedSecretNonce: string
+  privateNonceIndex: number
 }> => withDevice(deviceId)(transport => from(prepareTransaction(account, transport, transaction)));
 
 export default cmd;
diff --git a/apps/ledger-live-desktop/src/renderer/families/mimblewimble_coin/SendStepConnectDevice.jsx b/apps/ledger-live-desktop/src/renderer/families/mimblewimble_coin/SendStepConnectDevice.jsx
@@ -108,7 +108,7 @@ class StepConnectDevice extends PureComponent<Props, State> {
       id: undefined,
       offset: undefined,
       proof: undefined,
-      encryptedSecretNonce: undefined,
+      privateNonceIndex: undefined,
       transactionResponse: undefined
     }));
   }
@@ -145,14 +145,14 @@ class StepConnectDevice extends PureComponent<Props, State> {
             id,
             offset,
             proof,
-            encryptedSecretNonce
+            privateNonceIndex
           }: {
             transactionData: string;
             height: string;
             id: string;
             offset: string;
             proof: string | undefined;
-            encryptedSecretNonce: string;
+            privateNonceIndex: number;
           }
         ) => {
           qrcode.toString(transactionData, {
@@ -172,7 +172,7 @@ class StepConnectDevice extends PureComponent<Props, State> {
                 id,
                 offset: Buffer.from(offset, "hex"),
                 proof: (proof !== undefined) ? Buffer.from(proof, "hex") : undefined,
-                encryptedSecretNonce: Buffer.from(encryptedSecretNonce, "hex")
+                privateNonceIndex
               }));
             }
           });

diff --git a/apps/ledger-live-mobile/src/families/mimblewimble_coin/SendFundsConnectDevice.tsx b/apps/ledger-live-mobile/src/families/mimblewimble_coin/SendFundsConnectDevice.tsx
@@ -213,14 +213,14 @@ export default function ConnectDevice(
             id,
             offset,
             proof,
-            encryptedSecretNonce
+            privateNonceIndex
           }: {
             transactionData: string;
             height: string;
             id: string;
             offset: string;
             proof: string | undefined;
-            encryptedSecretNonce: string;
+            privateNonceIndex: number;
           }
         ) => {
           qrcode.toString(transactionData, {
@@ -238,7 +238,7 @@ export default function ConnectDevice(
                 id,
                 offset: Buffer.from(offset, "hex"),
                 proof: (proof !== undefined) ? Buffer.from(proof, "hex") : undefined,
-                encryptedSecretNonce: Buffer.from(encryptedSecretNonce, "hex"),
+                privateNonceIndex,
                 transactionResponse: undefined
               }));
             }

diff --git a/libs/ledger-live-common/src/appSupportsQuitApp.ts b/libs/ledger-live-common/src/appSupportsQuitApp.ts
@@ -59,8 +59,8 @@ export const minAppVersion = {
   Flow: "0.9.1",
   GameCredits: "1.5.0",
   GoChain: "1.4.0",
-  Grin: "4.0.0",
-  "Grin Testnet": "4.0.0",
+  Grin: "5.0.0",
+  "Grin Testnet": "5.0.0",
   Groestlcoin: "1.3.4",
   "Groestlcoin Test": "1.3.4",
   HODL: "0.0.3",
@@ -90,8 +90,8 @@ export const minAppVersion = {
   "Liquid Test Hless": "1.4.8",
   Lisk: "1.4.0",
   Litecoin: "1.5.0",
-  "MimbleWimble Coin": "4.0.0",
-  "MimbleWimble Coin Floonet": "4.0.0",
+  "MimbleWimble Coin": "5.0.0",
+  "MimbleWimble Coin Floonet": "5.0.0",
   Mix: "1.4.0",
   Monero: "1.7.4",
   Musicoin: "1.4.0",

diff --git a/libs/ledger-live-common/src/apps/support.ts b/libs/ledger-live-common/src/apps/support.ts
@@ -38,10 +38,10 @@ const appVersionsRequired = {
   Celo: ">= 1.1.8",
   "Cardano ADA": ">= 4.1.0",
   Zcash: "> 2.0.6",
-  "MimbleWimble Coin": ">= 4.0.0",
-  "MimbleWimble Coin Floonet": ">= 4.0.0",
-  Grin: ">= 4.0.0",
-  "Grin Testnet": ">= 4.0.0",
+  "MimbleWimble Coin": ">= 5.0.0",
+  "MimbleWimble Coin Floonet": ">= 5.0.0",
+  Grin: ">= 5.0.0",
+  "Grin Testnet": ">= 5.0.0",
 };
 export function mustUpgrade(
   deviceModel: DeviceModelId,

diff --git a/libs/ledger-live-common/src/families/mimblewimble_coin/api/sync.ts b/libs/ledger-live-common/src/families/mimblewimble_coin/api/sync.ts
@@ -10,6 +10,7 @@ import Secp256k1Zkp from "@nicolasflamel/secp256k1-zkp";
 import ProofBuilder from "./proofBuilder";
 import Common from "./common";
 import { Subscriber } from "rxjs";
+import Crypto from "./crypto"
 
 export default class Sync {
 

diff --git a/libs/ledger-live-common/src/families/mimblewimble_coin/cli-transaction.ts b/libs/ledger-live-common/src/families/mimblewimble_coin/cli-transaction.ts
@@ -28,7 +28,7 @@ const inferTransactions = (
       id: undefined,
       offset: undefined,
       proof: undefined,
-      encryptedSecretNonce: undefined,
+      privateNonceIndex: undefined,
       transactionResponse: undefined,
       useDefaultBaseFee: true,
       baseFee: Consensus.getDefaultBaseFee(mainAccount.currency),

diff --git a/libs/ledger-live-common/src/families/mimblewimble_coin/datasets/grin.ts b/libs/ledger-live-common/src/families/mimblewimble_coin/datasets/grin.ts
@@ -49,7 +49,7 @@ export default {
         id: undefined,
         offset: undefined,
         proof: undefined,
-        encryptedSecretNonce: undefined,
+        privateNonceIndex: undefined,
         transactionResponse: undefined,
         useDefaultBaseFee: true,
         baseFee: "500000",
@@ -74,7 +74,7 @@ export default {
         id: undefined,
         offset: undefined,
         proof: undefined,
-        encryptedSecretNonce: undefined,
+        privateNonceIndex: undefined,
         transactionResponse: undefined,
         useDefaultBaseFee: true,
         baseFee: "500000",
@@ -99,7 +99,7 @@ export default {
         id: undefined,
         offset: undefined,
         proof: undefined,
-        encryptedSecretNonce: undefined,
+        privateNonceIndex: undefined,
         transactionResponse: undefined,
         useDefaultBaseFee: true,
         baseFee: "500000",
@@ -124,7 +124,7 @@ export default {
         id: undefined,
         offset: undefined,
         proof: undefined,
-        encryptedSecretNonce: undefined,
+        privateNonceIndex: undefined,
         transactionResponse: undefined,
         useDefaultBaseFee: true,
         baseFee: "500000",
@@ -149,7 +149,7 @@ export default {
         id: undefined,
         offset: undefined,
         proof: undefined,
-        encryptedSecretNonce: undefined,
+        privateNonceIndex: undefined,
         transactionResponse: undefined,
         useDefaultBaseFee: true,
         baseFee: "1000000",
@@ -174,7 +174,7 @@ export default {
         id: undefined,
         offset: undefined,
         proof: undefined,
-        encryptedSecretNonce: undefined,
+        privateNonceIndex: undefined,
         transactionResponse: undefined,
         useDefaultBaseFee: true,
         baseFee: "1000000",
@@ -199,7 +199,7 @@ export default {
         id: undefined,
         offset: undefined,
         proof: undefined,
-        encryptedSecretNonce: undefined,
+        privateNonceIndex: undefined,
         transactionResponse: undefined,
         useDefaultBaseFee: true,
         baseFee: "1000000",
@@ -224,7 +224,7 @@ export default {
         id: undefined,
         offset: undefined,
         proof: undefined,
-        encryptedSecretNonce: undefined,
+        privateNonceIndex: undefined,
         transactionResponse: undefined,
         useDefaultBaseFee: false,
         baseFee: "0",

diff --git a/libs/ledger-live-common/src/families/mimblewimble_coin/datasets/grin_testnet.ts b/libs/ledger-live-common/src/families/mimblewimble_coin/datasets/grin_testnet.ts
@@ -49,7 +49,7 @@ export default {
         id: undefined,
         offset: undefined,
         proof: undefined,
-        encryptedSecretNonce: undefined,
+        privateNonceIndex: undefined,
         transactionResponse: undefined,
         useDefaultBaseFee: true,
         baseFee: "500000",
@@ -74,7 +74,7 @@ export default {
         id: undefined,
         offset: undefined,
         proof: undefined,
-        encryptedSecretNonce: undefined,
+        privateNonceIndex: undefined,
         transactionResponse: undefined,
         useDefaultBaseFee: true,
         baseFee: "500000",
@@ -99,7 +99,7 @@ export default {
         id: undefined,
         offset: undefined,
         proof: undefined,
-        encryptedSecretNonce: undefined,
+        privateNonceIndex: undefined,
         transactionResponse: undefined,
         useDefaultBaseFee: true,
         baseFee: "500000",
@@ -124,7 +124,7 @@ export default {
         id: undefined,
         offset: undefined,
         proof: undefined,
-        encryptedSecretNonce: undefined,
+        privateNonceIndex: undefined,
         transactionResponse: undefined,
         useDefaultBaseFee: true,
         baseFee: "500000",
@@ -149,7 +149,7 @@ export default {
         id: undefined,
         offset: undefined,
         proof: undefined,
-        encryptedSecretNonce: undefined,
+        privateNonceIndex: undefined,
         transactionResponse: undefined,
         useDefaultBaseFee: true,
         baseFee: "1000000",
@@ -174,7 +174,7 @@ export default {
         id: undefined,
         offset: undefined,
         proof: undefined,
-        encryptedSecretNonce: undefined,
+        privateNonceIndex: undefined,
         transactionResponse: undefined,
         useDefaultBaseFee: true,
         baseFee: "1000000",
@@ -199,7 +199,7 @@ export default {
         id: undefined,
         offset: undefined,
         proof: undefined,
-        encryptedSecretNonce: undefined,
+        privateNonceIndex: undefined,
         transactionResponse: undefined,
         useDefaultBaseFee: true,
         baseFee: "1000000",
@@ -224,7 +224,7 @@ export default {
         id: undefined,
         offset: undefined,
         proof: undefined,
-        encryptedSecretNonce: undefined,
+        privateNonceIndex: undefined,
         transactionResponse: undefined,
         useDefaultBaseFee: false,
         baseFee: "0",

diff --git a/libs/ledger-live-common/src/families/mimblewimble_coin/datasets/mimblewimble_coin.ts b/libs/ledger-live-common/src/families/mimblewimble_coin/datasets/mimblewimble_coin.ts
@@ -49,7 +49,7 @@ export default {
         id: undefined,
         offset: undefined,
         proof: undefined,
-        encryptedSecretNonce: undefined,
+        privateNonceIndex: undefined,
         transactionResponse: undefined,
         useDefaultBaseFee: true,
         baseFee: "1000000",
@@ -74,7 +74,7 @@ export default {
         id: undefined,
         offset: undefined,
         proof: undefined,
-        encryptedSecretNonce: undefined,
+        privateNonceIndex: undefined,
         transactionResponse: undefined,
         useDefaultBaseFee: true,
         baseFee: "1000000",
@@ -99,7 +99,7 @@ export default {
         id: undefined,
         offset: undefined,
         proof: undefined,
-        encryptedSecretNonce: undefined,
+        privateNonceIndex: undefined,
         transactionResponse: undefined,
         useDefaultBaseFee: true,
         baseFee: "1000000",
@@ -124,7 +124,7 @@ export default {
         id: undefined,
         offset: undefined,
         proof: undefined,
-        encryptedSecretNonce: undefined,
+        privateNonceIndex: undefined,
         transactionResponse: undefined,
         useDefaultBaseFee: true,
         baseFee: "1000000",
@@ -149,7 +149,7 @@ export default {
         id: undefined,
         offset: undefined,
         proof: undefined,
-        encryptedSecretNonce: undefined,
+        privateNonceIndex: undefined,
         transactionResponse: undefined,
         useDefaultBaseFee: true,
         baseFee: "1000000",
@@ -174,7 +174,7 @@ export default {
         id: undefined,
         offset: undefined,
         proof: undefined,
-        encryptedSecretNonce: undefined,
+        privateNonceIndex: undefined,
         transactionResponse: undefined,
         useDefaultBaseFee: true,
         baseFee: "1000000",
@@ -199,7 +199,7 @@ export default {
         id: undefined,
         offset: undefined,
         proof: undefined,
-        encryptedSecretNonce: undefined,
+        privateNonceIndex: undefined,
         transactionResponse: undefined,
         useDefaultBaseFee: true,
         baseFee: "1000000",
@@ -224,7 +224,7 @@ export default {
         id: undefined,
         offset: undefined,
         proof: undefined,
-        encryptedSecretNonce: undefined,
+        privateNonceIndex: undefined,
         transactionResponse: undefined,
         useDefaultBaseFee: false,
         baseFee: "0",