Start to update cosmwasm package

cosmos · Aug 21, 2020 · 9402538 · 9402538
1 parent d35a2c5
commit 9402538
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 35 deletions.
diff --git a/packages/cosmwasm/src/cosmwasmclient.searchtx.spec.ts b/packages/cosmwasm/src/cosmwasmclient.searchtx.spec.ts
@@ -50,7 +50,7 @@ describe("CosmWasmClient.searchTx", () => {
   beforeAll(async () => {
     if (wasmdEnabled()) {
       const wallet = await Secp256k1Wallet.fromMnemonic(alice.mnemonic);
-      const client = new SigningCosmWasmClient(wasmd.endpoint, alice.address0, wallet);
+      const client = SigningCosmWasmClient.fromOfflineSigner(wasmd.endpoint, alice.address0, wallet);
 
       {
         const recipient = makeRandomAddress();

diff --git a/packages/cosmwasm/src/cosmwasmclient.spec.ts b/packages/cosmwasm/src/cosmwasmclient.spec.ts
@@ -372,7 +372,7 @@ describe("CosmWasmClient", () => {
       if (wasmdEnabled()) {
         pendingWithoutWasmd();
         const wallet = await Secp256k1Wallet.fromMnemonic(alice.mnemonic);
-        const client = new SigningCosmWasmClient(wasmd.endpoint, alice.address0, wallet);
+        const client = SigningCosmWasmClient.fromOfflineSigner(wasmd.endpoint, alice.address0, wallet);
         const { codeId } = await client.upload(getHackatom().data);
         const initMsg = { verifier: makeRandomAddress(), beneficiary: makeRandomAddress() };
         const { contractAddress } = await client.instantiate(codeId, initMsg, "random hackatom");
@@ -423,7 +423,7 @@ describe("CosmWasmClient", () => {
       if (wasmdEnabled()) {
         pendingWithoutWasmd();
         const wallet = await Secp256k1Wallet.fromMnemonic(alice.mnemonic);
-        const client = new SigningCosmWasmClient(wasmd.endpoint, alice.address0, wallet);
+        const client = SigningCosmWasmClient.fromOfflineSigner(wasmd.endpoint, alice.address0, wallet);
         const { codeId } = await client.upload(getHackatom().data);
         const initMsg = { verifier: makeRandomAddress(), beneficiary: makeRandomAddress() };
         const { contractAddress } = await client.instantiate(codeId, initMsg, "a different hackatom");

diff --git a/packages/cosmwasm/src/signingcosmwasmclient.spec.ts b/packages/cosmwasm/src/signingcosmwasmclient.spec.ts
@@ -36,14 +36,14 @@ describe("SigningCosmWasmClient", () => {
   describe("makeReadOnly", () => {
     it("can be constructed", async () => {
       const wallet = await Secp256k1Wallet.fromMnemonic(alice.mnemonic);
-      const client = new SigningCosmWasmClient(httpUrl, alice.address0, wallet);
+      const client = SigningCosmWasmClient.fromOfflineSigner(httpUrl, alice.address0, wallet);
       expect(client).toBeTruthy();
     });
 
     it("can be constructed with custom gas price", async () => {
       const wallet = await Secp256k1Wallet.fromMnemonic(alice.mnemonic);
       const gasPrice = GasPrice.fromString("3.14utest");
-      const client = new SigningCosmWasmClient(httpUrl, alice.address0, wallet, gasPrice);
+      const client = SigningCosmWasmClient.fromOfflineSigner(httpUrl, alice.address0, wallet, gasPrice);
       const openedClient = (client as unknown) as PrivateSigningCosmWasmClient;
       expect(openedClient.fees).toEqual({
         upload: {
@@ -108,7 +108,13 @@ describe("SigningCosmWasmClient", () => {
       const gasLimits = {
         send: 160000,
       };
-      const client = new SigningCosmWasmClient(httpUrl, alice.address0, wallet, undefined, gasLimits);
+      const client = SigningCosmWasmClient.fromOfflineSigner(
+        httpUrl,
+        alice.address0,
+        wallet,
+        undefined,
+        gasLimits,
+      );
       const openedClient = (client as unknown) as PrivateSigningCosmWasmClient;
       expect(openedClient.fees).toEqual({
         upload: {
@@ -174,7 +180,13 @@ describe("SigningCosmWasmClient", () => {
       const gasLimits = {
         send: 160000,
       };
-      const client = new SigningCosmWasmClient(httpUrl, alice.address0, wallet, gasPrice, gasLimits);
+      const client = SigningCosmWasmClient.fromOfflineSigner(
+        httpUrl,
+        alice.address0,
+        wallet,
+        gasPrice,
+        gasLimits,
+      );
       const openedClient = (client as unknown) as PrivateSigningCosmWasmClient;
       expect(openedClient.fees).toEqual({
         upload: {
@@ -239,7 +251,7 @@ describe("SigningCosmWasmClient", () => {
     it("always uses authAccount implementation", async () => {
       pendingWithoutWasmd();
       const wallet = await Secp256k1Wallet.fromMnemonic(alice.mnemonic);
-      const client = new SigningCosmWasmClient(httpUrl, alice.address0, wallet);
+      const client = SigningCosmWasmClient.fromOfflineSigner(httpUrl, alice.address0, wallet);
 
       const openedClient = (client as unknown) as PrivateCosmWasmClient;
       const blockLatestSpy = spyOn(openedClient.lcdClient, "blocksLatest").and.callThrough();
@@ -257,7 +269,7 @@ describe("SigningCosmWasmClient", () => {
     it("works", async () => {
       pendingWithoutWasmd();
       const wallet = await Secp256k1Wallet.fromMnemonic(alice.mnemonic);
-      const client = new SigningCosmWasmClient(httpUrl, alice.address0, wallet);
+      const client = SigningCosmWasmClient.fromOfflineSigner(httpUrl, alice.address0, wallet);
       const wasm = getHackatom().data;
       const {
         codeId,
@@ -276,7 +288,7 @@ describe("SigningCosmWasmClient", () => {
     it("can set builder and source", async () => {
       pendingWithoutWasmd();
       const wallet = await Secp256k1Wallet.fromMnemonic(alice.mnemonic);
-      const client = new SigningCosmWasmClient(httpUrl, alice.address0, wallet);
+      const client = SigningCosmWasmClient.fromOfflineSigner(httpUrl, alice.address0, wallet);
       const hackatom = getHackatom();
 
       const meta: UploadMeta = {
@@ -295,7 +307,7 @@ describe("SigningCosmWasmClient", () => {
     it("works with transfer amount", async () => {
       pendingWithoutWasmd();
       const wallet = await Secp256k1Wallet.fromMnemonic(alice.mnemonic);
-      const client = new SigningCosmWasmClient(httpUrl, alice.address0, wallet);
+      const client = SigningCosmWasmClient.fromOfflineSigner(httpUrl, alice.address0, wallet);
       const { codeId } = await client.upload(getHackatom().data);
 
       const transferAmount = [coin(1234, "ucosm"), coin(321, "ustake")];
@@ -321,7 +333,7 @@ describe("SigningCosmWasmClient", () => {
     it("works with admin", async () => {
       pendingWithoutWasmd();
       const wallet = await Secp256k1Wallet.fromMnemonic(alice.mnemonic);
-      const client = new SigningCosmWasmClient(httpUrl, alice.address0, wallet);
+      const client = SigningCosmWasmClient.fromOfflineSigner(httpUrl, alice.address0, wallet);
       const { codeId } = await client.upload(getHackatom().data);
 
       const beneficiaryAddress = makeRandomAddress();
@@ -344,7 +356,7 @@ describe("SigningCosmWasmClient", () => {
     it("can instantiate one code multiple times", async () => {
       pendingWithoutWasmd();
       const wallet = await Secp256k1Wallet.fromMnemonic(alice.mnemonic);
-      const client = new SigningCosmWasmClient(httpUrl, alice.address0, wallet);
+      const client = SigningCosmWasmClient.fromOfflineSigner(httpUrl, alice.address0, wallet);
       const { codeId } = await client.upload(getHackatom().data);
 
       const contractAddress1 = await client.instantiate(
@@ -371,7 +383,7 @@ describe("SigningCosmWasmClient", () => {
     it("can update an admin", async () => {
       pendingWithoutWasmd();
       const wallet = await Secp256k1Wallet.fromMnemonic(alice.mnemonic);
-      const client = new SigningCosmWasmClient(httpUrl, alice.address0, wallet);
+      const client = SigningCosmWasmClient.fromOfflineSigner(httpUrl, alice.address0, wallet);
       const { codeId } = await client.upload(getHackatom().data);
 
       const beneficiaryAddress = makeRandomAddress();
@@ -404,7 +416,7 @@ describe("SigningCosmWasmClient", () => {
     it("can clear an admin", async () => {
       pendingWithoutWasmd();
       const wallet = await Secp256k1Wallet.fromMnemonic(alice.mnemonic);
-      const client = new SigningCosmWasmClient(httpUrl, alice.address0, wallet);
+      const client = SigningCosmWasmClient.fromOfflineSigner(httpUrl, alice.address0, wallet);
       const { codeId } = await client.upload(getHackatom().data);
 
       const beneficiaryAddress = makeRandomAddress();
@@ -437,7 +449,7 @@ describe("SigningCosmWasmClient", () => {
     it("can can migrate from one code ID to another", async () => {
       pendingWithoutWasmd();
       const wallet = await Secp256k1Wallet.fromMnemonic(alice.mnemonic);
-      const client = new SigningCosmWasmClient(httpUrl, alice.address0, wallet);
+      const client = SigningCosmWasmClient.fromOfflineSigner(httpUrl, alice.address0, wallet);
       const { codeId: codeId1 } = await client.upload(getHackatom().data);
       const { codeId: codeId2 } = await client.upload(getHackatom().data);
 
@@ -475,7 +487,7 @@ describe("SigningCosmWasmClient", () => {
     it("works", async () => {
       pendingWithoutWasmd();
       const wallet = await Secp256k1Wallet.fromMnemonic(alice.mnemonic);
-      const client = new SigningCosmWasmClient(httpUrl, alice.address0, wallet);
+      const client = SigningCosmWasmClient.fromOfflineSigner(httpUrl, alice.address0, wallet);
       const { codeId } = await client.upload(getHackatom().data);
 
       // instantiate
@@ -516,7 +528,7 @@ describe("SigningCosmWasmClient", () => {
     it("works", async () => {
       pendingWithoutWasmd();
       const wallet = await Secp256k1Wallet.fromMnemonic(alice.mnemonic);
-      const client = new SigningCosmWasmClient(httpUrl, alice.address0, wallet);
+      const client = SigningCosmWasmClient.fromOfflineSigner(httpUrl, alice.address0, wallet);
 
       // instantiate
       const transferAmount = coins(7890, "ucosm");
@@ -543,7 +555,7 @@ describe("SigningCosmWasmClient", () => {
     it("works", async () => {
       pendingWithoutWasmd();
       const wallet = await Secp256k1Wallet.fromMnemonic(alice.mnemonic);
-      const client = new SigningCosmWasmClient(httpUrl, alice.address0, wallet);
+      const client = SigningCosmWasmClient.fromOfflineSigner(httpUrl, alice.address0, wallet);
 
       const msg: MsgDelegate = {
         type: "cosmos-sdk/MsgDelegate",

diff --git a/packages/cosmwasm/src/signingcosmwasmclient.ts b/packages/cosmwasm/src/signingcosmwasmclient.ts
@@ -10,13 +10,13 @@ import {
   CosmosFeeTable,
   GasLimits,
   GasPrice,
+  InProcessOnlineSigner,
   isBroadcastTxFailure,
-  makeSignBytes,
   Msg,
   MsgSend,
   OfflineSigner,
+  OnlineSigner,
   StdFee,
-  StdTx,
 } from "@cosmjs/launchpad";
 import { Uint53 } from "@cosmjs/math";
 import pako from "pako";
@@ -151,9 +151,21 @@ export interface PrivateSigningCosmWasmClient {
 export class SigningCosmWasmClient extends CosmWasmClient {
   public readonly senderAddress: string;
 
-  private readonly signer: OfflineSigner;
+  private readonly signer: OnlineSigner;
   private readonly fees: CosmWasmFeeTable;
 
+  public static fromOfflineSigner(
+    apiUrl: string,
+    senderAddress: string,
+    signer: OfflineSigner,
+    gasPrice: GasPrice = defaultGasPrice,
+    gasLimits: Partial<GasLimits<CosmosFeeTable>> = {},
+    broadcastMode = BroadcastMode.Block,
+  ): SigningCosmWasmClient {
+    const online = new InProcessOnlineSigner(signer, apiUrl, broadcastMode);
+    return new SigningCosmWasmClient(apiUrl, senderAddress, online, gasPrice, gasLimits, broadcastMode);
+  }
+
   /**
    * Creates a new client with signing capability to interact with a CosmWasm blockchain. This is the bigger brother of CosmWasmClient.
    *
@@ -170,7 +182,7 @@ export class SigningCosmWasmClient extends CosmWasmClient {
   public constructor(
     apiUrl: string,
     senderAddress: string,
-    signer: OfflineSigner,
+    signer: OnlineSigner,
     gasPrice: GasPrice = defaultGasPrice,
     gasLimits: Partial<GasLimits<CosmWasmFeeTable>> = {},
     broadcastMode = BroadcastMode.Block,
@@ -357,17 +369,13 @@ export class SigningCosmWasmClient extends CosmWasmClient {
    * Gets account number and sequence from the API, creates a sign doc,
    * creates a single signature, assembles the signed transaction and broadcasts it.
    */
-  public async signAndBroadcast(msgs: readonly Msg[], fee: StdFee, memo = ""): Promise<BroadcastTxResult> {
-    const { accountNumber, sequence } = await this.getSequence();
-    const chainId = await this.getChainId();
-    const signBytes = makeSignBytes(msgs, fee, chainId, memo, accountNumber, sequence);
-    const signature = await this.signer.sign(this.senderAddress, signBytes);
-    const signedTx: StdTx = {
-      msg: msgs,
-      fee: fee,
+  public async signAndBroadcast(msgs: readonly Msg[], fee?: StdFee, memo = ""): Promise<BroadcastTxResult> {
+    const request = {
+      msgs: msgs,
+      chainId: await this.getChainId(),
       memo: memo,
-      signatures: [signature],
+      fee: fee,
     };
-    return this.broadcastTx(signedTx);
+    return this.signer.signAndBroadcast(this.senderAddress, request);
   }
 }
diff --git a/packages/cosmwasm/types/signingcosmwasmclient.d.ts b/packages/cosmwasm/types/signingcosmwasmclient.d.ts
@@ -7,6 +7,7 @@ import {
   GasPrice,
   Msg,
   OfflineSigner,
+  OnlineSigner,
   StdFee,
 } from "@cosmjs/launchpad";
 import { Account, CosmWasmClient, GetSequenceResult } from "./cosmwasmclient";
@@ -98,6 +99,14 @@ export declare class SigningCosmWasmClient extends CosmWasmClient {
   readonly senderAddress: string;
   private readonly signer;
   private readonly fees;
+  static fromOfflineSigner(
+    apiUrl: string,
+    senderAddress: string,
+    signer: OfflineSigner,
+    gasPrice?: GasPrice,
+    gasLimits?: Partial<GasLimits<CosmosFeeTable>>,
+    broadcastMode?: BroadcastMode,
+  ): SigningCosmWasmClient;
   /**
    * Creates a new client with signing capability to interact with a CosmWasm blockchain. This is the bigger brother of CosmWasmClient.
    *
@@ -114,7 +123,7 @@ export declare class SigningCosmWasmClient extends CosmWasmClient {
   constructor(
     apiUrl: string,
     senderAddress: string,
-    signer: OfflineSigner,
+    signer: OnlineSigner,
     gasPrice?: GasPrice,
     gasLimits?: Partial<GasLimits<CosmWasmFeeTable>>,
     broadcastMode?: BroadcastMode,
@@ -152,5 +161,5 @@ export declare class SigningCosmWasmClient extends CosmWasmClient {
    * Gets account number and sequence from the API, creates a sign doc,
    * creates a single signature, assembles the signed transaction and broadcasts it.
    */
-  signAndBroadcast(msgs: readonly Msg[], fee: StdFee, memo?: string): Promise<BroadcastTxResult>;
+  signAndBroadcast(msgs: readonly Msg[], fee?: StdFee, memo?: string): Promise<BroadcastTxResult>;
 }