Merge branch 'development' into template-add-hex-deser-for-types

* development:
  fix!: peer sync (tari-project#657)
  fix(vn/ui): committee bucket information (tari-project#656)
  fix(engine): return engine error from instruction invocation  (tari-project#655)
  fix(walletd): fix race condition causing transaction to be marked as invalid (tari-project#654)
  ci: double test timeout
  fix(vn-webui): fix incorrect jsonrpc address (tari-project#645)
  fix: add feeclaim_xxx address parsing (tari-project#648)

.config/nextest.toml

@@ -1,5 +1,5 @@
 [profile.ci]
-slow-timeout = { period = "30s", terminate-after=4 }
+slow-timeout = { period = "60s", terminate-after=4 }
 
 [profile.ci.junit]  # this can be some other profile, too
 path = "junit.xml"

applications/tari_dan_wallet_cli/src/command/transaction.rs

@@ -137,7 +137,7 @@ pub struct SubmitManifestArgs {
 
 #[derive(Debug, Args, Clone)]
 pub struct SendArgs {
-    amount: u32,
+    amount: u64,
     resource_address: ResourceAddress,
     destination_public_key: FromHex<Vec<u8>>,
     #[clap(flatten)]
@@ -147,7 +147,7 @@ pub struct SendArgs {
 
 #[derive(Debug, Args, Clone)]
 pub struct ConfidentialTransferArgs {
-    amount: u32,
+    amount: u64,
     destination_public_key: FromHex<Vec<u8>>,
     #[clap(flatten)]
     common: CommonSubmitArgs,
@@ -370,7 +370,7 @@ pub async fn handle_send(args: SendArgs, client: &mut WalletDaemonClient) -> Res
     let resp = client
         .accounts_transfer(TransferRequest {
             account: source_account_name,
-            amount: Amount::from(amount),
+            amount: Amount::try_from(amount)?,
             resource_address,
             destination_public_key,
             fee,
@@ -402,7 +402,7 @@ pub async fn handle_confidential_transfer(
     let resp = client
         .accounts_confidential_transfer(ConfidentialTransferRequest {
             account: source_account,
-            amount: Amount::from(amount),
+            amount: Amount::try_from(amount)?,
             resource_address: resource_address.unwrap_or(CONFIDENTIAL_TARI_RESOURCE_ADDRESS),
             validator_public_key: destination_public_key,
             fee: common.fee.map(|f| f.try_into()).transpose()?,

applications/tari_indexer/src/json_rpc/handlers.rs

@@ -586,10 +586,12 @@ impl JsonRpcHandlers {
                 ),
             )
         })?;
+
         let response = GetEpochManagerStatsResponse {
             current_epoch,
             current_block_height,
             is_valid,
+            committee_shard: None,
         };
         Ok(JsonRpcResponse::success(answer_id, response))
     }

applications/tari_indexer/src/p2p/services/comms_peer_provider.rs

@@ -53,14 +53,11 @@ impl PeerProvider for CommsPeerProvider {
         match self.peer_manager.find_by_public_key(addr).await? {
             Some(peer) => Ok(DanPeer {
                 identity: peer.public_key,
-                addresses: peer
+                claims: peer
                     .addresses
                     .addresses()
                     .iter()
-                    .filter_map(|a| {
-                        let claim = a.source.peer_identity_claim().cloned();
-                        claim.map(|claim| (a.address().clone(), claim))
-                    })
+                    .filter_map(|a| a.source.peer_identity_claim().cloned())
                     .collect(),
             }),
             None => Err(CommsPeerProviderError::PeerNotFound),
@@ -74,36 +71,36 @@ impl PeerProvider for CommsPeerProvider {
         Box::new(self.peer_manager.all().await.unwrap().into_iter().map(|p| {
             Ok(DanPeer {
                 identity: p.public_key,
-                addresses: p
+                claims: p
                     .addresses
                     .addresses()
                     .iter()
-                    .filter_map(|a| {
-                        let claim = a.source.peer_identity_claim().cloned();
-                        claim.map(|claim| (a.address().clone(), claim))
-                    })
+                    .filter_map(|a| a.source.peer_identity_claim().cloned())
                     .collect(),
             })
         }))
     }
 
     async fn add_peer(&self, peer: DanPeer<Self::Addr>) -> Result<(), Self::Error> {
         let node_id = NodeId::from_public_key(&peer.identity);
+        let addresses = MultiaddressesWithStats::new(
+            peer.claims
+                .iter()
+                .flat_map(|claim| {
+                    claim.addresses.iter().map(|addr| {
+                        MultiaddrWithStats::new(addr.clone(), PeerAddressSource::FromAnotherPeer {
+                            peer_identity_claim: claim.clone(),
+                            source_peer: peer.identity.clone(),
+                        })
+                    })
+                })
+                .collect(),
+        );
         self.peer_manager
             .add_peer(Peer::new(
-                peer.identity.clone(),
+                peer.identity,
                 node_id,
-                MultiaddressesWithStats::new(
-                    peer.addresses
-                        .iter()
-                        .map(|(addr, claim)| {
-                            MultiaddrWithStats::new(addr.clone(), PeerAddressSource::FromAnotherPeer {
-                                peer_identity_claim: claim.clone(),
-                                source_peer: peer.identity.clone(),
-                            })
-                        })
-                        .collect(),
-                ),
+                addresses,
                 PeerFlags::NONE,
                 PeerFeatures::NONE,
                 vec![],
@@ -122,16 +119,15 @@ impl PeerProvider for CommsPeerProvider {
             peer.identity.clone(),
             node_id,
             MultiaddressesWithStats::new(
-                peer.addresses
+                peer.claims
                     .iter()
-                    .map(|(addr, claim)| {
-                        MultiaddrWithStats::new(
-                            addr.clone(),
-                            tari_comms::net_address::PeerAddressSource::FromAnotherPeer {
+                    .flat_map(|claim| {
+                        claim.addresses.iter().map(|addr| {
+                            MultiaddrWithStats::new(addr.clone(), PeerAddressSource::FromAnotherPeer {
                                 peer_identity_claim: claim.clone(),
                                 source_peer: peer.identity.clone(),
-                            },
-                        )
+                            })
+                        })
                     })
                     .collect(),
             ),
@@ -156,14 +152,11 @@ impl PeerProvider for CommsPeerProvider {
         match self.peer_manager.find_by_node_id(node_id).await? {
             Some(peer) => Ok(DanPeer {
                 identity: peer.public_key,
-                addresses: peer
+                claims: peer
                     .addresses
                     .addresses()
                     .iter()
-                    .filter_map(|a| {
-                        let claim = a.source.peer_identity_claim().cloned();
-                        claim.map(|claim| (a.address().clone(), claim))
-                    })
+                    .filter_map(|a| a.source.peer_identity_claim().cloned())
                     .collect(),
             }),
             None => Err(CommsPeerProviderError::PeerNotFound),

applications/tari_indexer_web_ui/src/utils/json_rpc.tsx

@@ -61,7 +61,7 @@ async function getCommsStats() {
   return await jsonRpc('get_comms_stats');
 }
 async function getAllVns(epoch: number) {
-  return await jsonRpc('get_all_vns', epoch);
+  return await jsonRpc('get_network_validators', {epoch});
 }
 async function getConnections() {
   return await jsonRpc('get_connections');

applications/tari_validator_node/Cargo.toml

@@ -46,6 +46,7 @@ clap = { version = "3.2.5", features = ["env"] }
 config = "0.13.0"
 futures = { version = "^0.3.1" }
 include_dir = "0.7.2"
+indexmap = "2.0.0"
 json5 = "0.2.2"
 libsqlite3-sys = { version = "0.25", features = ["bundled"] }
 lmdb-zero = "0.4.4"