fix: minor fixes on collectibles (#3795)

Description --- - bumps anyhow crate, wanted to use it for collectibles but the tauri error doesn't implement sync for some reason - adds a default impl for CollectiblesConfig, since trying to run it with npm start from the folder would error - fix asset class image
tari-project · Feb 5, 2022 · cfc42dd · cfc42dd
1 parent 6f38420
commit cfc42dd
Show file tree

Hide file tree

Showing 13 changed files with 34 additions and 19 deletions.
diff --git a/applications/tari_base_node/Cargo.toml b/applications/tari_base_node/Cargo.toml
@@ -23,7 +23,7 @@ tari_service_framework = { path = "../../base_layer/service_framework" }
 tari_shutdown = { path = "../../infrastructure/shutdown" }
 tari_utilities = "0.3.0"
 
-anyhow = "1.0.32"
+anyhow = "1.0.53"
 bincode = "1.3.1"
 chrono = { version = "0.4.19", default-features = false }
 config = { version = "0.9.3" }

diff --git a/applications/tari_collectibles/src-tauri/src/main.rs b/applications/tari_collectibles/src-tauri/src/main.rs
@@ -3,6 +3,8 @@
   windows_subsystem = "windows"
 )]
 
+use std::error::Error;
+
 use tari_app_utilities::initialization::init_configuration;
 use tari_common::configuration::bootstrap::ApplicationType;
 
@@ -24,12 +26,14 @@ mod schema;
 mod status;
 mod storage;
 
-fn main() {
-  #[allow(unused_mut)] // config isn't mutated on windows
-  let (bootstrap, mut config, _) = init_configuration(ApplicationType::Collectibles).unwrap();
-  let state = ConcurrentAppState::new(bootstrap.base_path, config.collectibles_config.unwrap());
+fn main() -> Result<(), Box<dyn Error>> {
+  let (bootstrap, config, _) = init_configuration(ApplicationType::Collectibles)?;
+  let state = ConcurrentAppState::new(
+    bootstrap.base_path,
+    config.collectibles_config.unwrap_or_default(),
+  );
 
-  tauri::Builder::default()
+  let result = tauri::Builder::default()
     .manage(state)
     .invoke_handler(tauri::generate_handler![
       commands::create_db,
@@ -53,6 +57,7 @@ fn main() {
       commands::wallets::wallets_unlock,
       commands::wallets::wallets_seed_words,
     ])
-    .run(tauri::generate_context!())
-    .expect("error while running tauri application");
+    .run(tauri::generate_context!())?;
+
+  Ok(result)
 }
diff --git a/applications/tari_collectibles/web-app/src/Dashboard.js b/applications/tari_collectibles/web-app/src/Dashboard.js
@@ -54,7 +54,7 @@ class DashboardContent extends React.Component {
           name: o.name,
           description: o.description,
           public_key: toHexString(o.unique_id),
-          image_url: o.image_url || "asset-no-img.png",
+          image_url: o.image || "asset-no-img.png",
         })),
         isLoading: false,
       });

diff --git a/applications/tari_merge_mining_proxy/Cargo.toml b/applications/tari_merge_mining_proxy/Cargo.toml
@@ -20,7 +20,7 @@ tari_app_utilities = { path = "../tari_app_utilities" }
 tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", branch = "main" }
 tari_utilities = "^0.3"
 
-anyhow = "1.0.40"
+anyhow = "1.0.53"
 bincode = "1.3.1"
 bytes = "1.1"
 chrono = { version = "0.4.6", default-features = false }

diff --git a/applications/tari_validator_node/Cargo.toml b/applications/tari_validator_node/Cargo.toml
@@ -25,7 +25,7 @@ tari_dan_core = {path = "../../dan_layer/core"}
 tari_dan_storage_sqlite = {path = "../../dan_layer/storage_sqlite"}
 tari_common_types = {path = "../../base_layer/common_types"}
 
-anyhow = "1.0.32"
+anyhow = "1.0.53"
 async-trait = "0.1.50"
 blake2 = "0.9.2"
 clap = "2.33.3"

diff --git a/base_layer/p2p/Cargo.toml b/base_layer/p2p/Cargo.toml
@@ -19,7 +19,7 @@ tari_shutdown = { version = "^0.27", path = "../../infrastructure/shutdown" }
 tari_storage = { version = "^0.27", path = "../../infrastructure/storage" }
 tari_utilities = "^0.3"
 
