chore: rebase development

.github/workflows/ci.yml

@@ -21,35 +21,6 @@ env:
   PROTOC: protoc
 
 jobs:
-  checks:
-    name: npm checks
-    runs-on: ubuntu-latest
-    steps:
-      - name: checkout
-        uses: actions/checkout@v2
-      - name: npm audit launchpad_v2 gui
-        run: |
-          cd applications/launchpad_v2
-          npm audit
-      - name: npm audit collectibles
-        run: |
-          cd applications/tari_collectibles/web-app
-          # We have to ignore this for now because audit error is in react-scripts
-          npm audit || true
-      - name: npm audit explorer
-        run: |
-          cd applications/tari_explorer
-          npm audit
-      - name: npm audit web extensions
-        run: |
-          cd applications/tari_web_extension
-          # We have to ignore this for now because audit error is in react-scripts
-          npm audit || true
-      - name: npm audit web extensions example
-        run: |
-          cd applications/tari_web_extension_example
-          npm audit
-
   clippy:
     name: clippy
     runs-on: ubuntu-18.04

.github/workflows/coverage.yml

@@ -18,7 +18,8 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           toolchain: ${{ env.toolchain }}
-      - uses: Swatinem/rust-cache@v1
+          override: true
+          components: llvm-tools-preview
       - name: ubuntu dependencies
         run: |
           sudo apt-get update && \
@@ -28,7 +29,6 @@ jobs:
             pkg-config \
             libsqlite3-dev \
             clang-10 \
-            clang \
             git \
             cmake \
             libc++-dev \
@@ -47,12 +47,9 @@ jobs:
             libappindicator3-dev \
             patchelf \
             librsvg2-dev \
-      - name: test key manager wasm
+      - name: install grcov
         run: |
-          npm install -g wasm-pack
-          cd base_layer/key_manager
-          rustup target add wasm32-unknown-unknown
-          make test
+          cargo install grcov
       - name: cargo test compile
         uses: actions-rs/cargo@v1
         with:

.github/workflows/development-ci.yml

@@ -0,0 +1,44 @@
+on:
+  push:
+    branches:
+      - development
+      - main
+
+name: Development CI
+
+env:
+  toolchain: nightly-2021-11-20
+  CARGO_HTTP_MULTIPLEXING: false
+  CARGO_TERM_COLOR: always
+  PROTOC: protoc
+
+jobs:
+  checks:
+    name: npm checks
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@v2
+      - name: npm audit launchpad gui
+        run: |
+          cd applications/launchpad/gui-vue
+          npm audit
+      - name: npm audit collectibles
+        run: |
+          cd applications/tari_collectibles/web-app
+          # We have to ignore this for now because audit error is in react-scripts
+          npm audit || true
+      - name: npm audit explorer
+        run: |
+          cd applications/tari_explorer
+          npm audit
+      - name: npm audit web extensions
+        run: |
+          cd applications/tari_web_extension
+          # We have to ignore this for now because audit error is in react-scripts
+          npm audit || true
+      - name: npm audit web extensions example
+        run: |
+          cd applications/tari_web_extension_example
+          npm audit
+

applications/daily_tests/automatic_recovery_test.js

