refactor: remove cosmjs from hyperweb

Author: marslavish

templates/hyperweb/__tests__/ammContract.test.ts

@@ -1,55 +1,62 @@
 // @ts-nocheck
-import { DirectSecp256k1HdWallet } from '@cosmjs/proto-signing';
-import { assertIsDeliverTxSuccess } from '@cosmjs/stargate';
+import { Secp256k1HDWallet } from "@interchainjs/cosmos/wallets/secp256k1hd";
+import { assertIsDeliverTxSuccess } from "@interchainjs/cosmos/utils";
 
 import path from "path";
-import fs from 'fs';
-import { getSigningJsdClient, jsd } from 'hyperwebjs'
-import { useChain, generateMnemonic } from 'starshipjs';
-import { sleep } from '../test-utils/sleep';
-import './setup.test';
+import fs from "fs";
+import { getSigningJsdClient, jsd } from "hyperwebjs";
+import { useChain, generateMnemonic } from "starshipjs";
+import { sleep } from "../test-utils/sleep";
+import "./setup.test";
 
-describe('Contract 2: AMM contract test', () => {
+describe("Contract 2: AMM contract test", () => {
   let wallet, denom, address, queryClient, signingClient;
   let chainInfo, getCoin, getRpcEndpoint, creditFromFaucet;
   let contractCode, contractIndex;
 
   let wallet2, address2;
   let fee;
 
-  const denom2 = "uhypweb", uatom = "uatom", uusdc = "uusdc";
+  const denom2 = "uhypweb",
+    uatom = "uatom",
+    uusdc = "uusdc";
 
   beforeAll(async () => {
-    ({
-      chainInfo,
-      getCoin,
-      getRpcEndpoint,
-      creditFromFaucet
-    } = useChain('hyperweb'));
+    ({ chainInfo, getCoin, getRpcEndpoint, creditFromFaucet } =
+      useChain("hyperweb"));
     denom = (await getCoin()).base;
 
+    const commonPrefix = chainInfo.chain.bech32_prefix;
+    const cosmosHdPath = "m/44'/118'/0'/0/0";
+
     // Initialize wallet
-    wallet = await DirectSecp256k1HdWallet.fromMnemonic(generateMnemonic(), {
-      prefix: chainInfo.chain.bech32_prefix
-    });
+    wallet = Secp256k1HDWallet.fromMnemonic(generateMnemonic(), [
+      {
+        prefix: commonPrefix,
+        hdPath: cosmosHdPath,
+      },
+    ]);
     address = (await wallet.getAccounts())[0].address;
-    console.log(`contract creator address for amm: ${address}`)
+    console.log(`contract creator address for amm: ${address}`);
 
     // Initialize wallet2
-    wallet2 = await DirectSecp256k1HdWallet.fromMnemonic(generateMnemonic(), {
-      prefix: chainInfo.chain.bech32_prefix
-    });
+    wallet2 = Secp256k1HDWallet.fromMnemonic(generateMnemonic(), [
+      {
+        prefix: commonPrefix,
+        hdPath: cosmosHdPath,
+      },
+    ]);
     address2 = (await wallet2.getAccounts())[0].address;
-    console.log(`contract creator address2 for amm: ${address2}`)
+    console.log(`contract creator address2 for amm: ${address2}`);
 
     // Create custom cosmos interchain client
     queryClient = await jsd.ClientFactory.createRPCQueryClient({
-      rpcEndpoint: await getRpcEndpoint()
+      rpcEndpoint: await getRpcEndpoint(),
     });
 
     signingClient = await getSigningJsdClient({
       rpcEndpoint: await getRpcEndpoint(),
-      signer: wallet
+      signer: wallet,
     });
 
     await creditFromFaucet(address, denom);
@@ -60,21 +67,24 @@ describe('Contract 2: AMM contract test', () => {
     await creditFromFaucet(address2, denom);
     await creditFromFaucet(address2, denom2);
 
-    fee = {amount: [{denom, amount: '100000'}], gas: '550000'};
+    fee = { amount: [{ denom, amount: "100000" }], gas: "550000" };
 
     await sleep(2000); // sleep for 1 sec to get tokens transferred from faucet successfully
   });
 
-  it('check balance', async () => {
+  it("check balance", async () => {
     const balance = await signingClient.getBalance(address, denom);
     expect(balance.amount).toEqual("10000000000");
     expect(balance.denom).toEqual(denom);
   });
 
-  it('instantiate contract', async () => {
+  it("instantiate contract", async () => {
     // Read contract code from external file
-    const contractPath = path.join(__dirname, '../dist/contracts/ammContract.js');
-    contractCode = fs.readFileSync(contractPath, 'utf8');
+    const contractPath = path.join(
+      __dirname,
+      "../dist/contracts/ammContract.js"
+    );
+    contractCode = fs.readFileSync(contractPath, "utf8");
 
     const msg = jsd.jsd.MessageComposer.fromPartial.instantiate({
       creator: address,
@@ -85,20 +95,24 @@ describe('Contract 2: AMM contract test', () => {
     assertIsDeliverTxSuccess(result);
 
     // Parse the response to get the contract index
-    const response = jsd.jsd.MsgInstantiateResponse.fromProtoMsg(result.msgResponses[0]);
+    const response = jsd.jsd.MsgInstantiateResponse.fromProtoMsg(
+      result.msgResponses[0]
+    );
     contractIndex = response.index;
     expect(contractIndex).toBeGreaterThan(0);
     console.log(`contract index: ${contractIndex}`);
   });
 
-  it('query for contract based on index', async () => {
-    const response = await queryClient.jsd.jsd.contracts({index: contractIndex});
+  it("query for contract based on index", async () => {
+    const response = await queryClient.jsd.jsd.contracts({
+      index: contractIndex,
+    });
     expect(response.contracts.code).toEqual(contractCode);
     expect(response.contracts.index).toEqual(contractIndex);
     expect(response.contracts.creator).toEqual(address);
   });
 
-  it('perform getTotalSupply eval', async () => {
+  it("perform getTotalSupply eval", async () => {
     const msg = jsd.jsd.MessageComposer.fromPartial.eval({
       creator: address,
       index: contractIndex,
@@ -109,11 +123,13 @@ describe('Contract 2: AMM contract test', () => {
     const result = await signingClient.signAndBroadcast(address, [msg], fee);
     assertIsDeliverTxSuccess(result);
 
-    const response = jsd.jsd.MsgEvalResponse.fromProtoMsg(result.msgResponses[0]);
+    const response = jsd.jsd.MsgEvalResponse.fromProtoMsg(
+      result.msgResponses[0]
+    );
     expect(response.result).toEqual("0");
   });
 
-  it('perform addLiquidity eval', async () => {
+  it("perform addLiquidity eval", async () => {
     const msg = jsd.jsd.MessageComposer.fromPartial.eval({
       creator: address,
       index: contractIndex,
@@ -124,19 +140,21 @@ describe('Contract 2: AMM contract test', () => {
     const result = await signingClient.signAndBroadcast(address, [msg], fee);
     assertIsDeliverTxSuccess(result);
 
-    const response = jsd.jsd.MsgEvalResponse.fromProtoMsg(result.msgResponses[0]);
+    const response = jsd.jsd.MsgEvalResponse.fromProtoMsg(
+      result.msgResponses[0]
+    );
     expect(response.result).toEqual("null");
   });
 
-  it('check balance after addLiquidity', async () => {
+  it("check balance after addLiquidity", async () => {
     const usdcBalance = await signingClient.getBalance(address, uusdc);
     expect(usdcBalance.amount).toEqual("9950000000");
 
     const atomBalance = await signingClient.getBalance(address, uatom);
     expect(atomBalance.amount).toEqual("9950000000");
   });
 
-  it('perform swap eval', async () => {
+  it("perform swap eval", async () => {
     const msg = jsd.jsd.MessageComposer.fromPartial.eval({
       creator: address,
       index: contractIndex,
@@ -147,7 +165,9 @@ describe('Contract 2: AMM contract test', () => {
     const result = await signingClient.signAndBroadcast(address, [msg], fee);
     assertIsDeliverTxSuccess(result);
 
-    const response = jsd.jsd.MsgEvalResponse.fromProtoMsg(result.msgResponses[0]);
+    const response = jsd.jsd.MsgEvalResponse.fromProtoMsg(
+      result.msgResponses[0]
+    );
     expect(response.result).toEqual("9969998.011982398");
   });
 });

templates/hyperweb/__tests__/setup.test.ts

@@ -1,27 +1,52 @@
-// @ts-nocheck
-import path from 'path';
+import path from "path";
 
-import { StargateClient } from '@cosmjs/stargate';
-
-import { ConfigContext, useChain, useRegistry } from 'starshipjs';
+import { SigningClient } from "@interchainjs/cosmos/signing-client";
+import { DirectGenericOfflineSigner } from "@interchainjs/cosmos/types/wallet";
+import { Secp256k1HDWallet } from "@interchainjs/cosmos/wallets/secp256k1hd";
+import {
+  ConfigContext,
+  generateMnemonic,
+  useChain,
+  useRegistry,
+} from "starshipjs";
 
 beforeAll(async () => {
-  const configFile = path.join(__dirname, '..', 'configs', 'local.yaml');
+  const configFile = path.join(__dirname, "..", "configs", "local.yaml");
   ConfigContext.setConfigFile(configFile);
   ConfigContext.setRegistry(await useRegistry(configFile));
 });
 
-describe('Test clients', () => {
-  let client;
+describe("Test clients", () => {
+  let client: SigningClient;
 
   beforeAll(async () => {
-    const { getRpcEndpoint } = useChain('hyperweb');
-    client = await StargateClient.connect(await getRpcEndpoint());
+    const { getRpcEndpoint, chainInfo } = useChain("hyperweb");
+
+    const commonPrefix = chainInfo?.chain?.bech32_prefix;
+    const cosmosHdPath = "m/44'/118'/0'/0/0";
+
+    const directWallet = Secp256k1HDWallet.fromMnemonic(generateMnemonic(), [
+      {
+        prefix: commonPrefix,
+        hdPath: cosmosHdPath,
+      },
+    ]);
+    const directSigner = directWallet.toOfflineDirectSigner();
+
+    client = await SigningClient.connectWithSigner(
+      await getRpcEndpoint(),
+      new DirectGenericOfflineSigner(directSigner),
+      {
+        signerOptions: {
+          prefix: commonPrefix,
+        },
+      }
+    );
   });
 
-  it('check chain height', async () => {
-    const height = await client.getHeight();
+  it("check chain height", async () => {
+    const { header } = await client.getBlock(1);
 
-    expect(height).toBeGreaterThan(0);
+    expect(header.height).toBeGreaterThan(0);
   });
 });