Merge branch 'development' into vn-p2p-protocol

* development:
  refactor: reduce log level of some messages (tari-project#3804)
  ci: move Apple IDs into envs (tari-project#3797)
  feat: read asset definitions from base layer (tari-project#3802)

.github/workflows/base_node_binaries.yml

@@ -189,8 +189,10 @@ jobs:
         if: startsWith(runner.os,'macOS')
         env:
           MACOS_KEYCHAIN_PASS: ${{ secrets.MACOS_KEYCHAIN_PASS }}
+          MACOS_APPLICATION_ID: ${{ secrets.MACOS_APPLICATION_ID }}
           MACOS_APPLICATION_CERT: ${{ secrets.MACOS_APPLICATION_CERT }}
           MACOS_APPLICATION_PASS: ${{ secrets.MACOS_APPLICATION_PASS }}
+          MACOS_INSTALLER_ID: ${{ secrets.MACOS_INSTALLER_ID }}
           MACOS_INSTALLER_CERT: ${{ secrets.MACOS_INSTALLER_CERT }}
           MACOS_INSTALLER_PASS: ${{ secrets.MACOS_INSTALLER_PASS }}
         run: |
@@ -206,15 +208,15 @@ jobs:
           ./create_osx_install_zip.sh unused nozip
           FILES=("tari_base_node" "tari_console_wallet" "tari_mining_node" "tari_merge_mining_proxy")
           for FILE in "${FILES[@]}"; do
-            codesign --force -s "Developer ID Application: Tari Labs, LLC (8XGMD9X2H2)" "/tmp/tari_testnet/runtime/$FILE" -v
+            codesign --force -s "Developer ID Application: $MACOS_APPLICATION_ID" "/tmp/tari_testnet/runtime/$FILE" -v
             codesign --verify --deep --display --verbose=4 "/tmp/tari_testnet/runtime/$FILE"
           done
           pkgbuild --root /tmp/tari_testnet \
           --identifier "com.tarilabs.pkg" \
           --version "$VERSION" \
           --install-location "/tmp/tari" \
           --scripts "/tmp/tari_testnet/scripts" \
-          --sign "Developer ID Installer: Tari Labs, LLC (8XGMD9X2H2)" \
+          --sign "Developer ID Installer: $MACOS_INSTALLER_ID" \
           "${{ github.workspace }}${{ env.TBN_DIST }}/tari-${{ env.VERSION }}.pkg"
       - name: Artifact macos pkg
         if: startsWith(runner.os,'macOS')

applications/tari_app_grpc/proto/wallet.proto

@@ -44,6 +44,8 @@ service Wallet {
     rpc GetCompletedTransactions (GetCompletedTransactionsRequest) returns (stream GetCompletedTransactionsResponse);
     // Returns the balance
     rpc GetBalance (GetBalanceRequest) returns (GetBalanceResponse);
+    // Returns unspent amounts
+    rpc GetUnspentAmounts (Empty) returns (GetUnspentAmountsResponse);
     // Request the wallet perform a coinsplit
     rpc CoinSplit (CoinSplitRequest) returns (CoinSplitResponse);
     // Import Utxo to wallet
@@ -206,6 +208,10 @@ message GetBalanceResponse {
     uint64 pending_outgoing_balance = 3;
 }
 
+message GetUnspentAmountsResponse {
+    repeated uint64 amount = 1;
+}
+
 message GetCoinbaseRequest {
     uint64 reward = 1;
     uint64 fee = 2;

applications/tari_collectibles/src-tauri/src/clients/wallet_client.rs

@@ -123,4 +123,19 @@ impl WalletClient {
     debug!(target: LOG_TARGET, "result {:?}", result);
     Ok(result.into_inner())
   }
+
+  pub async fn get_unspent_amounts(
+    &mut self,
+  ) -> Result<grpc::GetUnspentAmountsResponse, CollectiblesError> {
+    let inner = self.inner.as_mut().unwrap();
+    let request = grpc::Empty {};
+    let result = inner.get_unspent_amounts(request).await.map_err(|source| {
+      CollectiblesError::ClientRequestError {
+        request: "get_unspent_amounts".to_string(),
+        source,
+      }
+    })?;
+    debug!(target: LOG_TARGET, "result {:?}", result);
+    Ok(result.into_inner())
+  }
 }

applications/tari_collectibles/src-tauri/src/commands/asset_wallets/mod.rs

@@ -175,6 +175,16 @@ pub(crate) async fn asset_wallets_get_balance(
   Ok(total)
 }
 
+#[tauri::command]
+pub(crate) async fn asset_wallets_get_unspent_amounts(
+  state: tauri::State<'_, ConcurrentAppState>,
+) -> Result<Vec<u64>, Status> {
+  let mut client = state.create_wallet_client().await;
+  client.connect().await?;
+  let result = client.get_unspent_amounts().await?;
+  Ok(result.amount)
+}
+
 #[tauri::command]
 pub(crate) async fn asset_wallets_list(
   state: tauri::State<'_, ConcurrentAppState>,

applications/tari_collectibles/src-tauri/src/main.rs

@@ -45,6 +45,7 @@ fn main() -> Result<(), Box<dyn Error>> {
       commands::asset_wallets::asset_wallets_create,
       commands::asset_wallets::asset_wallets_list,
       commands::asset_wallets::asset_wallets_get_balance,
+      commands::asset_wallets::asset_wallets_get_unspent_amounts,
       commands::asset_wallets::asset_wallets_get_latest_address,
       commands::asset_wallets::asset_wallets_create_address,
       commands::asset_wallets::asset_wallets_send_to,

applications/tari_collectibles/web-app/src/Create.js

@@ -156,6 +156,11 @@ class Create extends React.Component {
         templateIds.push(721);
       }
 
+      let outputs = await binding.command_asset_wallets_get_unspent_amounts();
+
+      if (outputs.length <= 1) {
+        throw { message: "You need at least two unspent outputs" };
+      }
       let publicKey = await binding.command_assets_create(
         name,
         description,

applications/tari_collectibles/web-app/src/binding.js

@@ -137,6 +137,10 @@ async function command_asset_wallets_get_balance(assetPublicKey) {
   return await invoke("asset_wallets_get_balance", { assetPublicKey });
 }
 
+async function command_asset_wallets_get_unspent_amounts() {
+  return await invoke("asset_wallets_get_unspent_amounts", {});
+}
+
 const commands = {
   command_create_db,
   command_assets_create,
@@ -147,6 +151,7 @@ const commands = {
   command_next_asset_public_key,
   command_asset_wallets_create,
   command_asset_wallets_get_balance,
+  command_asset_wallets_get_unspent_amounts,
   command_asset_wallets_list,
   command_asset_wallets_get_latest_address,
   command_asset_wallets_create_address,

applications/tari_console_wallet/src/grpc/wallet_grpc_server.rs

@@ -51,6 +51,7 @@ use tari_app_grpc::{
         GetOwnedAssetsResponse,
         GetTransactionInfoRequest,
         GetTransactionInfoResponse,
+        GetUnspentAmountsResponse,
         GetVersionRequest,
         GetVersionResponse,
         ImportUtxosRequest,
@@ -163,6 +164,25 @@ impl wallet_server::Wallet for WalletGrpcServer {
         }))
     }
 
+    async fn get_unspent_amounts(
+        &self,
+        _: Request<tari_rpc::Empty>,
+    ) -> Result<Response<GetUnspentAmountsResponse>, Status> {
+        let mut output_service = self.get_output_manager_service();
+        let unspent_amounts;
+        match output_service.get_unspent_outputs().await {
+            Ok(uo) => unspent_amounts = uo,
+            Err(e) => return Err(Status::not_found(format!("GetUnspentAmounts error! {}", e))),
+        }
+        Ok(Response::new(GetUnspentAmountsResponse {
+            amount: unspent_amounts
+                .into_iter()
+                .map(|o| o.value.as_u64())
+                .filter(|&a| a > 0)
+                .collect(),
+        }))
+    }
+
     async fn revalidate_all_transactions(
         &self,
         _request: Request<RevalidateRequest>,

applications/tari_validator_node/src/dan_node.rs

@@ -20,17 +20,17 @@
 //  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 //  USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-use std::{fs, fs::File, io::BufReader, path::Path, sync::Arc, time::Duration};
+use std::{collections::HashMap, sync::Arc, time::Duration};
 
-use futures::future::try_join_all;
-use log::*;
+use log::info;
 use tari_common::{configuration::ValidatorNodeConfig, GlobalConfig};
 use tari_comms::{types::CommsPublicKey, NodeIdentity};
 use tari_comms_dht::Dht;
 use tari_crypto::tari_utilities::hex::Hex;
 use tari_dan_core::{
     models::{AssetDefinition, Committee},
     services::{
+        BaseNodeClient,
         ConcreteAssetProcessor,
         ConcreteCheckpointManager,
         ConcreteCommitteeManager,
@@ -46,7 +46,7 @@ use tari_dan_storage_sqlite::{SqliteDbFactory, SqliteStorageService};
 use tari_p2p::{comms_connector::SubscriptionFactory, tari_message::TariMessageType};
 use tari_service_framework::ServiceHandles;
 use tari_shutdown::ShutdownSignal;
-use tokio::task;
+use tokio::{task, time};
 
 use crate::{
     default_service_specification::DefaultServiceSpecification,
@@ -58,7 +58,7 @@ use crate::{
     ExitCodes,
 };
 
-const LOG_TARGET: &str = "tari::dan::dan_node";
+const LOG_TARGET: &str = "tari::validator_node::app";
 
 pub struct DanNode {
     config: GlobalConfig,
@@ -84,81 +84,60 @@ impl DanNode {
             .as_ref()
             .ok_or_else(|| ExitCodes::ConfigError("Missing dan section".to_string()))?;
 
-        let asset_definitions = self.read_asset_definitions(&dan_config.asset_config_directory)?;
-        if asset_definitions.is_empty() {
-            warn!(
-                target: LOG_TARGET,
-                "No assets to process. Add assets by putting definitions in the `assets` folder with a `.asset` \
-                 extension."
-            );
-        }
-
-        let mut tasks = vec![];
-        for asset in asset_definitions {
-            let node_identity = node_identity.as_ref().clone();
-            let mempool = mempool_service.clone();
-            let handles = handles.clone();
-            let subscription_factory = subscription_factory.clone();
-            let shutdown = shutdown.clone();
-            let dan_config = dan_config.clone();
-            let db_factory = db_factory.clone();
-
-            tasks.push(task::spawn(DanNode::start_asset_worker(
-                asset,
-                node_identity,
-                mempool,
-                handles,
-                subscription_factory,
-                shutdown,
-                dan_config,
-                db_factory,
-            )));
-        }
-
-        if tasks.is_empty() {
-            // If there are no assets to process, work in proxy mode
-            tasks.push(task::spawn(DanNode::wait_for_exit()));
-        }
-        try_join_all(tasks)
-            .await
-            .map_err(|err| ExitCodes::UnknownError(format!("Join error occurred. {}", err)))?
-            .into_iter()
-            .collect::<Result<_, _>>()?;
-
-        Ok(())
-    }
-
-    fn read_asset_definitions(&self, path: &Path) -> Result<Vec<AssetDefinition>, ExitCodes> {
-        if !path.exists() {
-            fs::create_dir_all(path).expect("Could not create dir");
-        }
-        let paths = fs::read_dir(path).expect("Could not read asset definitions");
-
-        let mut result = vec![];
-        for path in paths {
-            let path = path.expect("Not a valid file").path();
-
-            if !path.is_dir() && path.extension().unwrap_or_default() == "asset" {
-                let file = File::open(path).expect("could not open file");
-                let reader = BufReader::new(file);
-
-                let def: AssetDefinition = serde_json::from_reader(reader).expect("lol not a valid json");
-                result.push(def);
-            }
-        }
-        Ok(result)
-    }
-
-    async fn wait_for_exit() -> Result<(), ExitCodes> {
-        println!("Type `exit` to exit");
+        let mut base_node_client = GrpcBaseNodeClient::new(dan_config.base_node_grpc_address);
+        let mut tasks = HashMap::new();
+        let mut next_scanned_height = 0u64;
         loop {
-            let mut line = String::new();
-            let _ = std::io::stdin().read_line(&mut line).expect("Failed to read line");
-            if line.to_lowercase().trim() == "exit" {
-                return Err(ExitCodes::UnknownError("User cancelled".to_string()));
-            } else {
-                println!("Type `exit` to exit");
+            let tip = base_node_client.get_tip_info().await.unwrap();
+            if tip.height_of_longest_chain >= next_scanned_height {
+                info!(
+                    target: LOG_TARGET,
+                    "Scanning base layer (tip : {}) for new assets", tip.height_of_longest_chain
+                );
+                if dan_config.scan_for_assets {
+                    next_scanned_height = tip.height_of_longest_chain + dan_config.new_asset_scanning_interval;
+                    info!(target: LOG_TARGET, "Next scanning height {}", next_scanned_height);
+                } else {
+                    next_scanned_height = u64::MAX; // Never run again.
+                }
+
+                let assets = base_node_client
+                    .get_assets_for_dan_node(node_identity.public_key().clone())
+                    .await
+                    .unwrap();
+                for asset in assets {
+                    if tasks.contains_key(&asset.public_key) {
+                        continue;
+                    }
+                    if let Some(allow_list) = &dan_config.assets_allow_list {
+                        if !allow_list.contains(&asset.public_key.to_hex()) {
+                            continue;
+                        }
+                    }
+                    info!(target: LOG_TARGET, "Adding asset {:?}", asset.public_key);
+                    let node_identity = node_identity.as_ref().clone();
+                    let mempool = mempool_service.clone();
+                    let handles = handles.clone();
+                    let subscription_factory = subscription_factory.clone();
+                    let shutdown = shutdown.clone();
+                    let dan_config = dan_config.clone();
+                    let db_factory = db_factory.clone();
+                    tasks.insert(
+                        asset.public_key.clone(),
+                        task::spawn(DanNode::start_asset_worker(
+                            asset.clone(),
+                            node_identity,
+                            mempool,
+                            handles,
+                            subscription_factory,
+                            shutdown,
+                            dan_config,
+                            db_factory,
+                        )),
+                    );
+                }
             }
+            time::sleep(Duration::from_secs(120)).await;
         }
     }
 

applications/tari_validator_node/src/grpc/services/base_node_client.rs

@@ -27,7 +27,7 @@ use tari_app_grpc::tari_rpc as grpc;
 use tari_common_types::types::PublicKey;
 use tari_crypto::tari_utilities::ByteArray;
 use tari_dan_core::{
-    models::{BaseLayerMetadata, BaseLayerOutput},
+    models::{AssetDefinition, BaseLayerMetadata, BaseLayerOutput},
     services::BaseNodeClient,
     DigitalAssetError,
 };
@@ -100,4 +100,48 @@ impl BaseNodeClient for GrpcBaseNodeClient {
             .transpose()?;
         Ok(output)
     }
+
+    async fn get_assets_for_dan_node(
+        &mut self,
+        dan_node_public_key: PublicKey,
+    ) -> Result<Vec<AssetDefinition>, DigitalAssetError> {
+        let inner = match self.inner.as_mut() {
+            Some(i) => i,
+            None => {
+                self.connect().await?;
+                self.inner.as_mut().unwrap()
+            },
+        };
+        let request = grpc::ListAssetRegistrationsRequest { offset: 0, count: 0 };
+        let mut result = inner.list_asset_registrations(request).await.unwrap().into_inner();
+        let mut assets: Vec<AssetDefinition> = vec![];
+        let tip = self.get_tip_info().await?;
+        while let Some(r) = result.message().await.unwrap() {
+            if let Ok(asset_public_key) = PublicKey::from_bytes(r.unique_id.as_bytes()) {
+                if let Some(checkpoint) = self
+                    .get_current_checkpoint(tip.height_of_longest_chain, asset_public_key.clone(), vec![3u8; 32])
+                    .await?
+                {
+                    if let Some(committee) = checkpoint.get_side_chain_committee() {
+                        if committee.contains(&dan_node_public_key) {
+                            assets.push(AssetDefinition {
+                                public_key: asset_public_key,
+                                template_parameters: r
+                                    .features
+                                    .unwrap()
+                                    .asset
+                                    .unwrap()
+                                    .template_parameters
+                                    .into_iter()
+                                    .map(|tp| tp.into())
+                                    .collect(),
+                                ..Default::default()
+                            });
+                        }
+                    }
+                }
+            }
+        }
+        Ok(assets)
+    }
 }