@@ -91,7 +91,9 @@ async function run(options = {}) {
           let recoveredAmount = 0;
           if (recoveredAmountMatch[2] === "T") {
             // convert to micro tari
-            recoveredAmount = round(parseFloat(recoveredAmountMatch[1]) * 1000000);
+            recoveredAmount = Math.round(
+              parseFloat(recoveredAmountMatch[1]) * 1000000
+            );
           } else {
             recoveredAmount = parseInt(recoveredAmountMatch[1]);
           }

applications/daily_tests/automatic_sync_test.js

@@ -7,7 +7,7 @@ const path = require("path");
 const helpers = require("./helpers");
 const BaseNodeProcess = require("integration_tests/helpers/baseNodeProcess");
 
-const NETWORK = "DIBBLER";
+const NETWORK = "dibbler";
 
 const SyncType = {
   Archival: "Archival",
@@ -59,12 +59,14 @@ async function run(options) {
   const baseNode = new BaseNodeProcess("compile", true);
   await baseNode.init();
 
-  // Bypass tor for outbound TCP (faster but less private)
-  process.env[`TARI_BASE_NODE__${NETWORK}__TOR_PROXY_BYPASS_FOR_OUTBOUND_TCP`] =
-    "true";
+  let config = {
+    // Bypass tor for outbound TCP (faster but less private)
+    [`${NETWORK}.base_node.p2p.transport.tor.proxy_bypass_for_outbound_tcp`]: true,
+  };
+
   // Set pruning horizon in config file if `pruned` command line arg is present
   if (options.syncType === SyncType.Pruned) {
-    process.env[`TARI_BASE_NODE__${NETWORK}__PRUNING_HORIZON`] = 20;
+    config[`${NETWORK}.base_node.storage.pruning_horizon`] = 20;
   }
 
   if (options.forceSyncPeer) {
@@ -73,11 +75,10 @@ async function run(options) {
       forcedSyncPeersStr = options.forceSyncPeer.join(",");
     }
     console.log(`Force sync peer set to ${forcedSyncPeersStr}`);
-    process.env[`TARI_BASE_NODE__${NETWORK}__FORCE_SYNC_PEERS`] =
-      forcedSyncPeersStr;
+    config[`${NETWORK}.base_node.force_sync_peers`] = forcedSyncPeersStr;
   }
 
-  await baseNode.start();
+  await baseNode.start({ network: NETWORK, config });
 
   await fs.mkdir(path.dirname(options.log), { recursive: true });
   let logfile = await fs.open(options.log, "w+");

applications/launchpad/backend/assets/config.toml

@@ -1,5 +1,32 @@
-# Config for launchpad v0.0.2
-[common]
+# Config for launchpad v1.0.0
+[base_node]
+network = "dibbler"
+grpc_address = "/ip4/0.0.0.0/tcp/18142"
+override_from = "dibbler"
+
+[base_node.storage]
+track_reorgs = true
+
+[dibbler.base_node]
+identity_file = "/var/tari/base_node/config/dibbler/tari_base_node_id.json"
+
+[igor.base_node]
+network = "igor"
+base_node_identity_file = "/var/tari/base_node/config/igor/base_node_id.json"
+
+[base_node.p2p]
+auxiliary_tcp_listener_address = "/dns4/base_node/tcp/18189"
+
+[base_node.p2p.transport]
+type = "tor"
+
+[base_node.p2p.transport.tor]
+control_auth = "password=tari"
+socks_address_override = "/dns4/tor/tcp/9050"
+control_address = "/dns4/tor/tcp/9051"
+
+[base_node.p2p.transport.tcp]
+listener_address = "/dns4/base_node/tcp/18189"
 
 [dibbler.p2p.seeds]
 dns_seeds = ["seeds.dibbler.tari.com"]
@@ -24,58 +51,39 @@ peer_seeds = [
     "544ed2baed414307e119d12894e27f9ddbdfa2fd5b6528dc843f27903e951c30::/ip4/13.40.189.176/tcp/18189"
 ]
 
-[base_node]
-network = "dibbler"
-grpc_address = "/ip4/0.0.0.0/tcp/18142"
-
-[base_node.storage]
-track_reorgs = true
-
-[dibbler.base_node]
-identity_file = "/var/tari/base_node/config/dibbler/tari_base_node_id.json"
-
-[igor.base_node]
-network = "igor"
-base_node_identity_file = "/var/tari/base_node/config/igor/base_node_id.json"
-
-[base_node.p2p.transport]
-tor.control_auth = "password=tari"
-#tcp.listener_address = "/dns4/base_node/tcp/18189"
-tor.socks_address_override = "/dns4/tor/tcp/9050"
-tor.control_address = "/dns4/tor/tcp/9051"
-
-
 [wallet]
 override_from = "dibbler"
 db_file = "wallet/wallet.dat"
 grpc_address = "/ip4/0.0.0.0/tcp/18143"
 password = "tari"
+use_libtor = false
 
 [wallet.p2p]
 
 [wallet.p2p.transport]
 type = "tor"
-tor.control_auth = "password=tari"
-tor.control_address = "/dns4/tor/tcp/9051"
-tor.socks_address_override = "/dns4/tor/tcp/9050"
+
+[wallet.p2p.transport.tor]
+control_auth = "password=tari"
+socks_address_override = "/dns4/tor/tcp/9050"
+control_address = "/dns4/tor/tcp/9051"
+
+[wallet.p2p.transport.tcp]
+listener_address = "/dns4/wallet/tcp/18188"
 
 [dibbler.wallet]
 network = "dibbler"
-#use_libtor = false
-#tor_onion_port = 18141
 
 [igor.wallet]
 network = "igor"
-#use_libtor = false
-#tor_onion_port = 18141
 
 [miner]
-base_node_grpc_address = "/dns4/base_node/tcp/18142"
-wallet_grpc_address = "/dns4/wallet/tcp/18143"
+base_node_addr = "/dns4/base_node/tcp/18142"
+wallet_addr = "/dns4/wallet/tcp/18143"
 mine_on_tip_only = true
+num_mining_threads = 1
 
 [merge_mining_proxy]
-#config = "dibbler"
 monerod_url = [ # stagenet
     "http://stagenet.xmr-tw.org:38081",
     "http://stagenet.community.xmr.to:38081",
@@ -90,5 +98,3 @@ submit_to_origin = true
 monerod_username = ""
 monerod_password = ""
 monerod_use_auth = false
-
-