chore(ts-sdk-sui): some cleanup

Signed-off-by: kaancaglan <[email protected]>

Author: Caglankaan

ts-sdk-sui/examples/sui-create-client-generate-instruction.ts

@@ -42,7 +42,6 @@ const program = Effect.gen(function*() {
 
   console.log("source", source)
 
-  // TODO: Destination will be somewhere
   const destination = yield* ChainRegistry.byUniversalId(
     UniversalChainId.make("union.union-1"),
   )
@@ -73,38 +72,30 @@ const program = Effect.gen(function*() {
     channelId: ChannelId.make(5),
     ucs03Address: "0x8675045186976da5b60baf20dc94413fb5415a7054052dc14d93c13d3dbdf830",
     instruction: tokenOrder,
-  
+
     // NEW — only read by the Sui client
     transport: {
       sui: {
-        relayStoreId:
-          "0x393a99c6d55d9a79efa52dea6ea253fef25d2526787127290b985222cc20a924",
-        vaultId:
-          "0x7c4ade19208295ed6bf3c4b58487aa4b917ba87d31460e9e7a917f7f12207ca3",
-        ibcStoreId:
-          "0xac7814eebdfbf975235bbb796e07533718a9d83201346769e5f281dc90009175",
+        relayStoreId: "0x393a99c6d55d9a79efa52dea6ea253fef25d2526787127290b985222cc20a924",
+        vaultId: "0x7c4ade19208295ed6bf3c4b58487aa4b917ba87d31460e9e7a917f7f12207ca3",
+        ibcStoreId: "0xac7814eebdfbf975235bbb796e07533718a9d83201346769e5f281dc90009175",
         coins: [
           {
             typeArg: "0x2::sui::SUI",
-            objectId:
-              "0xab70523198047a482febffab381a2a564002459bdcfa98991c747a013b3fd3e4",
+            objectId: "0x266d00c4b329111255339c041cc57a1b616cfeddafdae47df8f814002578e95b",
           },
         ],
       },
     },
   })
 
+  yield* Effect.log("ZKGM Client Request", request)
+
   const zkgmClient = yield* ZkgmClient.ZkgmClient
 
   const response: ZkgmClientResponse.ZkgmClientResponse = yield* zkgmClient.execute(request)
 
   yield* Effect.log("Submission Hash", response.txHash)
-
-  const completion = yield* response.waitFor(
-    ZkgmIncomingMessage.LifecycleEvent.$is("EvmTransactionReceiptComplete"),
-  )
-
-  yield* Effect.log("Completion", completion)
 }).pipe(
   Effect.provide(layerWithoutWallet),
   Effect.provide(PublicClient.Live({ url: getFullnodeUrl("testnet") })),

ts-sdk-sui/examples/sui-create-client-write-contract.ts

@@ -17,8 +17,7 @@ import {
   writeContract,
 } from "../src/Sui.js"
 
-const MNEMONIC = process.env.MNEMONIC
-  ?? "fix auto gallery heart practice drip joke nice decline lift attend bread"
+const MNEMONIC = process.env.SUI_MNEMONIC ?? "..."
 const RECIPIENT = process.env.RECIPIENT
   ?? "0x03ff9dd9e093387bdd4432c6a3eb6a1bd5a8f39a530042ac7efe576f18d3232b"
 

ts-sdk-sui/src/Sui.ts

@@ -1,19 +1,14 @@
 /**
- * This module handles EVM related functionality.
+ * This module handles Sui related functionality.
  *
  * @since 0.0.0
  */
-import { SuiClient, SuiClientOptions } from "@mysten/sui/client"
+import { SuiClient } from "@mysten/sui/client"
 import { Ed25519Keypair } from "@mysten/sui/keypairs/ed25519"
 import { Transaction } from "@mysten/sui/transactions"
-import { GAS_DENOMS } from "@unionlabs/sdk/Constants"
-import { UniversalChainId } from "@unionlabs/sdk/schema/chain"
-import * as Ucs03 from "@unionlabs/sdk/Ucs03"
 import { extractErrorDetails } from "@unionlabs/sdk/Utils"
-import * as Utils from "@unionlabs/sdk/Utils"
-import { Context, Data, Effect, flow, Layer, pipe, Schema as S } from "effect"
-import { type Address, erc20Abi } from "viem"
-import type { Hex } from "viem"
+import { Context, Data, Effect, flow, Layer } from "effect"
+import { type Address } from "viem"
 import * as internal from "./internal/sui.js"
 
 /**
@@ -87,43 +82,10 @@ export namespace Sui {
 //     return result
 //   })
 
-/**
- * @category errors
- * @since 0.0.0
- */
-export class WaitForTransactionReceiptError extends Data.TaggedError(
-  "WaitForTransactionReceiptError",
-)<{
-  cause: unknown
-}> {}
-
 export class ReadCoinError extends Data.TaggedError("ReadCoinError")<{
   cause: unknown
 }> {}
 
-// /**
-//  * Wait for a transaction receipt
-//  * @param hash The transaction hash for which to wait
-//  * @returns An Effect that resolves to the transaction receipt
-//  *
-//  * @category utils
-//  * @since 0.0.0
-//  */
-// export const waitForTransactionReceipt = (hash: Hash) =>
-//   Effect.gen(function*() {
-//     const client = (yield* PublicClient).client
-
-//     const receipt = yield* Effect.tryPromise({
-//       try: () => client.waitForTransactionReceipt({ hash }),
-//       catch: err =>
-//         new WaitForTransactionReceiptError({
-//           cause: Utils.extractErrorDetails(err as WaitForTransactionReceiptTimeoutErrorType),
-//         }),
-//     })
-
-//     return receipt
-//   })
-
 export const readContract = <T>(
   client: SuiClient,
   sender: string,
@@ -604,243 +566,3 @@ export const readCoinSymbol = (address: string) =>
     })
     return symbol
   })
