From b06dedbc2ee0fb4c98749263904963977542426f Mon Sep 17 00:00:00 2001
From: willclarktech <willclarktech@users.noreply.github.com>
Date: Wed, 14 Oct 2020 17:11:01 +0200
Subject: [PATCH] proto-signing: Update makeAuthInfo

---
 packages/proto-signing/src/signing.ts     | 20 ++++++++++++--------
 packages/proto-signing/types/signing.d.ts |  7 ++++---
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/packages/proto-signing/src/signing.ts b/packages/proto-signing/src/signing.ts
index 5bc6cc7c..aac3207a 100644
--- a/packages/proto-signing/src/signing.ts
+++ b/packages/proto-signing/src/signing.ts
@@ -2,24 +2,30 @@
 import Long from "long";
 
 import { omitDefaults } from "./adr27";
-import { cosmos } from "./codec";
+import { cosmos, google } from "./codec";
 
-const { SignDoc, AuthInfo } = cosmos.tx;
+const { SignDoc, AuthInfo } = cosmos.tx.v1beta1;
 
 /**
  * Creates and serializes an AuthInfo document using SIGN_MODE_DIRECT.
  */
-export function makeAuthInfo(pubkeys: readonly cosmos.crypto.IPublicKey[], gasLimit: number): Uint8Array {
+export function makeAuthInfo(
+  pubkeys: readonly google.protobuf.IAny[],
+  feeAmount: cosmos.base.v1beta1.Coin[],
+  gasLimit: number,
+  sequence: number,
+): Uint8Array {
   const authInfo = {
     signerInfos: pubkeys.map(
-      (pubkey): cosmos.tx.ISignerInfo => ({
+      (pubkey): cosmos.tx.v1beta1.ISignerInfo => ({
         publicKey: pubkey,
         modeInfo: {
-          single: { mode: cosmos.tx.signing.SignMode.SIGN_MODE_DIRECT },
+          single: { mode: cosmos.tx.signing.v1beta1.SignMode.SIGN_MODE_DIRECT },
         },
+        sequence: sequence ? Long.fromNumber(sequence) : undefined,
       }),
     ),
-    fee: { gasLimit: Long.fromNumber(gasLimit) },
+    fee: { amount: feeAmount, gasLimit: Long.fromNumber(gasLimit) },
   };
   return Uint8Array.from(AuthInfo.encode(authInfo).finish());
 }
@@ -29,7 +35,6 @@ export function makeSignBytes(
   authInfo: Uint8Array,
   chainId: string,
   accountNumber: number,
-  sequence: number,
 ): Uint8Array {
   const signDoc = SignDoc.create(
     omitDefaults({
@@ -37,7 +42,6 @@ export function makeSignBytes(
       authInfoBytes: authInfo,
       chainId: chainId,
       accountNumber: accountNumber,
-      accountSequence: sequence,
     }),
   );
   return Uint8Array.from(SignDoc.encode(signDoc).finish());
diff --git a/packages/proto-signing/types/signing.d.ts b/packages/proto-signing/types/signing.d.ts
index ebb669f4..6475907b 100644
--- a/packages/proto-signing/types/signing.d.ts
+++ b/packages/proto-signing/types/signing.d.ts
@@ -1,15 +1,16 @@
-import { cosmos } from "./codec";
+import { cosmos, google } from "./codec";
 /**
  * Creates and serializes an AuthInfo document using SIGN_MODE_DIRECT.
  */
 export declare function makeAuthInfo(
-  pubkeys: readonly cosmos.crypto.IPublicKey[],
+  pubkeys: readonly google.protobuf.IAny[],
+  feeAmount: cosmos.base.v1beta1.Coin[],
   gasLimit: number,
+  sequence: number,
 ): Uint8Array;
 export declare function makeSignBytes(
   txBody: Uint8Array,
   authInfo: Uint8Array,
   chainId: string,
   accountNumber: number,
-  sequence: number,
 ): Uint8Array;