fix coin control

MrCyjaneK · Oct 25, 2024 · 1079275 · 1079275
1 parent 14b348b
commit 1079275
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 8 deletions.
diff --git a/impls/monero.ts/src/coinsInfo.ts b/impls/monero.ts/src/coinsInfo.ts
@@ -15,6 +15,10 @@ export class CoinsInfo {
     return await readCString(await getSymbol("CoinsInfo_hash")(this.#coinsInfoPtr));
   }
 
+  async keyImage(): Promise<string | null> {
+    return await readCString(await getSymbol("CoinsInfo_keyImage")(this.#coinsInfoPtr));
+  }
+
   async blockHeight(): Promise<bigint> {
     return await getSymbol("CoinsInfo_blockHeight")(this.#coinsInfoPtr);
   }

diff --git a/impls/monero.ts/src/symbols.ts b/impls/monero.ts/src/symbols.ts
@@ -294,6 +294,13 @@ export const moneroSymbols = {
     // const char*
     result: "pointer",
   },
+  "MONERO_CoinsInfo_keyImage": {
+    nonblocking: true,
+    // void* coinsInfo_ptr
+    parameters: ["pointer"],
+    // const char*
+    result: "pointer",
+  },
   "MONERO_CoinsInfo_blockHeight": {
     nonblocking: true,
     // void* coinsInfo_ptr

diff --git a/impls/monero.ts/src/wallet.ts b/impls/monero.ts/src/wallet.ts
@@ -32,6 +32,7 @@ export class Wallet {
 
   async initWallet(daemonAddress: string): Promise<void> {
     await this.init(daemonAddress);
+    // await this.init3(); - enable logging to console
     await this.setTrustedDaemon(true);
     await this.setDaemonAddress(daemonAddress);
     await this.startRefresh();
@@ -98,6 +99,18 @@ export class Wallet {
     return bool;
   }
 
+  async init3(): Promise<void> {
+      // void* wallet_ptr, const char* argv0, const char* default_log_base_name,
+    //  const char* log_path, bool console
+    const bool = await getSymbol("Wallet_init3")(
+      this.#walletPtr,
+      CString(""),
+      CString(""),
+      CString(""),
+      true,
+   );
+  }
+
   async setTrustedDaemon(value: boolean): Promise<void> {
     await getSymbol("Wallet_setTrustedDaemon")(this.#walletPtr, value);
   }

diff --git a/tests/integration.test.ts b/tests/integration.test.ts
@@ -220,7 +220,7 @@ Deno.test("0001-polyseed.patch", async (t) => {
         walletInfo.offset,
       );
 
-      await wallet.initWallet(NODE_URL);
+      await wallet.initWallet(""); // empty string for offline test
 
       assertEquals(await wallet.address(), walletInfo.address);
 
@@ -269,7 +269,7 @@ Deno.test("0002-wallet-background-sync-with-just-the-view-key.patch", async () =
     const interval = setInterval(async () => {
       const blockChainHeight = BigInt(await backgroundWallet.blockChainHeight());
       const daemonBlockchainHeight = BigInt(await backgroundWallet.daemonBlockChainHeight());
-      console.log("Blockchain height:", blockChainHeight, "Daemon blockchain height:", daemonBlockchainHeight);
+      console.log("Blockchain height:", blockChainHeight, "Daemon blockchain height:", daemonBlockchainHeight, "Remains:", daemonBlockchainHeight-blockChainHeight);
 
       if (blockChainHeight === daemonBlockchainHeight) {
         clearInterval(interval);
@@ -328,7 +328,7 @@ Deno.test("0004-coin-control.patch", {
     const interval = setInterval(async () => {
       const blockChainHeight = BigInt(await wallet.blockChainHeight());
       const daemonBlockchainHeight = BigInt(await wallet.daemonBlockChainHeight());
-      console.log("Blockchain height:", blockChainHeight, "Daemon blockchain height:", daemonBlockchainHeight);
+      console.log("Blockchain height:", blockChainHeight, "Daemon blockchain height:", daemonBlockchainHeight, "Remains:", daemonBlockchainHeight-blockChainHeight);
 
       if (blockChainHeight === daemonBlockchainHeight) {
         clearInterval(interval);
@@ -355,7 +355,7 @@ Deno.test("0004-coin-control.patch", {
     const availableCoinsData: Record<string, {
       index: number;
       coin: CoinsInfo;
-      hash: string | null;
+      keyImage: string | null;
       amount: bigint;
     }[]> = {
       ["0.001"]: [],
@@ -401,7 +401,7 @@ Deno.test("0004-coin-control.patch", {
       availableCoinsData[humanReadableAmount].push({
         index: i,
         coin,
-        hash: await coin.hash(),
+        keyImage: await coin.keyImage(),
         amount,
       });
 
@@ -422,7 +422,7 @@ Deno.test("0004-coin-control.patch", {
         0,
         0,
         false,
-        availableCoinsData["0.001"][0].hash!,
+        availableCoinsData["0.001"][0].keyImage!,
       );
       assertEquals(await transaction.status(), 1);
     });
@@ -443,15 +443,16 @@ Deno.test("0004-coin-control.patch", {
       await freezeAll();
       await coins.thaw(availableCoinsData["0.001"][0].index);
       await coins.thaw(availableCoinsData["0.001"][1].index);
-
+      console.log("a");
       const transaction = await wallet.createTransaction(
         DESTINATION_ADDRESS,
         2n * BILLION,
         0,
         0,
         false,
-        availableCoinsData["0.001"][0].hash!,
+        availableCoinsData["0.001"][0].keyImage!,
       );
+      console.log("b");
 
       assertEquals(await transaction.status(), 1);
       assertEquals(