Merge branch 'main' into instantiate2

.circleci/config.yml

@@ -28,7 +28,7 @@ workflows:
             - build
           matrix:
             parameters:
-              simapp: ["simapp44", "simapp46"]
+              simapp: ["simapp44", "simapp46", "simapp47"]
       - test-node:
           requires:
             - build
@@ -159,6 +159,7 @@ jobs:
           command: |
             [ "<< parameters.simapp >>" = "simapp44" ] && export SIMAPP44_ENABLED=1 SLOW_SIMAPP44_ENABLED=1
             [ "<< parameters.simapp >>" = "simapp46" ] && export SIMAPP46_ENABLED=1 SLOW_SIMAPP46_ENABLED=1
+            [ "<< parameters.simapp >>" = "simapp47" ] && export SIMAPP47_ENABLED=1 SLOW_SIMAPP47_ENABLED=1
             yarn test --stream
       - run:
           name: Run CLI selftest
@@ -178,6 +179,7 @@ jobs:
           command: |
             [ "<< parameters.simapp >>" = "simapp44" ] && export SIMAPP44_ENABLED=1 SLOW_SIMAPP44_ENABLED=1
             [ "<< parameters.simapp >>" = "simapp46" ] && export SIMAPP46_ENABLED=1 SLOW_SIMAPP46_ENABLED=1
+            [ "<< parameters.simapp >>" = "simapp47" ] && export SIMAPP47_ENABLED=1 SLOW_SIMAPP47_ENABLED=1
             ./run_examples.sh
       - run:
           name: Stop chains

.yarn/sdks/typescript/lib/tsserver.js

@@ -109,6 +109,8 @@ const moduleWrapper = tsserver => {
             str = `zip:${str}`;
           } break;
         }
+      } else {
+        str = str.replace(/^\/?/, process.platform === `win32` ? `` : `/`);
       }
     }
 

.yarn/sdks/typescript/lib/tsserverlibrary.js

@@ -109,6 +109,8 @@ const moduleWrapper = tsserver => {
             str = `zip:${str}`;
           } break;
         }
+      } else {
+        str = str.replace(/^\/?/, process.platform === `win32` ? `` : `/`);
       }
     }
 

.yarn/sdks/typescript/package.json

@@ -1,6 +1,6 @@
 {
   "name": "typescript",
-  "version": "4.6.4-sdk",
+  "version": "4.9.5-sdk",
   "main": "./lib/typescript.js",
   "type": "commonjs"
 }

CHANGELOG.md

@@ -6,6 +6,28 @@ and this project adheres to
 
 ## [Unreleased]
 
