chore(ts-sdk-sui): fromWallet function is being called, error fixed on example

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

Author: Caglankaan

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

@@ -9,7 +9,17 @@ import { Effect, Logger } from "effect"
 import { getFullnodeUrl } from "@mysten/sui/client"
 import { PublicClient, WalletClient, writeContract, readCoinMetadata, readCoinBalances, sendInstruction } from "../src/Sui.js"
 import { Ed25519Keypair } from "@mysten/sui/keypairs/ed25519"
+import * as ZkgmClientRequest from "@unionlabs/sdk/ZkgmClientRequest"
+import * as ZkgmClientResponse from "@unionlabs/sdk/ZkgmClientResponse"
+import { ChannelId } from "@unionlabs/sdk/schema/channel"
+import * as ZkgmIncomingMessage from "@unionlabs/sdk/ZkgmIncomingMessage"
+import * as ZkgmClient from "@unionlabs/sdk/ZkgmClient"
+import { layerWithoutWallet } from "../src/SuiZkgmClient.js"
+
 import { Transaction } from "@mysten/sui/transactions"
+import * as TokenOrder from "@unionlabs/sdk/TokenOrder"
+import { UniversalChainId } from "@unionlabs/sdk/schema/chain"
+import { ChainRegistry } from "@unionlabs/sdk/ChainRegistry"
 
 const MNEMONIC = process.env.MNEMONIC ?? "fix auto gallery heart practice drip joke nice decline lift attend bread"
 const RECIPIENT = process.env.RECIPIENT ?? "0x03ff9dd9e093387bdd4432c6a3eb6a1bd5a8f39a530042ac7efe576f18d3232b"
