fix: merge conflicts

commerceblock · Jul 15, 2024 · 77d729b · 77d729b
2 parents f206c1f + 11033b5
commit 77d729b
Show file tree

Hide file tree

Showing 15 changed files with 395 additions and 205 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/clients/apps/nodejs/index.js b/clients/apps/nodejs/index.js
@@ -4,6 +4,10 @@ const program = new Command();
 const mercurynodejslib = require('mercurynodejslib');
 const client_config = require('./client_config');
 
+const sleep = (ms) => {
+  return new Promise(resolve => setTimeout(resolve, ms));
+}
+
 async function main() {
 
   const clientConfig = client_config.load();
@@ -123,9 +127,22 @@ async function main() {
       .argument('<wallet_name>', 'name of the wallet')
       .action(async (wallet_name) => {
 
-        let received_statechain_ids = await mercurynodejslib.transferReceive(clientConfig, wallet_name);
+        let receivedStatechainIds = [];
+
+        while(true) {
+
+          let transferReceiveResult = await mercurynodejslib.transferReceive(clientConfig, wallet_name);
+          receivedStatechainIds = [...receivedStatechainIds, ...transferReceiveResult.receivedStatechainIds];
+
+          if (!transferReceiveResult.isThereBatchLocked) {
+            console.log("Statecoin batch still locked. Waiting until expiration or unlock.");
+            await sleep(5000);
+          } else {
+            break;
+          }
+        }
 
-        console.log(JSON.stringify(received_statechain_ids, null, 2));
+        console.log(JSON.stringify(receivedStatechainIds, null, 2));
     });
 
   program.parse();

diff --git a/clients/apps/nodejs/test_basic_workflow2.js b/clients/apps/nodejs/test_basic_workflow2.js
diff --git a/clients/apps/rust/src/main.rs b/clients/apps/rust/src/main.rs
@@ -1,3 +1,5 @@
+use std::{thread, time::Duration};
+
 use anyhow::Result;
 use clap::{Parser, Subcommand};
 use serde_json::json;
@@ -162,7 +164,20 @@ async fn main() -> Result<()> {
         },
         Commands::TransferReceive { wallet_name } => {
             mercuryrustlib::coin_status::update_coins(&client_config, &wallet_name).await?;
-            let received_statechain_ids = mercuryrustlib::transfer_receiver::execute(&client_config, &wallet_name).await?;
+
+            let mut received_statechain_ids = Vec::<String>::new();
+
+            loop {
+                let transfer_receive_result = mercuryrustlib::transfer_receiver::execute(&client_config, &wallet_name).await?;
+                received_statechain_ids.extend(transfer_receive_result.received_statechain_ids);
+
+                if transfer_receive_result.is_there_batch_locked {
+                    println!("Statecoin batch still locked. Waiting until expiration or unlock.");
+                    thread::sleep(Duration::from_secs(5));
+                } else {
+                    break;
+                }
+            }
 
             let obj = json!(received_statechain_ids);
 

diff --git a/clients/libs/nodejs/index.js b/clients/libs/nodejs/index.js
@@ -178,12 +178,12 @@ const transferReceive = async (clientConfig, walletName) => {
 
     await coin_status.updateCoins(clientConfig, electrumClient, db, walletName);
 
-    let received_statechain_ids = await transfer_receive.execute(clientConfig, electrumClient, db, walletName);
+    let transferReceiveResult = await transfer_receive.execute(clientConfig, electrumClient, db, walletName);
 
     electrumClient.close();
     db.close();
 
-    return received_statechain_ids;
+    return transferReceiveResult;
 }
 
 module.exports = { 

diff --git a/clients/libs/nodejs/transfer_receive.js b/clients/libs/nodejs/transfer_receive.js
@@ -56,6 +56,7 @@ const execute = async (clientConfig, electrumClient, db, wallet_name) => {
         }
     }
 
+    let isThereBatchLocked = false;
     let receivedStatechainIds = [];
 
     let tempCoins = [...wallet.coins];
@@ -69,10 +70,14 @@ const execute = async (clientConfig, electrumClient, db, wallet_name) => {
 
             if (coin) {
                 try {
-                    let statechainIdAdded = await processEncryptedMessage(clientConfig, electrumClient, db, coin, encMessage, wallet.network, serverInfo, tempActivities);
+                    let messageResult = await processEncryptedMessage(clientConfig, electrumClient, db, coin, encMessage, wallet.network, serverInfo, tempActivities);
 
-                    if (statechainIdAdded) {
-                        receivedStatechainIds.push(statechainIdAdded);
+                    if (messageResult.isBatchLocked) {
+                        isThereBatchLocked = true;
+                    }
+
+                    if (messageResult.statechainId) {
+                        receivedStatechainIds.push(messageResult.statechainId);
                     }
                 } catch (error) {
                    // console.error(`Error: ${error.message}`);
@@ -84,11 +89,15 @@ const execute = async (clientConfig, electrumClient, db, wallet_name) => {
                     let newCoin = await mercury_wasm.duplicateCoinToInitializedState(wallet, authPubkey);
 
                     if (newCoin) {
-                        let statechainIdAdded = await processEncryptedMessage(clientConfig, electrumClient, db, newCoin, encMessage, wallet.network, serverInfo, tempActivities);
+                        let messageResult = await processEncryptedMessage(clientConfig, electrumClient, db, newCoin, encMessage, wallet.network, serverInfo, tempActivities);
 
-                        if (statechainIdAdded) {
+                        if (messageResult.isBatchLocked) {
+                            isThereBatchLocked = true;
+                        }
+
+                        if (messageResult.statechainId) {
                             tempCoins.push(newCoin);
-                            receivedStatechainIds.push(statechainIdAdded);
+                            receivedStatechainIds.push(messageResult.statechainId);
                         }
                     }
                 } catch (error) {
@@ -108,7 +117,10 @@ const execute = async (clientConfig, electrumClient, db, wallet_name) => {
 
     await sqlite_manager.updateWallet(db, wallet);
 
-    return receivedStatechainIds;
+    return {
+        isThereBatchLocked,
+        receivedStatechainIds
+    };
 }
 
 const getMsgAddr = async (clientConfig, auth_pubkey) => {
@@ -206,7 +218,16 @@ const processEncryptedMessage = async (clientConfig, electrumClient, db, coin, e
     let serverPublicKeyHex = "";
 
     try {
-        serverPublicKeyHex = await sendTransferReceiverRequestPayload(clientConfig, transferReceiverRequestPayload);
+        const transferReceiverResult = await sendTransferReceiverRequestPayload(clientConfig, transferReceiverRequestPayload);
+
+        if (transferReceiverResult.isBatchLocked) {
+            return {
+                isBatchLocked: true,
+                statechainId: None,
+            };
+        }
+
+        serverPublicKeyHex = transferReceiverResult.serverPubkey;
     } catch (error) {
         throw new Error(error);
     }
@@ -237,7 +258,10 @@ const processEncryptedMessage = async (clientConfig, electrumClient, db, coin, e
 
     await sqlite_manager.insertOrUpdateBackupTxs(db, transferMsg.statechain_id, transferMsg.backup_transactions);
 
-    return transferMsg.statechain_id;
+    return {
+        isBatchLocked: true,
+        statechainId: transferMsg.statechain_id,
+    };
 }
 
 const getTx0 = async (electrumClient, tx0_txid) => {
@@ -309,10 +333,6 @@ const unlockStatecoin = async (clientConfig, statechainId, signedStatechainId, a
     }
 }
 
-const sleep = (ms) => {
-    return new Promise(resolve => setTimeout(resolve, ms));
-}
-
 const sendTransferReceiverRequestPayload = async (clientConfig, transferReceiverRequestPayload) => {
 
     const statechain_entity_url = clientConfig.statechainEntity;
@@ -327,28 +347,29 @@ const sendTransferReceiverRequestPayload = async (clientConfig, transferReceiver
         socksAgent = { httpAgent: new SocksProxyAgent(torProxy) };
     }
 
-    while(true) {
-
-        try {
-            const response = await axios.post(url, transferReceiverRequestPayload, socksAgent);
-            return response.data.server_pubkey;
-        }
-        catch (error) {
-
-            if (error.response.status == 400) {
-                if (error.response.data.code == 'ExpiredBatchTimeError') {
-                    console.error(error.response.data.message);
-                    throw new Error(`Failed to update transfer message ${error.response.data.message}`);
-                } else  if (error.response.data.code == 'StatecoinBatchLockedError') {
-                    console.error("Statecoin batch still locked. Waiting until expiration or unlock.");
-                    await sleep(5000);
-                    continue;
-                }
-            } else {
-                throw new Error(`Failed to update transfer message ${JSON.stringify(error.response.data)}`);
+    try {
+        const response = await axios.post(url, transferReceiverRequestPayload, socksAgent);
+        return {
+            isBatchLocked: false,
+            serverPubkey: response.data.server_pubkey,
+        };
+    }
+    catch (error) {
+
+        if (error.response.status == 400) {
+            if (error.response.data.code == 'ExpiredBatchTimeError') {
+                throw new Error(`Failed to update transfer message ${error.response.data.message}`);
+            } else  if (error.response.data.code == 'StatecoinBatchLockedError') {
+                return {
+                    isBatchLocked: true,
+                    serverPubkey: null,
+                };
             }
+        } else {
+            throw new Error(`Failed to update transfer message ${JSON.stringify(error.response.data)}`);
         }
     }
+
 }
 
 module.exports = { newTransferAddress, execute };
diff --git a/clients/libs/nodejs/transfer_send.js b/clients/libs/nodejs/transfer_send.js
@@ -163,9 +163,6 @@ const get_new_x1 = async (clientConfig, statechain_id, signed_statechain_id, new
     let response;
     try {
         response = await axios.post(url, transferSenderRequestPayload, socksAgent);
-        if (response.data) {
-            console.log('Response:', response.data);
-        }
     } catch (error) {
         if (error.code === 'ECONNREFUSED') {
             console.error('Error: Connection refused. The server at 0.0.0.0:8000 is not available.');