Update Ledger signing for multisig changes (anoma#388)

* Update Ledger signing for multisig fixes

* Enable IBC now that it can be parsed

apps/extension/src/background/ledger/ledger.ts

@@ -30,7 +30,7 @@ export const DEFAULT_LEDGER_BIP44_PATH = makeBip44Path(coinType, {
 });
 
 export class Ledger {
-  constructor(public readonly namadaApp: NamadaApp | undefined = undefined) {}
+  constructor(public readonly namadaApp: NamadaApp | undefined = undefined) { }
 
   /**
    * Returns an initialized Ledger class instance with initialized Transport
@@ -85,7 +85,7 @@ export class Ledger {
       // Return address as bech32-encoded string
       address: address.toString(),
       // Return public key as hex-encoded string
-      publicKey: publicKey.toString("hex"),
+      publicKey: publicKey.toString("hex").substring(2),
     };
   }
 

apps/extension/src/background/ledger/service.ts

@@ -87,18 +87,20 @@ export class LedgerService {
     bytes: string,
     signatures: ResponseSign
   ): Promise<void> {
-    const { wrapperSignature, rawSignature } = signatures;
+    const { signature } = signatures;
+
+    if (!signature) {
+      throw new Error("Signature not provided")
+    }
 
     try {
       // Serialize signatures
-      const rawSig = encodeSignature(rawSignature);
-      const wrapperSig = encodeSignature(wrapperSignature);
+      const sig = encodeSignature(signature);
 
       await this.sdk.submit_signed_reveal_pk(
         fromBase64(txMsg),
         fromBase64(bytes),
-        rawSig,
-        wrapperSig
+        sig,
       );
     } catch (e) {
       console.warn(e);
@@ -118,25 +120,23 @@ export class LedgerService {
     }
 
     const encodedTx = getEncodedTxByType(txType, txMsg);
-    const { wrapperSignature, rawSignature } = signatures;
+    const { signature } = signatures;
+
+    if (!signature) {
+      throw new Error("Signature not provided!")
+    }
 
     // Serialize signatures
-    const rawSig = encodeSignature(rawSignature);
-    const wrapperSig = encodeSignature(wrapperSignature);
+    const sig = encodeSignature(signature);
 
     await this.broadcaster.startTx(msgId, txType);
 
     try {
-      // TODO: Remove this check once IBC Transfer is supported on Ledger!
-      // Disable tx submission for Ledger devices
-      if (txType !== TxType.IBCTransfer) {
-        await this.sdk.submit_signed_tx(
-          encodedTx,
-          fromBase64(bytes),
-          rawSig,
-          wrapperSig
-        );
-      }
+      await this.sdk.submit_signed_tx(
+        encodedTx,
+        fromBase64(bytes),
+        sig,
+      );
 
       // Clear pending tx if successful
       await this.txStore.set(msgId, null);

apps/extension/src/utils/index.ts

@@ -68,15 +68,15 @@ export const generateId = (
  * Convert ISignature into serialized and encoded signature
  */
 export const encodeSignature = (sig: ISignature): Uint8Array => {
-  const { secIndices, singlesig, sigType, multisigIndices, multisig } = sig;
+  const { pubkey, raw_indices, raw_signature, wrapper_indices, wrapper_signature } = sig;
 
   /* eslint-disable */
   const props = {
-    secIndices: new Uint8Array((secIndices as any).data),
-    singlesig: singlesig ? new Uint8Array((singlesig as any).data) : undefined,
-    sigType,
-    multisigIndices: new Uint8Array((multisigIndices as any).data),
-    multisig: multisig.map((sig) => new Uint8Array((sig as any).data))
+    pubkey: new Uint8Array((pubkey as any).data),
+    rawIndices: new Uint8Array((raw_indices as any).data),
+    rawSignature: new Uint8Array((raw_signature as any).data),
+    wrapperIndices: new Uint8Array((wrapper_indices as any).data),
+    wrapperSignature: new Uint8Array((wrapper_signature as any).data),
   };
   /* eslint-enable */
 

packages/ledger-namada/dist/common.d.ts

@@ -33,10 +33,6 @@ export declare const SIGN_VALUES_P2: {
 export declare const ERROR_CODE: {
     NoError: number;
 };
-export declare const enum SignatureType {
-    RawSignature = 0,
-    WrapperSignature = 1
-}
 export declare enum LedgerError {
     U2FUnknown = 1,
     U2FBadRequest = 2,

packages/ledger-namada/dist/config.d.ts

@@ -22,9 +22,8 @@ export declare const INS: {
     GET_IVK: number;
     GET_OVK: number;
     GET_NF: number;
-    GET_SIGNATURE: number;
 };
 export declare const SALT_LEN = 8;
 export declare const HASH_LEN = 32;
-export declare const PK_LEN_25519 = 32;
-export declare const ED25519_SIGNATURE_LEN = 64;
+export declare const PK_LEN_PLUS_TAG = 33;
+export declare const SIG_LEN_PLUS_TAG = 65;

packages/ledger-namada/dist/namadaApp.d.ts

@@ -16,8 +16,8 @@
  ******************************************************************************* */
 import Transport from '@ledgerhq/hw-transport';
 import { ResponseAddress, ResponseAppInfo, ResponseBase, ResponseSign, ResponseVersion } from './types';
-import { LedgerError, SignatureType } from './common';
-export { LedgerError, SignatureType };
+import { LedgerError } from './common';
+export { LedgerError };
 export * from './types';
 export declare class NamadaApp {
     transport: Transport;
@@ -28,7 +28,5 @@ export declare class NamadaApp {
     getAddressAndPubKey(path: string): Promise<ResponseAddress>;
     showAddressAndPubKey(path: string): Promise<ResponseAddress>;
     signSendChunk(chunkIdx: number, chunkNum: number, chunk: Buffer, ins: number): Promise<ResponseBase>;
-    getSignature(signatureType: SignatureType): Promise<any>;
-    _sign(path: string, message: Buffer): Promise<any>;
     sign(path: string, message: Buffer): Promise<ResponseSign>;
 }

packages/ledger-namada/dist/processResponses.d.ts

@@ -14,9 +14,8 @@
  *  limitations under the License.
  ******************************************************************************* */
 /// <reference types="node" />
-import { SignatureType } from './common';
 import { ISignature } from './types';
-export declare function processGetSignatureResponse(signatureType: SignatureType, response: Buffer): ISignature;
+export declare function getSignatureResponse(response: Buffer): ISignature;
 export declare function processGetAddrResponse(response: Buffer): {
     publicKey: Buffer;
     address: Buffer;