From 29deb6386a1e25e3512977d69c35726d0de10c48 Mon Sep 17 00:00:00 2001 From: omar Date: Tue, 4 Jun 2024 17:34:19 -0700 Subject: [PATCH] chore: save progress --- app/app.nix | 2 +- app/package-lock.json | 8 ++++---- app/package.json | 2 +- typescript-sdk/bun.lockb | Bin 113084 -> 113084 bytes typescript-sdk/package.json | 4 ++-- typescript-sdk/scripts/logger.ts | 4 ++-- .../{from-osmosis.ts => osmosis-to-union.ts} | 3 ++- typescript-sdk/scripts/union-to-sepolia.ts | 10 +++++----- 8 files changed, 17 insertions(+), 16 deletions(-) rename typescript-sdk/scripts/{from-osmosis.ts => osmosis-to-union.ts} (91%) 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 52b475fb341e344a7a41d16dc0cd202084f9f1b0..546fb60cc6f12ffbf1c187e28a3fd4506e1c815e 100755 GIT binary patch delta 1209 zcmb_bjZa%u6o2RSo6*@oLDn)p!nD3=5pR_YDgZqus1o2($w%;H}8pP`)3DdSnupD#l$<$J?-ff zmF>vhvvtpC$%;Tr!)^Er$B(#6Mmt(G(4`kr5ZtnhwyEPZy@lh&TEUH$wQ zQ<-tqU$1stJ9u~d<>N`Clds(A-h1)GzNCd>ZOicj(VXPgke^Iu;?b+wlR)OvTTyT>3_2n>52K43ZGE3%DT?&(oVRn+6sikb4j2QGT_FWkn zOm&GF>AF(#fx#?#y!zxy7EhXmz=BLRLejYi$t0F^o+Qv7W-QJ;j*!-w5R5ol`#}A_ zmb;@SORY_ArE%``m6@4>>P1*L{JtvdsP_0Z)vIIKi@T3>n&&P|JyOx>v>aJ$IV`4o}aw z3?7!n-B+G5ru^am=$83*!}DXcL+tnY<9}z>nC5zKx89q~tNFRsQ6hGH`HPO^#O310 zHzIPPyWtUY;$>b?(ON5HgMxNj!Lmn#*QrFv5z;+N|KPzxCTYcHOpUBUVD~Z!U*g!Z z6&!L<#Bz(^J_|*$EC=u);~59l^03XA=;TD#VG3vC3UQ^6J|!h2T0YU9Qi7ecVM2sX zIbj=p!wCi&!AC}7suB~xLJ3!7=L+dO51H&RP-`({7({H9tvEB^IrTOEg+En#aP4+- zg;c;nZHb6ogz_cMO!V9V5`c^&b>RVJ`px delta 1265 zcmb_bZA@Eb6u#%S^aJQtM`0D{C}s$Ou25RaCRm!yWg}FjW(qX}DfBWL3iN{xMx-){ zSr#{Nyt)@=blHayB_oj=?VL=+%wXn>pHVuTTg;X@v;C2%Y*F#Ngq!%wU!LT7pL5=G za_&8E&NIEJm|j%8WHxq8&hHPm|JHWumtoztyGFyJC3-zyr@9gt%>R6I_ekK#V_R!m zf#WhbZoq@AL3XXO6FC)QH^*@)$hOtk+wAY&7Zf;(_sMwgk974!&|f)_-?=sb;1Rui zkFs_+`G;~%M{lwHx}60jbrg_-BD!PIvI1 z0?9;@@#I*#0~};bR|P#Jp{q)oRX+s>lbu$yDl`AJvZZv=l;I_n~%1AdE?y=%GS_ruNXp0 z6PaJn_r2{pbx3hbL;hGlcFFbX^0&g{QF1t_C+8zIAR}*u>&VWKh6orXk-MQfvV>7X zxCWF2B6VautRYW^YCug+V6Hx*A%6vHAcc$t>qJ%eCb#p(?Cb^i!MT%5;_Lh0Ki3;m zx33$U$}bFz4;>k_=E$Qj=fP1@9R@F2P~sv^pl%f z61-YVj0ARp@G%i%SK|vc#kOOMkZ-Synl=z-W2swhiJA3nGH0CoX5K@l$Y6Q#U z=B_aFdfgQj~Q|ypMe=UQ|GHJP`MdZO^E-{y26KVaWRb?5g zxfC-_I#UMsgNue3dFYEsdP!B10$8~PJJCaS$X+c%y008EXu=MLEJ=2fM0ki<%%$wp zD^*rHWCxSOfU`0&N@A0Qp@l;H6J}pv1(Ri4WODi5+6li78f`d&h2s)3y4wzVI#mU> z_((Zu<=OvL9RIKa{}ep&g-V!}A;0E?G$UUiqf<=~Lynhvp#uz7bN8M;XQU+>7K)qw zL2K#1{4MlcGi2$!zOc8obzia28QIj?74Gl`{C)Jq2xQX-1$dP9`k;c|W{1iLK`Q!S tGmW*tLF#IOQfll36u5FnQ}?FB`A;{=SZ`3I%-a5(?~ 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),