Merge branch 'development' into clippy-warn-fixes

* development: chore: update launchpad backend (tari-project#4017) feat: allow network to be set by TARI_NETWORK env var (tari-project#4073) fix: support safe non-interactive mode (tari-project#4072) feat(collectibles): add list assets command (tari-project#3908) chore(deps): bump ejs from 3.1.6 to 3.1.7 in /applications/tari_collectibles/web-app (tari-project#4057) chore: remove deprecated ExtendBytes, update EpochTime (tari-project#3914) ci: fix coverage (tari-project#4071) feat(p2p): adds tor.forward_address setting (tari-project#4070) fix(key-manager): remove floating point math from mnemonic code (tari-project#4064) test(cucumber): use separate FFI target dir (tari-project#4067) refactor(comms): reduce length of long functions (clippy) (tari-project#4065) fix: update daily test configuration (tari-project#4049) refactor(rpc-macros): split into smaller functions (clippy) (tari-project#4063)
sdbondi · May 4, 2022 · ba24fb5 · ba24fb5
2 parents ff1d893 + 65f1147
commit ba24fb5
Show file tree

Hide file tree

Showing 190 changed files with 862 additions and 854 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -129,8 +129,13 @@ workflows:
       - run-integration-tests:
           filters:
             branches:
-              ignore: gh-pages
+              ignore:
+                gh-pages
+                launchpad_such_wow # TODO: Remove this filter once the branch is merged into development
       - run-ffi-integration-tests:
           filters:
             branches:
-              ignore: gh-pages
+              ignore:
+                gh-pages
+                launchpad_such_wow # TODO: Remove this filter once the branch is merged into development
+
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,6 +5,8 @@ on:
       - main
       - ci-*
   pull_request:
+    branches-ignore:
+      - 'launchpad_such_wow' # TODO: Remove this filter once the branch is merged into development
     types:
       - opened
       - reopened

diff --git a/.github/workflows/coverage.yml b/.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 && \

diff --git a/.github/workflows/rfc_test.yml b/.github/workflows/rfc_test.yml
@@ -4,6 +4,8 @@ on:
       - development
   pull_request:
     types: [opened]
+    branches-ignore:
+      - 'launchpad_such_wow' # TODO: Remove this filter once the branch is merged into development
 
 name: Test RFC Docs
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/applications/daily_tests/automatic_recovery_test.js b/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]);
           }

diff --git a/applications/daily_tests/automatic_sync_test.js b/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+");

diff --git a/applications/launchpad/backend/assets/config.toml b/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
-
-