build(deps): bump cosmjs to v0.32.2

archway-network · Feb 6, 2024 · 188955c · 188955c
1 parent 1ceca20
commit 188955c
Show file tree

Hide file tree

Showing 38 changed files with 8,213 additions and 1,182 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,25 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## v0.6.1 (Unreleased)
+
+### Changed
+
+- removed `long` package (#115)
+
+#### **arch3-core**
+
+- change the type of `gasWanted` and `gasUsed`of `TxResult` from `number` to `bigint`,
+  to match the new types returned by `@cosmjs/cosmwasm-stargate` (#115)
+- replace deprecated `TendermintClient` with `CosmosClient` (#115)
+
+#### **arch3-proto**
+
+- update `@cosmology/telescope` to version `1.4.12`, and update config files with options
+  `useTelescopeGeneratedType = true` and `enabledRegistryLoader = false` as a workaround
+  for currently open [telescope issue #482](https://github.com/cosmology-tech/telescope/issues/482) (#115)
+- update codegen script and compile proto files (#115)
+
 ## v0.6.0 (2023-02-06)
 
 ### BREAKING CHANGES

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -3,6 +3,7 @@ services:
     image: archwaynetwork/archwayd:v6.0.0
     command: start --x-crisis-skip-assert-invariants
     entrypoint: /docker-entrypoint.sh
+    platform: linux/amd64
     ports:
       - 1317:1317   # API
       - 9090:9090   # gRPC

diff --git a/package.json b/package.json
@@ -71,13 +71,12 @@
     ]
   },
   "resolutions": {
-    "@cosmjs/amino": "^0.31.3",
-    "@cosmjs/cosmwasm-stargate": "^0.31.3",
-    "@cosmjs/math": "^0.31.3",
-    "@cosmjs/proto-signing": "^0.31.3",
-    "@cosmjs/stargate": "^0.31.3",
-    "@cosmjs/tendermint-rpc": "^0.31.3",
-    "long": "^5.2.3"
+    "@cosmjs/amino": "^0.32.2",
+    "@cosmjs/cosmwasm-stargate": "^0.32.2",
+    "@cosmjs/math": "^0.32.2",
+    "@cosmjs/proto-signing": "^0.32.2",
+    "@cosmjs/stargate": "^0.32.2",
+    "@cosmjs/tendermint-rpc": "^0.32.2"
   },
   "dependencies": {
     "@archwayhq/arch3-core": "workspace:^",

diff --git a/packages/arch3-core/package.json b/packages/arch3-core/package.json
@@ -54,14 +54,13 @@
   },
   "dependencies": {
     "@archwayhq/arch3-proto": "workspace:^",
-    "@cosmjs/amino": "^0.31.3",
-    "@cosmjs/cosmwasm-stargate": "^0.31.3",
-    "@cosmjs/math": "^0.31.3",
-    "@cosmjs/proto-signing": "^0.31.3",
-    "@cosmjs/stargate": "^0.31.3",
-    "@cosmjs/tendermint-rpc": "^0.31.3",
-    "lodash": "^4.17.21",
-    "long": "^5.2.3"
+    "@cosmjs/amino": "^0.32.2",
+    "@cosmjs/cosmwasm-stargate": "^0.32.2",
+    "@cosmjs/math": "^0.32.2",
+    "@cosmjs/proto-signing": "^0.32.2",
+    "@cosmjs/stargate": "^0.32.2",
+    "@cosmjs/tendermint-rpc": "^0.32.2",
+    "lodash": "^4.17.21"
   },
   "devDependencies": {
     "@microsoft/eslint-formatter-sarif": "^3.0.0",

diff --git a/packages/arch3-core/src/archwayclient.ts b/packages/arch3-core/src/archwayclient.ts
@@ -2,11 +2,11 @@ import { Coin } from '@cosmjs/amino';
 import { CosmWasmClient } from '@cosmjs/cosmwasm-stargate';
 import {
   Tendermint37Client,
-  TendermintClient,
   HttpEndpoint,
   RpcClient,
   HttpBatchClient,
-  HttpBatchClientOptions
+  HttpBatchClientOptions,
+  CometClient
 } from '@cosmjs/tendermint-rpc';
 
 import { IArchwayQueryClient, createArchwayQueryClient } from './queryclient';
@@ -26,26 +26,26 @@ import {
 export class ArchwayClient extends CosmWasmClient implements IArchwayQueryClient {
   private readonly archwayQueryClient: IArchwayQueryClient;
 
-  protected constructor(tmClient: TendermintClient | undefined) {
-    super(tmClient);
-    this.archwayQueryClient = createArchwayQueryClient(tmClient);
+  protected constructor(cometClient: CometClient | undefined) {
+    super(cometClient);
+    this.archwayQueryClient = createArchwayQueryClient(cometClient);
   }
 
   /**
-   * Creates an instance by connecting to the given Tendermint RPC endpoint.
+   * Creates an instance by connecting to the given Tendermint/Comet RPC endpoint.
    *
    * @param endpoint - String URL of the RPC endpoint to connect or an {@link HttpEndpoint} object.
    * @returns An {@link ArchwayClient} connected to the endpoint.
    *
-   * @see Use {@link ArchwayClient.create} if you need Tendermint 0.37 support.
+   * @see Use {@link ArchwayClient.create} if you need Comet 0.38 support.
    */
   public static override async connect(endpoint: string | HttpEndpoint): Promise<ArchwayClient> {
     const tmClient = await Tendermint37Client.connect(endpoint);
     return ArchwayClient.create(tmClient);
   }
 
   /**
-   * Creates an instance by connecting to the given Tendermint RPC endpoint using an {@link HttpBatchClient} to batch
+   * Creates an instance by connecting to the given Tendermint/Comet RPC endpoint using an {@link HttpBatchClient} to batch
    * multiple requests and reduce queries to the server.
    *
    * @param endpoint - String URL of the RPC endpoint to connect or an {@link HttpEndpoint} object.
@@ -61,14 +61,14 @@ export class ArchwayClient extends CosmWasmClient implements IArchwayQueryClient
   }
 
   /**
-   * Creates an instance from a manually created Tendermint client.
+   * Creates an instance from a manually created Comet client.
    *
-   * @param tmClient - A Tendermint client for a given endpoint.
+   * @param cometClient - A Comet client for a given endpoint.
    * @returns An {@link ArchwayClient} connected to the endpoint.
    */
   /* eslint-disable-next-line @typescript-eslint/require-await */
-  public static override async create(tmClient: TendermintClient): Promise<ArchwayClient> {
-    return new ArchwayClient(tmClient);
+  public static override async create(cometClient: CometClient): Promise<ArchwayClient> {
+    return new ArchwayClient(cometClient);
   }
 
   public async getBlockRewardsTracking(): Promise<BlockTracking> {

diff --git a/packages/arch3-core/src/modules/rewards/queries.ts b/packages/arch3-core/src/modules/rewards/queries.ts
@@ -10,7 +10,6 @@ import {
   QueryRewardsRecordsResponse
 } from '@archwayhq/arch3-proto/build/archway/rewards/v1/query';
 import { createPagination, QueryClient } from '@cosmjs/stargate';
-import Long from 'long';
 
 export interface RewardsExtension {
   readonly rewards: {
@@ -41,7 +40,7 @@ export function setupRewardsExtension(base: QueryClient): RewardsExtension {
       blockRewardsTracking: () => queryService.blockRewardsTracking(),
       rewardsPool: () => queryService.rewardsPool(),
       estimateTxFees: (gasLimit: number, contractAddress: string) => queryService.estimateTxFees({
-        gasLimit: Long.fromNumber(gasLimit),
+        gasLimit: BigInt(gasLimit),
         contractAddress,
       }),
       rewardsRecords: (rewardsAddress: string, paginationKey?: Uint8Array) => queryService.rewardsRecords({

diff --git a/packages/arch3-core/src/queryclient.ts b/packages/arch3-core/src/queryclient.ts
@@ -10,7 +10,7 @@ import {
   setupTxExtension,
   TxExtension
 } from '@cosmjs/stargate';
-import { fromSeconds, TendermintClient, toRfc3339WithNanoseconds } from '@cosmjs/tendermint-rpc';
+import { fromSeconds, CometClient, toRfc3339WithNanoseconds } from '@cosmjs/tendermint-rpc';
 
 import { RewardsExtension, setupRewardsExtension } from './modules';
 import {
@@ -91,10 +91,10 @@ export interface IArchwayQueryClient {
 class ArchwayQueryClientImpl implements IArchwayQueryClient {
   private readonly queryClient: ExtendedQueryClient | undefined;
 
-  public constructor(tmClient: TendermintClient | undefined) {
-    if (tmClient) {
+  public constructor(cometClient: CometClient | undefined) {
+    if (cometClient) {
       this.queryClient = QueryClient.withExtensions(
-        tmClient,
+        cometClient,
         setupAuthExtension,
         setupBankExtension,
         setupWasmExtension,
@@ -123,17 +123,17 @@ class ArchwayQueryClientImpl implements IArchwayQueryClient {
 
     const txRewards = txRewardsResponse.map(txReward => {
       return {
-        txId: txReward.txId.toNumber(),
-        height: txReward.height.toNumber(),
+        txId: Number(txReward.txId),
+        height: Number(txReward.height),
         feeRewards: txReward.feeRewards,
       };
     });
 
     return {
       inflationRewards: {
-        height: inflationRewards.height.toNumber(),
+        height: Number(inflationRewards.height),
         inflationRewards: inflationRewards.inflationRewards,
-        maxGas: inflationRewards.maxGas.toNumber(),
+        maxGas: Number(inflationRewards.maxGas),
       },
       txRewards,
     };
@@ -198,7 +198,7 @@ class ArchwayQueryClientImpl implements IArchwayQueryClient {
     return {
       rewardsAddress,
       totalRewards,
-      totalRecords: recordsNum.toNumber(),
+      totalRecords: Number(recordsNum),
     };
   }
 
@@ -224,13 +224,13 @@ class ArchwayQueryClientImpl implements IArchwayQueryClient {
 
       const rewardsRecords = records.map(record => {
         const calculatedTime = fromSeconds(
-          record.calculatedTime.seconds.toNumber(),
+          Number(record.calculatedTime.seconds),
           record.calculatedTime.nanos
         );
         return {
-          id: record.id.toNumber(),
+          id: Number(record.id),
           rewardsAddress: record.rewardsAddress,
-          calculatedHeight: record.calculatedHeight.toNumber(),
+          calculatedHeight: Number(record.calculatedHeight),
           calculatedTime: toRfc3339WithNanoseconds(calculatedTime),
           rewards: record.rewards,
         };
@@ -249,9 +249,9 @@ class ArchwayQueryClientImpl implements IArchwayQueryClient {
  * Created a facade for querying archway modules using the
  * {@link QueryClient} extended with the {@link RewardsExtension}.
  *
- * @param tmClient - A Tendermint client for a given endpoint.
+ * @param cometClient - A Comet client for a given endpoint.
  * @returns A new {@link IArchwayQueryClient} implementation.
  */
-export function createArchwayQueryClient(tmClient: TendermintClient | undefined): IArchwayQueryClient {
-  return new ArchwayQueryClientImpl(tmClient);
+export function createArchwayQueryClient(cometClient: CometClient | undefined): IArchwayQueryClient {
+  return new ArchwayQueryClientImpl(cometClient);
 }
diff --git a/packages/arch3-core/src/signingarchwayclient.spec.ts b/packages/arch3-core/src/signingarchwayclient.spec.ts
@@ -41,7 +41,7 @@ const clientOptions: SigningArchwayClientOptions = {
 async function assertGasPriceEstimation(
   client: SigningArchwayClient,
   transactionHash: string,
-  gasWanted: number,
+  gasWanted: bigint,
   gasUnitPrice?: GasPrice,
   flatFees: readonly Coin[] = [],
 ): Promise<void> {
@@ -50,7 +50,7 @@ async function assertGasPriceEstimation(
   const tx = decodeTxRaw(txResponse.tx);
 
   // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
-  const { amount: calculatedAmount, gas: expectedGas } = calculateFee(gasWanted, gasUnitPrice!);
+  const { amount: calculatedAmount, gas: expectedGas } = calculateFee(Number(gasWanted), gasUnitPrice!);
   const expectedAmount = [...calculatedAmount, ...flatFees].reduce(addCoins);
   const txFee = tx.authInfo.fee;
   expect(txFee?.amount).toContainEqual(expectedAmount);
@@ -251,8 +251,8 @@ describe('SigningArchwayClient', () => {
         expect(result).toMatchObject({
           height: expect.any(Number),
           transactionHash: expect.any(String),
-          gasWanted: expect.any(Number),
-          gasUsed: expect.any(Number),
+          gasWanted: expect.any(BigInt),
+          gasUsed: expect.any(BigInt),
           metadata,
         });
         expect(result.logs).not.toHaveLength(0);
@@ -274,8 +274,8 @@ describe('SigningArchwayClient', () => {
         expect(result).toMatchObject({
           height: expect.any(Number),
           transactionHash: expect.any(String),
-          gasWanted: expect.any(Number),
-          gasUsed: expect.any(Number),
+          gasWanted: expect.any(BigInt),
+          gasUsed: expect.any(BigInt),
           metadata: {
             contractAddress,
             ownerAddress,
@@ -307,8 +307,8 @@ describe('SigningArchwayClient', () => {
         expect(result).toMatchObject({
           height: expect.any(Number),
           transactionHash: expect.any(String),
-          gasWanted: expect.any(Number),
-          gasUsed: expect.any(Number),
+          gasWanted: expect.any(BigInt),
+          gasUsed: expect.any(BigInt),
           premium: {
             contractAddress,
             flatFee,
@@ -337,8 +337,8 @@ describe('SigningArchwayClient', () => {
         expect(result).toMatchObject({
           height: expect.any(Number),
           transactionHash: expect.any(String),
-          gasWanted: expect.any(Number),
-          gasUsed: expect.any(Number),
+          gasWanted: expect.any(BigInt),
+          gasUsed: expect.any(BigInt),
           premium: {
             contractAddress,
             flatFee: coin(0, archwayd.denom),
@@ -375,8 +375,8 @@ describe('SigningArchwayClient', () => {
         expect(result).toMatchObject({
           height: expect.any(Number),
           transactionHash: expect.any(String),
-          gasWanted: expect.any(Number),
-          gasUsed: expect.any(Number),
+          gasWanted: expect.any(BigInt),
+          gasUsed: expect.any(BigInt),
           rewardsAddress: rewardsAddress,
           rewards: [expect.objectContaining({
             amount: expect.any(String),
@@ -400,8 +400,8 @@ describe('SigningArchwayClient', () => {
         expect(result).toMatchObject({
           height: expect.any(Number),
           transactionHash: expect.any(String),
-          gasWanted: expect.any(Number),
-          gasUsed: expect.any(Number),
+          gasWanted: expect.any(BigInt),
+          gasUsed: expect.any(BigInt),
           rewardsAddress: rewardsAddress,
           rewards: expect.arrayContaining([]),
         });
@@ -432,8 +432,8 @@ describe('SigningArchwayClient', () => {
         expect(result).toMatchObject({
           height: expect.any(Number),
           transactionHash: expect.any(String),
-          gasWanted: expect.any(Number),
-          gasUsed: expect.any(Number),
+          gasWanted: expect.any(BigInt),
+          gasUsed: expect.any(BigInt),
           metadata,
         });
         expect(result.logs).not.toHaveLength(0);