+### Changed
+
+- all: upgrade cosmjs-types to 0.8.0 to include Cosmos SDK 0.46/0.47 and IBC v7
+  types.
+- @cosmjs/cosmwasm-stargate: Implement auto-detection for Tendermint 0.34/37
+  ([#1411]).
+- @cosmjs/cosmwasm-stargate: Remove structured `searchTx` queries. Only raw
+  query strings and key/value pairs are now supported. ([#1411])
+- @cosmjs/cosmwasm-stargate: Let `searchTx` return non-readonly array. The
+  caller owns this array and can mutate it as they want. ([#1411])
+- @cosmjs/cosmwasm-stargate: In `UploadResult` (result from
+  `SigningCosmWasmClient.upload`), rename `originalChecksum` to `checksum` and
+  remove `compressedChecksum` ([#1409]).
+- @cosmjs/stargate: Implement auto-detection for Tendermint 0.34/37 ([#1411]).
+- @cosmjs/stargate: Remove structured `searchTx` queries. Only raw query strings
+  and key/value pairs are now supported. ([#1411])
+- @cosmjs/stargate: Let `searchTx` return non-readonly array. The caller owns
+  this array and can mutate it as they want. ([#1411])
+
+[#1409]: https://github.com/cosmos/cosmjs/issues/1409
+[#1411]: https://github.com/cosmos/cosmjs/pull/1411
+
 ## [0.30.1] - 2023-03-22
 
 ### Fixed

HACKING.md

@@ -116,6 +116,7 @@ order to avoid conflicts. Here is an overview of the ports used:
 | 9090  | simapp gRPC                    | Manual Stargate debugging       |
 | 11134 | Standalone Tendermint 0.34 RPC | @cosmjs/tendermint-rpc tests    |
 | 11135 | Standalone Tendermint 0.35 RPC | @cosmjs/tendermint-rpc tests    |
+| 11137 | Standalone Tendermint 0.37 RPC | @cosmjs/tendermint-rpc tests    |
 | 26658 | simapp Tendermint RPC          | Stargate client tests           |
 | 26659 | wasmd Tendermint RPC           | @cosmjs/cosmwasm-stargate tests |
 | 26660 | simapp slow Tendermint RPC     | Stargate client tests           |

packages/cli/examples/delegate.ts

@@ -29,7 +29,7 @@ const msg: MsgDelegateEncodeObject = {
     delegatorAddress: signerAddress,
     // To get the proper validator address, start the demo chain (./scripts/simapp44/start.sh), then run:
     //   curl http://localhost:1318/staking/validators | jq '.result[0].operator_address'
-    validatorAddress: "cosmosvaloper1urk9gy7cfws0ak9x5nu7lx4un9n6gqkrp230jk",
+    validatorAddress: "cosmosvaloper12nt2hqjps8r065wc02qks88tvqzdeua06e982h",
     amount: coin(300000, "ustake"),
   },
 };

packages/cli/package.json

@@ -54,7 +54,7 @@
     "axios": "^0.21.2",
     "babylon": "^6.18.0",
     "chalk": "^4",
-    "cosmjs-types": "^0.7.1",
+    "cosmjs-types": "^0.8.0",
     "diff": "^4",
     "recast": "^0.20",
     "ts-node": "^8",

packages/cosmwasm-stargate/package.json

@@ -46,7 +46,7 @@
     "@cosmjs/stargate": "workspace:^",
     "@cosmjs/tendermint-rpc": "workspace:^",
     "@cosmjs/utils": "workspace:^",
-    "cosmjs-types": "^0.7.1",
+    "cosmjs-types": "^0.8.0",
     "long": "^4.0.0",
     "pako": "^2.0.2"
   },

packages/cosmwasm-stargate/src/cosmwasmclient.searchtx.spec.ts

@@ -196,12 +196,12 @@ describe("CosmWasmClient.getTx and .searchTx", () => {
     });
   });
 
-  describe("with SearchByHeightQuery", () => {
+  describe("searchTx", () => {
     it("can search successful tx by height", async () => {
       pendingWithoutWasmd();
       assert(sendSuccessful, "value must be set in beforeAll()");
       const client = await CosmWasmClient.connect(wasmd.endpoint);
-      const result = await client.searchTx({ height: sendSuccessful.height });
+      const result = await client.searchTx(`tx.height=${sendSuccessful.height}`);
       expect(result.length).toBeGreaterThanOrEqual(1);
       expect(result).toContain(
         jasmine.objectContaining({
@@ -218,7 +218,7 @@ describe("CosmWasmClient.getTx and .searchTx", () => {
       pendingWithoutWasmd();
       assert(sendUnsuccessful, "value must be set in beforeAll()");
       const client = await CosmWasmClient.connect(wasmd.endpoint);
-      const result = await client.searchTx({ height: sendUnsuccessful.height });
+      const result = await client.searchTx(`tx.height=${sendUnsuccessful.height}`);
       expect(result.length).toBeGreaterThanOrEqual(1);
       expect(result).toContain(
         jasmine.objectContaining({
@@ -230,14 +230,13 @@ describe("CosmWasmClient.getTx and .searchTx", () => {
         }),
       );
     });
-  });
 
-  describe("with SearchBySentFromOrToQuery", () => {
     it("can search by sender", async () => {
       pendingWithoutWasmd();
       assert(sendSuccessful, "value must be set in beforeAll()");
       const client = await CosmWasmClient.connect(wasmd.endpoint);
-      const results = await client.searchTx({ sentFromOrTo: sendSuccessful.sender });
+      const query = `message.action = '/cosmos.bank.v1beta1.MsgSend' AND message.sender = '${sendSuccessful.sender}'`;
+      const results = await client.searchTx(query);
       expect(results.length).toBeGreaterThanOrEqual(1);
 
       // Check basic structure of all results
@@ -266,7 +265,7 @@ describe("CosmWasmClient.getTx and .searchTx", () => {
       pendingWithoutWasmd();
       assert(sendSuccessful, "value must be set in beforeAll()");
       const client = await CosmWasmClient.connect(wasmd.endpoint);
-      const results = await client.searchTx({ sentFromOrTo: sendSuccessful.recipient });
+      const results = await client.searchTx(`transfer.recipient='${sendSuccessful.recipient}'`);
       expect(results.length).toBeGreaterThanOrEqual(1);
 
       // Check basic structure of all results
@@ -290,69 +289,11 @@ describe("CosmWasmClient.getTx and .searchTx", () => {
       );
     });
 
-    it("can search by recipient and filter by minHeight", async () => {
-      pendingWithoutWasmd();
-      assert(sendSuccessful);
-      const client = await CosmWasmClient.connect(wasmd.endpoint);
-      const query = { sentFromOrTo: sendSuccessful.recipient };
-
-      {
-        const result = await client.searchTx(query, { minHeight: 0 });
-        expect(result.length).toEqual(1);
-      }
-
-      {
-        const result = await client.searchTx(query, { minHeight: sendSuccessful.height - 1 });
-        expect(result.length).toEqual(1);
-      }
-
-      {
-        const result = await client.searchTx(query, { minHeight: sendSuccessful.height });
-        expect(result.length).toEqual(1);
-      }
-
-      {
-        const result = await client.searchTx(query, { minHeight: sendSuccessful.height + 1 });
-        expect(result.length).toEqual(0);
-      }
-    });
-
-    it("can search by recipient and filter by maxHeight", async () => {
-      pendingWithoutWasmd();
-      assert(sendSuccessful);
-      const client = await CosmWasmClient.connect(wasmd.endpoint);
-      const query = { sentFromOrTo: sendSuccessful.recipient };
-
-      {
-        const result = await client.searchTx(query, { maxHeight: 9999999999999 });
-        expect(result.length).toEqual(1);
-      }
-
-      {
-        const result = await client.searchTx(query, { maxHeight: sendSuccessful.height + 1 });
-        expect(result.length).toEqual(1);
-      }
-
-      {
-        const result = await client.searchTx(query, { maxHeight: sendSuccessful.height });
-        expect(result.length).toEqual(1);
-      }
-
-      {
-        const result = await client.searchTx(query, { maxHeight: sendSuccessful.height - 1 });
-        expect(result.length).toEqual(0);
-      }
-    });
-  });
-
-  describe("with SearchByTagsQuery", () => {
-    it("can search by transfer.recipient", async () => {
+    it("works with tags", async () => {
       pendingWithoutWasmd();
       assert(sendSuccessful, "value must be set in beforeAll()");
       const client = await CosmWasmClient.connect(wasmd.endpoint);
-      const results = await client.searchTx({
-        tags: [{ key: "transfer.recipient", value: sendSuccessful.recipient }],
-      });
+      const results = await client.searchTx([{ key: "transfer.recipient", value: sendSuccessful.recipient }]);
       expect(results.length).toBeGreaterThanOrEqual(1);
 
       // Check basic structure of all results