[taler-depolymerization] branch master updated (4d23117 -> dac7fd3)

[gnunet]

This is an automated email from the git hooks/post-receive script.

antoine pushed a change to branch master
in repository depolymerization.

    from 4d23117  btc-wire: solve broken pipe errors with config
     new 1b10436  Watcher throttle on error
     new dac7fd3  eth-wire: update default confirmation to 27 blocks

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 README.md                     | 36 ++++++++++++++++++++----------------
 btc-wire/src/btc_config.rs    |  2 +-
 btc-wire/src/loops/watcher.rs |  3 +++
 docs/taler-eth-full.conf      |  2 +-
 eth-wire/src/lib.rs           |  2 +-
 eth-wire/src/loops/watcher.rs |  3 +++
 nginx.conf                    |  8 --------
 7 files changed, 29 insertions(+), 27 deletions(-)
 delete mode 100644 nginx.conf

diff --git a/README.md b/README.md
index f771f43..9476f3b 100644
--- a/README.md
+++ b/README.md
@@ -26,8 +26,6 @@ cd depolymerization
 make install
 ```
 
-To also install test tools run: `make install_test`.
-
 ## Configuration
 
 The configuration is based on
@@ -73,7 +71,7 @@ following currencies are supported:
 - Ethereum currencies (eth-wire):
   - ETHEREUMETH for main network
   - ROPSTENETH for ropsten network
-  - DEV_ETH for dev network
+  - DEVETH for dev network
 
 ### btc-wire
 
@@ -85,9 +83,9 @@ the RPC server. Two flags are mandatory:
 - `maxtxfee=?`: bitcoin transactions fees can exceed taler wire fees, putting
   your wire in bankruptcy. You must specify an acceptable transaction fee cap.
 
-It is also recommanded to disable RPC client timeout with `rpcclienttimeout=0`
+It is also recommanded to disable RPC client timeout with `rpcservertimeout=0`
 or to set a timeout delay superior than the block delay (e.g
-`rpcclienttimeout=720`) to prevent recurrent "Broken pipe" errors.
+`rpcservertimeout=720`) to prevent recurrent "Broken pipe" errors.
 
 ```ini
 [depolymerizer-bitcoin]
@@ -102,11 +100,11 @@ BOUNCE_FEE   = 0.00001
 ### eth-wire
 
 ```ini
-[depolymerizer-bitcoin]
+[depolymerizer-ethereum]
 # Datadir or ipc file path
 IPC_PATH     = ~/.ethereum/geth/geth.ipc
 # Number of blocks to consider a transactions durable
-CONFIRMATION = 24
+CONFIRMATION = 37
 # Amount to keep when bouncing malformed credit
 BOUNCE_FEE   = 0.00001
 ```
@@ -116,13 +114,13 @@ BOUNCE_FEE   = 0.00001
 ```ini
 [depolymerizer-___]
 # Port on which the server listen
-PORT          = 8080
+PORT        = 8080
 # Path on which the server listen (replace port)
-UNIXPATH      =
+UNIXPATH    =
 # HTTP Authentication Scheme (basic or none)
-AUTH_METHOD   =
+AUTH_METHOD =
 # Authentification token (base64 for basic auth)
-AUTH_TOKEN    =
+AUTH_TOKEN  =
 ```
 
 ### Process lifetime
