Chore: ics v6

.gitmodules

@@ -16,7 +16,6 @@
 [submodule "neutron"]
 	path = protos/neutron-src
 	url = [email protected]:neutron-org/neutron.git
-  branch = feat/choose-cron-blocker-2
 [submodule "slinky"]
 	path = protos/slinky-src
 	url = [email protected]:skip-mev/slinky.git

README.md

@@ -2,7 +2,7 @@
 
 Cosmjs types for users of Neutron chain.
 
-https://www.neutron.org/
+<https://www.neutron.org/>
 
 Version of this package is synced with Neutron chain version.
 
@@ -20,11 +20,23 @@ git submodule update --init --recursive
 
 # Install dependencies
 npm install
+
+# Set specified versions for submodules
+npm run set-versions
 ```
 
 ### Rebuilding types
 
 ```sh
-npm run codegen # Generate .ts files into ./src
-npm run build # Build .js/.d.ts files
+# Generate .ts files into ./src
+npm run codegen
+
+# Build .js/.d.ts files
+npm run build
+```
+
+### Removing all unnecessary folders and files
+
+```sh
+npm run clean
 ```

json-safe.d.ts

@@ -1,8 +1,8 @@
 /**
- * This file and any referenced files were automatically generated by @cosmology/telescope@1.8.3
+ * This file and any referenced files were automatically generated by @cosmology/telescope@1.10.0
  * DO NOT MODIFY BY HAND. Instead, download the latest proto files for your chain
  * and run the transpile command or npm scripts command that is used to regenerate this bundle.
  */
-export type JsonSafe<T> = {
-    [Prop in keyof T]: T[Prop] extends Uint8Array | bigint | Date ? string : T[Prop];
-};
+export type JsonSafe<T> = T extends Uint8Array | bigint | Date ? string : T extends Array<infer U> ? Array<JsonSafe<U>> : T extends object ? {
+    [K in keyof T]: JsonSafe<T[K]>;
+} : T;

package.json

@@ -24,7 +24,7 @@
     "neutron/",
     "osmosis/",
     "sdk/",
-    "slinky/",
+    "connect/",
     "tendermint/",
     "/binary.*",
     "/helpers.*",
@@ -37,14 +37,15 @@
     "!cosmos-sdk-*/**/*.md"
   ],
   "scripts": {
+    "set-versions": "./scripts/set-versions.sh",
     "format": "prettier --write --log-level warn \"./src/**/*.ts\" \"./scripts/**/*.js\"",
     "precodegen": "./scripts/exports_protos.sh",
     "codegen": "rm -rf ./src && ./scripts/codegen.js && cp -rf copypaste_files/* ./src/ && npm run format",
     "prepare-publishing": "./scripts/prepare-publishing.sh",
-    "build": "rm -rf ./build && tsc && npm run prepare-publishing"
-  },
-  "dependencies": {
+    "build": "rm -rf ./build && tsc && npm run prepare-publishing",
+    "clean": "./scripts/clean.sh"
   },
+  "dependencies": {},
   "devDependencies": {
     "@cosmology/telescope": "^1.5.4",
     "@types/node": "^15.6.2",

scripts/clean.sh

@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+
+set -o errexit -o nounset -o pipefail
+command -v shellcheck >/dev/null && shellcheck "$0"
+
+DIRS=(capability cosmos cosmos_proto cosmwasm feemarket gaia gogoproto google ibc neutron osmosis sdk connect tendermint)
+FILES=(
+  binary.d.ts
+  binary.js
+  binary.js.map
+  helpers.d.ts
+  helpers.js
+  helpers.js.map
+  json-safe.d.ts
+  json-safe.js
+  json-safe.js.map
+  utf8.d.ts
+  utf8.js
+  utf8.js.map
+  varint.d.ts
+  varint.js
+  varint.js.map
+  querier_types.js
+  querier_types.d.ts
+)
+
+for dir in "${DIRS[@]}"; do
+  rm -rf "$dir"
+done
+
+for f in "${FILES[@]}"; do
+  if [[ $f != *"json-safe"* ]]; then
+    rm -rf "$f"
+  fi
+done
+
+rm -rf ./build
+
+for dir in admin-module block-sdk cosmos-sdk feemarket ibc-go neutron connect wasmd ; do
+  rm -rf "protos/$dir"
+done

scripts/codegen.js

@@ -21,7 +21,11 @@ telescope({
     logLevel: 0,
     useSDKTypes: false,
     tsDisable: {
-      files: ["slinky/oracle/v1/query.ts"],
+      files: [
+        "connect/oracle/v2/query.ts",
+        "connect/marketmap/v2/tx.ts",
+        "connect/abci/v2/vote_extensions.ts",
+      ],
     },
     eslintDisable: {
       disableAll: true,
@@ -44,6 +48,7 @@ telescope({
           "neutron/dex/genesis.proto",
           "neutron/transfer/v1/query.proto",
           "slinky/abci/v1/vote_extensions.proto",
+          "slinky/marketmap/v1/tx.proto",
         ],
         packages: ["google.api"],
       },

scripts/exports_protos.sh

@@ -19,6 +19,8 @@ for dir in block-sdk feemarket slinky ; do
   buf export "protos/$dir-src/proto" --output "protos/$dir"
 done
 
+sed -i '' '/additional_bindings : \[\]/d' protos/slinky/connect/oracle/v2/query.proto
+
 for dir in neutron ; do
   rm -rf "protos/$dir"
   mkdir -p "protos/$dir"

scripts/prepare-publishing.sh

@@ -3,7 +3,7 @@
 set -o errexit -o nounset -o pipefail
 command -v shellcheck >/dev/null && shellcheck "$0"
 
-DIRS=(capability cosmos cosmos_proto cosmwasm feemarket gaia gogoproto google ibc neutron osmosis sdk slinky tendermint)
+DIRS=(capability cosmos cosmos_proto cosmwasm feemarket gaia gogoproto google ibc neutron osmosis sdk connect tendermint)
 FILES=(
   binary.d.ts
   binary.js

scripts/set-versions.sh

@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+
+set -o errexit -o nounset -o pipefail
+command -v shellcheck >/dev/null && shellcheck "$0"
+
+readonly ADMIN_MODULE_DIR="admin-module-src"
+readonly BLOCK_SDK_DIR="block-sdk-src"
+readonly COSMOS_SDK_DIR="cosmos-sdk-src"
+readonly FEEMARKET_DIR="feemarket-src"
+readonly IBC_GO_DIR="ibc-go-src"
+readonly NEUTRON_DIR="neutron-src"
+readonly SLINKY_DIR="slinky-src"
+readonly WASMD_DIR="wasmd-src"
+
+readonly ADMIN_MODULE_REV="v2.0.2"
+readonly BLOCK_SDK_REV="v2.1.5"
+readonly COSMOS_SDK_REV="v0.50.9-neutron"
+readonly FEEMARKET_REV="v1.1.1"
+readonly IBC_GO_REV="v8.5.1"
+readonly NEUTRON_REV="chore/ics-v6"
+readonly SLINKY_REV="v2.0.1"
+readonly WASMD_REV="v0.53.0-neutron"
+
+checkout_version () {
+   git -C protos/$1 checkout $2
+}
+
+checkout_version $ADMIN_MODULE_DIR $ADMIN_MODULE_REV
+checkout_version $BLOCK_SDK_DIR $BLOCK_SDK_REV
+checkout_version $COSMOS_SDK_DIR $COSMOS_SDK_REV
+checkout_version $FEEMARKET_DIR $FEEMARKET_REV
+checkout_version $IBC_GO_DIR $IBC_GO_REV
+checkout_version $NEUTRON_DIR $NEUTRON_REV
+checkout_version $SLINKY_DIR $SLINKY_REV
+checkout_version $WASMD_DIR $WASMD_REV

src/binary.ts

@@ -1,6 +1,6 @@
 /* eslint-disable */
 /**
- * This file and any referenced files were automatically generated by @cosmology/telescope@1.8.3
+ * This file and any referenced files were automatically generated by @cosmology/telescope@1.10.0
  * DO NOT MODIFY BY HAND. Instead, download the latest proto files for your chain
  * and run the transpile command or npm scripts command that is used to regenerate this bundle.
  */

src/connect/abci/v2/vote_extensions.ts

@@ -0,0 +1,157 @@
+//@ts-nocheck
+/* eslint-disable */
+import { BinaryReader, BinaryWriter } from "../../../binary";
+import { isSet, bytesFromBase64, base64FromBytes, DeepPartial, Exact, isObject } from "../../../helpers";
+import { JsonSafe } from "../../../json-safe";
+export const protobufPackage = "connect.abci.v2";
+export interface OracleVoteExtension_PricesEntry {
+  key: bigint;
+  value: Uint8Array;
+}
+/** OracleVoteExtension defines the vote extension structure for oracle prices. */
+export interface OracleVoteExtension {
+  /**
+   * Prices defines a map of id(CurrencyPair) -> price.Bytes() . i.e. 1 ->
+   * 0x123.. (bytes). Notice the `id` function is determined by the
+   * `CurrencyPairIDStrategy` used in the VoteExtensionHandler.
+   */
+  prices: {
+    [key: bigint]: Uint8Array;
+  };
+}
+function createBaseOracleVoteExtension_PricesEntry(): OracleVoteExtension_PricesEntry {
+  return {
+    key: BigInt(0),
+    value: new Uint8Array(),
+  };
+}
+export const OracleVoteExtension_PricesEntry = {
+  encode(
+    message: OracleVoteExtension_PricesEntry,
+    writer: BinaryWriter = BinaryWriter.create(),
+  ): BinaryWriter {
+    if (message.key !== BigInt(0)) {
+      writer.uint32(8).uint64(message.key);
+    }
+    if (message.value.length !== 0) {
+      writer.uint32(18).bytes(message.value);
+    }
+    return writer;
+  },
+  decode(input: BinaryReader | Uint8Array, length?: number): OracleVoteExtension_PricesEntry {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseOracleVoteExtension_PricesEntry();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          message.key = reader.uint64();
+          break;
+        case 2:
+          message.value = reader.bytes();
+          break;
+        default:
+          reader.skipType(tag & 7);
+          break;
+      }
+    }
+    return message;
+  },
+  fromJSON(object: any): OracleVoteExtension_PricesEntry {
+    const obj = createBaseOracleVoteExtension_PricesEntry();
+    if (isSet(object.key)) obj.key = BigInt(object.key.toString());
+    if (isSet(object.value)) obj.value = bytesFromBase64(object.value);
+    return obj;
+  },
+  toJSON(message: OracleVoteExtension_PricesEntry): JsonSafe<OracleVoteExtension_PricesEntry> {
+    const obj: any = {};
+    message.key !== undefined && (obj.key = (message.key || BigInt(0)).toString());
+    message.value !== undefined &&
+      (obj.value = base64FromBytes(message.value !== undefined ? message.value : new Uint8Array()));
+    return obj;
+  },
+  fromPartial<I extends Exact<DeepPartial<OracleVoteExtension_PricesEntry>, I>>(
+    object: I,
+  ): OracleVoteExtension_PricesEntry {
+    const message = createBaseOracleVoteExtension_PricesEntry();
+    if (object.key !== undefined && object.key !== null) {
+      message.key = BigInt(object.key.toString());
+    }
+    message.value = object.value ?? new Uint8Array();
+    return message;
+  },
+};
+function createBaseOracleVoteExtension(): OracleVoteExtension {
+  return {
+    prices: {},
+  };
+}
+export const OracleVoteExtension = {
+  typeUrl: "/connect.abci.v2.OracleVoteExtension",
+  encode(message: OracleVoteExtension, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter {
+    Object.entries(message.prices).forEach(([key, value]) => {
+      OracleVoteExtension_PricesEntry.encode(
+        {
+          key: key as any,
+          value,
+        },
+        writer.uint32(10).fork(),
+      ).ldelim();
+    });
+    return writer;
+  },
+  decode(input: BinaryReader | Uint8Array, length?: number): OracleVoteExtension {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseOracleVoteExtension();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          const entry1 = OracleVoteExtension_PricesEntry.decode(reader, reader.uint32());
+          if (entry1.value !== undefined) {
+            message.prices[entry1.key] = entry1.value;
+          }
+          break;
+        default:
+          reader.skipType(tag & 7);
+          break;
+      }
+    }
+    return message;
+  },
+  fromJSON(object: any): OracleVoteExtension {
+    const obj = createBaseOracleVoteExtension();
+    if (isObject(object.prices))
+      obj.prices = Object.entries(object.prices).reduce<{
+        [key: bigint]: bytes;
+      }>((acc, [key, value]) => {
+        acc[Number(key)] = bytes.fromJSON(value);
+        return acc;
+      }, {});
+    return obj;
+  },
+  toJSON(message: OracleVoteExtension): JsonSafe<OracleVoteExtension> {
+    const obj: any = {};
+    obj.prices = {};
+    if (message.prices) {
+      Object.entries(message.prices).forEach(([k, v]) => {
+        obj.prices[k] = bytes.toJSON(v);
+      });
+    }
+    return obj;
+  },
+  fromPartial<I extends Exact<DeepPartial<OracleVoteExtension>, I>>(object: I): OracleVoteExtension {
+    const message = createBaseOracleVoteExtension();
+    message.prices = Object.entries(object.prices ?? {}).reduce<{
+      [key: bigint]: bytes;
+    }>((acc, [key, value]) => {
+      if (value !== undefined) {
+        acc[Number(key)] = bytes.fromPartial(value);
+      }
+      return acc;
+    }, {});
+    return message;
+  },
+};