fix(sdk): update cosmjs patches (#3581)

unionlabs · Jan 20, 2025 · d8140e0 · d8140e0
2 parents 591785e + 9ea4c00
commit d8140e0
Show file tree

Hide file tree

Showing 15 changed files with 71 additions and 1,141 deletions.
diff --git a/.github/workflows/typescript-sdk-publish.yml b/.github/workflows/typescript-sdk-publish.yml
@@ -17,16 +17,15 @@ concurrency:
 defaults:
   run:
     shell: bash
+    working-directory: './typescript-sdk'
 
 env:
-  NODE_OPTIONS: '--no-warnings'
   ACTIONS_RUNNER_DEBUG: true
+  NODE_OPTIONS: '--no-warnings'
 
 jobs:
-  publish-jsr:
-    # manually temporarily disabled
-    if: false
-    name: 'Publish JSR'
+  publish-sdk:
+    name: 'Publish to Registries'
     runs-on: ['ubuntu-latest']
     permissions:
       contents: read
@@ -40,9 +39,22 @@ jobs:
         uses: oven-sh/setup-bun@v2
         with:
           bun-version: 'latest'
+          registry-url: 'https://registry.npmjs.org'
 
-      - name: 'Publish to JSR'
-        working-directory: './typescript-sdk'
+      - name: 'Install Dependencies'
+        run: bun install
+
+      - name: 'Prechecks'
         run: |
-          bun install
-          bun scripts/publish.ts --period patch
+          bun run build
+          bun run typecheck
+          bun run check-package
+
+      - name: 'Publish to JSR'
+        run: bun scripts/publish.ts --period patch
+
+      - name: 'Publish to NPM'
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+          NPM_CONFIG_TOKEN: ${{ secrets.NPM_TOKEN }}
+        run: npm publish --access='public' --no-git-tags
diff --git a/flake.lock b/flake.lock
diff --git a/networks/mkCosmosDevnet.nix b/networks/mkCosmosDevnet.nix
@@ -603,19 +603,17 @@ let
           mkdir -p $out/checksums
           echo -n $(cat "${checksum}") > "$out/checksums/$(basename $wasm .wasm)"
           mkdir -p $out/addresses
-          ${
-            builtins.concatStringsSep "\n" (
-              pkgs.lib.imap0 (
-                idx:
-                { salt, ... }:
-                ''
-                  echo -n "$(cat ${
-                    getContractAddress creator checksum salt
-                  })" > "$out/addresses/$(basename $wasm .wasm)_${builtins.toString idx}"
-                ''
-              ) instances
-            )
-          }
+          ${builtins.concatStringsSep "\n" (
+            pkgs.lib.imap0 (
+              idx:
+              { salt, ... }:
+              ''
+                echo -n "$(cat ${
+                  getContractAddress creator checksum salt
+                })" > "$out/addresses/$(basename $wasm .wasm)_${builtins.toString idx}"
+              ''
+            ) instances
+          )}
         done
       '';
 

diff --git a/typescript-sdk/bun.lockb b/typescript-sdk/bun.lockb
diff --git a/typescript-sdk/jsr.json b/typescript-sdk/jsr.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://jsr.io/schema/config-file.v1.json",
   "name": "@union/client",