-anyhow = "1.0.32"
+anyhow = "1.0.53"
 bytes = "0.5"
 chrono = { version = "0.4.19", default-features = false, features = ["serde"] }
 fs2 = "0.3.0"

diff --git a/base_layer/service_framework/Cargo.toml b/base_layer/service_framework/Cargo.toml
@@ -12,7 +12,7 @@ license = "BSD-3-Clause"
 [dependencies]
 tari_shutdown = { version = "^0.27", path = "../../infrastructure/shutdown" }
 
-anyhow = "1.0.32"
+anyhow = "1.0.53"
 async-trait = "0.1.50"
 futures = { version = "^0.3.16", features = ["async-await"] }
 log = "0.4.8"

diff --git a/common/Cargo.toml b/common/Cargo.toml
@@ -27,7 +27,7 @@ sha2 = "0.9.5"
 path-clean = "0.1.0"
 tari_storage = { version = "^0.27", path = "../infrastructure/storage"}
 
-anyhow = { version = "1.0", optional = true }
+anyhow = { version = "1.0.53", optional = true }
 git2 = { version = "0.8", optional = true }
 prost-build = { version = "0.9.0", optional = true }
 toml = { version = "0.5", optional = true }
@@ -37,4 +37,4 @@ tempfile = "3.1.0"
 
 [dev-dependencies]
 tari_test_utils = { version = "^0.27", path = "../infrastructure/test_utils"}
-anyhow = "1.0"
+anyhow = "1.0.53"
diff --git a/common/src/configuration/collectibles_config.rs b/common/src/configuration/collectibles_config.rs
@@ -37,6 +37,16 @@ pub struct CollectiblesConfig {
     pub wallet_grpc_address: SocketAddr,
 }
 
+impl Default for CollectiblesConfig {
+    fn default() -> Self {
+        Self {
+            validator_node_grpc_address: default_validator_node_grpc_address(),
+            base_node_grpc_address: default_base_node_grpc_address(),
+            wallet_grpc_address: default_wallet_grpc_address(),
+        }
+    }
+}
+
 fn default_validator_node_grpc_address() -> SocketAddr {
     SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 18144)
 }

diff --git a/comms/Cargo.toml b/comms/Cargo.toml
@@ -14,7 +14,7 @@ tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", branch
 tari_storage = { version = "^0.27", path = "../infrastructure/storage" }
 tari_shutdown = { version = "^0.27", path = "../infrastructure/shutdown" }
 
-anyhow = "1.0.32"
+anyhow = "1.0.53"
 async-trait = "0.1.36"
 bitflags = "1.0.4"
 blake2 = "0.9.0"

diff --git a/comms/dht/Cargo.toml b/comms/dht/Cargo.toml
@@ -18,7 +18,7 @@ tari_shutdown = { version = "^0.27", path = "../../infrastructure/shutdown" }
 tari_storage = { version = "^0.27", path = "../../infrastructure/storage" }
 tari_common_sqlite = { path = "../../common_sqlite" }
 
-anyhow = "1.0.32"
+anyhow = "1.0.53"
 bitflags = "1.2.0"
 bytes = "0.5"
 chacha20 = "0.7.1"

diff --git a/dan_layer/core/Cargo.toml b/dan_layer/core/Cargo.toml
@@ -20,7 +20,7 @@ tari_core = {path = "../../base_layer/core"}
 tari_dan_common_types = {path = "../common_types"}
 tari_common_types = {path = "../../base_layer/common_types"}
 
-anyhow = "1.0.32"
+anyhow = "1.0.53"
 async-trait = "0.1.50"
 blake2 = "0.9.2"
 clap = "2.33.3"

diff --git a/infrastructure/metrics/Cargo.toml b/infrastructure/metrics/Cargo.toml
@@ -19,7 +19,7 @@ reqwest = { version = "0.11.4", default-features = false, optional = true }
 tokio = { version = "1.7.1", optional = true, features = ["time", "rt-multi-thread"] }
 warp = { version = "0.3.1", optional = true, default-features = false }
 thiserror = "1.0.25"
-anyhow = "1.0.41"
+anyhow = "1.0.53"
 
 [features]
 pull = ["warp"]