Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RET manfiest classification update #373

Merged
merged 15 commits into from
Feb 12, 2025
Merged

RET manfiest classification update #373

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
5686e09
bump ret+scrypto
GhenadieVP Feb 4, 2025
7250dcf
wip
GhenadieVP Feb 4, 2025
0e10441
wip
GhenadieVP Feb 4, 2025
a809aa7
wip
GhenadieVP Feb 5, 2025
f343abf
wip
GhenadieVP Feb 6, 2025
ab3e362
unstake data
GhenadieVP Feb 6, 2025
36b9233
wip
GhenadieVP Feb 7, 2025
959b437
wip
GhenadieVP Feb 7, 2025
9a4ecb2
wip
GhenadieVP Feb 7, 2025
9bb530a
wip
GhenadieVP Feb 11, 2025
90553f5
wip
GhenadieVP Feb 11, 2025
bc71fac
wip
GhenadieVP Feb 11, 2025
ddaa85f
Revert "wip"
GhenadieVP Feb 11, 2025
21470d3
Merge branch 'main' into ret_update
GhenadieVP Feb 11, 2025
f475a40
wip
GhenadieVP Feb 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 35 additions & 25 deletions Cargo.lock
View file
Open in desktop

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

19 changes: 10 additions & 9 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,20 +295,20 @@ sargon-uniffi-conversion-macros = { path = "crates/uniffi/conversion-macros" }


# ==== RADIX DEPENDENCIES ====
radix-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "v1.3.0", features = [
radix-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "53d068fa1b471a63d7b5fd25c91dfa6e4940ee9e", features = [
"serde",
"secp256k1_sign_and_validate",
] }
radix-common-derive = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "v1.3.0" }
radix-engine = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "v1.3.0" }
radix-engine-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "v1.3.0" }
radix-engine-toolkit = { git = "https://github.com/radixdlt/radix-engine-toolkit", rev = "2ab5b35a6cb96c9faeb98ed8df67b870336e6873" }
radix-engine-toolkit-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "v1.3.0" }
radix-rust = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "v1.3.0", features = [
radix-common-derive = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "53d068fa1b471a63d7b5fd25c91dfa6e4940ee9e" }
radix-engine = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "53d068fa1b471a63d7b5fd25c91dfa6e4940ee9e" }
radix-engine-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "53d068fa1b471a63d7b5fd25c91dfa6e4940ee9e" }
radix-engine-toolkit = { git = "https://github.com/radixdlt/radix-engine-toolkit", rev = "279c050a25543a0394fffe7818573a2d1d2d3acf" }
radix-engine-toolkit-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "53d068fa1b471a63d7b5fd25c91dfa6e4940ee9e" }
radix-rust = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "53d068fa1b471a63d7b5fd25c91dfa6e4940ee9e", features = [
"serde",
] }
radix-transactions = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "v1.3.0" }
sbor = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "v1.3.0" }
radix-transactions = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "53d068fa1b471a63d7b5fd25c91dfa6e4940ee9e" }
sbor = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "53d068fa1b471a63d7b5fd25c91dfa6e4940ee9e" }


# ==== EXTERNAL DEPENDENCIES ====
Expand Down Expand Up @@ -370,6 +370,7 @@ iso8601-timestamp = { version = "0.2.16", default-features = false, features = [
] }

itertools = { version = "0.12.0", default-features = true }
either = { version = "1.13.0", default-features = false }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Im really not a fan of Either as ::Left gives zero glue as to what it is. Can we create a custom enum instead?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am using Either as it is part of iter partition_map API, might need to revisit then that implementation. Either is good for temporary types, similar to tuples.

k256 = { version = "=0.13.3", default-features = false }
log = { version = "0.4.20", default-features = false }
once_cell = { version = "1.19.0", default-features = false }
Expand Down
9 changes: 6 additions & 3 deletions crates/core/error/src/common_error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,9 +623,9 @@ pub enum CommonError {
#[error("No Profile is yet loaded. Current state is: {current_state}")]
ProfileStateNotLoaded { current_state: String } = 10180,

#[error("Failed to create Address from global_address (hex): {global_address_as_hex}, network_id: {network_id}")]
FailedToCreateAddressFromGlobalAddressAndNetworkID {
global_address_as_hex: String,
#[error("Failed to create Address from manifest address (hex): {manifest_address}, network_id: {network_id}")]
FailedToCreateAddressFromManifestAddressAndNetworkID {
manifest_address: String,
network_id: String,
} = 10181,

Expand Down Expand Up @@ -887,6 +887,9 @@ pub enum CommonError {

#[error("Invalid NodeId length: {actual}, expected: {expected}")]
InvalidNodeIdLength { expected: usize, actual: usize } = 10252,

#[error("Named addresses are not supported")]
NamedAddressesAreNotSupported = 10253,
}

impl CommonError {
Expand Down
1 change: 0 additions & 1 deletion crates/crypto/addresses/src/address/address_union.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,6 @@ macro_rules! address_union {
)+
}
}

}

impl $union_name {
Expand Down
Loading
Loading