Skip to content

Commit

Permalink
Merge branch 'development' into ja-bls-signature-base-layer-registration
Browse files Browse the repository at this point in the history
  • Loading branch information
@jorgeantonio21
jorgeantonio21 committed Jul 12, 2023
2 parents 7192ac7 + 9e88d2b commit 6601299
Show file tree
Hide file tree
Showing 40 changed files with 166 additions and 153 deletions.
92 changes: 46 additions & 46 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions applications/tari_dan_app_utilities/Cargo.toml
View file
Expand Up @@ -6,10 +6,10 @@ edition = "2021"
license = "BSD-3-Clause"

[dependencies]
tari_common_types = { git = "https://github.com/tari-project/tari.git", tag = "v0.51.0-pre.3" }
tari_core = { git = "https://github.com/tari-project/tari.git", tag = "v0.51.0-pre.3", default-features = false, features = ["transactions"] }
tari_common_types = { git = "https://github.com/tari-project/tari.git", tag = "v0.51.0-pre.4" }
tari_core = { git = "https://github.com/tari-project/tari.git", tag = "v0.51.0-pre.4", default-features = false, features = ["transactions"] }
tari_crypto = { version = "0.17" }
tari_shutdown = { git = "https://github.com/tari-project/tari.git", tag = "v0.51.0-pre.3" }
tari_shutdown = { git = "https://github.com/tari-project/tari.git", tag = "v0.51.0-pre.4" }

tari_dan_common_types = { path = "../../dan_layer/common_types" }
tari_dan_core = { path = "../../dan_layer/core" }
Expand Down
2 changes: 1 addition & 1 deletion applications/tari_dan_wallet_cli/Cargo.toml
View file
Expand Up @@ -8,7 +8,7 @@ version = "0.50.0-pre.0"
edition = "2021"

[dependencies]
tari_common_types = { git = "https://github.com/tari-project/tari.git", tag = "v0.51.0-pre.3" }
tari_common_types = { git = "https://github.com/tari-project/tari.git", tag = "v0.51.0-pre.4" }
tari_dan_common_types = { path = "../../dan_layer/common_types" }
tari_dan_engine = { path = "../../dan_layer/engine" }
tari_engine_types = { path = "../../dan_layer/engine_types" }
Expand Down
8 changes: 4 additions & 4 deletions applications/tari_dan_wallet_daemon/Cargo.toml
View file
Expand Up @@ -8,11 +8,11 @@ version = "0.50.0-pre.0"
edition = "2021"

