depolymerization

commit dac7fd3be2b9eba0d77de176a049e05971a601fb
parent 1b10436d222864210bd6ac952c0f107ba79c8905
Author: Antoine A <>
Date:   Thu, 10 Mar 2022 13:50:03 +0100

eth-wire: update default confirmation to 27 blocks

Diffstat:
M
README.md
 | 
32
++++++++++++++++++--------------
M
docs/taler-eth-full.conf
 | 
2
+-
M
eth-wire/src/lib.rs
 | 
2
+-

3 files changed, 20 insertions(+), 16 deletions(-)
diff --git 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
 
@@ -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/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
@@ -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 {