diff --git a/app/app.nix b/app/app.nix index b6d64a31fd..8f11cada8b 100644 --- a/app/app.nix +++ b/app/app.nix @@ -9,7 +9,7 @@ _: { { packages = { app = unstablePkgs.buildNpmPackage { - npmDepsHash = "sha256-SMJ/Qjxh6pRMOQVD8me5Xdcc0gBmhHRwvIMB7pkCZAA="; + npmDepsHash = "sha256-CMdHOVBGB0FIlhqdJft+2IUdAS8QVzZBBEuwFhQJN6g="; src = ./.; sourceRoot = "app"; npmFlags = [ "--legacy-peer-deps" ]; diff --git a/app/package-lock.json b/app/package-lock.json index d739114cfc..b960729876 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -85,7 +85,7 @@ "tailwind-variants": "^0.2.1", "tailwindcss": "^3.4.3", "tailwindcss-animate": "^1.0.7", - "tslib": "^2.6.2", + "tslib": "^2.6.3", "tsx": "^4.11.2", "typed-query-selector": "^2.11.2", "typescript": "^5.4.5", @@ -9756,9 +9756,9 @@ "integrity": "sha512-nsZd8ZeNUzukXPlJmTBwUAuABDe/9qtVDelJeT/qW0ow3ZS3BsQJtNkan1802aM9Uf68/Y8ljw86Hu0h5IUW3w==" }, "node_modules/tslib": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", - "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", + "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==" }, "node_modules/tsx": { "version": "4.11.2", diff --git a/app/package.json b/app/package.json index 880285eedc..a62d8abc08 100644 --- a/app/package.json +++ b/app/package.json @@ -90,7 +90,7 @@ "tailwind-variants": "^0.2.1", "tailwindcss": "^3.4.3", "tailwindcss-animate": "^1.0.7", - "tslib": "^2.6.2", + "tslib": "^2.6.3", "tsx": "^4.11.2", "typed-query-selector": "^2.11.2", "typescript": "^5.4.5", diff --git a/typescript-sdk/bun.lockb b/typescript-sdk/bun.lockb index 52b475fb34..546fb60cc6 100755 Binary files a/typescript-sdk/bun.lockb and b/typescript-sdk/bun.lockb differ diff --git a/typescript-sdk/package.json b/typescript-sdk/package.json index 0cc326c308..5fe785566a 100644 --- a/typescript-sdk/package.json +++ b/typescript-sdk/package.json @@ -20,7 +20,7 @@ "@cosmjs/encoding": "^0.32.3", "@cosmjs/stargate": "0.32.3", "@cosmjs/tendermint-rpc": "0.32.3", - "viem": "^2.13.3" + "viem": "^2.13.6" }, "devDependencies": { "@arethetypeswrong/cli": "^0.15.3", @@ -29,7 +29,7 @@ "@scure/base": "^1.1.6", "@total-typescript/ts-reset": "^0.5.1", "@types/bun": "^1.1.3", - "@types/node": "^20.14.0", + "@types/node": "^20.14.1", "consola": "^3.2.3", "cosmjs-types": "^0.9.0", "patch-package": "^8.0.0", diff --git a/typescript-sdk/scripts/logger.ts b/typescript-sdk/scripts/logger.ts index 20d8b5858f..de91241295 100644 --- a/typescript-sdk/scripts/logger.ts +++ b/typescript-sdk/scripts/logger.ts @@ -7,9 +7,9 @@ export const consola = createConsola({ } }) -export const timestamp = () => { +export function timestamp() { const d = new Date() const [date] = d.toISOString().split("T") const [time] = d.toTimeString().split(" ") - return `${date} ${time}` + return `${date}--${time?.replace(/:/g, "-")}` } diff --git a/typescript-sdk/scripts/from-osmosis.ts b/typescript-sdk/scripts/osmosis-to-union.ts similarity index 91% rename from typescript-sdk/scripts/from-osmosis.ts rename to typescript-sdk/scripts/osmosis-to-union.ts index 59b7ecdfdf..266febd5b1 100644 --- a/typescript-sdk/scripts/from-osmosis.ts +++ b/typescript-sdk/scripts/osmosis-to-union.ts @@ -1,6 +1,7 @@ #!/usr/bin/env bun import { parseArgs } from "node:util" import { UnionClient } from "#/mod.ts" +import { timestamp } from "./logger" /* `bun scripts/from-osmosis.ts --private-key "..."` */ @@ -30,7 +31,7 @@ const osmoFromOsmosisToUnion = await unionClient.transferAssets({ token: { denom: "uosmo", amount: "1" }, sender: "osmo14qemq0vw6y3gc3u3e0aty2e764u4gs5l32ydm0", receiver: "union14qemq0vw6y3gc3u3e0aty2e764u4gs5lnxk4rv", - memo: "sending OSMO from Osmosis to Union x", + memo: `${timestamp()} sending OSMO from Osmosis to Union x`, timeoutHeight: { revisionHeight: 888888888n, revisionNumber: 8n } } ] diff --git a/typescript-sdk/scripts/union-to-sepolia.ts b/typescript-sdk/scripts/union-to-sepolia.ts index 93e100ade9..2920ab3cd6 100644 --- a/typescript-sdk/scripts/union-to-sepolia.ts +++ b/typescript-sdk/scripts/union-to-sepolia.ts @@ -31,7 +31,7 @@ const unionClient = await UnionClient.connectWithSecret({ }) const contractAddress = "union124t57vjgsyknnhmr3fpkmyvw2543448kpt2xhk5p5hxtmjjsrmzsjyc4n7" - +const stamp = timestamp() const unionToSepoliaTransactions: Array = Array.from( { length: TX_COUNT }, (_, index) => ({ @@ -39,11 +39,11 @@ const unionToSepoliaTransactions: Array = Array.from( msg: { transfer: { channel: "channel-0", - receiver: "0xD0081080Ae8493cf7340458Eaf4412030df5FEEb".slice(2), - memo: `${index} - ${timestamp()} Sending UNO from Union to Sepolia` + receiver: "0x8478B37E983F520dBCB5d7D3aAD8276B82631aBd".slice(2), + memo: `${index} - ${stamp} Sending UNO from Union to Sepolia` } }, - funds: [{ amount: (index + 1).toString(), denom: `muno` }] + funds: [{ amount: (index + 2).toString(), denom: `muno` }] }) ) @@ -53,7 +53,7 @@ const transactionResults = await Array.fromAsync( unionClient.transferAssets({ kind: "cosmwasm", instructions: [transaction] }), { concurrency: 1 } ) - +console.info(stamp) consola.info( JSON.stringify( transactionResults.map(item => item.transactionHash),