[dependencies]
tari_app_utilities = { git = "https://github.com/tari-project/tari.git", tag = "v0.51.0-pre.3", package = "tari_app_utilities" }
tari_common = { git = "https://github.com/tari-project/tari.git", tag = "v0.51.0-pre.3" }
tari_app_utilities = { git = "https://github.com/tari-project/tari.git", tag = "v0.51.0-pre.4", package = "tari_app_utilities" }
tari_common = { git = "https://github.com/tari-project/tari.git", tag = "v0.51.0-pre.4" }
tari_crypto = { version = "0.17" }
tari_common_types = { git = "https://github.com/tari-project/tari.git", tag = "v0.51.0-pre.3" }
tari_shutdown = { git = "https://github.com/tari-project/tari.git", tag = "v0.51.0-pre.3" }
tari_common_types = { git = "https://github.com/tari-project/tari.git", tag = "v0.51.0-pre.4" }
tari_shutdown = { git = "https://github.com/tari-project/tari.git", tag = "v0.51.0-pre.4" }
tari_dan_wallet_sdk = { path = "../../dan_layer/wallet/sdk" }
tari_dan_wallet_storage_sqlite = { path = "../../dan_layer/wallet/storage_sqlite" }
tari_transaction = { path = "../../dan_layer/transaction" }
Expand Down
4 changes: 1 addition & 3 deletions applications/tari_dan_wallet_daemon/src/indexer_jrpc_impl.rs
View file
Expand Up @@ -85,9 +85,7 @@ impl WalletNetworkInterface for IndexerJsonRpcNetworkInterface {
.optional()?;

let Some(result) = maybe_result else {
return Ok(TransactionQueryResult {
execution_result: None,
});
return Ok(TransactionQueryResult { execution_result: None });
};

Ok(TransactionQueryResult {
Expand Down
7 changes: 6 additions & 1 deletion applications/tari_dan_wallet_daemon/src/services/account_monitor.rs
View file
Expand Up @@ -179,7 +179,12 @@ where
.scan_for_substate(&vault_addr, maybe_vault_version)
.await
.optional()?;
let Some(ValidatorScanResult { address: versioned_addr, substate, created_by_tx}) = scan_result else {
let Some(ValidatorScanResult {
address: versioned_addr,
substate,
created_by_tx,
}) = scan_result
else {
warn!(target: LOG_TARGET, "Vault {} for account {} does not exist according to validator node", vault_addr, versioned_account_address);
continue;
};
Expand Down
14 changes: 7 additions & 7 deletions applications/tari_indexer/Cargo.toml
View file
Expand Up @@ -8,15 +8,15 @@ version = "0.50.0-pre.0"
edition = "2021"

[dependencies]
tari_app_utilities = { git = "https://github.com/tari-project/tari.git", tag = "v0.51.0-pre.3" }
tari_common = { git = "https://github.com/tari-project/tari.git", tag = "v0.51.0-pre.3" }
tari_common_types = { git = "https://github.com/tari-project/tari.git", tag = "v0.51.0-pre.3" }
tari_comms = { git = "https://github.com/tari-project/tari.git", tag = "v0.51.0-pre.3" }
tari_app_utilities = { git = "https://github.com/tari-project/tari.git", tag = "v0.51.0-pre.4" }
tari_common = { git = "https://github.com/tari-project/tari.git", tag = "v0.51.0-pre.4" }
tari_common_types = { git = "https://github.com/tari-project/tari.git", tag = "v0.51.0-pre.4" }
tari_comms = { git = "https://github.com/tari-project/tari.git", tag = "v0.51.0-pre.4" }
tari_comms_logging = { path = "../../comms/tari_comms_logging" }
tari_crypto = { version = "0.17" }
tari_p2p = { git = "https://github.com/tari-project/tari.git", tag = "v0.51.0-pre.3" }
tari_shutdown = { git = "https://github.com/tari-project/tari.git", tag = "v0.51.0-pre.3" }
tari_storage = { git = "https://github.com/tari-project/tari.git", tag = "v0.51.0-pre.3" }
tari_p2p = { git = "https://github.com/tari-project/tari.git", tag = "v0.51.0-pre.4" }
tari_shutdown = { git = "https://github.com/tari-project/tari.git", tag = "v0.51.0-pre.4" }
tari_storage = { git = "https://github.com/tari-project/tari.git", tag = "v0.51.0-pre.4" }

tari_bor = { path = "../../dan_layer/tari_bor" }
tari_dan_app_utilities = { path = "../tari_dan_app_utilities" }
Expand Down
4 changes: 2 additions & 2 deletions applications/tari_signaling_server/Cargo.toml
View file
Expand Up @@ -8,8 +8,8 @@ repository = "https://github.com/tari-project/tari-dan"
license = "BSD-3-Clause"

[dependencies]
tari_common = { git = "https://github.com/tari-project/tari.git", tag = "v0.51.0-pre.3" }
tari_shutdown = { git = "https://github.com/tari-project/tari.git", tag = "v0.51.0-pre.3" }
tari_common = { git = "https://github.com/tari-project/tari.git", tag = "v0.51.0-pre.4" }
tari_shutdown = { git = "https://github.com/tari-project/tari.git", tag = "v0.51.0-pre.4" }
tari_dan_wallet_sdk = { path = "../../dan_layer/wallet/sdk" }

anyhow = "1.0.69"
Expand Down

0 comments on commit 6601299

Please sign in to comment.