-  "version": "0.0.39",
+  "version": "0.0.48",
   "license": "MIT",
   "exports": {
     ".": "./src/mod.ts"

diff --git a/typescript-sdk/package.json b/typescript-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@unionlabs/client",
-  "version": "0.0.45",
+  "version": "0.0.48",
   "homepage": "https://union.build",
   "description": "Union Labs cross-chain transfers client",
   "type": "module",
@@ -29,32 +29,31 @@
     "check-package": "deno run --allow-all npm:publint --strict && deno run --allow-all npm:@arethetypeswrong/cli@latest --pack --ignore-rules 'cjs-resolves-to-esm'"
   },
   "dependencies": {
-    "@aptos-labs/ts-sdk": "^1.33.1",
-    "@cosmjs/amino": "^0.32.4",
-    "@cosmjs/cosmwasm-stargate": "0.32.4",
-    "@cosmjs/proto-signing": "^0.32.4",
-    "@cosmjs/stargate": "0.32.4",
-    "@cosmjs/tendermint-rpc": "^0.32.4",
-    "@scure/base": "^1.2.1",
+    "@scure/base": "^1.2.4",
     "neverthrow": "^8.1.1",
     "ofetch": "^1.4.1",
-    "ox": "^0.6.0",
     "patch-package": "^8.0.0",
-    "viem": "^2.22.3"
+    "@aptos-labs/ts-sdk": "^1.33.1",
+    "@cosmjs/amino": "^0.33.0",
+    "@cosmjs/cosmwasm-stargate": "0.33.0",
+    "@cosmjs/proto-signing": "^0.33.0",
+    "@cosmjs/stargate": "0.33.0",
+    "@cosmjs/tendermint-rpc": "^0.33.0",
+    "viem": "^2.22.10"
   },
   "devDependencies": {
     "@total-typescript/ts-reset": "^0.6.1",
-    "@types/bun": "^1.1.15",
-    "@types/node": "^22.10.5",
-    "consola": "^3.3.3",
+    "@types/bun": "^1.1.17",
+    "@types/node": "^22.10.7",
+    "consola": "^3.4.0",
     "cosmjs-types": "^0.9.0",
     "jsr": "^0.13.2",
-    "knip": "^5.41.1",
+    "knip": "^5.42.2",
     "tsup": "^8.3.5",
     "tsx": "^4.19.2",
-    "typescript": "^5.7.2",
+    "typescript": "^5.7.3",
     "vite-tsconfig-paths": "^5.1.4",
-    "vitest": "^2.1.8"
+    "vitest": "^3.0.2"
   },
   "repository": {
     "type": "git",

diff --git a/...pt-sdk/patches/@cosmjs+amino+0.32.4.patch → ...pt-sdk/patches/@cosmjs+amino+0.33.0.patch b/...pt-sdk/patches/@cosmjs+amino+0.32.4.patch → ...pt-sdk/patches/@cosmjs+amino+0.33.0.patch
diff --git a/...tches/@cosmjs+tendermint-rpc+0.32.4.patch → ...tches/@cosmjs+tendermint-rpc+0.33.0.patch b/...tches/@cosmjs+tendermint-rpc+0.32.4.patch → ...tches/@cosmjs+tendermint-rpc+0.33.0.patch
@@ -1,5 +1,5 @@
 diff --git a/node_modules/@cosmjs/tendermint-rpc/build/comet38/adaptor/responses.js b/node_modules/@cosmjs/tendermint-rpc/build/comet38/adaptor/responses.js
-index e8b2dc3..b5c540a 100644
+index 29ec063..28a5c02 100644
 --- a/node_modules/@cosmjs/tendermint-rpc/build/comet38/adaptor/responses.js
 +++ b/node_modules/@cosmjs/tendermint-rpc/build/comet38/adaptor/responses.js
 @@ -72,7 +72,7 @@ function decodePubkey(data) {
@@ -11,20 +11,25 @@ index e8b2dc3..b5c540a 100644
          return {
              algorithm,
              data: (0, encoding_1.fromBase64)((0, encodings_1.assertNotEmpty)(value)),
-@@ -91,6 +91,11 @@ function decodePubkey(data) {
+@@ -91,6 +91,16 @@ function decodePubkey(data) {
                      algorithm: "secp256k1",
                      data: (0, encoding_1.fromBase64)((0, encodings_1.assertNotEmpty)(data.value)),
                  };
 +            case "tendermint/PubKeyBn254":
 +                return {
 +                    algorithm: "bn254",
 +                    data: (0, encoding_1.fromBase64)((0, encodings_1.assertNotEmpty)(data.value)),
++                };
++            case "cometbft/PubKeyBn254":
++                return {
++                    algorithm: "bn254",
++                    data: (0, encoding_1.fromBase64)((0, encodings_1.assertNotEmpty)(data.value)),
 +                };
              default:
                  throw new Error(`unknown pubkey type: ${data.type}`);
          }
 diff --git a/node_modules/@cosmjs/tendermint-rpc/build/tendermint37/adaptor/responses.js b/node_modules/@cosmjs/tendermint-rpc/build/tendermint37/adaptor/responses.js
-index 5c9a406..0083a25 100644
+index 19df9de..c73c4ca 100644
 --- a/node_modules/@cosmjs/tendermint-rpc/build/tendermint37/adaptor/responses.js
 +++ b/node_modules/@cosmjs/tendermint-rpc/build/tendermint37/adaptor/responses.js
 @@ -72,7 +72,7 @@ function decodePubkey(data) {
@@ -36,14 +41,19 @@ index 5c9a406..0083a25 100644
          return {
              algorithm,
              data: (0, encoding_1.fromBase64)((0, encodings_1.assertNotEmpty)(value)),
-@@ -91,6 +91,11 @@ function decodePubkey(data) {
+@@ -91,6 +91,16 @@ function decodePubkey(data) {
                      algorithm: "secp256k1",
                      data: (0, encoding_1.fromBase64)((0, encodings_1.assertNotEmpty)(data.value)),
                  };
 +            case "tendermint/PubKeyBn254":
 +                return {
 +                    algorithm: "bn254",
 +                    data: (0, encoding_1.fromBase64)((0, encodings_1.assertNotEmpty)(data.value)),
++                };
++            case "cometbft/PubKeyBn254":
++                return {
++                    algorithm: "bn254",
++                    data: (0, encoding_1.fromBase64)((0, encodings_1.assertNotEmpty)(data.value)),
 +                };
              default:
                  throw new Error(`unknown pubkey type: ${data.type}`);

diff --git a/typescript-sdk/playground/union-to-holesky.ts b/typescript-sdk/playground/union-to-holesky.ts
@@ -3,9 +3,9 @@ import "scripts/patch.ts"
 import { http } from "viem"
 import { holesky } from "viem/chains"
 import { parseArgs } from "node:util"
+import { hexToBytes } from "#convert.ts"
 import { raise } from "#utilities/index.ts"
 import { consola } from "../scripts/logger.ts"
-import { hexToBytes } from "#convert.ts"
 import { privateKeyToAccount } from "viem/accounts"
 import { DirectSecp256k1Wallet } from "@cosmjs/proto-signing"
 import { createUnionClient, type TransferAssetsParameters } from "#mod.ts"

diff --git a/typescript-sdk/src/abi/index.ts b/typescript-sdk/src/abi/index.ts