@@ -18,38 +28,65 @@ const keypair = Ed25519Keypair.deriveKeypair(MNEMONIC)
 
 
 const program = Effect.gen(function* () {
+  const source = yield* ChainRegistry.byUniversalId(
+    UniversalChainId.make("ethereum.17000"),
+  )
+
+  console.log("source", source)
+  const destination = yield* ChainRegistry.byUniversalId(
+    UniversalChainId.make("ethereum.11155111"),
+  )
   const { client } = yield* PublicClient
-  yield* Effect.log("Sui public client initialized", client.network )
-  const meta = yield* readCoinMetadata("0x2::sui::SUI" as any)
-  yield* Effect.log("SUI metadata", meta)
-
-  yield* Effect.log("keypair.getPublicKey().toSuiAddress()", keypair.getPublicKey().toSuiAddress())
-  const balances = yield* readCoinBalances("0x2::sui::SUI" as any, keypair.getPublicKey().toSuiAddress() as any)
-  yield* Effect.log("SUI balances", balances)
-
-
-  const wallet = yield* WalletClient
-  const amountMist = 10_000_000n // 0.01 SUI
-
-  const tx = new Transaction()
-  const coin = tx.splitCoins(tx.gas, [tx.pure.u64(amountMist)])
-  const recipient = tx.pure.address(RECIPIENT)
-
-  const res = yield* writeContract(
-    client,
-    keypair,
-    "0x2",                                // packageId: Sui framework
-    "transfer",                           // module: sui::transfer
-    "public_transfer",                    // function
-    ["0x2::coin::Coin<0x2::sui::SUI>"],   // type arg T
-    [coin, recipient],                    // (obj: T, recipient: address)
-    tx,
+
+  const tokenOrder = yield* TokenOrder.make({
+    source,
+    destination,
+    sender: "0x06627714f3F17a701f7074a12C02847a5D2Ca487",
+    receiver: "0x50A22f95bcB21E7bFb63c7A8544AC0683dCeA302",
+    // LINK on Holesky
+    baseToken: "0x685ce6742351ae9b618f383883d6d1e0c5a31b4b",
+    baseAmount: 10n,
+    // Holesky LINK on Sepolia
+    quoteToken: "0x80fdbf104ec58a527ec40f7b03f88c404ef4ba63",
+    quoteAmount: 10n,
+    kind: "escrow",
+    metadata: undefined,
+    version: 2,
+  })
+
+  yield* Effect.log("Token Order V2", tokenOrder)
+
+  const request = ZkgmClientRequest.make({
+    source,
+    destination,
+    channelId: ChannelId.make(2),
+    ucs03Address: "0x5fbe74a283f7954f10aa04c2edf55578811aeb03",
+    kind: "simulateAndExecute",
+    instruction: tokenOrder,
+  })
+
+  const zkgmClient = yield* ZkgmClient.ZkgmClient
+
+  // NOTE: 1. switch chain is assumed
+  // NOTE: 2. write in progress
+
+  const response: ZkgmClientResponse.ZkgmClientResponse = yield* zkgmClient.execute(request)
+
+  // NOTE: 3. write complete (with tx hash)
+
+  yield* Effect.log("Submission Hash", response.txHash)
+
+  const completion = yield* response.waitFor(
+    ZkgmIncomingMessage.LifecycleEvent.$is("EvmTransactionReceiptComplete"),
   )
 
-  yield* Effect.log("Transfer submitted", res)
+  // NOTE: 4. tx complete
+
+  yield* Effect.log("Completion", completion)
 
 
 }).pipe(
+  Effect.provide(layerWithoutWallet),
   Effect.provide(PublicClient.Live({ url: getFullnodeUrl("testnet") })),
   Effect.provide(
     WalletClient.Live({
@@ -59,6 +96,7 @@ const program = Effect.gen(function* () {
     }),
   ),
 
+  Effect.provide(ChainRegistry.Default),
   Effect.provide(Logger.replace(Logger.defaultLogger, Logger.prettyLoggerDefault)),
 )
 

ts-sdk-sui/src/internal/zkgmClient.ts

@@ -58,7 +58,7 @@ export const fromWallet = (
                 (v1) =>
                   Effect.gen(function*() {
                     const meta = yield* pipe(
-                      Sui.readCoinMetadata(
+                      Sui.readCoinMeta(
                         v1.baseToken.address as unknown as any
                       ),
                       Effect.provideService(Sui.PublicClient, client),
@@ -136,32 +136,32 @@ export const fromWallet = (
 
       console.log("[@unionlabs/sdk-sui/internal/zkgmClient]", { args })
 
-      // // TODO: Fix writecontract calling, decide parameters etc.
-      // const sendInstruction = Sui.writeContract({
-      //   client: client,
-      //   account: wallet.signer,
-      //   abi: Ucs03.Abi,
-      //   chain: wallet.chain,
-      //   functionName: "send",
-      //   address: request.ucs03Address as unknown as any,
-      //   args,
-      //   value: funds,
-      // }).pipe(
-      //   Effect.mapError((cause) =>
-      //     new ClientError.RequestError({
-      //       reason: "Transport",
-      //       request,
-      //       cause,
-      //       description: "writeContract",
-      //     })
-      //   ),
-      //   Effect.provideService(Evm.WalletClient, wallet),
-      // )
-
-      // return yield* pipe(
-      //   sendInstruction,
-      //   Effect.map((txHash) => new ClientResponseImpl(request, client, txHash)),
-      // )
+      // TODO: Fix writecontract calling, decide parameters etc.
+      const sendInstruction = Sui.writeContract({
+        client: client,
+        account: wallet.signer,
+        abi: Ucs03.Abi,
+        chain: wallet.chain,
+        functionName: "send",
+        address: request.ucs03Address as unknown as any,
+        args,
+        value: funds,
+      }).pipe(
+        Effect.mapError((cause) =>
+          new ClientError.RequestError({
+            reason: "Transport",
+            request,
+            cause,
+            description: "writeContract",
+          })
+        ),
+        Effect.provideService(Evm.WalletClient, wallet),
+      )
+
+      return yield* pipe(
+        sendInstruction,
+        Effect.map((txHash) => new ClientResponseImpl(request, client, txHash)),
+      )
     })
   )