Skip to content

Commit

Permalink
Merge branch 'main' into retrievableness-axolemma
Browse files Browse the repository at this point in the history
  • Loading branch information
leighmcculloch authored Aug 26, 2024
2 parents da2c688 + b1c5d5e commit 1cc8bef
Show file tree
Hide file tree
Showing 11 changed files with 36 additions and 36 deletions.
28 changes: 14 additions & 14 deletions Cargo.lock

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

10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ default-members = ["cmd/soroban-cli", "cmd/crates/soroban-spec-tools", "cmd/crat
exclude = ["cmd/crates/soroban-test/tests/fixtures/hello"]

[workspace.package]
version = "21.3.0"
version = "21.4.0"
rust-version = "1.79.0"

[workspace.dependencies.soroban-env-host]
Expand All @@ -27,15 +27,15 @@ version = "=21.5.0"
version = "=21.5.0"

[workspace.dependencies.soroban-spec-json]
version = "=21.3.0"
version = "=21.4.0"
path = "./cmd/crates/soroban-spec-json"

[workspace.dependencies.soroban-spec-typescript]
version = "21.3.0"
version = "21.4.0"
path = "./cmd/crates/soroban-spec-typescript"

[workspace.dependencies.soroban-spec-tools]
version = "21.3.0"
version = "21.4.0"
path = "./cmd/crates/soroban-spec-tools"

[workspace.dependencies.soroban-sdk]
Expand All @@ -48,7 +48,7 @@ version = "=21.2.0"
version = "=21.2.0"

[workspace.dependencies.soroban-cli]
version = "=21.3.0"
version = "=21.4.0"
path = "cmd/soroban-cli"

[workspace.dependencies.soroban-rpc]
Expand Down
2 changes: 1 addition & 1 deletion cmd/crates/soroban-test/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ repository = "https://github.com/stellar/soroban-test"
authors = ["Stellar Development Foundation <info@stellar.org>"]
license = "Apache-2.0"
readme = "README.md"
version = "21.3.0"
version = "21.4.0"
edition = "2021"
rust-version.workspace = true
autobins = false
Expand Down
2 changes: 1 addition & 1 deletion cmd/crates/soroban-test/tests/fixtures/hello/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "soroban-hello"
version = "21.3.0"
version = "21.4.0"
edition = "2021"
publish = false

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "test_custom_account"
version = "21.3.0"
version = "21.4.0"
authors = ["Stellar Development Foundation <info@stellar.org>"]
license = "Apache-2.0"
edition = "2021"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "test_custom_types"
version = "21.3.0"
version = "21.4.0"
authors = ["Stellar Development Foundation <info@stellar.org>"]
license = "Apache-2.0"
edition = "2021"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "test_hello_world"
version = "21.3.0"
version = "21.4.0"
authors = ["Stellar Development Foundation <info@stellar.org>"]
license = "Apache-2.0"
edition = "2021"
Expand Down
2 changes: 1 addition & 1 deletion cmd/soroban-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ repository = "https://github.com/stellar/stellar-cli"
authors = ["Stellar Development Foundation <info@stellar.org>"]
license = "Apache-2.0"
readme = "README.md"
version = "21.3.0"
version = "21.4.0"
edition = "2021"
rust-version.workspace = true
autobins = false
Expand Down
14 changes: 7 additions & 7 deletions cmd/soroban-cli/src/commands/contract/deploy/wasm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ impl NetworkRunnable for Cmd {
}
})?);

print.info(format!("Using wasm hash {wasm_hash}").as_str());
print.infoln(format!("Using wasm hash {wasm_hash}").as_str());

let network = config.get_network()?;
let salt: [u8; 32] = match &self.salt {
Expand Down Expand Up @@ -230,21 +230,21 @@ impl NetworkRunnable for Cmd {
)?;

if self.fee.build_only {
print.check("Transaction built!");
print.checkln("Transaction built!");
return Ok(TxnResult::Txn(txn));
}

print.info("Simulating deploy transaction…");
print.infoln("Simulating deploy transaction…");

let txn = client.simulate_and_assemble_transaction(&txn).await?;
let txn = self.fee.apply_to_assembled_txn(txn).transaction().clone();

if self.fee.sim_only {
print.check("Done!");
print.checkln("Done!");
return Ok(TxnResult::Txn(txn));
}

print.globe("Submitting deploy transaction…");
print.globeln("Submitting deploy transaction…");
print.log_transaction(&txn, &network, true)?;

let get_txn_resp = client
Expand All @@ -259,10 +259,10 @@ impl NetworkRunnable for Cmd {
let contract_id = stellar_strkey::Contract(contract_id.0).to_string();

if let Some(url) = utils::explorer_url_for_contract(&network, &contract_id) {
print.link(url);
print.linkln(url);
}

print.check("Deployed!");
print.checkln("Deployed!");

Ok(TxnResult::Res(contract_id))
}
Expand Down
6 changes: 3 additions & 3 deletions cmd/soroban-cli/src/commands/contract/install.rs
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ impl NetworkRunnable for Cmd {
// Skip reupload if this isn't V0 because V1 extension already
// exists.
if code.ext.ne(&ContractCodeEntryExt::V0) {
print.info("Skipping install because wasm already installed");
print.infoln("Skipping install because wasm already installed");
return Ok(TxnResult::Res(hash));
}
}
Expand All @@ -175,7 +175,7 @@ impl NetworkRunnable for Cmd {
}
}

print.info("Simulating install transaction…");
print.infoln("Simulating install transaction…");

let txn = client
.simulate_and_assemble_transaction(&tx_without_preflight)
Expand All @@ -186,7 +186,7 @@ impl NetworkRunnable for Cmd {
return Ok(TxnResult::Txn(txn));
}

print.globe("Submitting install transaction…");
print.globeln("Submitting install transaction…");

let txn_resp = client
.send_transaction_polling(&self.config.sign_with_local_key(txn).await?)
Expand Down
2 changes: 1 addition & 1 deletion cmd/stellar-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ repository = "https://github.com/stellar/stellar-cli"
authors = ["Stellar Development Foundation <info@stellar.org>"]
license = "Apache-2.0"
readme = "README.md"
version = "21.3.0"
version = "21.4.0"
edition = "2021"
rust-version.workspace = true
autobins = false
Expand Down

0 comments on commit 1cc8bef

Please sign in to comment.