-
-/**
- * PTB: begin_send -> (send_with_coin<T> ...)* -> end_send
- *
- * Mirrors:
- * sui client ptb \
- *   --move-call "$PKG::$MOD::begin_send" $CHANNEL_ID $SALT \
- *   --assign send_ctx1 \
- *   --move-call "$PKG::$MOD::send_with_coin" "<$TYPE_T>" \
- *       $RELAY_STORE $VAULT $IBC_STORE $COIN $VERSION $OPCODE $OPERAND send_ctx1 \
- *   --assign send_ctx2 \
- *   --move-call "$PKG::$MOD::end_send" $IBC_STORE $CLOCK $T_HEIGHT $T_TS send_ctx2 \
- *   --gas-budget 150000000
- */
-export const sendInstruction = (params: {
-  packageId: string
-
-  /** coin type, e.g. "0x2::sui::SUI" (used in typeArguments of send_with_coin) */
-  typeArg: string
-
-  relayStoreId: string // $RELAY_STORE
-  vaultId: string // $VAULT
-  ibcStoreId: string // $IBC_STORE
-  coinObjectId: string // $COIN
-
-  // extraSendCalls?: Array<{
-  //   relayStoreId?: string
-  //   vaultId?: string
-  //   ibcStoreId?: string
-  //   coinObjectId?: string
-  //   version?: number
-  //   opcode?: number
-  //   operandHex?: `0x${string}`
-  //   typeArg?: string
-  // }>
-
-  instruction: Ucs03.Instruction
-}) =>
-  Effect.gen(function*() {
-    const module = "zkgm"
-    const clockObjectId = "0x6" // Sui system clock object
-
-    const { client, signer } = yield* WalletClient
-    const channelId = (yield* ChannelSource).channelId
-
-    const salt = yield* Utils.generateSalt("evm") // TODO: check if evm will work here or not
-    const timeoutNs = Utils.getTimeoutInNanoseconds24HoursFromNow()
-    const tHeight = BigInt(0)
-
-    const operandHex =
-      (yield* S.encode(Ucs03.InstructionFromHex)(params.instruction)) as `0x${string}`
-
-    // helpers
-    const hexToBytes = (hex: `0x${string}`): Uint8Array => {
-      const s = hex.slice(2)
-      const out = new Uint8Array(s.length / 2)
-      for (let i = 0; i < out.length; i++) {
-        out[i] = parseInt(s.slice(i * 2, i * 2 + 2), 16)
-      }
-      return out
-    }
-
-    const tx = new Transaction()
-    // if (params.gasBudget !== undefined) tx.setGasBudget(BigInt(params.gasBudget as any))
-    // adress: 0x1234
-    let sendCtx = tx.moveCall({
-      target: `${params.packageId}::${module}::begin_send`,
-      typeArguments: [],
-      arguments: [
-        tx.pure.u32(channelId),
-        tx.pure.vector("u8", hexToBytes(salt as `0x${string}`)),
-      ],
-    })
-
-    const pushSendWithCoin = (cfg: {
-      relayStoreId: string
-      vaultId: string
-      ibcStoreId: string
-      coinObjectId: string
-      version: number
-      opcode: number
-      operandHex: `0x${string}`
-      typeArg: string
-    }) => {
-      sendCtx = tx.moveCall({
-        target: `${params.packageId}::${module}::send_with_coin`,
-        typeArguments: [cfg.typeArg],
-        arguments: [
-          tx.object(cfg.relayStoreId),
-          tx.object(cfg.vaultId),
-          tx.object(cfg.ibcStoreId),
-          tx.object(cfg.coinObjectId),
-          tx.pure.u8(cfg.version),
-          tx.pure.u8(cfg.opcode),
-          tx.pure.vector("u8", hexToBytes(cfg.operandHex)),
-          sendCtx,
-        ],
-      })
-    }
-
-    pushSendWithCoin({
-      relayStoreId: params.relayStoreId,
-      vaultId: params.vaultId,
-      ibcStoreId: params.ibcStoreId,
-      coinObjectId: params.coinObjectId,
-      version: params.instruction.version,
-      opcode: params.instruction.opcode,
-      operandHex,
-      typeArg: params.typeArg,
-    })
-
-    // TODO: multiple send_with_coin calls if needed??? will this work?
-    // for (const extra of params.extraSendCalls ?? []) {
-    //   pushSendWithCoin({
-    //     relayStoreId: extra.relayStoreId ?? params.relayStoreId,
-    //     vaultId: extra.vaultId ?? params.vaultId,
-    //     ibcStoreId: extra.ibcStoreId ?? params.ibcStoreId,
-    //     coinObjectId: extra.coinObjectId ?? params.coinObjectId,
-    //     version: extra.version ?? params.version,
-    //     opcode: extra.opcode ?? params.opcode,
-    //     operandHex: (extra.operandHex ?? operandHex) as `0x${string}`,
-    //     typeArg: extra.typeArg ?? params.typeArg,
-    //   })
-    // }
-
-    tx.moveCall({
-      target: `${params.packageId}::${module}::end_send`,
-      typeArguments: [],
-      arguments: [
-        tx.object(params.ibcStoreId),
-        tx.object(clockObjectId),
-        tx.pure.u64(tHeight),
-        tx.pure.u64(BigInt(timeoutNs)), // ns
-        sendCtx,
-      ],
-    })
-
-    const res = yield* Effect.tryPromise({
-      try: async () =>
-        client.signAndExecuteTransaction({
-          signer,
-          transaction: tx,
-        }),
-      catch: (e) => new WriteContractError({ cause: extractErrorDetails(e as Error) }),
-    })
-
-    return res
-  })
-
-// turn a hex string like "0xdeadbeef" into a number[] of bytes
-function hexToBytes(hex: string): number[] {
-  const h = hex.startsWith("0x") ? hex.slice(2) : hex
-  return h.match(/.{1,2}/g)!.map(b => parseInt(b, 16))
-}
-
-// // TODO: Decide the parameters here.
-// /**
-//  * @category utils
-//  * @since 0.0.0
-//  */
-// export const sendInstruction = (instruction: Ucs03.Instruction) =>
-//   Effect.gen(function*() {
-//     const walletClient = yield* WalletClient
-//     const sourceConfig = yield* ChannelSource
-
-//     const timeoutTimestamp = Utils.getTimeoutInNanoseconds24HoursFromNow()
-//     const salt = yield* Utils.generateSalt("evm")
-
-//     const operand = yield* S.encode(Ucs03.InstructionFromHex)(instruction)
-
-//     return yield* writeContract({
-//       client: walletClient.client,
-//       signer: walletClient.signer,
-//       account: walletClient.account,
-//       abi: Ucs03.Abi,
-//       // chain: walletClient.chain, TODO: Do we need this?
-//       fn: "send",
-//       address: sourceConfig.ucs03address,
-//       args: [
-//         sourceConfig.channelId,
-//         0n,
-//         timeoutTimestamp,
-//         salt,
-//         {
-//           opcode: instruction.opcode,
-//           version: instruction.version,
-//           operand,
-//         },
-//       ],
-//       value: 10n,
-//     })
-//   })
-
-// /**
-//  * Read the balance of an ERC20 token for a specific address
-//  * @param tokenAddress The address of the ERC20 token
-//  * @param ownerAddress The address to check the balance for
-//  * @param blockNumber The blockNumber at certain point
-//  * @returns An Effect that resolves to the token balance
-//  *
-//  * @category utils
-//  * @since 0.0.0
-//  */
-// export const readErc20BalanceAtBlock = (
-//   tokenAddress: Address,
-//   ownerAddress: Address,
-//   blockNumber: bigint,
-// ) =>
-//   Effect.gen(function*() {
-//     const client = (yield* PublicClient).client
-
-//     return yield* readContract(client, {
-//       address: tokenAddress,
-//       abi: erc20Abi,
-//       functionName: "balanceOf",
-//       args: [ownerAddress],
-//       blockNumber: blockNumber,
-//     })
-//   })
-
-// /**
-//  * Read the TotalSupply of an ERC20 token
-//  * @param tokenAddress The address of the ERC20 token
-//  * @param blockNumber The blockNumber at certain point
-//  * @returns An Effect that resolves to the totalSupply
-//  *
-//  * @category utils
-//  * @since 0.0.0
-//  */
-// export const readErc20TotalSupplyAtBlock = (tokenAddress: Address, blockNumber: bigint) =>
-//   Effect.gen(function*() {
-//     const client = (yield* PublicClient).client
-
-//     return yield* readContract(client, {
-//       address: tokenAddress,
-//       abi: erc20Abi,
-//       functionName: "totalSupply",
-//       blockNumber: blockNumber,
-//     })
-//   })

ts-sdk-sui/src/SuiZkgmClient.ts

@@ -1,5 +1,5 @@
 /**
- * This module defines a concrete {@link ZkgmClient} for EVM source chain usage.
+ * This module defines a concrete {@link ZkgmClient} for Sui source chain usage.
  *
  * @since 0.0.0
  */