@@ -159,7 +157,7 @@ BUMP_DELAY = 0
 
 [Bitcoind](https://bitcoincore.org/) version 22.\* is required
 
-1. Write configuration files
+1. Write configuration files (taler.conf and bitcoin.conf)
 2. Start bitcoind
 3. Start PostgreSQL
 4. Choose wallet password
@@ -173,7 +171,7 @@ BUMP_DELAY = 0
 
 [Geth](https://geth.ethereum.org/) version 1.10.\* is required
 
-1. Write configuration files
+1. Write configuration files (taler.conf)
 2. Start geth
 3. Start PostgreSQL
 4. Choose account password
@@ -211,6 +209,10 @@ password.
 
 Only the wire adapter need to have the password stored in its environment.
 
+## Log format
+
+TODO
+
 ## Test
 
 The following binaries need to be in the local user PATH:
@@ -226,6 +228,8 @@ You can use the [prepare](script/prepare.sh) script to 
downloads and extract
 blockchain binaries and find the path of the local postgres installation.
 However, taler binaries need to be compiled from source for now.
 
-```
-make test
-```
+TODO
+
+To also install test tools from source run: `make install_test`.
+
+To run all tests: `make test`.
diff --git a/btc-wire/src/btc_config.rs b/btc-wire/src/btc_config.rs
index 85cbafb..fa61c6f 100644
--- a/btc-wire/src/btc_config.rs
+++ b/btc-wire/src/btc_config.rs
@@ -22,7 +22,7 @@ use std::{
 use bitcoin::Network;
 use common::{
     currency::CurrencyBtc,
-    log::{fail, log::info, OrFail},
+    log::{fail, OrFail},
 };
 
 use crate::{
diff --git a/btc-wire/src/loops/watcher.rs b/btc-wire/src/loops/watcher.rs
index 2d24b6e..815b9bd 100644
--- a/btc-wire/src/loops/watcher.rs
+++ b/btc-wire/src/loops/watcher.rs
@@ -1,3 +1,5 @@
+use std::time::Duration;
+
 /*
   This file is part of TALER
   Copyright (C) 2022 Taler Systems SA
@@ -29,6 +31,7 @@ pub fn watcher(mut rpc: AutoRpcCommon, mut db: 
AutoReconnectDb) {
         })();
         if let Err(e) = result {
             error!("watcher: {}", e);
+            std::thread::sleep(Duration::from_secs(5));
         }
     }
 }
diff --git a/docs/taler-eth-full.conf b/docs/taler-eth-full.conf
index 6ab3861..5eb9e0e 100644
--- a/docs/taler-eth-full.conf
+++ b/docs/taler-eth-full.conf
@@ -13,7 +13,7 @@ AUTH_TOKEN    = YWRtaW46cGFzc3dvcmQ=
 PORT          = 8080
 UNIX_PATH     =
 IPC_PATH      = ~/.ethereum/geth/geth.ipc
-CONFIRMATION  = 24
+CONFIRMATION  = 37
 BOUNCE_FEE    = 0.00001
 HTTP_LIFETIME = 0
 WIRE_LIFETIME = 0
diff --git a/eth-wire/src/lib.rs b/eth-wire/src/lib.rs
index 90117cc..7971a8a 100644
--- a/eth-wire/src/lib.rs
+++ b/eth-wire/src/lib.rs
@@ -214,7 +214,7 @@ impl SyncState {
     }
 }
 
-const DEFAULT_CONFIRMATION: u16 = 24;
+const DEFAULT_CONFIRMATION: u16 = 37;
 const DEFAULT_BOUNCE_FEE: &str = "0.00001";
 
 pub struct WireState {
diff --git a/eth-wire/src/loops/watcher.rs b/eth-wire/src/loops/watcher.rs
index 45314a1..4e5d00b 100644
--- a/eth-wire/src/loops/watcher.rs
+++ b/eth-wire/src/loops/watcher.rs
@@ -1,3 +1,5 @@
+use std::time::Duration;
+
 /*
   This file is part of TALER
   Copyright (C) 2022 Taler Systems SA
@@ -33,6 +35,7 @@ pub fn watcher(mut rpc: AutoRpcCommon, mut db: 
AutoReconnectDb) {
         })();
         if let Err(e) = result {
             error!("watcher: {}", e);
+            std::thread::sleep(Duration::from_secs(5));
         }
     }
 }
diff --git a/nginx.conf b/nginx.conf
deleted file mode 100644
index 09efbd4..0000000
--- a/nginx.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-events {}
-http {
-    server {
-        location /btc-wire {
-            proxy_pass http://unix:/home/god/btc-wire.sock;
-        }
-    }
-}
\ No newline at end of file

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.