From eb0c4699e2722b6583002cdc2674c5610c28a3e9 Mon Sep 17 00:00:00 2001 From: o-az Date: Sat, 18 Jan 2025 12:16:45 -0800 Subject: [PATCH 1/5] chore: update deps --- flake.lock | 6 ++-- typescript-sdk/package.json | 29 +++++++++---------- ....32.4.patch => @cosmjs+amino+0.33.0.patch} | 0 ...ch => @cosmjs+tendermint-rpc+0.33.0.patch} | 0 4 files changed, 17 insertions(+), 18 deletions(-) rename typescript-sdk/patches/{@cosmjs+amino+0.32.4.patch => @cosmjs+amino+0.33.0.patch} (100%) rename typescript-sdk/patches/{@cosmjs+tendermint-rpc+0.32.4.patch => @cosmjs+tendermint-rpc+0.33.0.patch} (100%) diff --git a/flake.lock b/flake.lock index cf0a6104f7..94977ffa57 100644 --- a/flake.lock +++ b/flake.lock @@ -432,11 +432,11 @@ }, "nixpkgs-js": { "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "lastModified": 1737062831, + "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", "type": "github" }, "original": { diff --git a/typescript-sdk/package.json b/typescript-sdk/package.json index b3f79a18c7..85a1bc21f5 100644 --- a/typescript-sdk/package.json +++ b/typescript-sdk/package.json @@ -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.9" }, "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/typescript-sdk/patches/@cosmjs+amino+0.32.4.patch b/typescript-sdk/patches/@cosmjs+amino+0.33.0.patch similarity index 100% rename from typescript-sdk/patches/@cosmjs+amino+0.32.4.patch rename to typescript-sdk/patches/@cosmjs+amino+0.33.0.patch diff --git a/typescript-sdk/patches/@cosmjs+tendermint-rpc+0.32.4.patch b/typescript-sdk/patches/@cosmjs+tendermint-rpc+0.33.0.patch similarity index 100% rename from typescript-sdk/patches/@cosmjs+tendermint-rpc+0.32.4.patch rename to typescript-sdk/patches/@cosmjs+tendermint-rpc+0.33.0.patch From 5815d710f65bcdb9184f4d963cd7cd5cff6c468b Mon Sep 17 00:00:00 2001 From: o-az Date: Sat, 18 Jan 2025 12:28:08 -0800 Subject: [PATCH 2/5] fix: fmt --- networks/mkCosmosDevnet.nix | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/networks/mkCosmosDevnet.nix b/networks/mkCosmosDevnet.nix index 9306d307a9..08cb048e46 100644 --- 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 ''; From abdc4fa4392a664607294d67ba2c0e1a961859cf Mon Sep 17 00:00:00 2001 From: o-az Date: Sun, 19 Jan 2025 08:11:57 -0800 Subject: [PATCH 3/5] fix: update patch --- typescript-sdk/bun.lockb | Bin 160781 -> 159288 bytes .../@cosmjs+tendermint-rpc+0.33.0.patch | 18 ++++++++++++++---- typescript-sdk/playground/union-to-holesky.ts | 2 +- typescript-sdk/src/pfm.ts | 6 +++--- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/typescript-sdk/bun.lockb b/typescript-sdk/bun.lockb index 218330d8c4368e7e482c5950f2f14cc806691782..db7cb3488af3919a5edb43b3b40c25665113c580 100755 GIT binary patch delta 34803 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%0DoIzG9K5cRx1f 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 > { - if (sourceChainId === destinationChainId) { - return err(new Error("Source and destination chains cannot be the same")) - } + // if (sourceChainId === destinationChainId) { + // return err(new Error("Source and destination chains cannot be the same")) + // } // const { data: chains } = await offchainQuery.chains({ // includeContracts: true, From 31d9c6351c6ba113331af55628ffc874a9f6626f Mon Sep 17 00:00:00 2001 From: o-az Date: Sun, 19 Jan 2025 18:53:00 -0800 Subject: [PATCH 4/5] feat: publish through ci --- .github/workflows/typescript-sdk-publish.yml | 41 +- typescript-sdk/bun.lockb | Bin 159288 -> 159289 bytes typescript-sdk/package.json | 2 +- typescript-sdk/src/abi/index.ts | 3 - typescript-sdk/src/abi/ucs-02.ts | 1065 ------------------ typescript-sdk/src/utilities/functions.ts | 11 - typescript-sdk/src/utilities/index.ts | 10 - 7 files changed, 37 insertions(+), 1095 deletions(-) delete mode 100644 typescript-sdk/src/abi/index.ts delete mode 100644 typescript-sdk/src/abi/ucs-02.ts delete mode 100644 typescript-sdk/src/utilities/functions.ts diff --git a/.github/workflows/typescript-sdk-publish.yml b/.github/workflows/typescript-sdk-publish.yml index 468f802e67..9283d992c3 100644 --- a/.github/workflows/typescript-sdk-publish.yml +++ b/.github/workflows/typescript-sdk-publish.yml @@ -17,16 +17,48 @@ concurrency: defaults: run: shell: bash + working-directory: './typescript-sdk' env: - NODE_OPTIONS: '--no-warnings' ACTIONS_RUNNER_DEBUG: true + NODE_OPTIONS: '--no-warnings' jobs: + publish-npm: + name: 'Publish to NPM' + runs-on: ['ubuntu-latest'] + permissions: + contents: read + # The OIDC ID token is used for authentication with JSR. + id-token: write + steps: + - name: 'Checkout' + uses: actions/checkout@v4 + + - name: 'Setup bun' + uses: oven-sh/setup-bun@v2 + with: + bun-version: 'latest' + registry-url: 'https://registry.npmjs.org' + + - name: 'Install Dependencies' + run: bun install + + - name: 'Prechecks' + run: | + bun run build + bun run typecheck + bun run check-package + + - name: 'Publish to npm' + env: + NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} + NPM_CONFIG_TOKEN: ${{ secrets.NPM_TOKEN }} + run: | + bun publih --access='public' + publish-jsr: - # manually temporarily disabled - if: false - name: 'Publish JSR' + name: 'Publish to JSR' runs-on: ['ubuntu-latest'] permissions: contents: read @@ -42,7 +74,6 @@ jobs: bun-version: 'latest' - name: 'Publish to JSR' - working-directory: './typescript-sdk' run: | bun install bun scripts/publish.ts --period patch diff --git a/typescript-sdk/bun.lockb b/typescript-sdk/bun.lockb index db7cb3488af3919a5edb43b3b40c25665113c580..a3cbaebe43ffc2de2d1a6caed9ddd09fca37c718 100755 GIT binary patch delta 14000 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 delta 14058 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 f9wOog+=`F-*}O&mx9q6+(...functions: Array<(...args: Array) => T>) { - return functions.reduce( - (acc, currentFn) => - (...args: Array) => - acc(currentFn(...args)) - ) -} diff --git a/typescript-sdk/src/utilities/index.ts b/typescript-sdk/src/utilities/index.ts index ed648d89ad..4bb320a216 100644 --- a/typescript-sdk/src/utilities/index.ts +++ b/typescript-sdk/src/utilities/index.ts @@ -1,13 +1,3 @@ -/** - * sleep for the specified number of milliseconds - * @example - * ```ts - * await sleep(1000) - * ``` - */ -export const sleep = async (ms: number): Promise => - new Promise(resolve => setTimeout(resolve, ms)) - /** * get the current timestamp in the format `YYYY-MM-DD--HH-MM-SS` * @example From 9ea4c00c6634850720ba185949ba9dd1208ce4d7 Mon Sep 17 00:00:00 2001 From: o-az Date: Sun, 19 Jan 2025 19:04:34 -0800 Subject: [PATCH 5/5] fix: version --- .github/workflows/typescript-sdk-publish.yml | 33 +++++--------------- typescript-sdk/jsr.json | 2 +- typescript-sdk/package.json | 2 +- typescript-sdk/src/evm/client.ts | 2 +- typescript-sdk/src/pfm.ts | 2 +- 5 files changed, 11 insertions(+), 30 deletions(-) diff --git a/.github/workflows/typescript-sdk-publish.yml b/.github/workflows/typescript-sdk-publish.yml index 9283d992c3..b994185a31 100644 --- a/.github/workflows/typescript-sdk-publish.yml +++ b/.github/workflows/typescript-sdk-publish.yml @@ -24,8 +24,8 @@ env: NODE_OPTIONS: '--no-warnings' jobs: - publish-npm: - name: 'Publish to NPM' + publish-sdk: + name: 'Publish to Registries' runs-on: ['ubuntu-latest'] permissions: contents: read @@ -50,30 +50,11 @@ jobs: bun run typecheck bun run check-package - - name: 'Publish to npm' + - 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: | - bun publih --access='public' - - publish-jsr: - name: 'Publish to JSR' - runs-on: ['ubuntu-latest'] - permissions: - contents: read - # The OIDC ID token is used for authentication with JSR. - id-token: write - steps: - - name: 'Checkout' - uses: actions/checkout@v4 - - - name: 'Setup bun' - uses: oven-sh/setup-bun@v2 - with: - bun-version: 'latest' - - - name: 'Publish to JSR' - run: | - bun install - bun scripts/publish.ts --period patch + run: npm publish --access='public' --no-git-tags diff --git a/typescript-sdk/jsr.json b/typescript-sdk/jsr.json index 7191f25835..1274a03289 100644 --- 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 index 099aa79959..66efdf04bd 100644 --- 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", diff --git a/typescript-sdk/src/evm/client.ts b/typescript-sdk/src/evm/client.ts index 800f03122f..368876b505 100644 --- a/typescript-sdk/src/evm/client.ts +++ b/typescript-sdk/src/evm/client.ts @@ -26,7 +26,7 @@ import { berachainTestnetbArtio } from "viem/chains" import type { TransferAssetsParameters, LooseAutocomplete, Hex, HexAddress } from "../types.ts" -import { ucs03ZkgmAbi } from "#abi/ucs-03.ts" +import { ucs03ZkgmAbi } from "../abi/ucs-03.ts" export { sepolia, scrollSepolia, arbitrumSepolia, berachainTestnetbArtio } export const evmChains = [ diff --git a/typescript-sdk/src/pfm.ts b/typescript-sdk/src/pfm.ts index 5b7cb5f960..62fefdb0de 100644 --- a/typescript-sdk/src/pfm.ts +++ b/typescript-sdk/src/pfm.ts @@ -1,6 +1,6 @@ import type { ChainId } from "./types.ts" import { err, ok, Result } from "neverthrow" -import { sepolia } from "#mod.ts" +import { sepolia } from "./mod.ts" import { holesky } from "viem/chains" export const createPfmMemo: (_args: {