Skip to content

Commit

Permalink
Update the Scrypto dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
0xOmarA committed May 1, 2024
1 parent f098c9b commit 566632a
Show file tree
Hide file tree
Showing 14 changed files with 28 additions and 33 deletions.
24 changes: 11 additions & 13 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,17 @@ members = [
# Shared dependencies that all of the crates need - for now this is just the
# `radixdlt-scrypto` dependencies
[workspace.dependencies]
sbor = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "ff21f24952318387803ae720105eec079afe33f3", features = ["serde"] }
scrypto = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "ff21f24952318387803ae720105eec079afe33f3", features = ["serde"] }
scrypto-unit = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "ff21f24952318387803ae720105eec079afe33f3" }
transaction = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "ff21f24952318387803ae720105eec079afe33f3" }
transaction-scenarios = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "ff21f24952318387803ae720105eec079afe33f3" }
radix-engine = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "ff21f24952318387803ae720105eec079afe33f3" }
radix-engine-stores = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "ff21f24952318387803ae720105eec079afe33f3" }
radix-engine-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "ff21f24952318387803ae720105eec079afe33f3", features = ["serde"] }
radix-engine-queries = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "ff21f24952318387803ae720105eec079afe33f3" }
radix-engine-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "ff21f24952318387803ae720105eec079afe33f3" }
radix-engine-store-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "ff21f24952318387803ae720105eec079afe33f3" }
# Used by radix-engine-toolkit crate
faucet = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "9b2de066a110ccf6dcf071f7b7158baf14b96836" }
sbor = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "v1.1.2", features = ["serde"] }
scrypto = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "v1.1.2", features = ["serde"] }
scrypto-unit = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "v1.1.2" }
transaction = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "v1.1.2" }
transaction-scenarios = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "v1.1.2" }
radix-engine = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "v1.1.2" }
radix-engine-stores = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "v1.1.2" }
radix-engine-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "v1.1.2", features = ["serde"] }
radix-engine-queries = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "v1.1.2" }
radix-engine-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "v1.1.2" }
radix-engine-store-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "v1.1.2" }

[profile.release]
incremental = false
Expand Down
2 changes: 1 addition & 1 deletion crates/generator/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "generator"
version = "2.0.0"
version = "2.0.1"
edition = "2021"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion crates/radix-engine-toolkit-json/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "radix-engine-toolkit-json"
version = "2.0.0"
version = "2.0.1"
edition = "2021"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion crates/radix-engine-toolkit-uniffi/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "radix-engine-toolkit-uniffi"
version = "2.0.0"
version = "2.0.1"
edition = "2021"
build = "build.rs"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ import com.radixdlt.ret.*;
val information = getBuildInformation();

// Assert
assert(information.version == "2.0.0");
assert(information.version == "2.0.1");
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
build_info = get_build_information()

# Assert
assert build_info.version == "2.0.0"
assert build_info.version == "2.0.1"
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ do {
let buildInformation = radix_engine_toolkit_uniffi.getBuildInformation()

// Assert
assert(buildInformation.version == "2.0.0")
assert(buildInformation.version == "2.0.1")
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
func TestRetVersion(t *testing.T) {
var buildInfo = radix_engine_toolkit_uniffi.GetBuildInformation()

if buildInfo.Version != "2.0.0" {
if buildInfo.Version != "2.0.1" {
t.Fatalf("Wrong RET version: %s", buildInfo.Version)
}
}
Expand Down
3 changes: 1 addition & 2 deletions crates/radix-engine-toolkit/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "radix-engine-toolkit"
version = "2.0.0"
version = "2.0.1"
edition = "2021"
build = "build.rs"

Expand All @@ -15,7 +15,6 @@ radix-engine-common = { workspace = true }
radix-engine-queries = { workspace = true }
radix-engine-interface = { workspace = true }
radix-engine-store-interface = { workspace = true }
faucet = { workspace = true }

# Bech32 encoding and decoding of addresses. Used for the Olympia <-> Babylon address derivations.
bech32 = { version = "0.9.1" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -835,11 +835,9 @@ impl StaticWorktopContentsTracker {
if FAUCET_COMPONENT.as_node_id() == address.as_node_id() {
match method_name {
"free" => {
// puts on worktop faucet::FAUCET_FREE_AMOUNT XRD count
let resources = ResourceSpecifier::Amount(
XRD,
faucet::FAUCET_FREE_AMOUNT.into(),
);
// puts on worktop dec!(10_000) XRD count
let resources =
ResourceSpecifier::Amount(XRD, dec!(10_000).into());
self.worktop_content_tracker
.put_to_worktop(resources.clone());
self.add_new_instruction(TrackedResource::StaticallyKnown(
Expand Down
6 changes: 3 additions & 3 deletions crates/radix-engine-toolkit/tests/worktop.rs
Original file line number Diff line number Diff line change
Expand Up @@ -786,11 +786,11 @@ fn trusted_worktop_create_proof_fungible() {

// Assert
assert_eq!(twi.len(), 5);
validate_amount(&twi, 0, true, &[(XRD, faucet::FAUCET_FREE_AMOUNT.into())]);
validate_amount(&twi, 1, true, &[(XRD, faucet::FAUCET_FREE_AMOUNT.into())]);
validate_amount(&twi, 0, true, &[(XRD, dec!(10_000).into())]);
validate_amount(&twi, 1, true, &[(XRD, dec!(10_000).into())]);
validate_amount(&twi, 2, true, &[(XRD, dec!(10))]);
validate(&twi, 3, true, None);
validate_amount(&twi, 4, true, &[(XRD, faucet::FAUCET_FREE_AMOUNT.into())]);
validate_amount(&twi, 4, true, &[(XRD, dec!(10_000).into())]);
}

#[test]
Expand Down
2 changes: 1 addition & 1 deletion crates/sbor-json/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "sbor-json"
version = "2.0.0"
version = "2.0.1"
edition = "2021"
description = "The implementation of the SBOR JSON representations"

Expand Down
2 changes: 1 addition & 1 deletion crates/uniffi-bindgen/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "uniffi-bindgen"
version = "2.0.0"
version = "2.0.1"
edition = "2021"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion scripts/version_update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#

old_version="1.0.10"
new_version="2.0.0"
new_version="2.0.1"

cd ..
cargo set-version $new_version
Expand Down

0 comments on commit 566632a

Please sign in to comment.