diff --git a/.github/workflows/gas-test.yml b/.github/workflows/gas-test.yml index 3b2ecd5222..900c4a2247 100644 --- a/.github/workflows/gas-test.yml +++ b/.github/workflows/gas-test.yml @@ -36,7 +36,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - toolchain: ["1.92", "1.85"] + toolchain: ["1.95", "1.85"] steps: - name: Checkout code uses: actions/checkout@v5 @@ -46,7 +46,7 @@ jobs: with: toolchain: ${{ matrix.toolchain }} - - name: Run gas tests (prod) + - name: Run gas tests (experimental) run: | cd contracts/feature-tests/gas-tests cargo test --features wasmer-experimental diff --git a/Cargo.lock b/Cargo.lock index 3ee4acebf8..c630491286 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3075,7 +3075,7 @@ dependencies = [ [[package]] name = "multisig" -version = "1.0.0" +version = "0.0.0" dependencies = [ "multiversx-sc", "multiversx-sc-modules", @@ -3115,12 +3115,16 @@ checksum = "049721bdb4abb82202cf8d9b7981ef0c080615b7cb4ef2de345694a5329f1216" name = "multiversx-chain-core" version = "0.23.0" dependencies = [ + "base64", "bech32", "bitflags 2.11.1", "blake2", + "ed25519-dalek", "hex", + "hex-literal", "multiversx-sc-codec", "serde", + "serde_json", "sha2 0.11.0", "sha3", ] @@ -3145,7 +3149,6 @@ dependencies = [ "anyhow", "bitflags 2.11.1", "colored 3.1.1", - "ed25519-dalek", "hex", "itertools 0.14.0", "log", @@ -3212,12 +3215,40 @@ dependencies = [ "bitflags 2.11.1", "generic-array 1.4.3", "multiversx-chain-core", + "multiversx-sc-abi", "multiversx-sc-codec", "multiversx-sc-derive", "num-traits", "unwrap-infallible", ] +[[package]] +name = "multiversx-sc-abi" +version = "0.25.0" +dependencies = [ + "bitflags 2.11.1", + "multiversx-chain-core", + "multiversx-sc-codec", + "num-bigint", + "unwrap-infallible", +] + +[[package]] +name = "multiversx-sc-abi-derive" +version = "0.25.0" +dependencies = [ + "multiversx-sc-abi-derive-common", +] + +[[package]] +name = "multiversx-sc-abi-derive-common" +version = "0.25.0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.117", +] + [[package]] name = "multiversx-sc-codec" version = "0.25.0" @@ -3252,7 +3283,7 @@ dependencies = [ name = "multiversx-sc-derive" version = "0.66.1" dependencies = [ - "hex", + "multiversx-sc-abi-derive-common", "proc-macro2", "quote", "radix_trie", @@ -3264,7 +3295,6 @@ name = "multiversx-sc-meta" version = "0.66.1" dependencies = [ "anyhow", - "base64", "bip39", "clap", "colored 3.1.1", @@ -3280,8 +3310,10 @@ dependencies = [ "multiversx-sc-snippets", "multiversx-sdk", "pathdiff", + "rand 0.10.1", "regex", "reqwest", + "rpassword", "ruplacer", "semver", "serde", @@ -3289,6 +3321,7 @@ dependencies = [ "serial_test", "tokio", "toml", + "uuid", "zip", ] @@ -3376,7 +3409,6 @@ version = "0.16.0" dependencies = [ "aes", "anyhow", - "base64", "bip39", "ctr", "hex", @@ -3386,15 +3418,12 @@ dependencies = [ "multiversx-chain-core", "pbkdf2", "pem", - "rand 0.10.1", - "rpassword", "scrypt", "serde", "serde_json", "serde_repr", "sha2 0.11.0", "sha3", - "uuid", "zeroize", ] diff --git a/Cargo.toml b/Cargo.toml index c4f22840d7..709bfd7075 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,6 +2,9 @@ resolver = "3" members = [ + "data/abi", + "data/abi-derive-common", + "data/abi-derive", "data/codec", "data/codec-derive", "data/human-readable", diff --git a/chain/core/Cargo.toml b/chain/core/Cargo.toml index 5db122ede0..db11c16587 100644 --- a/chain/core/Cargo.toml +++ b/chain/core/Cargo.toml @@ -17,18 +17,24 @@ keywords = ["multiversx", "blockchain", "vm", "tools"] categories = ["cryptography::cryptocurrencies", "development-tools::debugging"] [features] -std = ["bech32", "serde", "hex", "blake2", "sha2", "sha3"] +std = ["base64", "bech32", "serde", "hex", "blake2", "sha2", "sha3", "ed25519-dalek"] [dependencies] bitflags = "2.9" +base64 = { version = "0.22", optional = true } bech32 = { version = "0.11", optional = true } serde = { version = "1.0", features = ["derive"], optional = true } hex = { version = "0.4", optional = true } blake2 = { version = "0.10", optional = true } sha2 = { version = "0.11", optional = true } sha3 = { version = "0.12", optional = true } +ed25519-dalek = { version = "2.1", optional = true } [dependencies.multiversx-sc-codec] -version = "=0.25.0" +version = "0.25.0" path = "../../data/codec" features = ["derive"] + +[dev-dependencies] +serde_json = "1.0" +hex-literal = "1.0" diff --git a/chain/core/src/std.rs b/chain/core/src/std.rs index d5863e7703..a0fd170436 100644 --- a/chain/core/src/std.rs +++ b/chain/core/src/std.rs @@ -1,7 +1,9 @@ +mod base64; mod bech32_address; mod code_hash; pub mod crypto; pub mod new_address; -pub use bech32_address::Bech32Address; +pub use base64::{base64_decode, base64_encode}; +pub use bech32_address::{Bech32Address, Bech32Hrp}; pub use code_hash::{CODE_HASH_LEN, code_hash}; diff --git a/chain/core/src/std/base64.rs b/chain/core/src/std/base64.rs new file mode 100644 index 0000000000..b76b694b26 --- /dev/null +++ b/chain/core/src/std/base64.rs @@ -0,0 +1,20 @@ +use base64::{Engine as _, engine::general_purpose}; + +/// Decodes a base64-encoded byte slice using the standard alphabet. +/// +/// Returns an error if the input contains characters outside the base64 alphabet +/// or has invalid padding. +pub fn base64_decode(to_decode: T) -> Result, base64::DecodeError> +where + T: AsRef<[u8]>, +{ + general_purpose::STANDARD.decode(to_decode) +} + +/// Encodes a byte slice as a base64 string using the standard alphabet with padding. +pub fn base64_encode(to_encode: T) -> String +where + T: AsRef<[u8]>, +{ + general_purpose::STANDARD.encode(to_encode) +} diff --git a/chain/core/src/std/bech32_address.rs b/chain/core/src/std/bech32_address.rs index 51f853f0b1..28a4fe31bc 100644 --- a/chain/core/src/std/bech32_address.rs +++ b/chain/core/src/std/bech32_address.rs @@ -2,41 +2,18 @@ use std::fmt::Display; use std::str::FromStr; use crate::{codec::*, types::Address}; -use bech32::{Bech32, Hrp}; +use bech32::Bech32; use serde::{Deserialize, Serialize}; -const BECH32_PREFIX: &str = "bech32:"; - -const ERR_ADDRESS_EMPTY: &str = "address string is empty"; +mod bech32_address_error; +pub use bech32_address_error::Bech32AddressError; -const DEFAULT_HRP: &str = "erd"; - -/// Error type returned by [`Bech32Address::try_from_bech32_string`]. -#[derive(Debug)] -pub enum Bech32AddressError { - /// The string could not be decoded as a valid bech32 value. - /// Contains a message with the offending input and the underlying error. - DecodeError(String), - /// The decoded payload is not exactly 32 bytes. - /// Contains the actual decoded length. - InvalidLength(usize), -} +mod bech32_hrp; +pub use bech32_hrp::Bech32Hrp; -impl core::fmt::Display for Bech32AddressError { - fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { - match self { - Bech32AddressError::DecodeError(msg) => write!(f, "bech32 decode error: {msg}"), - Bech32AddressError::InvalidLength(len) => { - write!( - f, - "invalid address length after decoding: expected 32, got {len}" - ) - } - } - } -} +const BECH32_PREFIX: &str = "bech32:"; -impl std::error::Error for Bech32AddressError {} +const ERR_ADDRESS_EMPTY: &str = "address string is empty"; /// Wraps and address, and presents it as a bech32 expression wherever possible. /// @@ -48,7 +25,7 @@ impl std::error::Error for Bech32AddressError {} #[derive(Clone, PartialEq, Eq)] pub struct Bech32Address { pub address: Address, - pub hrp: String, + pub hrp: Bech32Hrp, pub bech32: String, } @@ -71,7 +48,7 @@ impl Bech32Address { Ok(Bech32Address { address: Address::from_slice(&dest_address_bytes), - hrp: hrp.to_string(), + hrp: Bech32Hrp::from(hrp), bech32: bech32_string, }) } @@ -95,25 +72,24 @@ impl Bech32Address { } /// Encodes an [`Address`] as bech32 using the given human-readable part (HRP). - pub fn encode_address(hrp: &str, address: Address) -> Self { - let hrp_obj = Hrp::parse(hrp).expect("invalid hrp"); - let bech32_string = - bech32::encode::(hrp_obj, address.as_bytes()).expect("bech32 encode error"); + pub fn encode_address(hrp: Bech32Hrp, address: Address) -> Self { + let bech32_string = bech32::encode::(hrp.to_inner(), address.as_bytes()) + .expect("bech32 encode error"); Bech32Address { address, - hrp: hrp.to_owned(), + hrp, bech32: bech32_string, } } /// Encodes an [`Address`] as bech32 using the default HRP (`"erd"`). pub fn encode_address_default_hrp(address: Address) -> Self { - Self::encode_address(DEFAULT_HRP, address) + Self::encode_address(Bech32Hrp::default(), address) } /// Returns the zero address encoded with the given HRP. - pub fn zero(hrp: &str) -> Self { + pub fn zero(hrp: Bech32Hrp) -> Self { Bech32Address::encode_address(hrp, Address::zero()) } @@ -164,12 +140,12 @@ impl Bech32Address { /// Returns the human-readable part (HRP) as a borrowed `&str`. pub fn as_hrp(&self) -> &str { - &self.hrp + self.hrp.as_str() } - /// Clones and returns the human-readable part (HRP) as an owned [`String`]. - pub fn to_hrp(&self) -> String { - self.hrp.clone() + /// Returns the human-readable part (HRP) as [`Bech32Hrp`]. + pub fn to_hrp(&self) -> Bech32Hrp { + self.hrp } /// Consumes `self` and returns the underlying [`Address`]. @@ -244,10 +220,10 @@ impl<'de> Deserialize<'de> for Bech32Address { { // some old interactors have it serialized like this let mut bech32 = String::deserialize(deserializer)?; - if let Some(stripped) = bech32.strip_prefix("bech32:") { + if let Some(stripped) = bech32.strip_prefix(BECH32_PREFIX) { bech32 = stripped.to_string(); } - Ok(Bech32Address::from_bech32_string(bech32)) + Bech32Address::try_from_bech32_string(bech32).map_err(serde::de::Error::custom) } } @@ -322,7 +298,7 @@ impl FromStr for Bech32Address { } Ok(Bech32Address { address: Address::from_slice(&dest_address_bytes), - hrp: hrp.to_string(), + hrp: Bech32Hrp::from(hrp), bech32: s.to_string(), }) } @@ -332,24 +308,37 @@ impl FromStr for Bech32Address { mod tests { use super::*; - // A known valid bech32 address on the MultiversX network (32-byte payload). - const VALID_BECH32: &str = "erd1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq6gq4hu"; + // Alice's address, used as a representative non-trivial test address. + const ALICE_BECH32: &str = "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th"; + + // The zero address (all-zero 32-byte payload), kept for tests that specifically + // exercise that edge case. + const ZERO_BECH32: &str = "erd1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq6gq4hu"; #[test] fn test_try_from_bech32_string_valid() { - let result = Bech32Address::try_from_bech32_string(VALID_BECH32.to_string()); + let result = Bech32Address::try_from_bech32_string(ALICE_BECH32.to_string()); assert!(result.is_ok()); let addr = result.unwrap(); - assert_eq!(addr.bech32, VALID_BECH32); + assert_eq!(addr.bech32, ALICE_BECH32); assert_eq!(addr.hrp, "erd"); assert_eq!(addr.address.as_bytes().len(), 32); } + #[test] + fn test_try_from_bech32_string_zero_address() { + let result = Bech32Address::try_from_bech32_string(ZERO_BECH32.to_string()); + assert!(result.is_ok()); + let addr = result.unwrap(); + assert_eq!(addr.bech32, ZERO_BECH32); + assert!(addr.address.as_bytes().iter().all(|&b| b == 0)); + } + #[test] fn test_try_from_bech32_string_roundtrip() { - let original = Bech32Address::try_from_bech32_string(VALID_BECH32.to_string()).unwrap(); - let re_encoded = Bech32Address::encode_address(&original.hrp, original.address.clone()); - assert_eq!(re_encoded.bech32, VALID_BECH32); + let original = Bech32Address::try_from_bech32_string(ALICE_BECH32.to_string()).unwrap(); + let re_encoded = Bech32Address::encode_address(original.hrp, original.address.clone()); + assert_eq!(re_encoded.bech32, ALICE_BECH32); } #[test] @@ -369,10 +358,72 @@ mod tests { #[test] fn test_try_from_bech32_string_wrong_length() { // Encode a payload that is not 32 bytes to trigger the length check. - let hrp = bech32::Hrp::parse(DEFAULT_HRP).unwrap(); + let hrp = Bech32Hrp::default().to_inner(); let short_payload = [0u8; 10]; let bad_bech32 = bech32::encode::(hrp, &short_payload).unwrap(); let result = Bech32Address::try_from_bech32_string(bad_bech32); assert!(matches!(result, Err(Bech32AddressError::InvalidLength(10)))); } + + // --- serde Deserialize tests --- + + #[test] + fn test_deserialize_valid() { + let json = format!("\"{ALICE_BECH32}\""); + let addr: Bech32Address = serde_json::from_str(&json).unwrap(); + assert_eq!(addr.bech32, ALICE_BECH32); + } + + #[test] + fn test_deserialize_zero_address() { + let json = format!("\"{ZERO_BECH32}\""); + let addr: Bech32Address = serde_json::from_str(&json).unwrap(); + assert_eq!(addr.bech32, ZERO_BECH32); + assert!(addr.address.as_bytes().iter().all(|&b| b == 0)); + } + + #[test] + fn test_deserialize_bech32_prefix_stripped() { + // Old interactor format: "bech32:
" + let json = format!("\"bech32:{ALICE_BECH32}\""); + let addr: Bech32Address = serde_json::from_str(&json).unwrap(); + assert_eq!(addr.bech32, ALICE_BECH32); + } + + #[test] + fn test_deserialize_empty_string_returns_error() { + let result: Result = serde_json::from_str("\"\""); + assert!(result.is_err(), "expected error for empty string, got Ok"); + } + + #[test] + fn test_deserialize_invalid_bech32_returns_error() { + let result: Result = serde_json::from_str("\"not_valid!!!\""); + assert!(result.is_err(), "expected error for invalid bech32, got Ok"); + } + + #[test] + fn test_deserialize_bech32_prefix_only_returns_error() { + // "bech32:" strips to "" which should fail, not panic + let result: Result = serde_json::from_str("\"bech32:\""); + assert!(result.is_err(), "expected error for bare prefix, got Ok"); + } + + // --- serde Serialize tests --- + + #[test] + fn test_serialize_valid() { + let addr = Bech32Address::try_from_bech32_string(ALICE_BECH32.to_string()).unwrap(); + let json = serde_json::to_string(&addr).unwrap(); + assert_eq!(json, format!("\"{ALICE_BECH32}\"")); + } + + #[test] + fn test_serde_roundtrip() { + let original = Bech32Address::try_from_bech32_string(ALICE_BECH32.to_string()).unwrap(); + let json = serde_json::to_string(&original).unwrap(); + let decoded: Bech32Address = serde_json::from_str(&json).unwrap(); + assert_eq!(decoded.bech32, original.bech32); + assert_eq!(decoded.address, original.address); + } } diff --git a/chain/core/src/std/bech32_address/bech32_address_error.rs b/chain/core/src/std/bech32_address/bech32_address_error.rs new file mode 100644 index 0000000000..52d39cedd7 --- /dev/null +++ b/chain/core/src/std/bech32_address/bech32_address_error.rs @@ -0,0 +1,26 @@ +/// Error type returned by [`super::Bech32Address::try_from_bech32_string`]. +#[derive(Debug)] +pub enum Bech32AddressError { + /// The string could not be decoded as a valid bech32 value. + /// Contains a message with the offending input and the underlying error. + DecodeError(String), + /// The decoded payload is not exactly 32 bytes. + /// Contains the actual decoded length. + InvalidLength(usize), +} + +impl core::fmt::Display for Bech32AddressError { + fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { + match self { + Bech32AddressError::DecodeError(msg) => write!(f, "bech32 decode error: {msg}"), + Bech32AddressError::InvalidLength(len) => { + write!( + f, + "invalid address length after decoding: expected 32, got {len}" + ) + } + } + } +} + +impl std::error::Error for Bech32AddressError {} diff --git a/chain/core/src/std/bech32_address/bech32_hrp.rs b/chain/core/src/std/bech32_address/bech32_hrp.rs new file mode 100644 index 0000000000..6d89794d1a --- /dev/null +++ b/chain/core/src/std/bech32_address/bech32_hrp.rs @@ -0,0 +1,197 @@ +use bech32::Hrp; +use serde::{Deserialize, Serialize}; + +/// The default human-readable part (HRP) for MultiversX mainnet addresses: `"erd"`. +/// +/// Used as the [`Default`] value for [`Bech32Hrp`] and as the default HRP when +/// encoding addresses without an explicit HRP. +pub const ERD_HRP: Bech32Hrp = Bech32Hrp::parse_unchecked("erd"); + +/// Newtype wrapping the human-readable part (HRP) of a bech32 address. +/// +/// Wraps [`bech32::Hrp`], which validates and stores the HRP in a fixed-size buffer. +/// Because [`Hrp`] is [`Copy`], so is `Bech32Hrp`. +/// +/// Constants can be created with [`Bech32Hrp::parse_unchecked`], which is `const`: +/// +/// ```rust +/// # use multiversx_chain_core::std::Bech32Hrp; +/// const ERD_HRP: Bech32Hrp = Bech32Hrp::parse_unchecked("erd"); +/// ``` +#[derive(Clone, Copy, PartialEq, Eq)] +pub struct Bech32Hrp(Hrp); + +impl Bech32Hrp { + /// Creates a `Bech32Hrp` from a string slice without validation. + /// + /// This is a `const fn`, making it usable in constant and static contexts: + /// ```rust + /// # use multiversx_chain_core::std::Bech32Hrp; + /// const ERD: Bech32Hrp = Bech32Hrp::parse_unchecked("erd"); + /// ``` + /// + /// For runtime strings with validation use [`Bech32Hrp::from_string`]. + pub const fn parse_unchecked(hrp: &str) -> Self { + Bech32Hrp(Hrp::parse_unchecked(hrp)) + } + + /// Parses and creates a `Bech32Hrp` from an owned [`String`]. + /// + /// # Panics + /// + /// Panics if `hrp` is not a valid bech32 human-readable part. + pub fn from_string(hrp: String) -> Self { + Bech32Hrp(Hrp::parse(&hrp).unwrap_or_else(|err| panic!("invalid HRP '{hrp}': {err}"))) + } + + /// Returns the HRP as a borrowed `&str`. + pub fn as_str(&self) -> &str { + self.0.as_str() + } + + pub fn to_inner(&self) -> Hrp { + self.0 + } +} + +impl Default for Bech32Hrp { + fn default() -> Self { + ERD_HRP + } +} + +impl From for Bech32Hrp { + fn from(hrp: Hrp) -> Self { + Bech32Hrp(hrp) + } +} + +impl TryFrom for Bech32Hrp { + type Error = bech32::primitives::hrp::Error; + + fn try_from(s: String) -> Result { + Hrp::parse(&s).map(Bech32Hrp) + } +} + +impl TryFrom<&str> for Bech32Hrp { + type Error = bech32::primitives::hrp::Error; + + fn try_from(s: &str) -> Result { + Hrp::parse(s).map(Bech32Hrp) + } +} + +impl PartialEq for Bech32Hrp { + fn eq(&self, other: &str) -> bool { + self.0.as_str() == other + } +} + +impl PartialEq<&str> for Bech32Hrp { + fn eq(&self, other: &&str) -> bool { + self.0.as_str() == *other + } +} + +impl core::fmt::Display for Bech32Hrp { + fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { + self.0.fmt(f) + } +} + +impl core::fmt::Debug for Bech32Hrp { + fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { + f.debug_tuple("Bech32Hrp").field(&self.0.as_str()).finish() + } +} + +impl Serialize for Bech32Hrp { + fn serialize(&self, serializer: S) -> Result { + self.as_str().serialize(serializer) + } +} + +impl<'de> Deserialize<'de> for Bech32Hrp { + fn deserialize>(deserializer: D) -> Result { + let s = String::deserialize(deserializer)?; + Hrp::parse(&s) + .map(Bech32Hrp) + .map_err(|e| serde::de::Error::custom(format!("invalid HRP: {e}"))) + } +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn test_try_from_str_valid() { + let hrp = Bech32Hrp::try_from("erd").unwrap(); + assert_eq!(hrp.as_str(), "erd"); + + let hrp = Bech32Hrp::try_from("test").unwrap(); + assert_eq!(hrp.as_str(), "test"); + } + + #[test] + fn test_try_from_string_valid() { + let hrp = Bech32Hrp::try_from(String::from("erd")).unwrap(); + assert_eq!(hrp.as_str(), "erd"); + } + + #[test] + fn test_try_from_str_invalid() { + // HRP cannot be empty + assert!(Bech32Hrp::try_from("").is_err()); + // HRP cannot contain non-ASCII characters + assert!(Bech32Hrp::try_from("\u{e9}rd").is_err()); + } + + #[test] + fn test_try_from_string_invalid() { + assert!(Bech32Hrp::try_from(String::from("")).is_err()); + assert!(Bech32Hrp::try_from(String::from("\u{e9}rd")).is_err()); + } + + #[test] + fn test_parse_unchecked() { + let hrp = Bech32Hrp::parse_unchecked("erd"); + assert_eq!(hrp.as_str(), "erd"); + } + + #[test] + fn test_default_is_erd() { + assert_eq!(Bech32Hrp::default().as_str(), "erd"); + } + + #[test] + fn test_partial_eq_str() { + let hrp = Bech32Hrp::try_from("erd").unwrap(); + assert!(hrp == *"erd"); + assert!(hrp == "erd"); + assert!(hrp != *"test"); + assert!(hrp != "test"); + } + + #[test] + fn test_display() { + let hrp = Bech32Hrp::try_from("erd").unwrap(); + assert_eq!(hrp.to_string(), "erd"); + } + + #[test] + fn test_serde_roundtrip() { + let hrp = Bech32Hrp::try_from("erd").unwrap(); + let json = serde_json::to_string(&hrp).unwrap(); + assert_eq!(json, "\"erd\""); + let decoded: Bech32Hrp = serde_json::from_str(&json).unwrap(); + assert_eq!(decoded, hrp); + } + + #[test] + fn test_serde_deserialize_invalid() { + // Non-ASCII characters are not valid in an HRP + assert!(serde_json::from_str::("\"\u{e9}rd\"").is_err()); + } +} diff --git a/chain/core/src/std/crypto.rs b/chain/core/src/std/crypto.rs index e7f2cab9a7..23abf5fad6 100644 --- a/chain/core/src/std/crypto.rs +++ b/chain/core/src/std/crypto.rs @@ -1,22 +1,8 @@ //! Standard crypto functions and constants used across many MultiversX crates. -//! -//! TODO: move here the rest of the functions and the Wallet, with signing. -pub const SHA256_RESULT_LEN: usize = 32; -pub const KECCAK256_RESULT_LEN: usize = 32; +pub mod ed25519; +mod keccak256; +mod sha256; -/// Computes the SHA-256 hash of the given data. -/// -/// Returns a 32-byte array containing the hash digest. -pub fn sha256(data: &[u8]) -> [u8; SHA256_RESULT_LEN] { - use sha2::Digest; - sha2::Sha256::digest(data).into() -} - -/// Computes the Keccak-256 hash of the given data. -/// -/// Returns a 32-byte array containing the hash digest. -pub fn keccak256(data: &[u8]) -> [u8; KECCAK256_RESULT_LEN] { - use sha3::Digest; - sha3::Keccak256::digest(data).into() -} +pub use keccak256::{KECCAK256_RESULT_LEN, keccak256}; +pub use sha256::{SHA256_RESULT_LEN, sha256}; diff --git a/chain/core/src/std/crypto/ed25519.rs b/chain/core/src/std/crypto/ed25519.rs new file mode 100644 index 0000000000..e0aea57f3f --- /dev/null +++ b/chain/core/src/std/crypto/ed25519.rs @@ -0,0 +1,169 @@ +use ed25519_dalek::{Signer, Verifier}; + +/// An Ed25519 signing (private) key, wrapping a 32-byte seed. +#[derive(Clone, PartialEq, Eq)] +pub struct Ed25519SigningKey(ed25519_dalek::SigningKey); + +/// An Ed25519 verifying (public) key. +#[derive(Copy, Clone, PartialEq, Eq)] +pub struct Ed25519VerifyingKey(ed25519_dalek::VerifyingKey); + +/// An Ed25519 signature. +#[derive(Copy, Clone, PartialEq, Eq)] +pub struct Ed25519Signature(ed25519_dalek::Signature); + +impl Ed25519SigningKey { + /// Constructs a signing key from a 32-byte seed. + pub fn from_seed(seed: &[u8; 32]) -> Self { + Self(ed25519_dalek::SigningKey::from_bytes(seed)) + } + + /// Constructs a signing key from a 64-byte keypair (seed || public key). + /// Returns an error if the public key half does not match the seed half. + pub fn from_keypair_bytes(bytes: &[u8; 64]) -> Result { + ed25519_dalek::SigningKey::from_keypair_bytes(bytes).map(Self) + } + + /// Returns the 32-byte seed (secret scalar). + pub fn to_seed_bytes(&self) -> &[u8; 32] { + self.0.as_bytes() + } + + /// Returns the full 64-byte keypair encoding (seed || public key). + pub fn to_keypair_bytes(&self) -> [u8; 64] { + self.0.to_keypair_bytes() + } + + /// Derives the corresponding verifying (public) key. + pub fn verifying_key(&self) -> Ed25519VerifyingKey { + Ed25519VerifyingKey(self.0.verifying_key()) + } + + /// Signs a message with this key. + pub fn sign(&self, message: &[u8]) -> Ed25519Signature { + Ed25519Signature(self.0.sign(message)) + } +} + +impl Ed25519VerifyingKey { + /// Constructs a verifying key from its 32-byte compressed representation. + /// Returns `None` if the bytes do not represent a valid curve point. + pub fn from_bytes(bytes: &[u8; 32]) -> Option { + ed25519_dalek::VerifyingKey::from_bytes(bytes) + .ok() + .map(Self) + } + + /// Returns the 32-byte compressed encoding of the public key. + pub fn to_bytes(&self) -> [u8; 32] { + self.0.to_bytes() + } + + /// Returns a reference to the 32-byte compressed encoding of the public key. + pub fn as_bytes(&self) -> &[u8; 32] { + self.0.as_bytes() + } + + /// Verifies an Ed25519 signature. Returns `true` if the signature is valid. + pub fn verify(&self, message: &[u8], signature: &Ed25519Signature) -> bool { + self.0.verify(message, &signature.0).is_ok() + } +} + +impl Ed25519Signature { + /// Constructs a signature from its 64-byte representation. + pub fn from_bytes(bytes: &[u8; 64]) -> Self { + Self(ed25519_dalek::Signature::from_bytes(bytes)) + } + + /// Returns the 64-byte encoding of this signature. + pub fn to_bytes(&self) -> [u8; 64] { + self.0.to_bytes() + } +} + +#[cfg(test)] +mod tests { + use super::*; + + // Known-good vectors generated with ed25519-dalek 2.2.0 and verified via + // the roundtrip test below. The seed is arbitrary; the pk and sig are + // the values the library produces for (seed, empty message). + const SEED: [u8; 32] = + hex_literal::hex!("9d61b19deffd5a60ba844af492ec2cc44449c5697b326919703bac031cae3d55"); + const PK_BYTES: [u8; 32] = + hex_literal::hex!("700e2ce7c4b674427eab27ba820bcf6f0faebe68e09fe8564292114e41dc6a41"); + const SIG_BYTES: [u8; 64] = hex_literal::hex!( + "37b4bd5f28b61f55dc9673ae2895baceb863d9cf51780d040f98ad8cdc896cf5\ + be46be655a863525da0959f7f373611585e437e28ec971b7bd206ff9bd26e803" + ); + + #[test] + fn verifying_key_derived_from_seed() { + assert_eq!( + Ed25519SigningKey::from_seed(&SEED) + .verifying_key() + .to_bytes(), + PK_BYTES + ); + } + + #[test] + fn signing_key_from_seed_roundtrip() { + let sk = Ed25519SigningKey::from_seed(&SEED); + assert_eq!(sk.verifying_key().to_bytes(), PK_BYTES); + } + + #[test] + fn sign_produces_known_signature() { + let sk = Ed25519SigningKey::from_seed(&SEED); + assert_eq!(sk.sign(b"").to_bytes(), SIG_BYTES); + } + + #[test] + fn verify_valid_signature() { + let vk = Ed25519SigningKey::from_seed(&SEED).verifying_key(); + let sig = Ed25519Signature::from_bytes(&SIG_BYTES); + assert!(vk.verify(b"", &sig)); + } + + #[test] + fn verify_rejects_wrong_message() { + let vk = Ed25519SigningKey::from_seed(&SEED).verifying_key(); + let sig = Ed25519Signature::from_bytes(&SIG_BYTES); + assert!(!vk.verify(b"wrong", &sig)); + } + + #[test] + fn verify_rejects_wrong_signature() { + let vk = Ed25519SigningKey::from_seed(&SEED).verifying_key(); + let mut bad_bytes = SIG_BYTES; + bad_bytes[0] ^= 0xff; + let bad_sig = Ed25519Signature::from_bytes(&bad_bytes); + assert!(!vk.verify(b"", &bad_sig)); + } + + #[test] + fn verifying_key_from_bytes_roundtrip() { + let vk = Ed25519VerifyingKey::from_bytes(&PK_BYTES).unwrap(); + assert_eq!(vk.to_bytes(), PK_BYTES); + } + + #[test] + fn verifying_key_from_bytes_different_seeds_differ() { + let vk1 = Ed25519VerifyingKey::from_bytes(&PK_BYTES).unwrap(); + let vk2 = Ed25519SigningKey::from_seed(&[0x42u8; 32]).verifying_key(); + assert_ne!(vk1.to_bytes(), vk2.to_bytes()); + } + + #[test] + fn sign_then_verify_roundtrip() { + let seed: [u8; 32] = [0x42u8; 32]; + let sk = Ed25519SigningKey::from_seed(&seed); + let vk = sk.verifying_key(); + let msg = b"hello multiversx"; + let sig = sk.sign(msg); + assert!(vk.verify(msg, &sig)); + assert!(!vk.verify(b"other message", &sig)); + } +} diff --git a/chain/core/src/std/crypto/keccak256.rs b/chain/core/src/std/crypto/keccak256.rs new file mode 100644 index 0000000000..619bf4d80c --- /dev/null +++ b/chain/core/src/std/crypto/keccak256.rs @@ -0,0 +1,36 @@ +pub const KECCAK256_RESULT_LEN: usize = 32; + +/// Computes the Keccak-256 hash of the given data. +/// +/// Returns a 32-byte array containing the hash digest. +pub fn keccak256(data: &[u8]) -> [u8; KECCAK256_RESULT_LEN] { + use sha3::Digest; + sha3::Keccak256::digest(data).into() +} + +#[cfg(test)] +mod tests { + use super::*; + use hex_literal::hex; + + #[test] + fn keccak256_empty() { + // Keccak-256("") = + // c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470 + let expected = hex!("c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"); + assert_eq!(keccak256(b""), expected); + } + + #[test] + fn keccak256_abc() { + // Keccak-256("abc") = + // 4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45 + let expected = hex!("4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45"); + assert_eq!(keccak256(b"abc"), expected); + } + + #[test] + fn keccak256_different_inputs_differ() { + assert_ne!(keccak256(b"foo"), keccak256(b"bar")); + } +} diff --git a/chain/core/src/std/crypto/sha256.rs b/chain/core/src/std/crypto/sha256.rs new file mode 100644 index 0000000000..1d19d963d0 --- /dev/null +++ b/chain/core/src/std/crypto/sha256.rs @@ -0,0 +1,36 @@ +pub const SHA256_RESULT_LEN: usize = 32; + +/// Computes the SHA-256 hash of the given data. +/// +/// Returns a 32-byte array containing the hash digest. +pub fn sha256(data: &[u8]) -> [u8; SHA256_RESULT_LEN] { + use sha2::Digest; + sha2::Sha256::digest(data).into() +} + +#[cfg(test)] +mod tests { + use super::*; + use hex_literal::hex; + + #[test] + fn sha256_empty() { + // NIST FIPS 180-4: SHA-256("") = + // e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 + let expected = hex!("e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"); + assert_eq!(sha256(b""), expected); + } + + #[test] + fn sha256_abc() { + // NIST FIPS 180-4: SHA-256("abc") = + // ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad + let expected = hex!("ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad"); + assert_eq!(sha256(b"abc"), expected); + } + + #[test] + fn sha256_different_inputs_differ() { + assert_ne!(sha256(b"foo"), sha256(b"bar")); + } +} diff --git a/chain/core/src/std/new_address.rs b/chain/core/src/std/new_address.rs index 7b1ff3a50f..bdbd49482b 100644 --- a/chain/core/src/std/new_address.rs +++ b/chain/core/src/std/new_address.rs @@ -58,7 +58,7 @@ pub fn compute_new_address_bech32( deployment_nonce: u64, ) -> Bech32Address { let address = compute_new_address(&deployer.address, deployment_nonce); - Bech32Address::encode_address(&deployer.hrp, address) + Bech32Address::encode_address(deployer.hrp, address) } /// Generates a mock smart contract address deterministically from a creator address and nonce. diff --git a/chain/core/src/token_identifier_util.rs b/chain/core/src/token_identifier_util.rs index 55c424fbcd..5c9d412a6c 100644 --- a/chain/core/src/token_identifier_util.rs +++ b/chain/core/src/token_identifier_util.rs @@ -1,3 +1,16 @@ +/// Error type returned by token identifier validation functions. +#[derive(Debug, Clone, PartialEq, Eq)] +pub enum TokenIdValidationError { + /// Token identifier length is outside the allowed range. + InvalidLength, + /// Ticker contains a character that is not uppercase alphanumeric. + InvalidTickerChar, + /// The dash separator is missing or not at the expected position. + MissingOrMisplacedDash, + /// The random suffix contains a character outside `[0-9a-f]`. + InvalidRandomChar, +} + const TICKER_MIN_LENGTH: usize = 3; const TICKER_MAX_LENGTH: usize = 10; const ADDITIONAL_RANDOM_CHARS_LENGTH: usize = 6; @@ -8,52 +21,170 @@ pub const IDENTIFIER_MAX_LENGTH: usize = TICKER_MAX_LENGTH + ADDITIONAL_RANDOM_C const DASH_CHARACTER: u8 = b'-'; -/// There is a VM implementation of this very function. -/// This implementation is used for debugging mode and backwards compatibility. -/// Using the VM implementation instead of this one saves ~0.6 kB of contract code. -pub fn validate_token_identifier(token_id_slice: &[u8]) -> bool { - let length = token_id_slice.len(); - - #[allow(clippy::manual_range_contains)] - if length < IDENTIFIER_MIN_LENGTH || length > IDENTIFIER_MAX_LENGTH { - return false; - } - - let lowercase_letter_range = b'a'..=b'z'; +/// Validates the ticker portion of a token identifier (uppercase alphanumeric). +/// +/// Expects `ticker` to be the slice before the dash. +fn validate_ticker(ticker: &[u8]) -> Result<(), TokenIdValidationError> { let uppercase_letter_range = b'A'..=b'Z'; let number_range = b'0'..=b'9'; - // ticker must be all uppercase alphanumeric - let ticker_len = get_token_ticker_len(length); - let ticker = &token_id_slice[..ticker_len]; for ticker_char in ticker { let is_uppercase_letter = uppercase_letter_range.contains(ticker_char); let is_number = number_range.contains(ticker_char); if !is_uppercase_letter && !is_number { - return false; + return Err(TokenIdValidationError::InvalidTickerChar); } } - let dash_position = ticker_len; - if token_id_slice[dash_position] != DASH_CHARACTER { - return false; - } + Ok(()) +} + +/// Validates the random suffix of a token identifier (lowercase hex digits `[0-9a-f]`). +/// +/// The suffix is hex-encoded from 3 bytes, so only `[0-9a-f]{6}` is valid. +fn validate_random_chars(random_chars: &[u8]) -> Result<(), TokenIdValidationError> { + let hex_letter_range = b'a'..=b'f'; + let number_range = b'0'..=b'9'; - // random chars are alphanumeric lowercase - let random_chars = &token_id_slice[(length - ADDITIONAL_RANDOM_CHARS_LENGTH)..]; for rand_char in random_chars { - let is_lowercase_letter = lowercase_letter_range.contains(rand_char); + let is_hex_letter = hex_letter_range.contains(rand_char); let is_number = number_range.contains(rand_char); - if !is_lowercase_letter && !is_number { - return false; + if !is_hex_letter && !is_number { + return Err(TokenIdValidationError::InvalidRandomChar); } } - true + Ok(()) +} + +/// There is a VM implementation of this very function. +/// This implementation is used for debugging mode and backwards compatibility. +/// Using the VM implementation instead of this one saves ~0.6 kB of contract code. +pub fn validate_token_identifier(token_id_slice: &[u8]) -> Result<(), TokenIdValidationError> { + let length = token_id_slice.len(); + + #[allow(clippy::manual_range_contains)] + if length < IDENTIFIER_MIN_LENGTH || length > IDENTIFIER_MAX_LENGTH { + return Err(TokenIdValidationError::InvalidLength); + } + + // The dash must be at the fixed position separating the ticker from the 6-char suffix. + let dash_pos = get_token_ticker_len(length); + if token_id_slice[dash_pos] != DASH_CHARACTER { + return Err(TokenIdValidationError::MissingOrMisplacedDash); + } + + validate_ticker(&token_id_slice[..dash_pos])?; + + validate_random_chars(&token_id_slice[(dash_pos + 1)..]) } pub fn get_token_ticker_len(token_id_len: usize) -> usize { token_id_len - ADDITIONAL_RANDOM_CHARS_LENGTH - 1 } + +#[cfg(test)] +mod tests { + use super::{TokenIdValidationError, validate_token_identifier}; + + fn valid(token_id: &str) { + assert_eq!(validate_token_identifier(token_id.as_bytes()), Ok(())); + } + + fn invalid(token_id: &str, expected_err: TokenIdValidationError) { + assert_eq!( + validate_token_identifier(token_id.as_bytes()), + Err(expected_err) + ); + } + + #[test] + fn test_valid_identifiers() { + valid("ALC-6258d2"); + valid("ALC123-6258d2"); + valid("12345-6258d2"); + // max-length ticker (10 chars) + valid("EGLDRIDEFL-08d8ef"); + // number at end of max-length ticker + valid("EGLDRIDEF2-08d8ef"); + } + + #[test] + fn test_invalid_length() { + // total too short: ticker 0 chars + invalid("-6258d2", TokenIdValidationError::InvalidLength); + // total too short: ticker 2 chars + invalid("AL-6258d2", TokenIdValidationError::InvalidLength); + // total too short: no dash, 9 chars + invalid("ALC6258d2", TokenIdValidationError::InvalidLength); + // total too long: ticker 11 chars + invalid("ALCCCCCCCCC-6258d2", TokenIdValidationError::InvalidLength); + // total too long: suffix 7 chars + invalid("EGLDRIDEFL-08d8eff", TokenIdValidationError::InvalidLength); + } + + #[test] + fn test_missing_or_misplaced_dash() { + // no dash at expected position (valid length, but no dash at pos 3) + invalid("ABCX6258d2", TokenIdValidationError::MissingOrMisplacedDash); + // dash too early (valid length 10, dash at pos 2, expected at pos 3) + invalid("AL-C6258d2", TokenIdValidationError::MissingOrMisplacedDash); + // dash too early (valid length 12, dash at pos 3, expected at pos 5) + invalid( + "ALC-6258d2ff", + TokenIdValidationError::MissingOrMisplacedDash, + ); + // dash too late (valid length 16, dash at pos 10, expected at pos 9) + invalid( + "EGLDRIDEFL-08d8e", + TokenIdValidationError::MissingOrMisplacedDash, + ); + } + + #[test] + fn test_invalid_ticker_char() { + // all lowercase ticker + invalid("alc-6258d2", TokenIdValidationError::InvalidTickerChar); + // lowercase char in ticker + invalid( + "EGLDRIDEFl-08d8ef", + TokenIdValidationError::InvalidTickerChar, + ); + // special char in ticker + invalid( + "EGLDRIDEF*-08d8ef", + TokenIdValidationError::InvalidTickerChar, + ); + // extra dash inside the ticker (dash at expected pos, but ticker contains a dash) + // "AL-C-6258d2" (11 chars): dash_pos=4, ticker="AL-C" → InvalidTickerChar + invalid("AL-C-6258d2", TokenIdValidationError::InvalidTickerChar); + // "ALC--6258d2" (11 chars): dash_pos=4, ticker="ALC-" → InvalidTickerChar + invalid("ALC--6258d2", TokenIdValidationError::InvalidTickerChar); + // identifier starting with a dash: dash_pos=3, ticker="-LC" → InvalidTickerChar + invalid("-LC-6258d2", TokenIdValidationError::InvalidTickerChar); + } + + #[test] + fn test_invalid_random_char() { + // uppercase char in random part + invalid("ALC-6258D2", TokenIdValidationError::InvalidRandomChar); + invalid( + "EGLDRIDEFL-08d8eF", + TokenIdValidationError::InvalidRandomChar, + ); + // special char in random part + invalid( + "EGLDRIDEFL-08d*ef", + TokenIdValidationError::InvalidRandomChar, + ); + // non-hex lowercase letters (g-z) in random part + invalid("ABC-ghijkl", TokenIdValidationError::InvalidRandomChar); + invalid("ALC-6258g2", TokenIdValidationError::InvalidRandomChar); + invalid("ALC-zzzzzz", TokenIdValidationError::InvalidRandomChar); + // dash in the random part (dash at expected pos, suffix contains a dash) + // "ALC-625-d2" (10 chars): dash_pos=3, ticker="ALC" ✓, suffix="625-d2" → InvalidRandomChar + invalid("ALC-625-d2", TokenIdValidationError::InvalidRandomChar); + } +} diff --git a/chain/core/src/types/address.rs b/chain/core/src/types/address.rs index 515a1d757a..407c0c3ab7 100644 --- a/chain/core/src/types/address.rs +++ b/chain/core/src/types/address.rs @@ -48,7 +48,7 @@ impl Address { /// Encodes the address as a bech32 string using the given human-readable part (HRP). #[cfg(feature = "std")] - pub fn to_bech32(&self, hrp: &str) -> crate::std::Bech32Address { + pub fn to_bech32(&self, hrp: crate::std::Bech32Hrp) -> crate::std::Bech32Address { crate::std::Bech32Address::encode_address(hrp, self.clone()) } diff --git a/chain/core/src/types/flags.rs b/chain/core/src/types/flags.rs index 6b2522c386..9d2db6dc65 100644 --- a/chain/core/src/types/flags.rs +++ b/chain/core/src/types/flags.rs @@ -5,7 +5,7 @@ mod esdt_token_type; mod return_code; mod token_type; -pub use code_metadata::CodeMetadata; +pub use code_metadata::{CodeMetadata, CodeMetadataError}; pub use esdt_local_role::EsdtLocalRole; pub use esdt_local_role_flags::EsdtLocalRoleFlags; pub use esdt_token_type::EsdtTokenType; diff --git a/chain/core/src/types/flags/code_metadata.rs b/chain/core/src/types/flags/code_metadata.rs index ee55b3c734..e190c8d33b 100644 --- a/chain/core/src/types/flags/code_metadata.rs +++ b/chain/core/src/types/flags/code_metadata.rs @@ -5,16 +5,48 @@ use bitflags::bitflags; const UPGRADEABLE_STRING: &str = "Upgradeable"; const READABLE_STRING: &str = "Readable"; +const GUARDED_STRING: &str = "Guarded"; const PAYABLE_STRING: &str = "Payable"; const PAYABLE_BY_SC_STRING: &str = "PayableBySC"; const DEFAULT_STRING: &str = "Default"; bitflags! { - /// Flags representing the smart contract's allowed actions after deploy. - #[derive(Default, PartialEq, Debug, Clone, Copy)] + /// Bit-flags that govern a smart contract's permissions after deployment. + /// + /// Each flag corresponds to a protocol-level capability: + /// - [`UPGRADEABLE`](CodeMetadata::UPGRADEABLE) — the contract may be upgraded by its owner. + /// - [`READABLE`](CodeMetadata::READABLE) — other contracts may read this contract's storage. + /// - [`GUARDED`](CodeMetadata::GUARDED) — transactions require a second guardian signature. + /// - [`PAYABLE`](CodeMetadata::PAYABLE) — the contract accepts direct EGLD/ESDT transfers. + /// - [`PAYABLE_BY_SC`](CodeMetadata::PAYABLE_BY_SC) — the contract accepts transfers from other contracts only. + /// + /// # Wire format + /// + /// Metadata is serialised as exactly **2 big-endian bytes**. The first byte carries + /// `UPGRADEABLE` (bit 0), `READABLE` (bit 2), and `GUARDED` (bit 3); the second byte carries + /// `PAYABLE` (bit 1) and `PAYABLE_BY_SC` (bit 2). + /// + /// # Parsing + /// + /// - Use [`TryFrom<&[u8]>`] / [`TryFrom`] in **tooling and off-chain code** — these + /// return [`CodeMetadataError`] on wrong-length input or unknown bits, enabling fail-closed + /// validation. + /// - Use [`from_bytes_or_default`](CodeMetadata::from_bytes_or_default) in the **Rust VM** — + /// this mirrors the lenient Go protocol implementation: wrong-length input yields + /// [`EMPTY`](CodeMetadata::EMPTY) and unknown bits are silently truncated. + /// + /// # Default value + /// + /// [`Default::default()`] returns `UPGRADEABLE | READABLE | PAYABLE | PAYABLE_BY_SC`, + /// which is the permissive set used as a fallback in **scenario tests** when a deployed + /// contract's metadata field is left unset. This is intentionally *not* the zero value; + /// use [`EMPTY`](CodeMetadata::EMPTY) explicitly when you need all flags cleared. + #[derive(PartialEq, Debug, Clone, Copy)] pub struct CodeMetadata: u16 { - /// No flags set. The contract is not upgradeable, not readable, and not payable. - const DEFAULT = 0; + /// No flags set. The contract is not upgradeable, not readable, and not payable, has no guardian. + /// + /// Warning! This is not the default value, see CodeMetadata::default() for that. + const EMPTY = 0; /// The contract can be upgraded in the future. const UPGRADEABLE = 0b0000_0001_0000_0000; // LSB of first byte @@ -22,6 +54,10 @@ bitflags! { /// The contract's storage can be read by other contracts. const READABLE = 0b0000_0100_0000_0000; // 3rd LSB of first byte + /// The contract is guarded: transactions must carry a second signature + /// from a guardian account in order to be executed. + const GUARDED = 0b0000_1000_0000_0000; // 4th LSB of first byte + /// The contract can receive funds without having any endpoint called, /// just like user accounts. /// @@ -35,95 +71,167 @@ bitflags! { } } +impl Default for CodeMetadata { + fn default() -> Self { + CodeMetadata::UPGRADEABLE + | CodeMetadata::READABLE + | CodeMetadata::PAYABLE + | CodeMetadata::PAYABLE_BY_SC + } +} + impl CodeMetadata { /// Returns `true` if the contract is allowed to be upgraded. pub fn is_upgradeable(&self) -> bool { - *self & CodeMetadata::UPGRADEABLE != CodeMetadata::DEFAULT + *self & CodeMetadata::UPGRADEABLE != CodeMetadata::EMPTY } /// Returns `true` if the contract can receive funds without an endpoint call. pub fn is_payable(&self) -> bool { - *self & CodeMetadata::PAYABLE != CodeMetadata::DEFAULT + *self & CodeMetadata::PAYABLE != CodeMetadata::EMPTY } /// Returns `true` if the contract can receive funds from other smart contracts /// without an endpoint call. Direct user transfers are rejected. pub fn is_payable_by_sc(&self) -> bool { - *self & CodeMetadata::PAYABLE_BY_SC != CodeMetadata::DEFAULT + *self & CodeMetadata::PAYABLE_BY_SC != CodeMetadata::EMPTY } /// Returns `true` if the contract's storage can be read by other contracts. pub fn is_readable(&self) -> bool { - *self & CodeMetadata::READABLE != CodeMetadata::DEFAULT + *self & CodeMetadata::READABLE != CodeMetadata::EMPTY + } + + /// Returns `true` if the contract is guarded. + pub fn is_guarded(&self) -> bool { + *self & CodeMetadata::GUARDED != CodeMetadata::EMPTY } + /// Serialises the metadata to its 2-byte big-endian wire representation. + /// + /// The returned array is the canonical on-chain encoding: first byte carries + /// `UPGRADEABLE`, `READABLE`, and `GUARDED`; second byte carries `PAYABLE` and `PAYABLE_BY_SC`. #[inline] pub fn to_byte_array(&self) -> [u8; 2] { self.bits().to_be_bytes() } + /// Serialises the metadata to a 2-byte big-endian `Vec`. + /// + /// Convenience wrapper around [`to_byte_array`](Self::to_byte_array) for call sites + /// that need an owned buffer. pub fn to_vec(&self) -> Vec { self.to_byte_array().to_vec() } - pub fn for_each_string_token(&self, mut f: F) { + /// Calls `f` once for each token that makes up the human-readable display of these flags. + /// + /// Tokens are the flag name strings (`"Upgradeable"`, `"Readable"`, `"Guarded"`, + /// `"Payable"`, `"PayableBySC"`) and the `"|"` separator between them. + /// If no flags are set, `f` is called once with `"Default"`. + /// + /// The flag order matches the canonical display order used in scenario JSON files. + pub fn write_display_tokens(&self, mut write: F) { let mut nothing_printed: bool = true; if self.is_upgradeable() { - f(UPGRADEABLE_STRING); + write(UPGRADEABLE_STRING); nothing_printed = false; } if self.is_readable() { if !nothing_printed { - f("|"); + write("|"); + } + write(READABLE_STRING); + nothing_printed = false; + } + if self.is_guarded() { + if !nothing_printed { + write("|"); } - f(READABLE_STRING); + write(GUARDED_STRING); nothing_printed = false; } if self.is_payable() { if !nothing_printed { - f("|"); + write("|"); } - f(PAYABLE_STRING); + write(PAYABLE_STRING); nothing_printed = false; } if self.is_payable_by_sc() { if !nothing_printed { - f("|"); + write("|"); } - f(PAYABLE_BY_SC_STRING); + write(PAYABLE_BY_SC_STRING); nothing_printed = false; } if nothing_printed { - f(DEFAULT_STRING); + write(DEFAULT_STRING); + } + } + + /// Parses code metadata from a 2-byte slice, mirroring the MultiversX protocol implementation. + /// + /// If the slice is not exactly 2 bytes, returns [`CodeMetadata::EMPTY`] (all flags cleared). + /// Unknown or reserved bits are silently ignored; only the bits corresponding to known flags + /// are extracted. + /// + /// This intentionally lenient behaviour matches the on-chain Go implementation + /// (`CodeMetadataFromBytes`). Prefer [`TryFrom<&[u8]>`] in tooling and off-chain code + /// where strict validation is desirable. + pub fn from_bytes_or_default(bytes: &[u8]) -> Self { + if bytes.len() != 2 { + return CodeMetadata::EMPTY; } + let value = u16::from_be_bytes([bytes[0], bytes[1]]); + CodeMetadata::from_bits_truncate(value) } } -impl From<[u8; 2]> for CodeMetadata { +/// Error type returned when converting raw bytes or integers into [`CodeMetadata`] fails. +#[derive(Debug, PartialEq, Clone, Copy)] +pub enum CodeMetadataError { + /// The input slice was not exactly 2 bytes long. + InvalidLength, + /// The bit pattern contains bits that do not correspond to any known flag. + InvalidBits(u16), +} + +impl TryFrom for CodeMetadata { + type Error = CodeMetadataError; + #[inline] - fn from(arr: [u8; 2]) -> Self { - CodeMetadata::from(u16::from_be_bytes(arr)) + fn try_from(value: u16) -> Result { + CodeMetadata::from_bits(value).ok_or(CodeMetadataError::InvalidBits(value)) } } -impl From for CodeMetadata { +impl TryFrom<[u8; 2]> for CodeMetadata { + type Error = CodeMetadataError; + #[inline] - fn from(value: u16) -> Self { - CodeMetadata::from_bits_truncate(value) + fn try_from(arr: [u8; 2]) -> Result { + CodeMetadata::try_from(u16::from_be_bytes(arr)) } } -impl From<&[u8]> for CodeMetadata { - fn from(slice: &[u8]) -> Self { - let arr: [u8; 2] = slice.try_into().unwrap_or_default(); - CodeMetadata::from(arr) +impl TryFrom<&[u8]> for CodeMetadata { + type Error = CodeMetadataError; + + fn try_from(slice: &[u8]) -> Result { + let arr: [u8; 2] = slice + .try_into() + .map_err(|_| CodeMetadataError::InvalidLength)?; + CodeMetadata::try_from(arr) } } -impl From<&Vec> for CodeMetadata { - fn from(v: &Vec) -> Self { - CodeMetadata::from(v.as_slice()) +impl TryFrom<&Vec> for CodeMetadata { + type Error = CodeMetadataError; + + fn try_from(v: &Vec) -> Result { + CodeMetadata::try_from(v.as_slice()) } } @@ -155,7 +263,8 @@ impl NestedDecode for CodeMetadata { I: NestedDecodeInput, H: DecodeErrorHandler, { - Ok(CodeMetadata::from(u16::dep_decode_or_handle_err(input, h)?)) + let value = u16::dep_decode_or_handle_err(input, h)?; + CodeMetadata::try_from(value).map_err(|_| h.handle_error(DecodeError::INVALID_VALUE)) } } @@ -174,10 +283,12 @@ mod tests { use super::*; #[test] - fn test_default() { - assert!(!CodeMetadata::DEFAULT.is_upgradeable()); - assert!(!CodeMetadata::DEFAULT.is_payable()); - assert!(!CodeMetadata::DEFAULT.is_readable()); + fn test_empty() { + assert!(!CodeMetadata::EMPTY.is_upgradeable()); + assert!(!CodeMetadata::EMPTY.is_payable()); + assert!(!CodeMetadata::EMPTY.is_payable_by_sc()); + assert!(!CodeMetadata::EMPTY.is_readable()); + assert!(!CodeMetadata::EMPTY.is_guarded()); } #[test] @@ -185,50 +296,102 @@ mod tests { let all = CodeMetadata::UPGRADEABLE | CodeMetadata::PAYABLE | CodeMetadata::PAYABLE_BY_SC - | CodeMetadata::READABLE; + | CodeMetadata::READABLE + | CodeMetadata::GUARDED; assert!(all.is_upgradeable()); assert!(all.is_payable()); assert!(all.is_payable_by_sc()); assert!(all.is_readable()); + assert!(all.is_guarded()); - assert_eq!(all.bits(), 0x0506); + assert_eq!(all.bits(), 0x0d06); assert_eq!(CodeMetadata::from_bits_truncate(0xffff), all); } #[test] fn test_each() { - assert!(CodeMetadata::UPGRADEABLE.is_upgradeable()); - assert!(!CodeMetadata::PAYABLE.is_upgradeable()); - assert!(!CodeMetadata::PAYABLE_BY_SC.is_upgradeable()); - assert!(!CodeMetadata::READABLE.is_upgradeable()); + type CodeMetadataChecker = fn(&CodeMetadata) -> bool; + let flags_and_checkers: &[(CodeMetadata, CodeMetadataChecker)] = &[ + (CodeMetadata::UPGRADEABLE, CodeMetadata::is_upgradeable), + (CodeMetadata::READABLE, CodeMetadata::is_readable), + (CodeMetadata::GUARDED, CodeMetadata::is_guarded), + (CodeMetadata::PAYABLE, CodeMetadata::is_payable), + (CodeMetadata::PAYABLE_BY_SC, CodeMetadata::is_payable_by_sc), + ]; + + // checking that checkers match, and are orthogonal (each checker only returns true for its own flag) + for (flag, checker) in flags_and_checkers { + for (other_flag, _) in flags_and_checkers { + assert_eq!( + checker(other_flag), + flag == other_flag, + "{checker:?} returned unexpected result for flag {other_flag:?}", + ); + } + } + } - assert!(!CodeMetadata::UPGRADEABLE.is_payable()); - assert!(CodeMetadata::PAYABLE.is_payable()); - assert!(!CodeMetadata::PAYABLE_BY_SC.is_payable()); - assert!(!CodeMetadata::READABLE.is_payable()); + #[test] + fn test_try_from_slice_exact_length() { + assert!( + CodeMetadata::try_from(&[1u8, 0u8][..]) + .unwrap() + .is_upgradeable() + ); + assert!( + CodeMetadata::try_from(&[0u8, 2u8][..]) + .unwrap() + .is_payable() + ); + assert!( + !CodeMetadata::try_from(&[0u8, 0u8][..]) + .unwrap() + .is_upgradeable() + ); + } - assert!(!CodeMetadata::UPGRADEABLE.is_payable_by_sc()); - assert!(!CodeMetadata::PAYABLE.is_payable_by_sc()); - assert!(CodeMetadata::PAYABLE_BY_SC.is_payable_by_sc()); - assert!(!CodeMetadata::READABLE.is_payable_by_sc()); + #[test] + fn test_try_from_slice_wrong_length() { + assert_eq!( + CodeMetadata::try_from(&[1u8][..]), + Err(CodeMetadataError::InvalidLength) + ); + assert_eq!( + CodeMetadata::try_from(&[][..]), + Err(CodeMetadataError::InvalidLength) + ); + assert_eq!( + CodeMetadata::try_from(&[1u8, 0u8, 0u8][..]), + Err(CodeMetadataError::InvalidLength) + ); + } - assert!(!CodeMetadata::UPGRADEABLE.is_readable()); - assert!(!CodeMetadata::PAYABLE.is_readable()); - assert!(!CodeMetadata::PAYABLE_BY_SC.is_readable()); - assert!(CodeMetadata::READABLE.is_readable()); + #[test] + fn test_try_from_invalid_bits() { + // 0x0001 has no defined flag in the second byte at bit 0 + assert_eq!( + CodeMetadata::try_from(0x0001u16), + Err(CodeMetadataError::InvalidBits(0x0001)) + ); } /// Translated from vm-wasm. #[test] - fn test_from_array() { - assert!(CodeMetadata::from([1, 0]).is_upgradeable()); - assert!(!CodeMetadata::from([1, 0]).is_readable()); - assert!(CodeMetadata::from([0, 2]).is_payable()); - assert!(CodeMetadata::from([4, 0]).is_readable()); - assert!(!CodeMetadata::from([4, 0]).is_upgradeable()); - assert!(!CodeMetadata::from([0, 0]).is_upgradeable()); - assert!(!CodeMetadata::from([0, 0]).is_payable()); - assert!(!CodeMetadata::from([0, 0]).is_readable()); + fn test_try_from_array() { + assert!(CodeMetadata::try_from([1u8, 0u8]).unwrap().is_upgradeable()); + assert!(!CodeMetadata::try_from([1u8, 0u8]).unwrap().is_readable()); + assert!(!CodeMetadata::try_from([1u8, 0u8]).unwrap().is_guarded()); + assert!(CodeMetadata::try_from([0u8, 2u8]).unwrap().is_payable()); + assert!(CodeMetadata::try_from([4u8, 0u8]).unwrap().is_readable()); + assert!(!CodeMetadata::try_from([4u8, 0u8]).unwrap().is_upgradeable()); + assert!(!CodeMetadata::try_from([4u8, 0u8]).unwrap().is_guarded()); + assert!(CodeMetadata::try_from([8u8, 0u8]).unwrap().is_guarded()); + assert!(!CodeMetadata::try_from([8u8, 0u8]).unwrap().is_upgradeable()); + assert!(!CodeMetadata::try_from([8u8, 0u8]).unwrap().is_readable()); + assert!(!CodeMetadata::try_from([0u8, 0u8]).unwrap().is_upgradeable()); + assert!(!CodeMetadata::try_from([0u8, 0u8]).unwrap().is_payable()); + assert!(!CodeMetadata::try_from([0u8, 0u8]).unwrap().is_readable()); + assert!(!CodeMetadata::try_from([0u8, 0u8]).unwrap().is_guarded()); } } diff --git a/chain/core/src/types/flags/esdt_local_role.rs b/chain/core/src/types/flags/esdt_local_role.rs index 4feedd654e..3a6e0cf819 100644 --- a/chain/core/src/types/flags/esdt_local_role.rs +++ b/chain/core/src/types/flags/esdt_local_role.rs @@ -18,6 +18,19 @@ const ESDT_ROLE_MODIFY_CREATOR: &str = "ESDTRoleModifyCreator"; const ESDT_ROLE_NFT_RECREATE: &str = "ESDTRoleNFTRecreate"; const ESDT_ROLE_TRANSFER: &str = "ESDTTransferRole"; +/// An ESDT local role that can be granted to or revoked from an account for a specific token. +/// +/// Each role has two canonical representations: +/// - A **byte-string name** (e.g. `"ESDTRoleLocalMint"`) used in on-chain role +/// assignment, decoded via `From<&[u8]>`. +/// - A **numeric ID** (`u16`) used for `ManagedVecItem` payload encoding, +/// accessed via [`as_u16`][EsdtLocalRole::as_u16] and decoded via `From`. +/// +/// The numeric IDs and bit-flag positions correspond to the `Role*` iota constants +/// in `vmhost/vmhooks/eei_helpers.go` of `mx-chain-vm-go`. +/// +/// The declaration order matches the Go VM `iota` ordering so that the codec +/// discriminant (declaration index) aligns with [`as_u16`][EsdtLocalRole::as_u16]. #[derive(TopDecode, TopEncode, NestedDecode, NestedEncode, Clone, PartialEq, Eq, Debug, Copy)] pub enum EsdtLocalRole { None, @@ -29,13 +42,20 @@ pub enum EsdtLocalRole { NftUpdateAttributes, NftAddUri, NftRecreate, - ModifyRoyalties, ModifyCreator, + ModifyRoyalties, SetNewUri, Transfer, } impl EsdtLocalRole { + /// Returns the 1-based ordinal role ID used for `ManagedVecItem` payload encoding. + /// + /// This is a sequential index (1..=12), **not** a bitflag value. The + /// corresponding bitflag in [`EsdtLocalRoleFlags`] is `1 << (id - 1)`, which + /// aligns with the Go VM's `Role*` iota ordering in + /// `vmhost/vmhooks/eei_helpers.go`. `Transfer` (12) has no counterpart in + /// the current Go VM iota. This is the inverse of `From`. pub fn as_u16(&self) -> u16 { match self { Self::None => 0, @@ -54,10 +74,17 @@ impl EsdtLocalRole { } } + /// Returns the canonical byte-string name of this role (e.g. `b"ESDTRoleLocalMint"`). + /// + /// This is the format used in on-chain ESDT role grant/revoke operations. pub fn as_role_name(&self) -> &'static [u8] { self.name().as_bytes() } + /// Returns the canonical string name of this role (e.g. `"ESDTRoleLocalMint"`). + /// + /// This is the format used in on-chain ESDT role grant/revoke operations and + /// corresponds to the role-name constants in the Go VM. pub fn name(&self) -> &'static str { match self { Self::None => ESDT_ROLE_NONE, @@ -76,6 +103,9 @@ impl EsdtLocalRole { } } + /// Converts this role to its corresponding bit-flag in [`EsdtLocalRoleFlags`]. + /// + /// The bit position matches the Go VM's `Role*` iota constant for the same role. pub fn to_flag(&self) -> EsdtLocalRoleFlags { match self { Self::None => EsdtLocalRoleFlags::NONE, @@ -106,19 +136,24 @@ const ALL_ROLES: [EsdtLocalRole; 12] = [ EsdtLocalRole::NftUpdateAttributes, EsdtLocalRole::NftAddUri, EsdtLocalRole::NftRecreate, - EsdtLocalRole::ModifyRoyalties, EsdtLocalRole::ModifyCreator, + EsdtLocalRole::ModifyRoyalties, EsdtLocalRole::SetNewUri, EsdtLocalRole::Transfer, ]; impl EsdtLocalRole { + /// Iterates over all non-`None` roles in canonical numeric-ID order. pub fn iter_all() -> core::slice::Iter<'static, EsdtLocalRole> { ALL_ROLES.iter() } } impl From for EsdtLocalRole { + /// Decodes a numeric role ID into an [`EsdtLocalRole`]. + /// + /// This is the inverse of [`EsdtLocalRole::as_u16`]. Unknown values map to + /// [`EsdtLocalRole::None`]. #[inline] fn from(value: u16) -> Self { match value { @@ -130,8 +165,8 @@ impl From for EsdtLocalRole { 6 => Self::NftUpdateAttributes, 7 => Self::NftAddUri, 8 => Self::NftRecreate, - 9 => Self::ModifyRoyalties, - 10 => Self::ModifyCreator, + 9 => Self::ModifyCreator, + 10 => Self::ModifyRoyalties, 11 => Self::SetNewUri, 12 => Self::Transfer, _ => Self::None, @@ -140,6 +175,11 @@ impl From for EsdtLocalRole { } impl<'a> From<&'a [u8]> for EsdtLocalRole { + /// Decodes an ESDT role from its canonical byte-string name + /// (e.g. `b"ESDTRoleLocalMint"`). + /// + /// This is the primary decoding path for on-chain ESDT role data. Unknown + /// byte strings map to [`EsdtLocalRole::None`]. #[inline] fn from(byte_slice: &'a [u8]) -> Self { if byte_slice == ESDT_ROLE_LOCAL_MINT.as_bytes() { diff --git a/chain/core/src/types/flags/esdt_local_role_flags.rs b/chain/core/src/types/flags/esdt_local_role_flags.rs index 11f8d5fcba..da1ef103aa 100644 --- a/chain/core/src/types/flags/esdt_local_role_flags.rs +++ b/chain/core/src/types/flags/esdt_local_role_flags.rs @@ -2,7 +2,29 @@ use super::EsdtLocalRole; use bitflags::bitflags; bitflags! { - #[derive(PartialEq, Clone, Copy)] + /// Bit-flag representation of ESDT local roles. + /// + /// Each flag corresponds to a `Role*` constant defined in the Go VM at + /// `vmhost/vmhooks/eei_helpers.go` (`mx-chain-vm-go`), where the same + /// values are produced via `1 << iota` starting from `RoleMint = 1`. + /// + /// Correspondence table (Rust flag → Go constant → bit): + /// + /// | Rust flag | Go constant | Bit | + /// |------------------------|--------------------------|----| + /// | `MINT` | `RoleMint` | 0 | + /// | `BURN` | `RoleBurn` | 1 | + /// | `NFT_CREATE` | `RoleNFTCreate` | 2 | + /// | `NFT_ADD_QUANTITY` | `RoleNFTAddQuantity` | 3 | + /// | `NFT_BURN` | `RoleNFTBurn` | 4 | + /// | `NFT_UPDATE_ATTRIBUTES`| `RoleNFTUpdateAttributes`| 5 | + /// | `NFT_ADD_URI` | `RoleNFTAddURI` | 6 | + /// | `NFT_RECREATE` | `RoleNFTRecreate` | 7 | + /// | `MODIFY_CREATOR` | `RoleModifyCreator` | 8 | + /// | `MODIFY_ROYALTIES` | `RoleModifyRoyalties` | 9 | + /// | `SET_NEW_URI` | `RoleSetNewURI` | 10 | + /// | `TRANSFER` | *(not yet in Go VM)* | 11 | + #[derive(PartialEq, Clone, Copy, Debug)] pub struct EsdtLocalRoleFlags: u64 { const NONE = 0b00000000_00000000; const MINT = 0b00000000_00000001; @@ -22,10 +44,14 @@ bitflags! { } impl EsdtLocalRoleFlags { + /// Returns `true` if this flag set contains the bit corresponding to `role`. pub fn has_role(&self, role: &EsdtLocalRole) -> bool { *self & role.to_flag() != EsdtLocalRoleFlags::NONE } + /// Iterates over all [`EsdtLocalRole`] variants whose bit is set in this flag set. + /// + /// Roles are yielded in canonical numeric-ID order (see [`EsdtLocalRole::iter_all`]). pub fn iter_roles(&self) -> impl Iterator { EsdtLocalRole::iter_all().filter(move |role| self.has_role(role)) } diff --git a/chain/core/tests/esdt_local_role_test.rs b/chain/core/tests/esdt_local_role_test.rs new file mode 100644 index 0000000000..2b11489212 --- /dev/null +++ b/chain/core/tests/esdt_local_role_test.rs @@ -0,0 +1,148 @@ +use multiversx_chain_core::types::{EsdtLocalRole, EsdtLocalRoleFlags}; + +/// Every non-None role paired with its expected numeric ID, canonical name, +/// and expected flag bit. This is the single source of truth for all +/// round-trip checks below. +#[rustfmt::skip] +const ROLE_TABLE: &[(EsdtLocalRole, u16, &str, EsdtLocalRoleFlags)] = &[ + (EsdtLocalRole::Mint, 1, "ESDTRoleLocalMint", EsdtLocalRoleFlags::MINT), + (EsdtLocalRole::Burn, 2, "ESDTRoleLocalBurn", EsdtLocalRoleFlags::BURN), + (EsdtLocalRole::NftCreate, 3, "ESDTRoleNFTCreate", EsdtLocalRoleFlags::NFT_CREATE), + (EsdtLocalRole::NftAddQuantity, 4, "ESDTRoleNFTAddQuantity", EsdtLocalRoleFlags::NFT_ADD_QUANTITY), + (EsdtLocalRole::NftBurn, 5, "ESDTRoleNFTBurn", EsdtLocalRoleFlags::NFT_BURN), + (EsdtLocalRole::NftUpdateAttributes, 6, "ESDTRoleNFTUpdateAttributes",EsdtLocalRoleFlags::NFT_UPDATE_ATTRIBUTES), + (EsdtLocalRole::NftAddUri, 7, "ESDTRoleNFTAddURI", EsdtLocalRoleFlags::NFT_ADD_URI), + (EsdtLocalRole::NftRecreate, 8, "ESDTRoleNFTRecreate", EsdtLocalRoleFlags::NFT_RECREATE), + (EsdtLocalRole::ModifyCreator, 9, "ESDTRoleModifyCreator", EsdtLocalRoleFlags::MODIFY_CREATOR), + (EsdtLocalRole::ModifyRoyalties, 10, "ESDTRoleModifyRoyalties", EsdtLocalRoleFlags::MODIFY_ROYALTIES), + (EsdtLocalRole::SetNewUri, 11, "ESDTRoleSetNewURI", EsdtLocalRoleFlags::SET_NEW_URI), + (EsdtLocalRole::Transfer, 12, "ESDTTransferRole", EsdtLocalRoleFlags::TRANSFER), +]; + +#[test] +fn test_none_role() { + assert_eq!(EsdtLocalRole::None.as_u16(), 0); + assert_eq!(EsdtLocalRole::None.name(), ""); + assert_eq!(EsdtLocalRole::None.as_role_name(), b""); + assert_eq!(EsdtLocalRole::None.to_flag(), EsdtLocalRoleFlags::NONE); +} + +#[test] +fn test_as_u16() { + for (role, id, _, _) in ROLE_TABLE { + assert_eq!(role.as_u16(), *id, "{role:?}.as_u16()"); + } +} + +#[test] +fn test_from_u16_round_trip() { + for (role, id, _, _) in ROLE_TABLE { + assert_eq!(EsdtLocalRole::from(*id), *role, "from({})", id); + } +} + +#[test] +fn test_from_u16_unknown_returns_none() { + assert_eq!(EsdtLocalRole::from(0u16), EsdtLocalRole::None); + assert_eq!(EsdtLocalRole::from(13u16), EsdtLocalRole::None); + assert_eq!(EsdtLocalRole::from(u16::MAX), EsdtLocalRole::None); +} + +/// `as_u16` and `From` must be exact inverses for every defined role. +#[test] +fn test_u16_round_trip_both_directions() { + for (role, _, _, _) in ROLE_TABLE { + let id = role.as_u16(); + assert_eq!(&EsdtLocalRole::from(id), role, "round-trip for {role:?}"); + } +} + +#[test] +fn test_name_and_as_role_name() { + for (role, _, name, _) in ROLE_TABLE { + assert_eq!(role.name(), *name, "{role:?}.name()"); + assert_eq!( + role.as_role_name(), + name.as_bytes(), + "{role:?}.as_role_name()" + ); + } +} + +#[test] +fn test_from_byte_slice_round_trip() { + for (role, _, name, _) in ROLE_TABLE { + let decoded = EsdtLocalRole::from(name.as_bytes()); + assert_eq!(decoded, *role, "from(b\"{name}\")"); + } +} + +#[test] +fn test_from_byte_slice_unknown_returns_none() { + assert_eq!(EsdtLocalRole::from(b"".as_ref()), EsdtLocalRole::None); + assert_eq!( + EsdtLocalRole::from(b"unknown".as_ref()), + EsdtLocalRole::None + ); + // Ensure a near-match (extra char) does not decode as a valid role. + assert_eq!( + EsdtLocalRole::from(b"ESDTRoleLocalMintX".as_ref()), + EsdtLocalRole::None, + ); +} + +/// `name()` and `From<&[u8]>` must be exact inverses for every defined role. +#[test] +fn test_byte_slice_round_trip_both_directions() { + for (role, _, _, _) in ROLE_TABLE { + let name = role.name(); + assert_eq!( + &EsdtLocalRole::from(name.as_bytes()), + role, + "round-trip for {role:?}", + ); + } +} + +#[test] +fn test_to_flag() { + for (role, _, _, flag) in ROLE_TABLE { + assert_eq!(role.to_flag(), *flag, "{role:?}.to_flag()"); + } + assert_eq!(EsdtLocalRole::None.to_flag(), EsdtLocalRoleFlags::NONE); +} + +/// `ModifyCreator` (9) and `ModifyRoyalties` (10) are the historically +/// swapped pair — verify both directions explicitly. +#[test] +fn test_modify_creator_and_modify_royalties_not_swapped() { + assert_eq!(EsdtLocalRole::ModifyCreator.as_u16(), 9); + assert_eq!(EsdtLocalRole::ModifyRoyalties.as_u16(), 10); + assert_eq!(EsdtLocalRole::from(9u16), EsdtLocalRole::ModifyCreator); + assert_eq!(EsdtLocalRole::from(10u16), EsdtLocalRole::ModifyRoyalties); + assert_eq!( + EsdtLocalRole::from(b"ESDTRoleModifyCreator".as_ref()), + EsdtLocalRole::ModifyCreator, + ); + assert_eq!( + EsdtLocalRole::from(b"ESDTRoleModifyRoyalties".as_ref()), + EsdtLocalRole::ModifyRoyalties, + ); + assert_eq!( + EsdtLocalRole::ModifyCreator.to_flag(), + EsdtLocalRoleFlags::MODIFY_CREATOR, + ); + assert_eq!( + EsdtLocalRole::ModifyRoyalties.to_flag(), + EsdtLocalRoleFlags::MODIFY_ROYALTIES, + ); +} + +#[test] +fn test_iter_all_order_and_completeness() { + let roles: Vec = EsdtLocalRole::iter_all().copied().collect(); + assert_eq!(roles.len(), ROLE_TABLE.len()); + for (idx, (expected_role, _, _, _)) in ROLE_TABLE.iter().enumerate() { + assert_eq!(roles[idx], *expected_role, "iter_all position {idx}"); + } +} diff --git a/chain/vm/Cargo.toml b/chain/vm/Cargo.toml index 6cda31eaed..a1fedb8cc1 100644 --- a/chain/vm/Cargo.toml +++ b/chain/vm/Cargo.toml @@ -32,7 +32,6 @@ bitflags = "2.9" colored = "3.0" rand = { version = "0.10", optional = true } rand_seeder = "0.5.0" -ed25519-dalek = "2.1.0" serde = { version = "1.0", features = ["derive"] } toml = "1.0" anyhow = "1.0" diff --git a/chain/vm/src/blockchain/state/account_data.rs b/chain/vm/src/blockchain/state/account_data.rs index a4e1906e07..0c890e55d3 100644 --- a/chain/vm/src/blockchain/state/account_data.rs +++ b/chain/vm/src/blockchain/state/account_data.rs @@ -4,7 +4,7 @@ use num_traits::Zero; use super::AccountEsdt; use crate::{ display_util::key_hex, - types::{Address, VMCodeMetadata}, + types::{Address, CodeMetadata}, }; use std::{collections::HashMap, fmt, fmt::Write}; @@ -19,7 +19,7 @@ pub struct AccountData { pub storage: AccountStorage, pub username: Vec, pub contract_path: Option>, - pub code_metadata: VMCodeMetadata, + pub code_metadata: CodeMetadata, pub contract_owner: Option
, pub developer_rewards: BigUint, } @@ -34,7 +34,7 @@ impl AccountData { storage: AccountStorage::default(), username: vec![], contract_path: None, - code_metadata: VMCodeMetadata::empty(), + code_metadata: CodeMetadata::empty(), contract_owner: None, developer_rewards: BigUint::zero(), } diff --git a/chain/vm/src/builtin_functions/general/upgrade_contract.rs b/chain/vm/src/builtin_functions/general/upgrade_contract.rs index 1bbb1563c1..fb672d1e06 100644 --- a/chain/vm/src/builtin_functions/general/upgrade_contract.rs +++ b/chain/vm/src/builtin_functions/general/upgrade_contract.rs @@ -3,7 +3,7 @@ use crate::{ host::context::{BlockchainUpdate, CallType, TxCache, TxFunctionName, TxInput, TxResult}, host::execution, host::runtime::{RuntimeInstanceCallLambda, RuntimeRef}, - types::VMCodeMetadata, + types::CodeMetadata, }; use super::super::builtin_func_trait::BuiltinFunction; @@ -33,7 +33,7 @@ impl BuiltinFunction for UpgradeContract { } let new_code = tx_input.args[0].clone(); - let code_metadata = VMCodeMetadata::from(&tx_input.args[1]); + let code_metadata = CodeMetadata::from_bytes_or_default(&tx_input.args[1]); let args = if tx_input.args.len() > 2 { tx_input.args[2..].to_vec() diff --git a/chain/vm/src/crypto_functions.rs b/chain/vm/src/crypto_functions.rs index e70b10e513..e5e63ec969 100644 --- a/chain/vm/src/crypto_functions.rs +++ b/chain/vm/src/crypto_functions.rs @@ -1,36 +1,45 @@ +//! Thin wrappers over [`multiversx_chain_core::std::crypto`] for convenient use in the VM. + use multiversx_chain_core::std::crypto; +/// Computes the SHA-256 hash of `data`. +/// Returns a 32-byte digest. +/// +/// Wraps [`multiversx_chain_core::std::crypto::sha256`]. pub fn sha256(data: &[u8]) -> [u8; crypto::SHA256_RESULT_LEN] { crypto::sha256(data) } +/// Computes the Keccak-256 hash of `data`. +/// Returns a 32-byte digest. +/// +/// Wraps [`multiversx_chain_core::std::crypto::keccak256`]. pub fn keccak256(data: &[u8]) -> [u8; crypto::KECCAK256_RESULT_LEN] { crypto::keccak256(data) } +/// Verifies an Ed25519 signature. +/// +/// Wraps [`multiversx_chain_core::std::crypto::ed25519::Ed25519VerifyingKey::verify`]. +/// +/// Returns `true` if `signature` is a valid Ed25519 signature of `message` +/// under the public key `key`. +/// +/// Returns `false` if: +/// - `key` is not exactly 32 bytes +/// - `signature` is not exactly 64 bytes +/// - `key` does not represent a valid curve point +/// - the signature does not verify pub fn verify_ed25519(key: &[u8], message: &[u8], signature: &[u8]) -> bool { - use ed25519_dalek::{Signature, Verifier, VerifyingKey}; - - let key_32: [u8; 32] = if let Ok(key_32) = key.try_into() { - key_32 - } else { + let Ok(key_32) = key.try_into() else { return false; }; - let signature_64: [u8; 64] = if let Ok(signature_64) = signature.try_into() { - signature_64 - } else { + let Ok(sig_64) = signature.try_into() else { return false; }; - - let verifying_key_result = VerifyingKey::from_bytes(&key_32); - let verifying_key = if let Ok(verifying_key) = verifying_key_result { - verifying_key - } else { + let Some(verifying_key) = crypto::ed25519::Ed25519VerifyingKey::from_bytes(key_32) else { return false; }; - - let sig = Signature::from_bytes(&signature_64); - - let result = verifying_key.verify(message, &sig); - result.is_ok() + let sig = crypto::ed25519::Ed25519Signature::from_bytes(sig_64); + verifying_key.verify(message, &sig) } diff --git a/chain/vm/src/host/context/managed_type_container/tx_managed_buffer.rs b/chain/vm/src/host/context/managed_type_container/tx_managed_buffer.rs index ef1aca4dc2..13e2f5c313 100644 --- a/chain/vm/src/host/context/managed_type_container/tx_managed_buffer.rs +++ b/chain/vm/src/host/context/managed_type_container/tx_managed_buffer.rs @@ -1,6 +1,6 @@ use crate::{ host::context::{TxFunctionName, TxTokenTransfer}, - types::{Address, RawHandle, VMCodeMetadata}, + types::{Address, CodeMetadata, RawHandle}, }; use super::ManagedTypeContainer; @@ -34,9 +34,8 @@ impl ManagedTypeContainer { TxFunctionName::from(self.mb_get(handle)) } - pub fn mb_to_code_metadata(&self, handle: RawHandle) -> VMCodeMetadata { - let bytes: [u8; 2] = self.mb_get(handle).try_into().unwrap(); - VMCodeMetadata::from(bytes) + pub fn mb_to_code_metadata(&self, handle: RawHandle) -> CodeMetadata { + CodeMetadata::from_bytes_or_default(self.mb_get(handle)) } pub fn mb_get_slice( diff --git a/chain/vm/src/host/context/tx_context.rs b/chain/vm/src/host/context/tx_context.rs index ef26b188e5..1479fbf65a 100644 --- a/chain/vm/src/host/context/tx_context.rs +++ b/chain/vm/src/host/context/tx_context.rs @@ -4,7 +4,7 @@ use crate::{ state::{AccountData, AccountEsdt, BlockchainState}, }, host::runtime::RuntimeRef, - types::{Address, VMCodeMetadata}, + types::{Address, CodeMetadata}, }; use num_bigint::BigUint; use num_traits::Zero; @@ -53,7 +53,7 @@ impl TxContext { esdt: AccountEsdt::default(), username: Vec::new(), contract_path: None, - code_metadata: VMCodeMetadata::empty(), + code_metadata: CodeMetadata::empty(), contract_owner: None, developer_rewards: BigUint::zero(), }); @@ -154,7 +154,7 @@ impl TxContext { &self, new_address: &Address, contract_path: Vec, - code_metadata: VMCodeMetadata, + code_metadata: CodeMetadata, contract_owner: Address, ) { assert!( diff --git a/chain/vm/src/host/execution/exec_call.rs b/chain/vm/src/host/execution/exec_call.rs index b17d0916af..c970a43290 100644 --- a/chain/vm/src/host/execution/exec_call.rs +++ b/chain/vm/src/host/execution/exec_call.rs @@ -11,7 +11,7 @@ use crate::{ }, runtime::{RuntimeInstanceCallLambda, RuntimeInstanceCallLambdaDefault, RuntimeRef}, }, - types::VMCodeMetadata, + types::CodeMetadata, }; use num_bigint::BigUint; use num_traits::Zero; @@ -210,7 +210,7 @@ fn insert_ghost_account( username: Vec::new(), storage: HashMap::new(), contract_path: None, - code_metadata: VMCodeMetadata::empty(), + code_metadata: CodeMetadata::empty(), contract_owner: None, developer_rewards: BigUint::zero(), }); diff --git a/chain/vm/src/host/execution/exec_create.rs b/chain/vm/src/host/execution/exec_create.rs index ccc370ce2e..ec49c3c06b 100644 --- a/chain/vm/src/host/execution/exec_create.rs +++ b/chain/vm/src/host/execution/exec_create.rs @@ -2,14 +2,14 @@ use crate::{ blockchain::state::BlockchainStateRef, host::context::{BlockchainUpdate, TxCache, TxContext, TxInput, TxResult}, host::runtime::{RuntimeInstanceCallLambda, RuntimeRef}, - types::{Address, VMCodeMetadata}, + types::{Address, CodeMetadata}, }; /// Executes deploy transaction and commits changes back to the underlying blockchain state. pub fn commit_deploy( tx_input: TxInput, contract_path: &[u8], - code_metadata: VMCodeMetadata, + code_metadata: CodeMetadata, state: &mut BlockchainStateRef, runtime: &RuntimeRef, f: F, @@ -47,7 +47,7 @@ where pub fn execute_deploy( mut tx_input: TxInput, contract_path: Vec, - code_metadata: VMCodeMetadata, + code_metadata: CodeMetadata, tx_cache: TxCache, runtime: &RuntimeRef, f: F, diff --git a/chain/vm/src/host/vm_hooks/vh_context.rs b/chain/vm/src/host/vm_hooks/vh_context.rs index bb750ae4ff..0d567de474 100644 --- a/chain/vm/src/host/vm_hooks/vh_context.rs +++ b/chain/vm/src/host/vm_hooks/vh_context.rs @@ -8,7 +8,7 @@ use crate::{ BackTransfers, ManagedTypeContainer, TxErrorTrace, TxFunctionName, TxInput, TxLog, TxResult, }, schedule::GasSchedule, - types::{Address, H256, VMCodeMetadata}, + types::{Address, CodeMetadata, H256}, }; /// Abstracts away the borrowing of a managed types structure. @@ -119,7 +119,7 @@ pub trait VMHooksContext: Debug { &mut self, egld_value: num_bigint::BigUint, contract_code: Vec, - code_metadata: VMCodeMetadata, + code_metadata: CodeMetadata, args: Vec>, ) -> Result<(Address, Vec>), VMHooksEarlyExit>; diff --git a/chain/vm/src/host/vm_hooks/vh_handler/vh_blockchain.rs b/chain/vm/src/host/vm_hooks/vh_handler/vh_blockchain.rs index 333b2e71a0..e8903bcec7 100644 --- a/chain/vm/src/host/vm_hooks/vh_handler/vh_blockchain.rs +++ b/chain/vm/src/host/vm_hooks/vh_handler/vh_blockchain.rs @@ -554,7 +554,10 @@ impl VMHooksHandler { let m_types = self.context.m_types_lock(); let token_id = m_types.mb_get(token_id_handle); - Ok(multiversx_chain_core::token_identifier_util::validate_token_identifier(token_id)) + Ok( + multiversx_chain_core::token_identifier_util::validate_token_identifier(token_id) + .is_ok(), + ) } #[allow(clippy::too_many_arguments)] diff --git a/chain/vm/src/host/vm_hooks/vh_handler/vh_send.rs b/chain/vm/src/host/vm_hooks/vh_handler/vh_send.rs index eb80f6731f..2404004bf8 100644 --- a/chain/vm/src/host/vm_hooks/vh_handler/vh_send.rs +++ b/chain/vm/src/host/vm_hooks/vh_handler/vh_send.rs @@ -7,7 +7,7 @@ use crate::{ context::{AsyncCallTxData, Promise, TxFunctionName, TxTokenTransfer}, vm_hooks::{VMHooksContext, vh_early_exit::early_exit_vm_error}, }, - types::{Address, RawHandle, VMCodeMetadata, top_encode_big_uint, top_encode_u64}, + types::{Address, CodeMetadata, RawHandle, top_encode_big_uint, top_encode_u64}, vm_err_msg, }; use multiversx_chain_core::types::ReturnCode; @@ -114,7 +114,7 @@ impl VMHooksHandler { to: Address, egld_value: num_bigint::BigUint, contract_code: Vec, - code_metadata: VMCodeMetadata, + code_metadata: CodeMetadata, args: Vec>, ) -> Result<(), VMHooksEarlyExit> { let mut arguments = vec![contract_code, code_metadata.to_vec()]; diff --git a/chain/vm/src/host/vm_hooks/vh_tx_context.rs b/chain/vm/src/host/vm_hooks/vh_tx_context.rs index f97960283c..f2d5a2b660 100644 --- a/chain/vm/src/host/vm_hooks/vh_tx_context.rs +++ b/chain/vm/src/host/vm_hooks/vh_tx_context.rs @@ -16,7 +16,7 @@ use crate::{ TxContextRef, TxFunctionName, TxInput, TxResult, async_call_tx_input, }, host::execution, - types::{Address, VMCodeMetadata}, + types::{Address, CodeMetadata}, vm_err_msg, }; @@ -209,7 +209,7 @@ impl VMHooksContext for TxVMHooksContext { &mut self, egld_value: num_bigint::BigUint, contract_code: Vec, - code_metadata: VMCodeMetadata, + code_metadata: CodeMetadata, args: Vec>, ) -> Result<(Address, Vec>), VMHooksEarlyExit> { let contract_address = self.current_address(); diff --git a/chain/vm/src/types.rs b/chain/vm/src/types.rs index e584909d0e..573563ed25 100644 --- a/chain/vm/src/types.rs +++ b/chain/vm/src/types.rs @@ -1,5 +1,5 @@ pub use crate::chain_core::types::Address; -pub use crate::chain_core::types::CodeMetadata as VMCodeMetadata; +pub use crate::chain_core::types::CodeMetadata; pub use crate::chain_core::types::EsdtLocalRole; pub use crate::chain_core::types::EsdtLocalRoleFlags; pub use crate::chain_core::types::H256; diff --git a/contracts/examples/multisig/Cargo.toml b/contracts/examples/multisig/Cargo.toml index b38d24c32b..592fa9f2b4 100644 --- a/contracts/examples/multisig/Cargo.toml +++ b/contracts/examples/multisig/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "multisig" -version = "1.0.0" +version = "0.0.0" authors = ["Andrei Marinica "] edition = "2024" publish = false diff --git a/contracts/examples/multisig/interact/src/multisig_interact.rs b/contracts/examples/multisig/interact/src/multisig_interact.rs index 59574edd76..49e806259a 100644 --- a/contracts/examples/multisig/interact/src/multisig_interact.rs +++ b/contracts/examples/multisig/interact/src/multisig_interact.rs @@ -113,8 +113,8 @@ impl MultisigInteract { let dan = test_wallets::dan(); let eve = test_wallets::eve(); - for wallet in &[carol, dan, eve] { - self.interactor.register_wallet(*wallet).await; + for wallet in [carol, dan, eve] { + self.interactor.register_wallet(wallet).await; } } diff --git a/contracts/examples/multisig/tests/multisig_blackbox_test.rs b/contracts/examples/multisig/tests/multisig_blackbox_test.rs index bc2579ba4f..060cff6d7e 100644 --- a/contracts/examples/multisig/tests/multisig_blackbox_test.rs +++ b/contracts/examples/multisig/tests/multisig_blackbox_test.rs @@ -530,7 +530,7 @@ fn blackbox_deploy_and_upgrade_from_source() { let action_id = state.propose_sc_deploy_from_source( 0u64, ADDER_ADDRESS, - CodeMetadata::all(), + CodeMetadata::default(), MultiValueVec::from([top_encode_to_vec_u8_or_panic(&5u64)]), ); state.sign(action_id); @@ -576,7 +576,7 @@ fn blackbox_deploy_and_upgrade_from_source() { ADDER_ADDRESS, 0u64, factorial_address, - CodeMetadata::all(), + CodeMetadata::default(), MultiValueVec::new(), ); state.sign(action_id); diff --git a/contracts/examples/multisig/tests/multisig_whitebox_test.rs b/contracts/examples/multisig/tests/multisig_whitebox_test.rs index f602753aa6..f57781b767 100644 --- a/contracts/examples/multisig/tests/multisig_whitebox_test.rs +++ b/contracts/examples/multisig/tests/multisig_whitebox_test.rs @@ -626,7 +626,7 @@ fn whitebox_deploy_and_upgrade_from_source() { ActionRaw::SCDeployFromSource { amount: 0u64.into(), source: ADDER_ADDRESS.to_address(), - code_metadata: CodeMetadata::all(), + code_metadata: CodeMetadata::default(), arguments: vec![BoxedBytes::from(&[5u8][..])], }, None, @@ -683,7 +683,7 @@ fn whitebox_deploy_and_upgrade_from_source() { ActionRaw::SCUpgradeFromSource { source: FACTORIAL_ADDRESS.to_address(), amount: 0u64.into(), - code_metadata: CodeMetadata::all(), + code_metadata: CodeMetadata::default(), arguments: Vec::new(), sc_address: ADDER_ADDRESS.to_address(), }, diff --git a/contracts/examples/order-book/factory/src/lib.rs b/contracts/examples/order-book/factory/src/lib.rs index d6ca7e9642..1df8c7115a 100644 --- a/contracts/examples/order-book/factory/src/lib.rs +++ b/contracts/examples/order-book/factory/src/lib.rs @@ -33,7 +33,7 @@ pub trait Factory { .raw_deploy() .arguments_raw(arguments) .from_source(source) - .code_metadata(CodeMetadata::DEFAULT) + .code_metadata(CodeMetadata::EMPTY) .returns(ReturnsNewManagedAddress) .sync_call(); diff --git a/contracts/feature-tests/abi-tester/abi_tester_expected_main.abi.json b/contracts/feature-tests/abi-tester/abi_tester_expected_main.abi.json index e98d6acd11..40c2f0769b 100644 --- a/contracts/feature-tests/abi-tester/abi_tester_expected_main.abi.json +++ b/contracts/feature-tests/abi-tester/abi_tester_expected_main.abi.json @@ -14,6 +14,10 @@ "version": "0.0.0", "gitVersion": "" }, + "abi": { + "name": "multiversx-sc-abi", + "version": "0.25.0" + }, "framework": { "name": "multiversx-sc", "version": "0.66.1" diff --git a/contracts/feature-tests/abi-tester/abi_tester_expected_view.abi.json b/contracts/feature-tests/abi-tester/abi_tester_expected_view.abi.json index efbf91a377..97c873ce8c 100644 --- a/contracts/feature-tests/abi-tester/abi_tester_expected_view.abi.json +++ b/contracts/feature-tests/abi-tester/abi_tester_expected_view.abi.json @@ -14,6 +14,10 @@ "version": "0.0.0", "gitVersion": "" }, + "abi": { + "name": "multiversx-sc-abi", + "version": "0.25.0" + }, "framework": { "name": "multiversx-sc", "version": "0.66.1" diff --git a/contracts/feature-tests/composability/forwarder-legacy/src/fwd_deploy_legacy.rs b/contracts/feature-tests/composability/forwarder-legacy/src/fwd_deploy_legacy.rs index d573b45ec0..64a58ae0da 100644 --- a/contracts/feature-tests/composability/forwarder-legacy/src/fwd_deploy_legacy.rs +++ b/contracts/feature-tests/composability/forwarder-legacy/src/fwd_deploy_legacy.rs @@ -38,7 +38,7 @@ pub trait DeployContractModule { ) -> (ManagedAddress, OptionalValue) { self.vault_proxy() .init(opt_arg) - .deploy_contract(code, CodeMetadata::DEFAULT) + .deploy_contract(code, CodeMetadata::EMPTY) } #[endpoint] @@ -49,7 +49,7 @@ pub trait DeployContractModule { ) -> MultiValue2> { self.vault_proxy() .init(opt_arg) - .deploy_from_source(&source_address, CodeMetadata::DEFAULT) + .deploy_from_source(&source_address, CodeMetadata::EMPTY) .into() } } diff --git a/contracts/feature-tests/composability/forwarder/src/fwd_deploy.rs b/contracts/feature-tests/composability/forwarder/src/fwd_deploy.rs index 7145f2555a..bc8db840bd 100644 --- a/contracts/feature-tests/composability/forwarder/src/fwd_deploy.rs +++ b/contracts/feature-tests/composability/forwarder/src/fwd_deploy.rs @@ -53,7 +53,7 @@ pub trait DeployContractModule { self.tx() .typed(vault_proxy::VaultProxy) .init(opt_arg) - .code_metadata(CodeMetadata::DEFAULT) + .code_metadata(CodeMetadata::EMPTY) .from_source(source_address) .returns(ReturnsNewManagedAddress) .returns(ReturnsResult) diff --git a/contracts/feature-tests/composability/mesh-interactor/src/call_tree_deploy.rs b/contracts/feature-tests/composability/mesh-interactor/src/call_tree_deploy.rs index 1843afc9f7..640d11cf21 100644 --- a/contracts/feature-tests/composability/mesh-interactor/src/call_tree_deploy.rs +++ b/contracts/feature-tests/composability/mesh-interactor/src/call_tree_deploy.rs @@ -44,7 +44,7 @@ impl ComposabilityInteract { let code_metadata = if contract.payable.unwrap_or(false) { CodeMetadata::PAYABLE } else { - CodeMetadata::DEFAULT + CodeMetadata::EMPTY }; buffer.push_tx(|tx| { tx.from(wallet) diff --git a/contracts/feature-tests/use-module/use_module_expected_main.abi.json b/contracts/feature-tests/use-module/use_module_expected_main.abi.json index 81b40d8966..57b5b7089e 100644 --- a/contracts/feature-tests/use-module/use_module_expected_main.abi.json +++ b/contracts/feature-tests/use-module/use_module_expected_main.abi.json @@ -14,6 +14,10 @@ "version": "0.0.0", "gitVersion": "" }, + "abi": { + "name": "multiversx-sc-abi", + "version": "0.25.0" + }, "framework": { "name": "multiversx-sc", "version": "0.66.1" diff --git a/contracts/feature-tests/use-module/use_module_expected_view.abi.json b/contracts/feature-tests/use-module/use_module_expected_view.abi.json index 6e4e93eb69..df9ae56910 100644 --- a/contracts/feature-tests/use-module/use_module_expected_view.abi.json +++ b/contracts/feature-tests/use-module/use_module_expected_view.abi.json @@ -14,6 +14,10 @@ "version": "0.0.0", "gitVersion": "" }, + "abi": { + "name": "multiversx-sc-abi", + "version": "0.25.0" + }, "framework": { "name": "multiversx-sc", "version": "0.66.1" diff --git a/data/abi-derive-common/Cargo.toml b/data/abi-derive-common/Cargo.toml new file mode 100644 index 0000000000..6a471f6a25 --- /dev/null +++ b/data/abi-derive-common/Cargo.toml @@ -0,0 +1,28 @@ +[package] +name = "multiversx-sc-abi-derive-common" +version = "0.25.0" +edition = "2024" +publish = false + +authors = [ + "Andrei Marinica ", + "MultiversX ", +] +license = "GPL-3.0-only" +readme = "README.md" +repository = "https://github.com/multiversx/mx-sdk-rs" +homepage = "https://multiversx.com/" +documentation = "https://docs.multiversx.com/" +description = "MultiversX ABI common functionality for derive macros" +keywords = ["multiversx", "wasm", "webassembly", "blockchain", "contract"] +categories = [ + "no-std", + "wasm", + "cryptography::cryptocurrencies", + "development-tools", +] + +[dependencies] +proc-macro2 = "1.0" +quote = "1.0" +syn = { version = "2.0", features = ["full", "extra-traits"] } diff --git a/data/abi-derive-common/README.md b/data/abi-derive-common/README.md new file mode 100644 index 0000000000..86fdba58e9 --- /dev/null +++ b/data/abi-derive-common/README.md @@ -0,0 +1,10 @@ +# multiversx-sc-abi-derive-common + +Common logic for the `TypeAbi` derive macros in MultiversX smart contracts. + +This is a regular library crate (not a proc-macro crate) that contains the shared implementation used by both `multiversx-sc-abi-derive` and `multiversx-sc-derive`. + +## Contents + +- **`type_abi_derive`** — generates `TypeAbi` trait implementations for structs and enums +- **`parse`** — attribute parsing utilities (doc comments, macro attributes) diff --git a/data/abi-derive-common/src/lib.rs b/data/abi-derive-common/src/lib.rs new file mode 100644 index 0000000000..402a4dc571 --- /dev/null +++ b/data/abi-derive-common/src/lib.rs @@ -0,0 +1,13 @@ +// ensure we don't run out of macro stack +#![recursion_limit = "1024"] +// TODO: remove once minimum version is 1.87+ +#![allow(unknown_lints)] +#![allow(clippy::collapsible_if)] +#![allow(clippy::manual_is_multiple_of)] + +/// Common code for derive macros, shared between `data/abi-derive` and `framework/derive`. +pub mod parse; + +mod type_abi_derive; + +pub use type_abi_derive::{TypeAbiImportCrate, type_abi_derive, type_abi_full}; diff --git a/data/abi-derive-common/src/parse.rs b/data/abi-derive-common/src/parse.rs new file mode 100644 index 0000000000..9cda54b7c2 --- /dev/null +++ b/data/abi-derive-common/src/parse.rs @@ -0,0 +1 @@ +pub mod attributes; diff --git a/framework/derive/src/parse/attributes/doc_attr.rs b/data/abi-derive-common/src/parse/attributes.rs similarity index 78% rename from framework/derive/src/parse/attributes/doc_attr.rs rename to data/abi-derive-common/src/parse/attributes.rs index 693d03e35b..8f0db88371 100644 --- a/framework/derive/src/parse/attributes/doc_attr.rs +++ b/data/abi-derive-common/src/parse/attributes.rs @@ -1,14 +1,10 @@ use quote::ToTokens; -use super::{attr_names::*, util::*}; - -/// unlike the others, this is standard Rust, -/// all doc comments get automatically transformed into "doc" attributes -static ATTR_DOC: &str = "doc"; - /// Doc comments are actually syntactic sugar for doc attributes, /// so extracting doc comments means parsing "doc" attributes. pub fn extract_doc(attrs: &[syn::Attribute]) -> Vec { + const ATTR_DOC: &str = "doc"; + attrs .iter() .filter(|attr| { @@ -79,25 +75,3 @@ fn remove_backslashes(input: &str) -> String { .replace("\\\"", "\"") .replace("\\'", "'") } - -pub struct OutputNameAttribute { - pub output_name: String, -} - -impl OutputNameAttribute { - pub fn parse(attr: &syn::Attribute) -> Option { - is_attr_one_string_arg(attr, ATTR_OUTPUT_NAME).map(|arg_str| OutputNameAttribute { - output_name: arg_str, - }) - } -} - -pub struct TitleAttribute { - pub title: String, -} - -impl TitleAttribute { - pub fn parse(attr: &syn::Attribute) -> Option { - is_attr_one_string_arg(attr, ATTR_TITLE).map(|arg_str| TitleAttribute { title: arg_str }) - } -} diff --git a/framework/derive/src/type_abi_derive.rs b/data/abi-derive-common/src/type_abi_derive.rs similarity index 71% rename from framework/derive/src/type_abi_derive.rs rename to data/abi-derive-common/src/type_abi_derive.rs index 34385cc649..9243f3fc21 100644 --- a/framework/derive/src/type_abi_derive.rs +++ b/data/abi-derive-common/src/type_abi_derive.rs @@ -1,16 +1,32 @@ -use crate::parse::attributes::extract_macro_attributes; - -use super::parse::attributes::extract_doc; +use crate::parse::attributes::{extract_doc, extract_macro_attributes}; use quote::{ToTokens, quote}; const BITFLAGS_PATH: &str = ":: __private :: PublicFlags :: Internal"; const BITFLAGS_PRIMITIVE: &str = "Primitive"; + pub struct ExplicitDiscriminant { pub variant_index: usize, pub value: usize, } -fn field_snippet(index: usize, field: &syn::Field) -> proc_macro2::TokenStream { +#[derive(Clone, Copy)] +pub enum TypeAbiImportCrate { + MultiversxSc, + MultiversxScAbi, +} + +fn import_tokens(context: TypeAbiImportCrate) -> proc_macro2::TokenStream { + match context { + TypeAbiImportCrate::MultiversxSc => quote! { multiversx_sc::abi }, + TypeAbiImportCrate::MultiversxScAbi => quote! { multiversx_sc_abi }, + } +} + +fn field_snippet( + index: usize, + field: &syn::Field, + context: TypeAbiImportCrate, +) -> proc_macro2::TokenStream { let field_docs = extract_doc(field.attrs.as_slice()); let field_name_str = if let Some(ident) = &field.ident { ident.to_string() @@ -18,8 +34,9 @@ fn field_snippet(index: usize, field: &syn::Field) -> proc_macro2::TokenStream { index.to_string() }; let field_ty = sanitize_field_type_path(&field.ty); + let imports = import_tokens(context); quote! { - field_descriptions.push(multiversx_sc::abi::StructFieldDescription::new( + field_descriptions.push(#imports::StructFieldDescription::new( &[ #(#field_docs),* ], #field_name_str, <#field_ty>::type_names(), @@ -46,26 +63,32 @@ fn sanitize_field_type_path(field_type: &syn::Type) -> syn::Type { field_type.clone() } -fn fields_snippets(fields: &syn::Fields) -> Vec { +fn fields_snippets( + fields: &syn::Fields, + context: TypeAbiImportCrate, +) -> Vec { match fields { syn::Fields::Named(fields_named) => fields_named .named .iter() .enumerate() - .map(|(index, field)| field_snippet(index, field)) + .map(|(index, field)| field_snippet(index, field, context)) .collect(), syn::Fields::Unnamed(fields_unnamed) => fields_unnamed .unnamed .iter() .enumerate() - .map(|(index, field)| field_snippet(index, field)) + .map(|(index, field)| field_snippet(index, field, context)) .collect(), syn::Fields::Unit => Vec::new(), } } -pub fn type_abi_derive(input: proc_macro::TokenStream) -> proc_macro2::TokenStream { - let ast: syn::DeriveInput = syn::parse(input).unwrap(); +pub fn type_abi_derive( + input: proc_macro2::TokenStream, + context: TypeAbiImportCrate, +) -> proc_macro2::TokenStream { + let ast: syn::DeriveInput = syn::parse2(input).unwrap(); let name = &ast.ident; let name_str = name.to_string(); let type_docs = extract_doc(ast.attrs.as_slice()); @@ -76,22 +99,24 @@ pub fn type_abi_derive(input: proc_macro::TokenStream) -> proc_macro2::TokenStre ); } + let imports = import_tokens(context); + let type_description_impl = match &ast.data { syn::Data::Struct(data_struct) => { - let struct_field_snippets = fields_snippets(&data_struct.fields); + let struct_field_snippets = fields_snippets(&data_struct.fields, context); quote! { - fn provide_type_descriptions(accumulator: &mut TDC) { + fn provide_type_descriptions(accumulator: &mut TDC) { let type_names = Self::type_names(); if !accumulator.contains_type(&type_names.abi) { accumulator.reserve_type_name(type_names.clone()); - let mut field_descriptions = multiversx_sc::types::heap::Vec::new(); + let mut field_descriptions = #imports::Vec::new(); #(#struct_field_snippets)* accumulator.insert( type_names.clone(), - multiversx_sc::abi::TypeDescription::new( + #imports::TypeDescription::new( &[ #(#type_docs),* ], type_names, - multiversx_sc::abi::TypeContents::Struct(field_descriptions), + #imports::TypeContents::Struct(field_descriptions), &[ #(#macro_attributes),* ], ), ); @@ -108,13 +133,13 @@ pub fn type_abi_derive(input: proc_macro::TokenStream) -> proc_macro2::TokenStre .map(|(variant_index, variant)| { let variant_docs = extract_doc(variant.attrs.as_slice()); let variant_name_str = variant.ident.to_string(); - let variant_field_snippets = fields_snippets(&variant.fields); + let variant_field_snippets = fields_snippets(&variant.fields, context); let variant_discriminant = get_discriminant(variant_index, variant, &mut previous_disc); quote! { - let mut field_descriptions = multiversx_sc::types::heap::Vec::new(); + let mut field_descriptions = #imports::Vec::new(); #(#variant_field_snippets)* - variant_descriptions.push(multiversx_sc::abi::EnumVariantDescription::new( + variant_descriptions.push(#imports::EnumVariantDescription::new( &[ #(#variant_docs),* ], #variant_name_str, #variant_discriminant, @@ -124,18 +149,18 @@ pub fn type_abi_derive(input: proc_macro::TokenStream) -> proc_macro2::TokenStre }) .collect(); quote! { - fn provide_type_descriptions(accumulator: &mut TDC) { + fn provide_type_descriptions(accumulator: &mut TDC) { let type_names = Self::type_names(); if !accumulator.contains_type(&type_names.abi) { accumulator.reserve_type_name(type_names.clone()); - let mut variant_descriptions = multiversx_sc::types::heap::Vec::new(); + let mut variant_descriptions = #imports::Vec::new(); #(#enum_variant_snippets)* accumulator.insert( type_names.clone(), - multiversx_sc::abi::TypeDescription::new( + #imports::TypeDescription::new( &[ #(#type_docs),* ], type_names, - multiversx_sc::abi::TypeContents::Enum(variant_descriptions), + #imports::TypeContents::Enum(variant_descriptions), &[ #(#macro_attributes),* ], ), ); @@ -148,13 +173,13 @@ pub fn type_abi_derive(input: proc_macro::TokenStream) -> proc_macro2::TokenStre let (impl_generics, ty_generics, where_clause) = &ast.generics.split_for_impl(); quote! { - impl #impl_generics multiversx_sc::abi::TypeAbiFrom for #name #ty_generics #where_clause {} - impl #impl_generics multiversx_sc::abi::TypeAbiFrom<&Self> for #name #ty_generics #where_clause {} + impl #impl_generics #imports::TypeAbiFrom for #name #ty_generics #where_clause {} + impl #impl_generics #imports::TypeAbiFrom<&Self> for #name #ty_generics #where_clause {} - impl #impl_generics multiversx_sc::abi::TypeAbi for #name #ty_generics #where_clause { + impl #impl_generics #imports::TypeAbi for #name #ty_generics #where_clause { type Unmanaged = Self; - fn type_name() -> multiversx_sc::abi::TypeName { + fn type_name() -> #imports::TypeName { #name_str.into() } #type_description_impl @@ -162,11 +187,13 @@ pub fn type_abi_derive(input: proc_macro::TokenStream) -> proc_macro2::TokenStre } } -pub fn type_abi_full(input: proc_macro::TokenStream) -> proc_macro2::TokenStream { - let input_conv = proc_macro2::TokenStream::from(input.clone()); - let derive_code = type_abi_derive(input); +pub fn type_abi_full( + input: proc_macro2::TokenStream, + context: TypeAbiImportCrate, +) -> proc_macro2::TokenStream { + let derive_code = type_abi_derive(input.clone(), context); quote! { - #input_conv + #input #derive_code } } @@ -189,7 +216,7 @@ pub fn get_discriminant( }); value } - _ => panic!("Only integer values as discriminants"), // theoretically covered by the compiler + _ => panic!("Only integer values as discriminants"), }; return quote! { #lit}; } diff --git a/data/abi-derive/Cargo.toml b/data/abi-derive/Cargo.toml new file mode 100644 index 0000000000..9f071a3b0f --- /dev/null +++ b/data/abi-derive/Cargo.toml @@ -0,0 +1,32 @@ +[package] +name = "multiversx-sc-abi-derive" +version = "0.25.0" +edition = "2024" +publish = false + +authors = [ + "Andrei Marinica ", + "MultiversX ", +] +license = "GPL-3.0-only" +readme = "README.md" +repository = "https://github.com/multiversx/mx-sdk-rs" +homepage = "https://multiversx.com/" +documentation = "https://docs.multiversx.com/" +description = "MultiversX ABI derive macros - TypeAbi derive and type_abi attribute" +keywords = ["multiversx", "wasm", "webassembly", "blockchain", "contract"] +categories = [ + "no-std", + "wasm", + "cryptography::cryptocurrencies", + "development-tools", +] + +[lib] +name = "multiversx_sc_abi_derive" +proc-macro = true + +[dependencies.multiversx-sc-abi-derive-common] +version = "=0.25.0" +path = "../abi-derive-common" + diff --git a/data/abi-derive/README.md b/data/abi-derive/README.md new file mode 100644 index 0000000000..850561fd8d --- /dev/null +++ b/data/abi-derive/README.md @@ -0,0 +1,20 @@ +# multiversx-sc-abi-derive + +Procedural macros for deriving TypeAbi trait implementations in MultiversX smart contracts. + +## Usage + +This crate provides: +- `#[type_abi]` attribute macro for generating TypeAbi implementations +- `#[derive(TypeAbi)]` derive macro (deprecated, use #[type_abi] instead) + +Place the `#[type_abi]` attribute before your derives: + +```rust +#[type_abi] +#[derive(TopEncode, TopDecode, NestedEncode, NestedDecode)] +pub struct MyStruct { + pub field1: u64, + pub field2: String, +} +``` diff --git a/data/abi-derive/src/lib.rs b/data/abi-derive/src/lib.rs new file mode 100644 index 0000000000..dc706bb5d2 --- /dev/null +++ b/data/abi-derive/src/lib.rs @@ -0,0 +1,24 @@ +// ensure we don't run out of macro stack +#![recursion_limit = "1024"] + +#[proc_macro_derive(TypeAbi)] +pub fn type_abi_derive(input: proc_macro::TokenStream) -> proc_macro::TokenStream { + multiversx_sc_abi_derive_common::type_abi_derive( + input.into(), + multiversx_sc_abi_derive_common::TypeAbiImportCrate::MultiversxScAbi, + ) + .into() +} + +#[proc_macro_attribute] +pub fn type_abi( + args: proc_macro::TokenStream, + input: proc_macro::TokenStream, +) -> proc_macro::TokenStream { + assert!(args.is_empty(), "#[type_abi] attribute takes no arguments"); + multiversx_sc_abi_derive_common::type_abi_full( + input.into(), + multiversx_sc_abi_derive_common::TypeAbiImportCrate::MultiversxScAbi, + ) + .into() +} diff --git a/data/abi/Cargo.toml b/data/abi/Cargo.toml new file mode 100644 index 0000000000..493c8252f7 --- /dev/null +++ b/data/abi/Cargo.toml @@ -0,0 +1,36 @@ +[package] +name = "multiversx-sc-abi" +version = "0.25.0" +edition = "2024" +publish = false # TEMP + +authors = [ + "Andrei Marinica ", + "MultiversX ", +] +license = "GPL-3.0-only" +readme = "README.md" +repository = "https://github.com/multiversx/mx-sdk-rs" +homepage = "https://multiversx.com/" +documentation = "https://docs.multiversx.com/" +description = "ABI type definitions and metadata for MultiversX smart contracts" +keywords = ["multiversx", "wasm", "webassembly", "blockchain", "contract"] +categories = [ + "no-std", + "wasm", + "cryptography::cryptocurrencies", + "development-tools", +] + +[dependencies.multiversx-chain-core] +version = "=0.23.0" +path = "../../chain/core" + +[dependencies.multiversx-sc-codec] +path = "../codec" +version = "0.25.0" + +[dependencies] +num-bigint = { version = "0.4", optional = true } # can only be used in std contexts +unwrap-infallible = "1.0" +bitflags = "2.9" diff --git a/data/abi/README.md b/data/abi/README.md new file mode 100644 index 0000000000..5875d9e758 --- /dev/null +++ b/data/abi/README.md @@ -0,0 +1,157 @@ +# multiversx-sc-abi + +ABI (Application Binary Interface) generation and type metadata for MultiversX smart contracts. + +## Overview + +This crate provides the core types and traits for generating ABI metadata in MultiversX smart contracts. The ABI describes: +- Contract endpoints (initialization, upgrades, regular endpoints, callbacks) +- Endpoint parameters and return types +- Events and their data +- ESDT attribute structures +- Custom type descriptions (structs and enums) + +## Features + +### Core Traits + +- **`TypeAbi`** - Main trait implemented by all types that can appear in the ABI (arguments, results, event logs, etc.) +- **`TypeAbiFrom`** - Trait for type conversions in ABI context + +### ABI Components + +- **`ContractAbi`** - Complete contract ABI including endpoints, events, and type descriptions +- **`EndpointAbi`** - Metadata for contract endpoints (init, upgrade, view, external) +- **`EventAbi`** - Event definitions with indexed and non-indexed fields +- **`EsdtAttributeAbi`** - ESDT token attribute descriptions +- **`BuildInfoAbi`** - Build information (framework version, rustc version, etc.) + +### Type Descriptions + +- **`TypeDescription`** - Detailed description of custom types +- **`TypeContents`** - Enum/Struct field information +- **`TypeNames`** - ABI and Rust type name mappings +- **`TypeDescriptionContainer`** - Accumulator for collecting type descriptions + +## Usage + +### Implementing TypeAbi + +For custom types, use the `#[type_abi]` attribute from the [`multiversx-sc-abi-derive`](../abi-derive) crate: + +```rust +use multiversx_sc_abi::TypeAbi; + +#[type_abi] +#[derive(TopEncode, TopDecode, NestedEncode, NestedDecode)] +pub struct MyStruct { + pub field1: u64, + pub field2: BigUint, +} + +#[type_abi] +#[derive(TopEncode, TopDecode, NestedEncode, NestedDecode)] +pub enum MyEnum { + Variant1, + Variant2(u32), + Variant3 { x: u64, y: u64 }, +} +``` + +### Accessing Type Information + +```rust +use multiversx_sc_abi::{TypeAbi, TypeDescriptionContainerImpl}; + +// Get type name +let name = MyStruct::type_name(); + +// Collect type descriptions for ABI generation +let mut accumulator = TypeDescriptionContainerImpl::new(); +MyStruct::provide_type_descriptions(&mut accumulator); +``` + +### Built-in TypeAbi Implementations + +The crate provides `TypeAbi` implementations for: + +- **Primitive types**: `u8`, `u16`, `u32`, `u64`, `u128`, `usize`, `i8`, `i16`, `i32`, `i64`, `isize`, `bool`, `f64` +- **Core types**: `NonZeroUsize` +- **Codec types**: `TopEncodeMulti`, `TopDecodeMulti`, `MultiValueEncoded`, etc. +- **VM core types**: Address, token identifiers, managed types (when available) +- **BigInt types**: `num_bigint::BigUint`, `num_bigint::BigInt` (enabled with `num-bigint` feature) + +## Features + +- **`num-bigint`** - Enables TypeAbi implementations for `num_bigint::BigUint` and `num_bigint::BigInt` + +## Dependencies + +- [`multiversx-chain-core`](../../chain/core) - Core blockchain types +- [`multiversx-sc-codec`](../codec) - Binary serialization/deserialization +- `bitflags` - For bitflag type support +- `unwrap-infallible` - For infallible conversions + +## Integration + +This crate is typically not used directly in smart contracts. Instead: + +1. Smart contract code uses types from `multiversx-sc` framework +2. The `#[type_abi]` attribute from `multiversx-sc-abi-derive` generates implementations +3. The `multiversx-sc-meta` tool uses this crate to generate ABI JSON files + +## ABI Generation Flow + +1. Contract code is annotated with `#[contract]`, `#[module]`, and `#[type_abi]` attributes +2. Procedural macros collect endpoint, event, and type information +3. `ContractAbi` structure is populated with all metadata +4. ABI is serialized to JSON for deployment and interaction tools + +## Example ABI Output + +```json +{ + "name": "MyContract", + "endpoints": [ + { + "name": "myEndpoint", + "inputs": [ + { + "name": "amount", + "type": "BigUint" + } + ], + "outputs": [ + { + "type": "MyStruct" + } + ] + } + ], + "types": { + "MyStruct": { + "type": "struct", + "fields": [ + { + "name": "field1", + "type": "u64" + }, + { + "name": "field2", + "type": "BigUint" + } + ] + } + } +} +``` + +## Related Crates + +- [`multiversx-sc-abi-derive`](../abi-derive) - Procedural macros for deriving TypeAbi +- [`multiversx-sc-codec`](../codec) - Binary serialization used in ABI types +- [`multiversx-sc-meta`](../../framework/meta) - Tools that consume ABI for code generation + +## License + +GPL-3.0-only diff --git a/framework/base/src/abi/contract_abi.rs b/data/abi/src/contract_abi.rs similarity index 93% rename from framework/base/src/abi/contract_abi.rs rename to data/abi/src/contract_abi.rs index f84d80ea52..848dbaa026 100644 --- a/framework/base/src/abi/contract_abi.rs +++ b/data/abi/src/contract_abi.rs @@ -1,9 +1,20 @@ -use super::*; +mod build_info_abi; +mod endpoint_abi; +mod esdt_attribute_abi; +mod event_abi; + +pub use build_info_abi::*; +pub use endpoint_abi::*; +pub use esdt_attribute_abi::EsdtAttributeAbi; +pub use event_abi::*; + use alloc::{ string::{String, ToString}, vec::Vec, }; +use crate::{TypeAbi, TypeDescriptionContainer, TypeDescriptionContainerImpl}; + #[derive(Debug, Default, Clone)] pub struct ContractAbi { pub build_info: BuildInfoAbi, diff --git a/framework/base/src/abi/build_info_abi.rs b/data/abi/src/contract_abi/build_info_abi.rs similarity index 64% rename from framework/base/src/abi/build_info_abi.rs rename to data/abi/src/contract_abi/build_info_abi.rs index 613afd28a1..6cdb32f005 100644 --- a/framework/base/src/abi/build_info_abi.rs +++ b/data/abi/src/contract_abi/build_info_abi.rs @@ -7,9 +7,25 @@ use alloc::{borrow::ToOwned, string::String}; pub struct BuildInfoAbi { pub rustc: Option, pub contract_crate: ContractCrateBuildAbi, + pub abi: Option, pub framework: FrameworkBuildAbi, } +impl BuildInfoAbi { + pub fn dummy() -> Self { + BuildInfoAbi { + rustc: None, + contract_crate: ContractCrateBuildAbi { + name: "contract-crate".to_owned(), + version: "0.0.0".to_owned(), + git_version: "0.0.0".to_owned(), + }, + abi: Some(FrameworkBuildAbi::new("abi-crate", "0.0.0")), + framework: FrameworkBuildAbi::new("framework-crate", "0.0.0"), + } + } +} + #[derive(Clone, Default, Debug)] pub struct RustcAbi { pub version: String, @@ -51,13 +67,21 @@ pub struct FrameworkBuildAbi { } impl FrameworkBuildAbi { - /// Called from the ABI generator in every contract. - /// - /// Note: the values are extracted here, this makes them capture the framework crate info. - pub fn create() -> Self { + pub fn new(name: &str, version: &str) -> Self { FrameworkBuildAbi { - name: env!("CARGO_PKG_NAME").to_owned(), - version: env!("CARGO_PKG_VERSION").to_owned(), + name: name.to_owned(), + version: version.to_owned(), } } + + /// Called from the ABI generator in every contract. + /// + /// Contains the ABI crate name and current version. + pub fn abi_crate() -> Self { + FrameworkBuildAbi::new(env!("CARGO_PKG_NAME"), env!("CARGO_PKG_VERSION")) + } + + pub fn dummy() -> Self { + FrameworkBuildAbi::new("", "") + } } diff --git a/framework/base/src/abi/endpoint_abi.rs b/data/abi/src/contract_abi/endpoint_abi.rs similarity index 99% rename from framework/base/src/abi/endpoint_abi.rs rename to data/abi/src/contract_abi/endpoint_abi.rs index 8e96554d84..7aa9510ff1 100644 --- a/framework/base/src/abi/endpoint_abi.rs +++ b/data/abi/src/contract_abi/endpoint_abi.rs @@ -1,4 +1,5 @@ -use super::*; +use crate::{TypeAbi, TypeNames}; + use alloc::{ borrow::ToOwned, string::{String, ToString}, diff --git a/framework/base/src/abi/esdt_attribute_abi.rs b/data/abi/src/contract_abi/esdt_attribute_abi.rs similarity index 90% rename from framework/base/src/abi/esdt_attribute_abi.rs rename to data/abi/src/contract_abi/esdt_attribute_abi.rs index ee37466064..acd13d716b 100644 --- a/framework/base/src/abi/esdt_attribute_abi.rs +++ b/data/abi/src/contract_abi/esdt_attribute_abi.rs @@ -1,6 +1,6 @@ use alloc::string::{String, ToString}; -use super::{TypeAbi, TypeDescriptionContainerImpl, TypeName}; +use crate::{TypeAbi, TypeDescriptionContainerImpl, TypeName}; #[derive(Clone, Debug)] pub struct EsdtAttributeAbi { diff --git a/framework/base/src/abi/event_abi.rs b/data/abi/src/contract_abi/event_abi.rs similarity index 96% rename from framework/base/src/abi/event_abi.rs rename to data/abi/src/contract_abi/event_abi.rs index 416e967b75..c48c2e19f9 100644 --- a/framework/base/src/abi/event_abi.rs +++ b/data/abi/src/contract_abi/event_abi.rs @@ -1,4 +1,5 @@ -use super::*; +use crate::{TypeAbi, TypeName}; + use alloc::{ string::{String, ToString}, vec::Vec, diff --git a/data/abi/src/lib.rs b/data/abi/src/lib.rs new file mode 100644 index 0000000000..0f0b7b3c78 --- /dev/null +++ b/data/abi/src/lib.rs @@ -0,0 +1,16 @@ +#![no_std] + +// re-export basic heap types +extern crate alloc; + +mod contract_abi; +mod types; + +pub use contract_abi::*; +pub use types::*; + +/// The current version of `multiversx_sc_codec`, re-exported. +pub use multiversx_sc_codec as codec; + +/// Re-exported for easier import in derive macros. +pub use alloc::vec::Vec; diff --git a/data/abi/src/types.rs b/data/abi/src/types.rs new file mode 100644 index 0000000000..4365f197eb --- /dev/null +++ b/data/abi/src/types.rs @@ -0,0 +1,19 @@ +mod type_abi; +mod type_abi_from; +mod type_abi_impl_basic; +mod type_abi_impl_codec_multi; +mod type_abi_impl_vm_core; +mod type_description; +mod type_description_container; +mod type_names; + +#[cfg(feature = "num-bigint")] +mod type_abi_impl_big_int; +mod type_abi_universal_input; + +pub use type_abi::*; +pub use type_abi_from::*; +pub use type_abi_universal_input::TypeAbiUniversalInput; +pub use type_description::*; +pub use type_description_container::*; +pub use type_names::{TypeName, TypeNames}; diff --git a/framework/base/src/abi/type_abi.rs b/data/abi/src/types/type_abi.rs similarity index 98% rename from framework/base/src/abi/type_abi.rs rename to data/abi/src/types/type_abi.rs index 29b88cdb1d..4a5d2038b5 100644 --- a/framework/base/src/abi/type_abi.rs +++ b/data/abi/src/types/type_abi.rs @@ -1,4 +1,5 @@ use super::*; +use crate::contract_abi::{OutputAbi, OutputAbis}; use alloc::{format, string::ToString, vec::Vec}; /// Implemented for all types that can end up in the ABI: diff --git a/framework/base/src/abi/type_abi_from.rs b/data/abi/src/types/type_abi_from.rs similarity index 100% rename from framework/base/src/abi/type_abi_from.rs rename to data/abi/src/types/type_abi_from.rs diff --git a/framework/base/src/abi/type_abi_impl_basic.rs b/data/abi/src/types/type_abi_impl_basic.rs similarity index 99% rename from framework/base/src/abi/type_abi_impl_basic.rs rename to data/abi/src/types/type_abi_impl_basic.rs index 8c05c09bac..bff32fd8b8 100644 --- a/framework/base/src/abi/type_abi_impl_basic.rs +++ b/data/abi/src/types/type_abi_impl_basic.rs @@ -1,5 +1,5 @@ use super::*; -use crate::arrayvec::ArrayVec; +use crate::{codec::arrayvec::ArrayVec, contract_abi::OutputAbis}; use alloc::{ boxed::Box, format, diff --git a/framework/base/src/abi/type_abi_impl_big_int.rs b/data/abi/src/types/type_abi_impl_big_int.rs similarity index 100% rename from framework/base/src/abi/type_abi_impl_big_int.rs rename to data/abi/src/types/type_abi_impl_big_int.rs diff --git a/framework/base/src/abi/type_abi_impl_codec_multi.rs b/data/abi/src/types/type_abi_impl_codec_multi.rs similarity index 98% rename from framework/base/src/abi/type_abi_impl_codec_multi.rs rename to data/abi/src/types/type_abi_impl_codec_multi.rs index 9dcca82225..5524e963ce 100644 --- a/framework/base/src/abi/type_abi_impl_codec_multi.rs +++ b/data/abi/src/types/type_abi_impl_codec_multi.rs @@ -1,7 +1,7 @@ use alloc::format; use crate::{ - abi::{OutputAbis, TypeAbi, TypeAbiFrom, TypeDescriptionContainer, TypeName}, + OutputAbis, TypeAbi, TypeAbiFrom, TypeDescriptionContainer, TypeName, codec::multi_types::{IgnoreValue, OptionalValue}, }; diff --git a/framework/base/src/abi/type_abi_impl_vm_core.rs b/data/abi/src/types/type_abi_impl_vm_core.rs similarity index 100% rename from framework/base/src/abi/type_abi_impl_vm_core.rs rename to data/abi/src/types/type_abi_impl_vm_core.rs diff --git a/framework/base/src/abi/type_abi_universal_input.rs b/data/abi/src/types/type_abi_universal_input.rs similarity index 97% rename from framework/base/src/abi/type_abi_universal_input.rs rename to data/abi/src/types/type_abi_universal_input.rs index 0686fe34af..eae5358723 100644 --- a/framework/base/src/abi/type_abi_universal_input.rs +++ b/data/abi/src/types/type_abi_universal_input.rs @@ -1,6 +1,6 @@ use multiversx_sc_codec::{EncodeErrorHandler, TopEncode, TopEncodeOutput}; -use crate::abi::TypeAbiFrom; +use crate::TypeAbiFrom; /// Type that ignores TypeAbiFrom restrictions. /// diff --git a/framework/base/src/abi/type_description.rs b/data/abi/src/types/type_description.rs similarity index 100% rename from framework/base/src/abi/type_description.rs rename to data/abi/src/types/type_description.rs diff --git a/framework/base/src/abi/type_description_container.rs b/data/abi/src/types/type_description_container.rs similarity index 100% rename from framework/base/src/abi/type_description_container.rs rename to data/abi/src/types/type_description_container.rs diff --git a/data/abi/src/types/type_names.rs b/data/abi/src/types/type_names.rs new file mode 100644 index 0000000000..2625660904 --- /dev/null +++ b/data/abi/src/types/type_names.rs @@ -0,0 +1,30 @@ +pub type TypeName = alloc::string::String; + +#[derive(Clone, Default, Debug, PartialEq, Eq)] +pub struct TypeNames { + pub abi: alloc::string::String, + pub rust: alloc::string::String, + pub specific: Option, +} + +impl TypeNames { + pub const fn new() -> Self { + TypeNames { + abi: alloc::string::String::new(), + rust: alloc::string::String::new(), + specific: None, + } + } + + pub const fn from_abi(abi_name: alloc::string::String) -> Self { + TypeNames { + abi: abi_name, + rust: alloc::string::String::new(), + specific: None, + } + } + + pub fn specific_or_abi(&self) -> &str { + self.specific.as_deref().unwrap_or(&self.abi) + } +} diff --git a/data/codec-derive/Cargo.toml b/data/codec-derive/Cargo.toml index 66ffa5eb9b..59404dbcea 100644 --- a/data/codec-derive/Cargo.toml +++ b/data/codec-derive/Cargo.toml @@ -2,6 +2,7 @@ name = "multiversx-sc-codec-derive" version = "0.25.0" edition = "2024" +publish = false # TEMP authors = ["dorin.iancu ", "Andrei Marinica ", "MultiversX "] license = "GPL-3.0-only" @@ -17,11 +18,8 @@ categories = ["no-std", "wasm", "cryptography::cryptocurrencies", "development-t name = "multiversx_sc_codec_derive" proc-macro = true -[features] -default = ["syn/full", "syn/parsing", "syn/extra-traits"] - [dependencies] proc-macro2 = "1.0" quote = "1.0" -syn = "2.0" +syn = { version = "2.0", features = ["full", "extra-traits"] } hex = "0.4" diff --git a/data/codec/Cargo.toml b/data/codec/Cargo.toml index eb8bf0fd3b..3c1c6b9a6e 100644 --- a/data/codec/Cargo.toml +++ b/data/codec/Cargo.toml @@ -2,6 +2,7 @@ name = "multiversx-sc-codec" version = "0.25.0" edition = "2024" +publish = false # TEMP authors = [ "Andrei Marinica ", diff --git a/data/codec/src/single/nested_de.rs b/data/codec/src/single/nested_de.rs index ec62a31b86..e0870c338a 100644 --- a/data/codec/src/single/nested_de.rs +++ b/data/codec/src/single/nested_de.rs @@ -17,13 +17,7 @@ pub trait NestedDecode: Sized { fn dep_decode_or_handle_err(input: &mut I, h: H) -> Result where I: NestedDecodeInput, - H: DecodeErrorHandler, - { - match Self::dep_decode(input) { - Ok(v) => Ok(v), - Err(e) => Err(h.handle_error(e)), - } - } + H: DecodeErrorHandler; /// Allows the framework to do monomorphisation of special cases where the data is of type `u8`. /// diff --git a/data/codec/src/single/nested_en.rs b/data/codec/src/single/nested_en.rs index cb193b8975..b9cc9c72b5 100644 --- a/data/codec/src/single/nested_en.rs +++ b/data/codec/src/single/nested_en.rs @@ -18,13 +18,7 @@ pub trait NestedEncode: Sized { fn dep_encode_or_handle_err(&self, dest: &mut O, h: H) -> Result<(), H::HandledErr> where O: NestedEncodeOutput, - H: EncodeErrorHandler, - { - match self.dep_encode(dest) { - Ok(()) => Ok(()), - Err(e) => Err(h.handle_error(e)), - } - } + H: EncodeErrorHandler; /// Allows the framework to do monomorphisation of special cases where the data is of type `u8`. /// diff --git a/data/codec/src/single/top_de.rs b/data/codec/src/single/top_de.rs index 921d9c50bb..01a1447f96 100644 --- a/data/codec/src/single/top_de.rs +++ b/data/codec/src/single/top_de.rs @@ -33,13 +33,7 @@ pub trait TopDecode: Sized { fn top_decode_or_handle_err(input: I, h: H) -> Result where I: TopDecodeInput, - H: DecodeErrorHandler, - { - match Self::top_decode(input) { - Ok(v) => Ok(v), - Err(e) => Err(h.handle_error(e)), - } - } + H: DecodeErrorHandler; /// Allows types to provide optimized implementations for their boxed version. /// Especially designed for byte arrays that can be transmuted directly from the input sometimes. diff --git a/data/codec/src/single/top_en.rs b/data/codec/src/single/top_en.rs index 7871cf55f9..e79a5b690b 100644 --- a/data/codec/src/single/top_en.rs +++ b/data/codec/src/single/top_en.rs @@ -20,13 +20,7 @@ pub trait TopEncode: Sized { fn top_encode_or_handle_err(&self, output: O, h: H) -> Result<(), H::HandledErr> where O: TopEncodeOutput, - H: EncodeErrorHandler, - { - match self.top_encode(output) { - Ok(()) => Ok(()), - Err(e) => Err(h.handle_error(e)), - } - } + H: EncodeErrorHandler; } pub fn top_encode_from_nested(obj: &T, output: O, h: H) -> Result<(), H::HandledErr> diff --git a/framework/base/Cargo.toml b/framework/base/Cargo.toml index 1584037bee..0123bdc44d 100644 --- a/framework/base/Cargo.toml +++ b/framework/base/Cargo.toml @@ -36,6 +36,10 @@ generic-array = "1.2" version = "=0.66.1" path = "../derive" +[dependencies.multiversx-sc-abi] +version = "=0.25.0" +path = "../../data/abi" + [dependencies.multiversx-sc-codec] version = "=0.25.0" path = "../../data/codec" diff --git a/framework/base/src/contract_base/wrappers/blockchain_wrapper.rs b/framework/base/src/contract_base/wrappers/blockchain_wrapper.rs index 0d16849fbb..ba27d63504 100644 --- a/framework/base/src/contract_base/wrappers/blockchain_wrapper.rs +++ b/framework/base/src/contract_base/wrappers/blockchain_wrapper.rs @@ -165,7 +165,7 @@ where ManagedRefMut::<'static, A, ManagedBuffer>::wrap_handle(mbuf_temp_1) .load_to_byte_array(&mut buffer); } - CodeMetadata::from(buffer) + CodeMetadata::from_bytes_or_default(&buffer) } pub fn get_code_hash(&self, address: &ManagedAddress) -> ManagedBuffer { diff --git a/framework/base/src/formatter/formatter_impl_vm_core.rs b/framework/base/src/formatter/formatter_impl_vm_core.rs index 26d12294c2..1653a04b54 100644 --- a/framework/base/src/formatter/formatter_impl_vm_core.rs +++ b/framework/base/src/formatter/formatter_impl_vm_core.rs @@ -4,7 +4,7 @@ use super::{FormatByteReceiver, SCBinary, SCDisplay, SCLowerHex, hex_util}; impl SCDisplay for CodeMetadata { fn fmt(&self, f: &mut F) { - self.for_each_string_token(|token| f.append_bytes(token.as_bytes())) + self.write_display_tokens(|token| f.append_bytes(token.as_bytes())) } } diff --git a/framework/base/src/lib.rs b/framework/base/src/lib.rs index bd63d4dacd..d1701ed5ef 100644 --- a/framework/base/src/lib.rs +++ b/framework/base/src/lib.rs @@ -17,7 +17,14 @@ pub use crate::codec::arrayvec; /// Reexported for convenience. pub use generic_array::typenum; -pub mod abi; +// TEMP: should adjust imports. +pub use multiversx_sc_abi as abi; + +/// Must be called from here, to capture the framework crate info, and not the abi crate info. +pub fn framework_build_abi() -> abi::FrameworkBuildAbi { + abi::FrameworkBuildAbi::new(env!("CARGO_PKG_NAME"), env!("CARGO_PKG_VERSION")) +} + pub mod api; pub mod contract_base; pub mod err_msg; diff --git a/framework/base/src/types/interaction/tx_data/upgrade_call.rs b/framework/base/src/types/interaction/tx_data/upgrade_call.rs index 591e8accb5..185ef43396 100644 --- a/framework/base/src/types/interaction/tx_data/upgrade_call.rs +++ b/framework/base/src/types/interaction/tx_data/upgrade_call.rs @@ -23,7 +23,7 @@ where fn default() -> UpgradeCall { UpgradeCall { code_source: (), - code_metadata: CodeMetadata::DEFAULT, + code_metadata: CodeMetadata::EMPTY, arg_buffer: ManagedArgBuffer::new(), } } diff --git a/framework/base/tests/formatter_test.rs b/framework/base/tests/formatter_test.rs index 1519374672..04038b3c95 100644 --- a/framework/base/tests/formatter_test.rs +++ b/framework/base/tests/formatter_test.rs @@ -140,7 +140,7 @@ fn test_display_code_metadata() { | CodeMetadata::PAYABLE_BY_SC, "Upgradeable|Readable|Payable|PayableBySC", ); - check_code_metadata_display(CodeMetadata::DEFAULT, "Default"); + check_code_metadata_display(CodeMetadata::EMPTY, "Default"); } fn check_lower_hex_eq(item: T, expected: &str) { diff --git a/framework/derive/Cargo.toml b/framework/derive/Cargo.toml index 4e8f25b3d8..e3041d397d 100644 --- a/framework/derive/Cargo.toml +++ b/framework/derive/Cargo.toml @@ -13,16 +13,16 @@ description = "MultiversX smart contract API procedural macros" keywords = ["multiversx", "blockchain", "contract"] categories = ["cryptography::cryptocurrencies", "development-tools::procedural-macro-helpers"] +[lib] +name = "multiversx_sc_derive" +proc-macro = true + +[dependencies.multiversx-sc-abi-derive-common] +version = "=0.25.0" +path = "../../data/abi-derive-common" + [dependencies] proc-macro2 = "1.0" quote = "1.0" -syn = "2.0" -hex = "0.4" +syn = { version = "2.0", features = ["full", "extra-traits"] } radix_trie = "0.3" - -[features] -default = ["syn/full", "syn/parsing", "syn/extra-traits"] - -[lib] -name = "multiversx_sc_derive" -proc-macro = true diff --git a/framework/derive/src/generate/abi_gen.rs b/framework/derive/src/generate/abi_gen.rs index b679c7da95..30894bcabe 100644 --- a/framework/derive/src/generate/abi_gen.rs +++ b/framework/derive/src/generate/abi_gen.rs @@ -276,7 +276,8 @@ fn generate_abi_method_body( env!("CARGO_PKG_NAME"), env!("CARGO_PKG_VERSION"), ), - framework: multiversx_sc::abi::FrameworkBuildAbi::create(), + abi: Some(multiversx_sc::abi::FrameworkBuildAbi::abi_crate()), + framework: multiversx_sc::framework_build_abi(), }, &[ #(#contract_docs),* ], #contract_name, diff --git a/framework/derive/src/lib.rs b/framework/derive/src/lib.rs index a781a2556a..5b1cf2792e 100644 --- a/framework/derive/src/lib.rs +++ b/framework/derive/src/lib.rs @@ -21,7 +21,6 @@ mod managed_vec_item_derive; mod model; mod parse; mod preprocessing; -mod type_abi_derive; mod validate; #[proc_macro_attribute] @@ -54,7 +53,11 @@ pub fn proxy( )] #[proc_macro_derive(TypeAbi)] pub fn type_abi_derive(input: proc_macro::TokenStream) -> proc_macro::TokenStream { - type_abi_derive::type_abi_derive(input).into() + multiversx_sc_abi_derive_common::type_abi_derive( + input.into(), + multiversx_sc_abi_derive_common::TypeAbiImportCrate::MultiversxSc, + ) + .into() } #[proc_macro_attribute] @@ -62,8 +65,12 @@ pub fn type_abi( args: proc_macro::TokenStream, input: proc_macro::TokenStream, ) -> proc_macro::TokenStream { - assert!(args.is_empty(), "#[type_abi] attribute takes no args"); - type_abi_derive::type_abi_full(input).into() + assert!(args.is_empty(), "#[type_abi] attribute takes no arguments"); + multiversx_sc_abi_derive_common::type_abi_full( + input.into(), + multiversx_sc_abi_derive_common::TypeAbiImportCrate::MultiversxSc, + ) + .into() } #[proc_macro_derive(ManagedVecItem)] diff --git a/framework/derive/src/parse/attributes.rs b/framework/derive/src/parse/attributes.rs index 648fd30e9a..7f40ef79c0 100644 --- a/framework/derive/src/parse/attributes.rs +++ b/framework/derive/src/parse/attributes.rs @@ -1,20 +1,22 @@ mod argument_attr; mod attr_names; -mod doc_attr; mod endpoint_attr; mod event_attr; mod label_attr; +mod output_name_attr; mod payable_attr; mod storage_attr; +mod title_attr; mod trait_argument_prop; mod trait_prop_names; mod util; pub use argument_attr::*; -pub use doc_attr::{OutputNameAttribute, TitleAttribute, extract_doc, extract_macro_attributes}; pub use endpoint_attr::*; pub use event_attr::*; pub use label_attr::*; +pub use output_name_attr::OutputNameAttribute; pub use payable_attr::*; pub use storage_attr::*; +pub use title_attr::TitleAttribute; pub use trait_argument_prop::*; diff --git a/framework/derive/src/parse/attributes/output_name_attr.rs b/framework/derive/src/parse/attributes/output_name_attr.rs new file mode 100644 index 0000000000..f7bb12dc85 --- /dev/null +++ b/framework/derive/src/parse/attributes/output_name_attr.rs @@ -0,0 +1,13 @@ +use super::{attr_names::ATTR_OUTPUT_NAME, util::is_attr_one_string_arg}; + +pub struct OutputNameAttribute { + pub output_name: String, +} + +impl OutputNameAttribute { + pub fn parse(attr: &syn::Attribute) -> Option { + is_attr_one_string_arg(attr, ATTR_OUTPUT_NAME).map(|arg_str| OutputNameAttribute { + output_name: arg_str, + }) + } +} diff --git a/framework/derive/src/parse/attributes/title_attr.rs b/framework/derive/src/parse/attributes/title_attr.rs new file mode 100644 index 0000000000..741a9047cc --- /dev/null +++ b/framework/derive/src/parse/attributes/title_attr.rs @@ -0,0 +1,11 @@ +use super::{attr_names::ATTR_TITLE, util::is_attr_one_string_arg}; + +pub struct TitleAttribute { + pub title: String, +} + +impl TitleAttribute { + pub fn parse(attr: &syn::Attribute) -> Option { + is_attr_one_string_arg(attr, ATTR_TITLE).map(|arg_str| TitleAttribute { title: arg_str }) + } +} diff --git a/framework/derive/src/parse/contract_trait_parse.rs b/framework/derive/src/parse/contract_trait_parse.rs index 2600b21fb4..2965a60c90 100644 --- a/framework/derive/src/parse/contract_trait_parse.rs +++ b/framework/derive/src/parse/contract_trait_parse.rs @@ -1,5 +1,7 @@ +use multiversx_sc_abi_derive_common::parse::attributes::extract_doc; + use super::{ - attributes::extract_doc, method_parse::process_method, parse_util::validate_attribute_args, + method_parse::process_method, parse_util::validate_attribute_args, supertrait_parse::parse_supertrait, }; use crate::{ diff --git a/framework/derive/src/parse/method_parse.rs b/framework/derive/src/parse/method_parse.rs index 1d49f03dde..c4e3b75aac 100644 --- a/framework/derive/src/parse/method_parse.rs +++ b/framework/derive/src/parse/method_parse.rs @@ -1,7 +1,8 @@ +use multiversx_sc_abi_derive_common::parse::attributes::extract_doc; + use crate::model::{Method, MethodImpl, MethodPayableMetadata, PublicRole, TraitProperties}; use super::{ - attributes::extract_doc, auto_impl_parse::{ process_event_attribute, process_proxy_attribute, process_storage_clear_attribute, process_storage_get_attribute, process_storage_is_empty_attribute, diff --git a/framework/meta-lib/src/abi_json/build_info_abi_json.rs b/framework/meta-lib/src/abi_json/build_info_abi_json.rs index e9603f63b0..0c896c6a12 100644 --- a/framework/meta-lib/src/abi_json/build_info_abi_json.rs +++ b/framework/meta-lib/src/abi_json/build_info_abi_json.rs @@ -8,6 +8,9 @@ pub struct BuildInfoAbiJson { #[serde(skip_serializing_if = "Option::is_none")] pub rustc: Option, pub contract_crate: ContractCrateBuildAbiJson, + #[serde(default)] + #[serde(skip_serializing_if = "Option::is_none")] + pub abi: Option, pub framework: FrameworkBuildAbiJson, } @@ -16,6 +19,7 @@ impl From<&BuildInfoAbi> for BuildInfoAbiJson { BuildInfoAbiJson { rustc: abi.rustc.as_ref().map(RustcAbiJson::from), contract_crate: ContractCrateBuildAbiJson::from(&abi.contract_crate), + abi: abi.abi.as_ref().map(FrameworkBuildAbiJson::from), framework: FrameworkBuildAbiJson::from(&abi.framework), } } @@ -26,6 +30,7 @@ impl From<&BuildInfoAbiJson> for BuildInfoAbi { BuildInfoAbi { rustc: abi_json.rustc.as_ref().map(RustcAbi::from), contract_crate: ContractCrateBuildAbi::from(&abi_json.contract_crate), + abi: abi_json.abi.as_ref().map(FrameworkBuildAbi::from), framework: FrameworkBuildAbi::from(&abi_json.framework), } } diff --git a/framework/meta-lib/src/contract/generate_proxy/proxy_generator.rs b/framework/meta-lib/src/contract/generate_proxy/proxy_generator.rs index 48007e3d07..3ad1e31a47 100644 --- a/framework/meta-lib/src/contract/generate_proxy/proxy_generator.rs +++ b/framework/meta-lib/src/contract/generate_proxy/proxy_generator.rs @@ -763,7 +763,7 @@ where #[cfg(test)] pub mod tests { - use multiversx_sc::abi::{BuildInfoAbi, ContractAbi, ContractCrateBuildAbi, FrameworkBuildAbi}; + use multiversx_sc::abi::{BuildInfoAbi, ContractAbi}; use crate::contract::{meta_config::MetaConfig, sc_config::proxy_config::ProxyConfig}; @@ -771,16 +771,7 @@ pub mod tests { #[test] fn clean_paths_unsanitized_test() { - let build_info = BuildInfoAbi { - rustc: None, - contract_crate: ContractCrateBuildAbi { - name: "contract-crate".to_owned(), - version: "0.0.0".to_owned(), - git_version: "0.0.0".to_owned(), - }, - framework: FrameworkBuildAbi::create(), - }; - + let build_info = BuildInfoAbi::dummy(); let original_contract_abi = ContractAbi::new(build_info, &[""], "contract-crate", false); let meta_config = MetaConfig::create(original_contract_abi.clone(), false); let mut proxy_generator = ProxyGenerator { @@ -804,16 +795,7 @@ pub mod tests { #[test] fn clean_paths_sanitized_test() { - let build_info = BuildInfoAbi { - rustc: None, - contract_crate: ContractCrateBuildAbi { - name: "contract-crate".to_owned(), - version: "0.0.0".to_owned(), - git_version: "0.0.0".to_owned(), - }, - framework: FrameworkBuildAbi::create(), - }; - + let build_info = BuildInfoAbi::dummy(); let original_contract_abi = ContractAbi::new(build_info, &[""], "contract-crate", false); let meta_config = MetaConfig::create(original_contract_abi.clone(), false); let mut proxy_generator = ProxyGenerator { diff --git a/framework/meta/.gitignore b/framework/meta/.gitignore index 9b12a82495..70153de369 100644 --- a/framework/meta/.gitignore +++ b/framework/meta/.gitignore @@ -1,2 +1,3 @@ tests/cs_tx_cli_test/outfiles tests/cs_tx_cli_test/alice.pem +tests/temp/ diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml index dd198c141f..9cb7c58813 100644 --- a/framework/meta/Cargo.toml +++ b/framework/meta/Cargo.toml @@ -41,14 +41,17 @@ regex = "1.11" reqwest = { version = "0.13", features = ["rustls", "blocking", "json"] } copy_dir = "0.1.2" pathdiff = "0.2.1" -common-path = "1.0.0" +common-path = "1.0" bip39 = { version = "2.0", features = ["rand"] } +rand = { version = "0.10", default-features = false } +uuid = { version = "1.10", features = ["v4"] } anyhow = "1.0" hex = "0.4.3" -base64 = "0.22" indexmap = { version = "2", features = ["serde"] } # warning: newer versions require Rust 1.88, hence we are not upgrading yet zip = { version = "7.2", features = ["deflate"], default-features = false } +# rpassword >=7.4 requires Rust 1.88 (let_chains), pin to 7.3.x for Rust 1.85 compat +rpassword = "~7.3" [dependencies.multiversx-sc-meta-lib] version = "=0.66.1" @@ -75,7 +78,6 @@ features = ["std"] [dependencies.multiversx-sdk] version = "=0.16.0" path = "../../sdk/core" -features = ["wallet-full"] [dev-dependencies] serial_test = "3.2" diff --git a/framework/meta/src/cli/cli_args_sender.rs b/framework/meta/src/cli/cli_args_sender.rs index 15518b1338..2dd337c077 100644 --- a/framework/meta/src/cli/cli_args_sender.rs +++ b/framework/meta/src/cli/cli_args_sender.rs @@ -1,7 +1,7 @@ use anyhow::{Context, Result, anyhow}; use clap::Args; -use multiversx_sc_snippets::sdk::{data::keystore::InsertPassword, wallet::Wallet}; -use std::path::PathBuf; +use multiversx_sc_snippets::sdk::{wallet::Keystore, wallet::Wallet}; +use std::{io::Write, path::PathBuf}; /// Wallet / sender arguments shared by commands that sign transactions. #[derive(Clone, PartialEq, Eq, Debug, Args)] @@ -24,13 +24,21 @@ pub fn load_wallet(sender: &SenderArgs) -> Result { if let Some(pem) = &sender.pem { Wallet::from_pem_file(pem).context("failed to load PEM wallet") } else if let Some(keyfile) = &sender.keyfile { - let insert_password = match &sender.keystore_password { - Some(pw) => InsertPassword::Plaintext(pw.clone()), - None => InsertPassword::StandardInput, + let password = match &sender.keystore_password { + Some(pw) => pw.clone(), + None => get_keystore_password(), }; - Wallet::from_keystore_secret(keyfile, insert_password) + let keystore = Keystore::from_file(keyfile)?; + keystore + .decrypt_wallet(&password) .context("failed to load keystore wallet") } else { Err(anyhow!("a wallet is required: use --pem or --keyfile")) } } + +pub fn get_keystore_password() -> String { + print!("Insert password: "); + std::io::stdout().flush().unwrap(); + rpassword::read_password().unwrap() +} diff --git a/framework/meta/src/cli/cli_standalone_main.rs b/framework/meta/src/cli/cli_standalone_main.rs index 0218e02a7d..acc611aed9 100644 --- a/framework/meta/src/cli/cli_standalone_main.rs +++ b/framework/meta/src/cli/cli_standalone_main.rs @@ -4,7 +4,7 @@ use crate::cmd::data::data_cli; use crate::cmd::retrieve_address::retrieve_address; use crate::cmd::scen_blackbox::scen_blackbox_tool; use crate::cmd::tx::tx_cli; -use crate::cmd::wallet::wallet; +use crate::cmd::wallet_cmd::wallet; use clap::Parser; use crate::cmd::all::call_all_meta; diff --git a/framework/meta/src/cmd.rs b/framework/meta/src/cmd.rs index e01fa4d5d5..ca2c2d2071 100644 --- a/framework/meta/src/cmd.rs +++ b/framework/meta/src/cmd.rs @@ -15,4 +15,4 @@ pub mod test; pub mod test_coverage; pub mod tx; pub mod upgrade; -pub mod wallet; +pub mod wallet_cmd; diff --git a/framework/meta/src/cmd/reproducible_builds/publish.rs b/framework/meta/src/cmd/reproducible_builds/publish.rs index 0eccefdad4..f284ee9b67 100644 --- a/framework/meta/src/cmd/reproducible_builds/publish.rs +++ b/framework/meta/src/cmd/reproducible_builds/publish.rs @@ -4,7 +4,7 @@ use std::time::Duration; use hex::ToHex; use multiversx_chain_core::std::crypto; use multiversx_sc_snippets::imports::Bech32Address; -use multiversx_sc_snippets::sdk::wallet::Wallet; +use multiversx_sc_snippets::sdk::wallet::{Wallet, WalletSignature}; use crate::cli::ReproducibleBuildPublishArgs; use crate::cli::cli_args_sender::load_wallet; @@ -52,12 +52,12 @@ pub async fn publish_contract(args: &ReproducibleBuildPublishArgs) { ); // Sign the payload. - let signature_hex = sign_payload(&wallet, &contract, &payload); + let signature = sign_payload(&wallet, &contract, &payload); let url = format!("{}/verifier", args.verifier_url.trim_end_matches('/')); let (status, body) = post_verification_request( &url, - &signature_hex, + signature, &contract, &args.docker_image, &source_code, @@ -106,17 +106,20 @@ pub(super) fn compute_bytes_for_signing(contract: &Bech32Address, payload: &str) crypto::keccak256(&content).to_vec() } -/// Signs the payload using the MultiversX message signing protocol and returns the hex signature. -pub(super) fn sign_payload(wallet: &Wallet, contract: &Bech32Address, payload: &str) -> String { +/// Signs the payload using the MultiversX message signing protocol and returns the signature. +pub(super) fn sign_payload( + wallet: &Wallet, + contract: &Bech32Address, + payload: &str, +) -> WalletSignature { let bytes_to_sign = compute_bytes_for_signing(contract, payload); - let signature: [u8; 64] = wallet.sign_bytes(bytes_to_sign); - signature.encode_hex() + wallet.sign_bytes(bytes_to_sign) } /// POSTs the verification request and returns the HTTP status code and parsed response body. async fn post_verification_request( url: &str, - signature: &str, + signature: WalletSignature, contract: &Bech32Address, docker_image: &str, source_code: &serde_json::Value, @@ -228,7 +231,6 @@ async fn poll_task(verifier_url: &str, task_id: &str) { #[cfg(test)] mod tests { use super::*; - use hex::ToHex; use multiversx_chain_core::std::crypto::{keccak256, sha256}; /// Independently re-implements the signing bytes computation and checks it matches. diff --git a/framework/meta/src/cmd/reproducible_builds/source_pack.rs b/framework/meta/src/cmd/reproducible_builds/source_pack.rs index 2650d5ff0f..8fc5c2f77d 100644 --- a/framework/meta/src/cmd/reproducible_builds/source_pack.rs +++ b/framework/meta/src/cmd/reproducible_builds/source_pack.rs @@ -1,4 +1,4 @@ -use base64::{Engine, engine::general_purpose::STANDARD as BASE64}; +use multiversx_chain_core::std::base64_encode; use serde::Serialize; use std::{ collections::HashSet, @@ -165,7 +165,7 @@ fn make_entry( ) -> SourceFileEntry { let rel = pathdiff::diff_paths(file, project_folder).unwrap(); let path_str = rel.to_string_lossy().replace('\\', "/"); - let content = BASE64.encode(fs::read(file).unwrap()); + let content = base64_encode(fs::read(file).unwrap()); SourceFileEntry { path: path_str.clone(), content, diff --git a/framework/meta/src/cmd/reproducible_builds/source_unpack.rs b/framework/meta/src/cmd/reproducible_builds/source_unpack.rs index eb56248355..3a3bad2ed9 100644 --- a/framework/meta/src/cmd/reproducible_builds/source_unpack.rs +++ b/framework/meta/src/cmd/reproducible_builds/source_unpack.rs @@ -1,5 +1,5 @@ use anyhow::{Context, Result, bail}; -use base64::{Engine, engine::general_purpose::STANDARD as BASE64}; +use multiversx_chain_core::std::base64_decode; use std::{ fs, path::{Component, Path, PathBuf}, @@ -67,8 +67,7 @@ pub fn unpack_packed_source( fs::create_dir_all(parent) .with_context(|| format!("Failed to create {}", parent.display()))?; } - let content = BASE64 - .decode(&entry.content) + let content = base64_decode(&entry.content) .with_context(|| format!("Failed to decode entry '{}'", entry.path))?; fs::write(&file_path, content) .with_context(|| format!("Failed to write {}", file_path.display()))?; diff --git a/framework/meta/src/cmd/reproducible_builds/unpublish.rs b/framework/meta/src/cmd/reproducible_builds/unpublish.rs index 99ba434fea..0f96a19a60 100644 --- a/framework/meta/src/cmd/reproducible_builds/unpublish.rs +++ b/framework/meta/src/cmd/reproducible_builds/unpublish.rs @@ -1,6 +1,5 @@ use std::io::{self, Write}; -use hex::ToHex; use multiversx_sc_snippets::imports::Bech32Address; use crate::cli::ReproducibleBuildUnpublishArgs; @@ -38,11 +37,10 @@ pub async fn unpublish_contract(args: &ReproducibleBuildUnpublishArgs) { // Sign using the same MultiversX message signing protocol as verify. let bytes_to_sign = compute_bytes_for_signing(&contract, &payload); - let signature: [u8; 64] = wallet.sign_bytes(bytes_to_sign); - let signature_hex: String = signature.encode_hex(); + let signature = wallet.sign_bytes(bytes_to_sign); let request_body = serde_json::json!({ - "signature": signature_hex, + "signature": signature, "payload": payload_obj, }); diff --git a/framework/meta/src/cmd/tx/parse_code_metadata.rs b/framework/meta/src/cmd/tx/parse_code_metadata.rs index 1b971bb0db..d9e2e9b530 100644 --- a/framework/meta/src/cmd/tx/parse_code_metadata.rs +++ b/framework/meta/src/cmd/tx/parse_code_metadata.rs @@ -5,7 +5,7 @@ use crate::cli::cli_args_tx::MetadataArgs; /// Build a [`CodeMetadata`] bitfield from the CLI [`MetadataArgs`] flags. /// Defaults match standard contract conventions: upgradeable + readable, not payable. pub fn parse_code_metadata(meta: &MetadataArgs) -> CodeMetadata { - let mut flags = CodeMetadata::DEFAULT; + let mut flags = CodeMetadata::EMPTY; if !meta.metadata_not_upgradeable { flags |= CodeMetadata::UPGRADEABLE; } diff --git a/framework/meta/src/cmd/tx/tx_cli_call.rs b/framework/meta/src/cmd/tx/tx_cli_call.rs index 95c9a4f588..0785c6aa89 100644 --- a/framework/meta/src/cmd/tx/tx_cli_call.rs +++ b/framework/meta/src/cmd/tx/tx_cli_call.rs @@ -17,7 +17,7 @@ async fn tx_call_inner(args: &CallArgs) -> Result<()> { // Create the interactor – fetches network config. let mut interactor = Interactor::new(&args.gateway.proxy).await; - let sender_address = interactor.register_wallet(wallet).await; + let sender_address = interactor.register_wallet(wallet.clone()).await; let sender_bech32 = sender_address.to_bech32(interactor.get_hrp()); // Determine nonce. diff --git a/framework/meta/src/cmd/tx/tx_cli_common.rs b/framework/meta/src/cmd/tx/tx_cli_common.rs index 5b8c21edbb..adf8c9405a 100644 --- a/framework/meta/src/cmd/tx/tx_cli_common.rs +++ b/framework/meta/src/cmd/tx/tx_cli_common.rs @@ -1,6 +1,7 @@ use std::fs; use anyhow::{Context, Result, anyhow}; +use multiversx_chain_core::std::base64_decode; use multiversx_sc_snippets::ExplorerUrl; use multiversx_sc_snippets::{ hex, @@ -10,7 +11,6 @@ use multiversx_sc_snippets::{ }, sdk::{ data::transaction::{ApiTransactionResult, Transaction}, - utils::base64_decode, wallet::Wallet, }, }; @@ -157,14 +157,16 @@ pub async fn sign_and_dispatch( tx.chain_id = chain_id.clone(); } - let decoded_data = tx - .data - .as_ref() - .map(|d| String::from_utf8_lossy(&base64_decode(d)).into_owned()) - .unwrap_or_default(); + let decoded_data = match &tx.data { + None => String::new(), + Some(d) => { + let bytes = base64_decode(d)?; + String::from_utf8_lossy(&bytes).into_owned() + } + }; let sig = wallet.sign_tx(&tx); - tx.signature = Some(hex::encode(sig)); + tx.signature = Some(sig); let output = TxOutputFile { emitted_transaction: tx, diff --git a/framework/meta/src/cmd/tx/tx_cli_deploy.rs b/framework/meta/src/cmd/tx/tx_cli_deploy.rs index f6c09f3450..d36c8a27f1 100644 --- a/framework/meta/src/cmd/tx/tx_cli_deploy.rs +++ b/framework/meta/src/cmd/tx/tx_cli_deploy.rs @@ -21,7 +21,7 @@ async fn tx_deploy_inner(args: &DeployArgs) -> Result<()> { // Create the interactor – this fetches the network config in the process. let mut interactor = Interactor::new(&args.gateway.proxy).await; - let sender_address = interactor.register_wallet(wallet).await; + let sender_address = interactor.register_wallet(wallet.clone()).await; let sender_bech32 = sender_address.to_bech32(interactor.get_hrp()); // Determine nonce. diff --git a/framework/meta/src/cmd/tx/tx_cli_new.rs b/framework/meta/src/cmd/tx/tx_cli_new.rs index ff6dce3f9e..966d756893 100644 --- a/framework/meta/src/cmd/tx/tx_cli_new.rs +++ b/framework/meta/src/cmd/tx/tx_cli_new.rs @@ -1,11 +1,8 @@ use std::fs; use anyhow::{Context, Result}; -use multiversx_sc_snippets::{ - hex, - imports::{Bech32Address, Interactor, InteractorIntoSdkTransaction}, - sdk::utils::{base64_decode, base64_encode}, -}; +use multiversx_chain_core::std::{base64_decode, base64_encode}; +use multiversx_sc_snippets::imports::{Bech32Address, Interactor, InteractorIntoSdkTransaction}; use crate::cli::cli_args_tx::NewArgs; use crate::cmd::tx::tx_cli_common::load_wallet; @@ -29,7 +26,7 @@ async fn tx_new_inner(args: &NewArgs) -> Result<()> { // Create the interactor – this fetches the network config in the process. let mut interactor = Interactor::new(&args.gateway.proxy).await; - let sender_address = interactor.register_wallet(wallet).await; + let sender_address = interactor.register_wallet(wallet.clone()).await; let sender = sender_address.to_bech32(interactor.get_hrp()); // Determine nonce (explicit override or recalled from network). @@ -56,11 +53,13 @@ async fn tx_new_inner(args: &NewArgs) -> Result<()> { } // Decode the data field for the human-readable output. - let decoded_data = tx - .data - .as_ref() - .map(|d| String::from_utf8_lossy(&base64_decode(d)).into_owned()) - .unwrap_or_default(); + let decoded_data = match &tx.data { + None => String::new(), + Some(d) => { + let bytes = base64_decode(d)?; + String::from_utf8_lossy(&bytes).into_owned() + } + }; tx.nonce = nonce; if let Some(gas_price) = args.tx.gas_price { tx.gas_price = gas_price; @@ -70,7 +69,7 @@ async fn tx_new_inner(args: &NewArgs) -> Result<()> { } let sig = wallet.sign_tx(&tx); - tx.signature = Some(hex::encode(sig)); + tx.signature = Some(sig); let output = TxOutputFile { emitted_transaction: tx, diff --git a/framework/meta/src/cmd/tx/tx_cli_send.rs b/framework/meta/src/cmd/tx/tx_cli_send.rs index 432b75de87..d21226c870 100644 --- a/framework/meta/src/cmd/tx/tx_cli_send.rs +++ b/framework/meta/src/cmd/tx/tx_cli_send.rs @@ -1,5 +1,5 @@ use anyhow::Result; -use multiversx_sc_snippets::sdk::utils::base64_decode; +use multiversx_chain_core::std::base64_decode; use super::{ output::TxOutputFile, @@ -17,11 +17,13 @@ pub async fn tx_send(args: &SendArgs) { async fn tx_send_inner(args: &SendArgs) -> Result<()> { let tx = load_transaction_from_file(&args.infile)?; - let decoded_data = tx - .data - .as_ref() - .map(|d| String::from_utf8_lossy(&base64_decode(d)).into_owned()) - .unwrap_or_default(); + let decoded_data = match &tx.data { + None => String::new(), + Some(d) => { + let bytes = base64_decode(d)?; + String::from_utf8_lossy(&bytes).into_owned() + } + }; let output = TxOutputFile { emitted_transaction: tx, diff --git a/framework/meta/src/cmd/tx/tx_cli_sign.rs b/framework/meta/src/cmd/tx/tx_cli_sign.rs index 02455d6bf4..13cff560ee 100644 --- a/framework/meta/src/cmd/tx/tx_cli_sign.rs +++ b/framework/meta/src/cmd/tx/tx_cli_sign.rs @@ -1,5 +1,5 @@ use anyhow::{Result, anyhow}; -use multiversx_sc_snippets::{hex, sdk::utils::base64_decode}; +use multiversx_chain_core::std::base64_decode; use super::{ output::TxOutputFile, @@ -33,13 +33,15 @@ async fn tx_sign_inner(args: &SignArgs) -> Result<()> { } let sig = wallet.sign_tx(&tx); - tx.signature = Some(hex::encode(sig)); + tx.signature = Some(sig); - let decoded_data = tx - .data - .as_ref() - .map(|d| String::from_utf8_lossy(&base64_decode(d)).into_owned()) - .unwrap_or_default(); + let decoded_data = match &tx.data { + None => String::new(), + Some(d) => { + let bytes = base64_decode(d)?; + String::from_utf8_lossy(&bytes).into_owned() + } + }; let output = TxOutputFile { emitted_transaction: tx, diff --git a/framework/meta/src/cmd/tx/tx_cli_upgrade.rs b/framework/meta/src/cmd/tx/tx_cli_upgrade.rs index 6f3714fe4b..71bceb7430 100644 --- a/framework/meta/src/cmd/tx/tx_cli_upgrade.rs +++ b/framework/meta/src/cmd/tx/tx_cli_upgrade.rs @@ -22,7 +22,7 @@ async fn tx_upgrade_inner(args: &UpgradeArgs) -> Result<()> { // Create the interactor – this fetches the network config. let mut interactor = Interactor::new(&args.gateway.proxy).await; - let sender_address = interactor.register_wallet(wallet).await; + let sender_address = interactor.register_wallet(wallet.clone()).await; let sender_bech32 = sender_address.to_bech32(interactor.get_hrp()); // Determine nonce. diff --git a/framework/meta/src/cmd/wallet.rs b/framework/meta/src/cmd/wallet_cmd.rs similarity index 55% rename from framework/meta/src/cmd/wallet.rs rename to framework/meta/src/cmd/wallet_cmd.rs index 60125cb6c9..1b2827c7c9 100644 --- a/framework/meta/src/cmd/wallet.rs +++ b/framework/meta/src/cmd/wallet_cmd.rs @@ -1,17 +1,27 @@ -use core::str; +use std::{ + fs::{self, File}, + io::{self, Read, Write}, +}; + +use bip39::Language; +use rand::Rng; + +use multiversx_sc::types::Address; +use multiversx_sc_snippets::{ + hex, + imports::Bech32Address, + sdk::{ + chain_core::std::Bech32Hrp, + wallet::{Keystore, KeystoreRandomness, Wallet}, + }, +}; +use multiversx_sdk::wallet::{KeystoreError, Mnemonic, WalletPem}; +use crate::cli::cli_args_sender::get_keystore_password; use crate::cli::{ WalletAction, WalletArgs, WalletBech32Args, WalletConvertArgs, WalletNewArgs, WalletTestWalletArgs, }; -use bip39::{Language, Mnemonic}; -use multiversx_sc::types::{self, Address}; -use multiversx_sc_snippets::sdk::{crypto::public_key::PublicKey, wallet::Wallet}; -use multiversx_sc_snippets::{hex, imports::Bech32Address}; -use std::{ - fs::{self, File}, - io::{self, Read, Write}, -}; pub fn wallet(args: &WalletArgs) { let command = &args.command; @@ -30,40 +40,43 @@ fn convert(convert_args: &WalletConvertArgs) { let out_format = &convert_args.to; let hrp = convert_args .hrp - .clone() - .unwrap_or_else(|| "erd".to_string()); + .as_deref() + .map(|hrp| Bech32Hrp::try_from(hrp).expect("invalid HRP")) + .unwrap_or_default(); let mut mnemonic_str = String::new(); - let private_key_str: String; - let public_key_str: String; match (in_format.as_str(), out_format.as_str()) { ("mnemonic", "pem") => match infile { Some(file) => { mnemonic_str = fs::read_to_string(file).unwrap(); - (private_key_str, public_key_str) = Wallet::get_wallet_keys_mnemonic(mnemonic_str); - write_resulted_pem(&hrp, &public_key_str, &private_key_str, outfile); + let wallet = Wallet::try_from(Mnemonic::parse(&mnemonic_str).unwrap()).unwrap(); + write_resulted_pem(wallet.to_pem(hrp), outfile); } None => { println!( "Insert text below. Press 'Ctrl-D' (Linux / MacOS) or 'Ctrl-Z' (Windows) when done." ); _ = io::stdin().read_to_string(&mut mnemonic_str).unwrap(); - (private_key_str, public_key_str) = Wallet::get_wallet_keys_mnemonic(mnemonic_str); - write_resulted_pem(&hrp, &public_key_str, &private_key_str, outfile); + let wallet = Wallet::try_from(Mnemonic::parse(&mnemonic_str).unwrap()).unwrap(); + write_resulted_pem(wallet.to_pem(hrp), outfile); } }, ("keystore-secret", "pem") => match infile { Some(file) => { - let private_key = Wallet::get_private_key_from_keystore_secret( - file, - &Wallet::get_keystore_password(), - ) - .unwrap(); - private_key_str = private_key.to_string(); - let public_key = PublicKey::from(&private_key); - public_key_str = public_key.to_string(); - write_resulted_pem(&hrp, &public_key_str, &private_key_str, outfile); + let keystore = Keystore::from_file(file).expect("keystore parsing error"); + match keystore.decrypt_wallet(&get_keystore_password()) { + Ok(wallet) => { + println!("Password is correct"); + write_resulted_pem(wallet.to_pem(hrp), outfile); + } + Err(KeystoreError::InvalidPassword) => { + panic!("Password is incorrect"); + } + Err(e) => { + panic!("Failed to extract private key from keystore: {e}"); + } + } } None => { panic!("Input file is required for keystore-secret format"); @@ -71,19 +84,15 @@ fn convert(convert_args: &WalletConvertArgs) { }, ("pem", "keystore-secret") => match infile { Some(file) => { - let pem_decoded_keys = Wallet::get_pem_decoded_content(file); - (private_key_str, public_key_str) = Wallet::get_wallet_keys_pem(file); - - let address = get_wallet_address(&private_key_str); - let hex_decoded_keys = hex::decode(pem_decoded_keys).unwrap(); - - let json_result = Wallet::encrypt_keystore( - hex_decoded_keys.as_slice(), - &hrp, - &address, - &public_key_str, - &Wallet::get_keystore_password(), - ); + let wallet_pem = WalletPem::from_pem_file(file).expect("error reading PEM file"); + let randomness = new_keystore_randomness(); + let json_result = Keystore::encrypt( + &wallet_pem.private_key, + hrp, + &get_keystore_password(), + randomness, + ) + .to_json_string(); write_resulted_keystore(json_result, outfile); } None => { @@ -96,16 +105,14 @@ fn convert(convert_args: &WalletConvertArgs) { } } -fn write_resulted_pem(hrp: &str, public_key: &str, private_key: &str, outfile: Option<&String>) { - let address = get_wallet_address(private_key); +fn write_resulted_pem(wallet_pem: WalletPem, outfile: Option<&String>) { + let pem_content = wallet_pem.to_pem_str(); match outfile { Some(outfile) => { - let pem_content = Wallet::generate_pem_content(hrp, &address, private_key, public_key); let mut file = File::create(outfile).unwrap(); file.write_all(pem_content.as_bytes()).unwrap(); } None => { - let pem_content = Wallet::generate_pem_content(hrp, &address, private_key, public_key); print!("{}", pem_content); } } @@ -123,6 +130,18 @@ fn write_resulted_keystore(json_result: String, outfile: Option<&String>) { } } +pub fn new_keystore_randomness() -> KeystoreRandomness { + let mut salt = [0u8; 32]; + let mut iv = [0u8; 16]; + rand::rng().fill_bytes(&mut salt); + rand::rng().fill_bytes(&mut iv); + KeystoreRandomness { + salt, + iv, + id: uuid::Uuid::new_v4().to_string(), + } +} + fn bech32_conversion(bech32_args: &WalletBech32Args) { let encode_address = bech32_args.hex_address.as_ref(); let decode_address = bech32_args.bech32_address.as_ref(); @@ -132,7 +151,7 @@ fn bech32_conversion(bech32_args: &WalletBech32Args) { let bytes_from_hex = hex::decode(hex).unwrap(); let bytes_arr: [u8; 32] = bytes_from_hex.try_into().unwrap(); - let addr = types::Address::from(&bytes_arr); + let addr = Address::from(&bytes_arr); let bech32_addr = Bech32Address::from(addr).to_bech32_str().to_string(); println!("{}", bech32_addr); } @@ -148,42 +167,28 @@ fn bech32_conversion(bech32_args: &WalletBech32Args) { } } -fn get_wallet_address(private_key: &str) -> Address { - let wallet = Wallet::from_private_key(private_key).unwrap(); - wallet.to_address() -} - pub fn generate_mnemonic() -> Mnemonic { - Mnemonic::generate_in(Language::English, 24).unwrap() + Mnemonic::from(bip39::Mnemonic::generate_in(Language::English, 24).unwrap()) } -struct WalletInfo { +struct NewWalletInfo { mnemonic: Mnemonic, - private_key_str: String, - public_key_str: String, - address: Address, + wallet: Wallet, } -impl WalletInfo { +impl NewWalletInfo { fn generate() -> Self { let mnemonic = generate_mnemonic(); - let (private_key_str, public_key_str) = - Wallet::get_wallet_keys_mnemonic(mnemonic.to_string()); - let address = get_wallet_address(private_key_str.as_str()); - WalletInfo { - mnemonic, - private_key_str, - public_key_str, - address, - } + let wallet = Wallet::try_from(mnemonic.clone()).unwrap(); + NewWalletInfo { mnemonic, wallet } } fn generate_for_shard(shard: u8) -> Self { assert!(shard < 3, "Shard must be between 0 and 2"); loop { - let wallet = Self::generate(); - if wallet.address.shard_of_3().as_u32() == shard as u32 { - return wallet; + let wallet_info = Self::generate(); + if wallet_info.wallet.address.shard_of_3().as_u32() == shard as u32 { + return wallet_info; } } } @@ -192,56 +197,52 @@ impl WalletInfo { fn new(new_args: &WalletNewArgs) { let format = new_args.wallet_format.as_deref(); let outfile = new_args.outfile.as_ref(); - let hrp = new_args.hrp.clone().unwrap_or_else(|| "erd".to_string()); + let hrp = new_args + .hrp + .as_deref() + .map(|hrp| Bech32Hrp::try_from(hrp).expect("invalid HRP")) + .unwrap_or_default(); - let wallet = if let Some(shard) = new_args.shard { - WalletInfo::generate_for_shard(shard) + let new_wallet_info = if let Some(shard) = new_args.shard { + NewWalletInfo::generate_for_shard(shard) } else { - WalletInfo::generate() + NewWalletInfo::generate() }; - let WalletInfo { - mnemonic, - private_key_str, - public_key_str, - address, - } = wallet; - - println!("Mnemonic: {}", mnemonic); + println!("Mnemonic: {}", new_wallet_info.mnemonic); println!("Wallet address:"); - println!(" - bech32: {}", address.to_bech32(&hrp)); - println!(" - hex: 0x{}", address.to_hex()); + println!( + " - bech32: {}", + new_wallet_info.wallet.address.to_bech32(hrp) + ); + println!(" - hex: 0x{}", new_wallet_info.wallet.address.to_hex()); match format { Some("pem") => { - write_resulted_pem( - &hrp, - public_key_str.as_str(), - private_key_str.as_str(), - outfile, - ); + write_resulted_pem(new_wallet_info.wallet.to_pem(hrp), outfile); if let Some(outfile) = outfile { println!("Wallet saved to '{outfile}'"); } } Some("keystore-secret") => { - let concatenated_keys = format!("{}{}", private_key_str, public_key_str); - let hex_decoded_keys = hex::decode(concatenated_keys).unwrap(); - let json_result = Wallet::encrypt_keystore( - hex_decoded_keys.as_slice(), - &hrp, - &address, - &public_key_str, - &Wallet::get_keystore_password(), - ); + let randomness = new_keystore_randomness(); + let json_result = Keystore::encrypt( + &new_wallet_info.wallet.private_key, + hrp, + &get_keystore_password(), + randomness, + ) + .to_json_string(); write_resulted_keystore(json_result, outfile); if let Some(outfile) = outfile { println!("Wallet saved to '{outfile}'"); } } - Some(_) => { - println!("Unsupported format"); + Some(format) => { + println!( + "Unsupported format: '{format}'. Supported formats are 'pem' and 'keystore-secret'." + ); } None => {} } diff --git a/framework/meta/tests/wallet_convert_cli_test.rs b/framework/meta/tests/wallet_convert_cli_test.rs new file mode 100644 index 0000000000..492533def7 --- /dev/null +++ b/framework/meta/tests/wallet_convert_cli_test.rs @@ -0,0 +1,217 @@ +use multiversx_sc_meta::cli::{WalletAction, WalletArgs, WalletConvertArgs}; +use multiversx_sc_meta::cmd::wallet_cmd::wallet; +use multiversx_sdk::wallet::Wallet; +use std::{ + fs, + io::Write, + path::{Path, PathBuf}, + process::{Command, Stdio}, +}; + +/// A well-known mnemonic with deterministic key material, taken from the wallet SDK tests. +const KNOWN_MNEMONIC: &str = "acid twice post genre topic observe valid viable gesture fortune funny dawn around blood enemy page update reduce decline van bundle zebra rookie real"; +/// Expected private key derived from `KNOWN_MNEMONIC` at account 0, index 0. +const KNOWN_PRIVATE_KEY: &str = "0b7966138e80b8f3bb64046f56aea4250fd7bacad6ed214165cea6767fd0bc2c"; +/// Expected public key derived from `KNOWN_MNEMONIC` at account 0, index 0. +const KNOWN_PUBLIC_KEY: &str = "dfefe0453840e5903f2bd519de9b0ed6e9621e57e28ba0b4c1b15115091dd72f"; +/// Expected bech32 address (default "erd" HRP) for the above key pair. +const KNOWN_BECH32_ERD: &str = "erd1mlh7q3fcgrjeq0et65vaaxcw6m5ky8jhu296pdxpk9g32zga6uhsemxx2a"; + +/// Base directory for temporary test artefacts (ignored by git). +const TEMP_DIR: &str = "tests/temp"; + +/// Returns a path inside `tests/temp/` using the given filename. +/// The directory is created on first use. +fn temp_path(filename: &str) -> PathBuf { + let dir = PathBuf::from(TEMP_DIR); + fs::create_dir_all(&dir).expect("failed to create tests/temp"); + dir.join(filename) +} + +/// Silently removes a file if it exists, ignoring errors. +fn remove_if_exists(path: &Path) { + let _ = fs::remove_file(path); +} + +// ── mnemonic → pem ─────────────────────────────────────────────────────────── + +/// Happy path: mnemonic from a file, PEM written to a file. +/// Verifies that the resulting PEM contains exactly the expected private key, +/// public key, and bech32 address. +#[test] +fn test_convert_mnemonic_to_pem_file_in_file_out() { + let mnemonic_file = temp_path("mnemonic_file_in_file_out.txt"); + let output_pem = temp_path("mnemonic_file_in_file_out.pem"); + remove_if_exists(&mnemonic_file); + remove_if_exists(&output_pem); + + fs::write(&mnemonic_file, KNOWN_MNEMONIC).unwrap(); + + wallet(&WalletArgs { + command: WalletAction::Convert(WalletConvertArgs { + from: "mnemonic".to_string(), + to: "pem".to_string(), + infile: Some(mnemonic_file.to_str().unwrap().to_string()), + outfile: Some(output_pem.to_str().unwrap().to_string()), + ..Default::default() + }), + }); + + let wallet = Wallet::from_pem_file(&output_pem).unwrap(); + assert_eq!(wallet.private_key.to_seed_hex(), KNOWN_PRIVATE_KEY); + assert_eq!(wallet.public_key().to_hex(), KNOWN_PUBLIC_KEY); + + let pem_content = fs::read_to_string(&output_pem).unwrap(); + assert!( + pem_content.contains(KNOWN_BECH32_ERD), + "PEM header should contain the bech32 address" + ); + + remove_if_exists(&mnemonic_file); + remove_if_exists(&output_pem); +} + +/// Mnemonic piped via stdin, PEM returned on stdout. +/// Exercises the interactive (no --infile) code path with a controlled stdin. +/// This is the only test that must remain a subprocess invocation, because the +/// code path reads directly from `io::stdin()`. +#[test] +fn test_convert_mnemonic_to_pem_stdin_in_stdout() { + let sc_meta_bin = env!("CARGO_BIN_EXE_sc-meta"); + + let mut child = Command::new(sc_meta_bin) + .args([ + "wallet", + "convert", + "--in-format", + "mnemonic", + "--out-format", + "pem", + ]) + .stdin(Stdio::piped()) + .stdout(Stdio::piped()) + .stderr(Stdio::piped()) + .spawn() + .expect("failed to spawn sc-meta"); + + // Write the mnemonic to the child's stdin, then drop to signal EOF. + if let Some(mut stdin) = child.stdin.take() { + stdin + .write_all(KNOWN_MNEMONIC.as_bytes()) + .expect("failed to write to stdin"); + } + + let output = child.wait_with_output().expect("failed to wait for child"); + assert!(output.status.success()); + + let stdout = String::from_utf8(output.stdout).unwrap(); + assert!(stdout.contains("-----BEGIN PRIVATE KEY for")); + assert!(stdout.contains(KNOWN_BECH32_ERD)); + assert!(stdout.contains("-----END PRIVATE KEY for")); +} + +/// Custom --hrp flag changes the bech32 prefix in the PEM header while keeping +/// the underlying key material identical. +#[test] +fn test_convert_mnemonic_to_pem_custom_hrp() { + let custom_hrp = "test"; + let mnemonic_file = temp_path("mnemonic_custom_hrp.txt"); + let output_pem = temp_path("mnemonic_custom_hrp.pem"); + remove_if_exists(&mnemonic_file); + remove_if_exists(&output_pem); + + fs::write(&mnemonic_file, KNOWN_MNEMONIC).unwrap(); + + wallet(&WalletArgs { + command: WalletAction::Convert(WalletConvertArgs { + from: "mnemonic".to_string(), + to: "pem".to_string(), + infile: Some(mnemonic_file.to_str().unwrap().to_string()), + outfile: Some(output_pem.to_str().unwrap().to_string()), + hrp: Some(custom_hrp.to_string()), + }), + }); + + let pem_content = fs::read_to_string(&output_pem).unwrap(); + // bech32 separator between HRP and data is always "1" + assert!( + pem_content.contains(&format!("-----BEGIN PRIVATE KEY for {custom_hrp}1")), + "PEM header should use the custom HRP; got:\n{pem_content}" + ); + + // Key material must be the same regardless of the HRP + let wallet = Wallet::from_pem_file(&output_pem).unwrap(); + assert_eq!(wallet.private_key_hex(), KNOWN_PRIVATE_KEY); + assert_eq!(wallet.public_key_hex(), KNOWN_PUBLIC_KEY); + + remove_if_exists(&mnemonic_file); + remove_if_exists(&output_pem); +} + +// ── unsupported format pair ─────────────────────────────────────────────────── + +/// Any conversion path that is not explicitly handled should return without +/// panicking (it prints "Unsupported conversion" to stdout). +#[test] +fn test_convert_unsupported_format_does_not_panic() { + // mnemonic → keystore-secret is not a supported path; should be a no-op. + wallet(&WalletArgs { + command: WalletAction::Convert(WalletConvertArgs { + from: "mnemonic".to_string(), + to: "keystore-secret".to_string(), + ..Default::default() + }), + }); +} + +// ── missing --infile errors ─────────────────────────────────────────────────── + +/// pem → keystore-secret requires --infile; omitting it must panic with an +/// informative message. +#[test] +fn test_convert_pem_to_keystore_panics_without_infile() { + let result = std::panic::catch_unwind(|| { + wallet(&WalletArgs { + command: WalletAction::Convert(WalletConvertArgs { + from: "pem".to_string(), + to: "keystore-secret".to_string(), + ..Default::default() + }), + }); + }); + let err = result.expect_err("expected a panic when --infile is missing"); + let msg = err + .downcast_ref::<&str>() + .copied() + .or_else(|| err.downcast_ref::().map(String::as_str)) + .unwrap_or(""); + assert!( + msg.contains("Input file is required for pem format"), + "unexpected panic message: {msg}" + ); +} + +/// keystore-secret → pem requires --infile; omitting it must panic with an +/// informative message. +#[test] +fn test_convert_keystore_to_pem_panics_without_infile() { + let result = std::panic::catch_unwind(|| { + wallet(&WalletArgs { + command: WalletAction::Convert(WalletConvertArgs { + from: "keystore-secret".to_string(), + to: "pem".to_string(), + ..Default::default() + }), + }); + }); + let err = result.expect_err("expected a panic when --infile is missing"); + let msg = err + .downcast_ref::<&str>() + .copied() + .or_else(|| err.downcast_ref::().map(String::as_str)) + .unwrap_or(""); + assert!( + msg.contains("Input file is required for keystore-secret format"), + "unexpected panic message: {msg}" + ); +} diff --git a/framework/meta/tests/wallet_encrypt_keystore_test.rs b/framework/meta/tests/wallet_encrypt_keystore_test.rs index 29d98fd718..92c6087393 100644 --- a/framework/meta/tests/wallet_encrypt_keystore_test.rs +++ b/framework/meta/tests/wallet_encrypt_keystore_test.rs @@ -1,5 +1,9 @@ +use multiversx_chain_core::std::Bech32Hrp; use multiversx_sc::types::Address; -use multiversx_sdk::{crypto::public_key::PublicKey, wallet::Wallet}; +use multiversx_sc_meta::cmd::wallet_cmd::new_keystore_randomness; +use multiversx_sdk::wallet::Keystore; +use multiversx_sdk::wallet::PrivateKey; +use multiversx_sdk::wallet::Wallet; use std::fs::{self, File}; use std::io::Write; @@ -8,56 +12,51 @@ const ALICE_KEYSTORE_PATH_TEST_1: &str = "tests/alice1.json"; const ALICE_KEYSTORE_PATH_TEST_2: &str = "tests/alice2.json"; const ALICE_PEM_PATH_TEST: &str = "tests/alice_test.pem"; const KEYSTORE_PASSWORD: &str = "abcd"; -const ALICE_PUBLIC_KEY: &str = "0139472eff6886771a982f3083da5d421f24c29181e63888228dc81ca60d69e1"; const ALICE_PRIVATE_KEY: &str = "413f42575f7f26fad3317a778771212fdb80245850981e48b58a4f25e344e8f9"; fn create_keystore_file_from_scratch(hrp: &str, file: &str) -> Address { - let wallet = Wallet::from_private_key(ALICE_PRIVATE_KEY).unwrap(); - let address = wallet.to_address(); - - let concatenated_keys = format!("{}{}", ALICE_PRIVATE_KEY, ALICE_PUBLIC_KEY); - let hex_decoded_keys = hex::decode(concatenated_keys).unwrap(); - let json_result = Wallet::encrypt_keystore( - hex_decoded_keys.as_slice(), - hrp, - &address, - ALICE_PUBLIC_KEY, + let wallet = Wallet::from(PrivateKey::from_seed_hex_str(ALICE_PRIVATE_KEY).unwrap()); + let json_result = Keystore::encrypt( + &wallet.private_key, + hrp.try_into().expect("invalid HRP"), KEYSTORE_PASSWORD, - ); + new_keystore_randomness(), + ) + .to_json_string(); write_to_file(&json_result, file); - address + wallet.address } #[test] fn test_wallet_convert_pem_to_keystore() { let _ = create_keystore_file_from_scratch("erd", ALICE_KEYSTORE_PATH_TEST_1); - let (private_key_pem, _public_key_pem) = Wallet::get_wallet_keys_pem(ALICE_PEM_PATH); + let wallet_pem = Wallet::from_pem_file(ALICE_PEM_PATH).unwrap(); assert_eq!( - Wallet::get_private_key_from_keystore_secret(ALICE_KEYSTORE_PATH_TEST_1, KEYSTORE_PASSWORD) + Keystore::from_file(ALICE_KEYSTORE_PATH_TEST_1) + .unwrap() + .decrypt_wallet(KEYSTORE_PASSWORD) .unwrap() - .to_string(), - private_key_pem + .private_key, + wallet_pem.private_key ); fs::remove_file(ALICE_KEYSTORE_PATH_TEST_1).unwrap(); } #[test] fn test_wallet_convert_keystore_to_pem() { - let address = create_keystore_file_from_scratch("erd", ALICE_KEYSTORE_PATH_TEST_2); + create_keystore_file_from_scratch("erd", ALICE_KEYSTORE_PATH_TEST_2); - let private_key = - Wallet::get_private_key_from_keystore_secret(ALICE_KEYSTORE_PATH_TEST_2, KEYSTORE_PASSWORD) - .unwrap(); - let private_key_str = private_key.to_string(); - let public_key = PublicKey::from(&private_key); - let public_key_str = public_key.to_string(); - - let pem_content = - Wallet::generate_pem_content("erd", &address, &private_key_str, &public_key_str); + let wallet = Keystore::from_file(ALICE_KEYSTORE_PATH_TEST_2) + .unwrap() + .decrypt_wallet(KEYSTORE_PASSWORD) + .unwrap(); + let pem_content = wallet.to_pem(Bech32Hrp::default()).to_pem_str(); write_to_file(&pem_content, ALICE_PEM_PATH_TEST); assert_eq!( - private_key_str, - Wallet::get_wallet_keys_pem(ALICE_PEM_PATH_TEST).0 + wallet.private_key, + Wallet::from_pem_file(ALICE_PEM_PATH_TEST) + .unwrap() + .private_key ); fs::remove_file(ALICE_PEM_PATH_TEST).unwrap(); diff --git a/framework/scenario/src/api/impl_vh/vh_single_tx_api.rs b/framework/scenario/src/api/impl_vh/vh_single_tx_api.rs index b07f3063c6..573c5c3978 100644 --- a/framework/scenario/src/api/impl_vh/vh_single_tx_api.rs +++ b/framework/scenario/src/api/impl_vh/vh_single_tx_api.rs @@ -12,7 +12,7 @@ use multiversx_chain_vm::{ vm_hooks::VMHooksContext, }, schedule::GasSchedule, - types::{Address, VMCodeMetadata}, + types::{Address, CodeMetadata}, }; use crate::executor::debug::ContractDebugInstanceState; @@ -153,7 +153,7 @@ impl VMHooksContext for SingleTxApiVMHooksContext { &mut self, _egld_value: num_bigint::BigUint, _contract_code: Vec, - _code_metadata: VMCodeMetadata, + _code_metadata: CodeMetadata, _args: Vec>, ) -> Result<(Address, Vec>), VMHooksEarlyExit> { panic!("cannot launch contract calls in the SingleTxApi") diff --git a/framework/scenario/src/api/impl_vh/vh_static_api.rs b/framework/scenario/src/api/impl_vh/vh_static_api.rs index a5efd55b1d..bb3a670c67 100644 --- a/framework/scenario/src/api/impl_vh/vh_static_api.rs +++ b/framework/scenario/src/api/impl_vh/vh_static_api.rs @@ -9,7 +9,7 @@ use multiversx_chain_vm::{ vm_hooks::VMHooksContext, }, schedule::GasSchedule, - types::{Address, VMCodeMetadata}, + types::{Address, CodeMetadata}, }; use crate::executor::debug::ContractDebugInstanceState; @@ -132,7 +132,7 @@ impl VMHooksContext for StaticApiVMHooksContext { &mut self, _egld_value: num_bigint::BigUint, _contract_code: Vec, - _code_metadata: VMCodeMetadata, + _code_metadata: CodeMetadata, _args: Vec>, ) -> Result<(Address, Vec>), VMHooksEarlyExit> { panic!("cannot launch contract calls in the StaticApi") diff --git a/framework/scenario/src/scenario/model/transaction/tx_deploy.rs b/framework/scenario/src/scenario/model/transaction/tx_deploy.rs index b497265eb0..52617151ed 100644 --- a/framework/scenario/src/scenario/model/transaction/tx_deploy.rs +++ b/framework/scenario/src/scenario/model/transaction/tx_deploy.rs @@ -25,7 +25,7 @@ impl Default for TxDeploy { Self { from: Default::default(), egld_value: Default::default(), - code_metadata: CodeMetadata::all(), + code_metadata: CodeMetadata::default(), contract_code: Default::default(), arguments: Default::default(), gas_limit: U64Value::from(DEFAULT_GAS_EXPR), diff --git a/framework/scenario/src/scenario/model/value/bytes_value.rs b/framework/scenario/src/scenario/model/value/bytes_value.rs index 752df8f41c..1a8d8566c7 100644 --- a/framework/scenario/src/scenario/model/value/bytes_value.rs +++ b/framework/scenario/src/scenario/model/value/bytes_value.rs @@ -1,5 +1,5 @@ use multiversx_sc::{ - codec::{EncodeError, TopEncode, TopEncodeOutput}, + codec::{EncodeErrorHandler, TopEncode, TopEncodeOutput}, types::{AnnotatedValue, ManagedBuffer, TxCodeValue, TxEnv}, }; @@ -163,11 +163,12 @@ impl fmt::Display for BytesValue { } impl TopEncode for BytesValue { - fn top_encode(&self, output: O) -> Result<(), EncodeError> + fn top_encode_or_handle_err(&self, output: O, h: H) -> Result<(), H::HandledErr> where O: TopEncodeOutput, + H: EncodeErrorHandler, { - self.value.top_encode(output) + self.value.top_encode_or_handle_err(output, h) } } diff --git a/framework/scenario/src/scenario/run_vm/sc_deploy.rs b/framework/scenario/src/scenario/run_vm/sc_deploy.rs index f6f1c4eebd..fbfbb38720 100644 --- a/framework/scenario/src/scenario/run_vm/sc_deploy.rs +++ b/framework/scenario/src/scenario/run_vm/sc_deploy.rs @@ -2,13 +2,10 @@ use crate::{ multiversx_sc::types::heap::Address, scenario::model::ScDeployStep, scenario_model::TxResponse, }; -use multiversx_chain_vm::{ - host::{ - context::{TxFunctionName, TxInput, TxResult}, - execution, - runtime::{RuntimeInstanceCallLambda, RuntimeInstanceCallLambdaDefault}, - }, - types::VMCodeMetadata, +use multiversx_chain_vm::host::{ + context::{TxFunctionName, TxInput, TxResult}, + execution, + runtime::{RuntimeInstanceCallLambda, RuntimeInstanceCallLambdaDefault}, }; use super::{ScenarioVMRunner, check_tx_output, tx_input_util::generate_tx_hash}; @@ -42,7 +39,7 @@ impl ScenarioVMRunner { let (new_address, tx_result) = execution::commit_deploy( tx_input, contract_code, - VMCodeMetadata::from(sc_deploy_step.tx.code_metadata.bits()), + sc_deploy_step.tx.code_metadata, &mut self.blockchain_mock.state, &runtime, f, diff --git a/framework/scenario/src/scenario/run_vm/set_state.rs b/framework/scenario/src/scenario/run_vm/set_state.rs index 6bcb366870..6ff84d8b68 100644 --- a/framework/scenario/src/scenario/run_vm/set_state.rs +++ b/framework/scenario/src/scenario/run_vm/set_state.rs @@ -5,15 +5,12 @@ use multiversx_chain_vm::{ AccountData, AccountEsdt, BlockInfo as CrateBlockInfo, BlockchainState, EsdtData, EsdtInstance, EsdtInstanceMetadata, EsdtInstances, EsdtRoles, }, - types::VMCodeMetadata, + types::CodeMetadata, }; use multiversx_sc::types::{TimestampMillis, TimestampSeconds}; use super::ScenarioVMRunner; -/// Refers to the default of the "setState" scenario step. -pub const DEFAULT_CODE_METADATA: VMCodeMetadata = VMCodeMetadata::all(); - impl ScenarioVMRunner { pub fn perform_set_state(&mut self, set_state_step: &SetStateStep) { execute(&mut self.blockchain_mock.state, set_state_step); @@ -61,8 +58,10 @@ fn execute(state: &mut BlockchainState, set_state_step: &SetStateStep) { code_metadata: account .code_metadata .as_ref() - .map(|bytes_value| VMCodeMetadata::from(&bytes_value.value)) - .unwrap_or(DEFAULT_CODE_METADATA), + .map(|bytes_value| { + CodeMetadata::try_from(&bytes_value.value).expect("invalid CodeMetadata") + }) + .unwrap_or_default(), contract_owner: account .owner .as_ref() diff --git a/framework/scenario/tests/contract_without_macros.rs b/framework/scenario/tests/contract_without_macros.rs index 336e8394a6..a09a54668e 100644 --- a/framework/scenario/tests/contract_without_macros.rs +++ b/framework/scenario/tests/contract_without_macros.rs @@ -399,13 +399,7 @@ mod sample_adder { type Api = multiversx_sc::api::uncallable::UncallableApi; fn abi() -> multiversx_sc::abi::ContractAbi { let mut contract_abi = multiversx_sc::abi::ContractAbi::new( - multiversx_sc::abi::BuildInfoAbi { - rustc: None, - contract_crate: multiversx_sc::abi::ContractCrateBuildAbi::new( - "adder", "0.0.0", - ), - framework: multiversx_sc::abi::FrameworkBuildAbi::create(), - }, + multiversx_sc::abi::BuildInfoAbi::dummy(), &[ "One of the simplest smart contracts possible,", "it holds a single variable in storage, which anyone can increment.", diff --git a/framework/scenario/tests/token_id_test.rs b/framework/scenario/tests/token_id_test.rs index 700057ff73..1524e1efad 100644 --- a/framework/scenario/tests/token_id_test.rs +++ b/framework/scenario/tests/token_id_test.rs @@ -79,6 +79,12 @@ fn test_is_valid_esdt_identifier() { // valid ticker only numbers assert!(TokenId::::from("12345-6258d2").is_valid_esdt_identifier()); + // valid identifier with max-length ticker (10 chars) + assert!(TokenId::::from("EGLDRIDEFL-08d8ef").is_valid_esdt_identifier()); + + // valid identifier with number at end of max-length ticker + assert!(TokenId::::from("EGLDRIDEF2-08d8ef").is_valid_esdt_identifier()); + // missing dash assert!(!TokenId::::from("ALC6258d2").is_valid_esdt_identifier()); @@ -88,12 +94,35 @@ fn test_is_valid_esdt_identifier() { // lowercase ticker assert!(!TokenId::::from("alc-6258d2").is_valid_esdt_identifier()); + // lowercase char in ticker + assert!(!TokenId::::from("EGLDRIDEFl-08d8ef").is_valid_esdt_identifier()); + + // special char in ticker + assert!(!TokenId::::from("EGLDRIDEF*-08d8ef").is_valid_esdt_identifier()); + // uppercase random chars assert!(!TokenId::::from("ALC-6258D2").is_valid_esdt_identifier()); + // uppercase char in random part + assert!(!TokenId::::from("EGLDRIDEFL-08d8eF").is_valid_esdt_identifier()); + + // special char in random part + assert!(!TokenId::::from("EGLDRIDEFL-08d*ef").is_valid_esdt_identifier()); + + // non-hex lowercase letter in random part (g-z are not valid hex digits) + assert!(!TokenId::::from("ABC-ghijkl").is_valid_esdt_identifier()); + assert!(!TokenId::::from("ALC-6258g2").is_valid_esdt_identifier()); + assert!(!TokenId::::from("ALC-zzzzzz").is_valid_esdt_identifier()); + // too many random chars assert!(!TokenId::::from("ALC-6258d2ff").is_valid_esdt_identifier()); + // too many random chars (7) + assert!(!TokenId::::from("EGLDRIDEFL-08d8eff").is_valid_esdt_identifier()); + + // too few random chars (5) + assert!(!TokenId::::from("EGLDRIDEFL-08d8e").is_valid_esdt_identifier()); + // ticker too short assert!(!TokenId::::from("AL-6258d2").is_valid_esdt_identifier()); diff --git a/framework/snippets/src/imports.rs b/framework/snippets/src/imports.rs index 2e531f793f..fcfcf82f4f 100644 --- a/framework/snippets/src/imports.rs +++ b/framework/snippets/src/imports.rs @@ -5,9 +5,7 @@ pub use crate::{ InteractorSimulateGasAsync, SimulateGas, StepBuffer, dns_address_for_name, }; -pub use crate::sdk::{ - data::keystore::InsertPassword, test_wallets, validator::Validator, wallet::Wallet, -}; +pub use crate::sdk::{test_wallets, validator::Validator, wallet::Wallet}; pub use env_logger; diff --git a/framework/snippets/src/interactor/interactor_base.rs b/framework/snippets/src/interactor/interactor_base.rs index 2cfeb24f90..fa4acf5495 100644 --- a/framework/snippets/src/interactor/interactor_base.rs +++ b/framework/snippets/src/interactor/interactor_base.rs @@ -5,7 +5,10 @@ use multiversx_sc_scenario::{ meta::tools::find_current_workspace, multiversx_sc::types::Address, }; -use multiversx_sdk::gateway::{GatewayAsyncService, NetworkConfigRequest, SetStateAccount}; +use multiversx_sdk::{ + chain_core::std::Bech32Hrp, + gateway::{GatewayAsyncService, NetworkConfigRequest, SetStateAccount}, +}; use super::ExplorerUrl; use std::{ @@ -82,7 +85,7 @@ where address.clone(), Sender { address: address.clone(), - hrp: self.network_config.address_hrp.clone(), + hrp: self.network_config.address_hrp, wallet, current_nonce: None, }, @@ -115,8 +118,8 @@ where self.current_dir.join(INTERACTOR_SET_STATE_PATH) } - pub fn get_hrp(&self) -> &str { - &self.network_config.address_hrp + pub fn get_hrp(&self) -> Bech32Hrp { + self.network_config.address_hrp } pub fn is_registered_wallet(&self, address: &Address) -> bool { diff --git a/framework/snippets/src/interactor/interactor_scenario/interactor_sc_call.rs b/framework/snippets/src/interactor/interactor_scenario/interactor_sc_call.rs index 4b6d2758b2..d3aea037e8 100644 --- a/framework/snippets/src/interactor/interactor_scenario/interactor_sc_call.rs +++ b/framework/snippets/src/interactor/interactor_scenario/interactor_sc_call.rs @@ -7,9 +7,8 @@ use multiversx_sc_scenario::{ scenario::ScenarioRunner, scenario_model::{ScCallStep, SetStateStep, TxCall}, }; -use multiversx_sdk::{ - data::transaction::Transaction, gateway::SimulateTxRequest, utils::base64_encode, -}; +use multiversx_sdk::chain_core::std::base64_encode; +use multiversx_sdk::{data::transaction::Transaction, gateway::SimulateTxRequest}; use multiversx_sdk::{ gateway::{GatewayAsyncService, SendTxRequest}, retrieve_tx_on_network, diff --git a/framework/snippets/src/interactor/interactor_scenario/interactor_sc_deploy.rs b/framework/snippets/src/interactor/interactor_scenario/interactor_sc_deploy.rs index de93bcaf01..ba2ea4f838 100644 --- a/framework/snippets/src/interactor/interactor_scenario/interactor_sc_deploy.rs +++ b/framework/snippets/src/interactor/interactor_scenario/interactor_sc_deploy.rs @@ -7,9 +7,8 @@ use multiversx_sc_scenario::{ mandos_system::ScenarioRunner, scenario_model::{ScDeployStep, SetStateStep}, }; -use multiversx_sdk::{ - data::transaction::Transaction, gateway::SimulateTxRequest, utils::base64_encode, -}; +use multiversx_sdk::chain_core::std::base64_encode; +use multiversx_sdk::{data::transaction::Transaction, gateway::SimulateTxRequest}; use multiversx_sdk::{ gateway::{GatewayAsyncService, SendTxRequest}, retrieve_tx_on_network, @@ -20,13 +19,13 @@ where GatewayProxy: GatewayAsyncService, { pub(crate) fn sc_deploy_to_blockchain_tx(&self, sc_deploy_step: &ScDeployStep) -> Transaction { - let hrp = self.network_config.address_hrp.clone(); + let hrp = self.network_config.address_hrp; Transaction { nonce: 0, value: sc_deploy_step.tx.egld_value.value.to_string(), - sender: sc_deploy_step.tx.from.to_address().to_bech32(&hrp), - receiver: Bech32Address::zero(&hrp), + sender: sc_deploy_step.tx.from.to_address().to_bech32(hrp), + receiver: Bech32Address::zero(hrp), gas_price: self.gas_price, gas_limit: sc_deploy_step.tx.gas_limit.value, data: Some(base64_encode(sc_deploy_step.tx.to_tx_data())), diff --git a/framework/snippets/src/interactor/interactor_scenario/interactor_vm_query.rs b/framework/snippets/src/interactor/interactor_scenario/interactor_vm_query.rs index 83684de909..1e5cb2d48f 100644 --- a/framework/snippets/src/interactor/interactor_scenario/interactor_vm_query.rs +++ b/framework/snippets/src/interactor/interactor_scenario/interactor_vm_query.rs @@ -17,9 +17,9 @@ where GatewayProxy: GatewayAsyncService, { pub async fn perform_sc_query(&mut self, step: &mut ScQueryStep) { - let hrp = self.network_config.address_hrp.clone(); + let hrp = self.network_config.address_hrp; - let sc_address = step.tx.to.to_address().to_bech32(&hrp); + let sc_address = step.tx.to.to_address().to_bech32(hrp); let req = VMQueryInput { sc_address, func_name: step.tx.function.clone(), diff --git a/framework/snippets/src/interactor/interactor_sender.rs b/framework/snippets/src/interactor/interactor_sender.rs index 7f6265a0e8..72ee215c1d 100644 --- a/framework/snippets/src/interactor/interactor_sender.rs +++ b/framework/snippets/src/interactor/interactor_sender.rs @@ -2,6 +2,7 @@ use std::collections::HashMap; use crate::sdk::{data::transaction::Transaction, wallet::Wallet}; use multiversx_sc_scenario::{imports::Bech32Address, multiversx_sc::types::Address}; +use multiversx_sdk::chain_core::std::Bech32Hrp; use multiversx_sdk::data::account::Account; use multiversx_sdk::data::esdt::EsdtBalance; use multiversx_sdk::gateway::{ @@ -13,7 +14,7 @@ use crate::InteractorBase; /// A user account that can sign transactions (a pem is present). pub struct Sender { pub address: Address, - pub hrp: String, + pub hrp: Bech32Hrp, pub wallet: Wallet, pub current_nonce: Option, } @@ -109,6 +110,6 @@ where // sign let signature = sender.wallet.sign_tx(transaction); - transaction.signature = Some(hex::encode(signature)); + transaction.signature = Some(signature); } } diff --git a/framework/snippets/src/multi/interactor_multi_sc_process.rs b/framework/snippets/src/multi/interactor_multi_sc_process.rs index 2cc8acf811..c816b9f533 100644 --- a/framework/snippets/src/multi/interactor_multi_sc_process.rs +++ b/framework/snippets/src/multi/interactor_multi_sc_process.rs @@ -57,5 +57,5 @@ pub(crate) fn update_nonces_and_sign_tx(transaction: &mut Transaction, sender: & sender.current_nonce = Some(sender.current_nonce.unwrap() + 1); let signature = sender.wallet.sign_tx(&*transaction); - transaction.signature = Some(hex::encode(signature)); + transaction.signature = Some(signature); } diff --git a/framework/snippets/src/network_response.rs b/framework/snippets/src/network_response.rs index 773caa5ca8..739a1d58f1 100644 --- a/framework/snippets/src/network_response.rs +++ b/framework/snippets/src/network_response.rs @@ -1,6 +1,6 @@ use crate::sdk::{ + chain_core::std::base64_decode, data::transaction::{ApiLogs, ApiSmartContractResult, ApiTransactionResult, Events}, - utils::base64_decode, }; use multiversx_sc_scenario::{ imports::{Address, ESDTSystemSCAddress, ReturnCode}, @@ -29,9 +29,11 @@ pub fn parse_tx_response(tx: ApiTransactionResult, return_code: ReturnCode) -> T fn process_signal_error(tx: &ApiTransactionResult, return_code: ReturnCode) -> TxResponseStatus { if let Some(event) = find_log(tx, LOG_IDENTIFIER_SIGNAL_ERROR) { if event.topics.len() >= 2 { - let error_message = String::from_utf8(base64_decode(&event.topics[1])).expect( - "Failed to decode base64-encoded error message from transaction event topic", - ); + let error_message = String::from_utf8( + base64_decode(&event.topics[1]) + .expect("Failed to base64-decode error message topic"), + ) + .expect("Failed to decode base64-encoded error message from transaction event topic"); return TxResponseStatus::new(return_code, &error_message); } } @@ -140,7 +142,9 @@ fn process_new_issued_token_identifier(tx: &ApiTransactionResult) -> Option) -> Option Vec> { let mut out = Vec::new(); event.data.for_each(|data_member| { - let decoded_data = String::from_utf8(base64_decode(data_member)).unwrap(); + let decoded_data = String::from_utf8(base64_decode(data_member).unwrap()).unwrap(); if decoded_data.starts_with('@') { let out_content = decode_scr_data_or_panic(decoded_data.as_str()); diff --git a/sdk/core/Cargo.toml b/sdk/core/Cargo.toml index bb3222e55e..43ca05dcd7 100644 --- a/sdk/core/Cargo.toml +++ b/sdk/core/Cargo.toml @@ -15,9 +15,6 @@ description = "SDK for interacting with the MultiversX blockchain" categories = ["cryptography::cryptocurrencies", "api-bindings"] keywords = ["multiversx", "blockchain", "sdk", "api"] -[features] -wallet-full = ["rand", "uuid"] - [dependencies] serde = { version = "1.0", features = ["derive"] } serde_json = { version = "1.0", features = ["preserve_order"] } @@ -28,7 +25,6 @@ sha2 = "0.11" sha3 = "0.12" hmac = "0.13" hex = "0.4" -base64 = "0.22" pbkdf2 = { version = "0.13", default-features = false } zeroize = "1.4" itertools = "0.14" @@ -37,11 +33,6 @@ log = "0.4" scrypt = { version = "0.12", default-features = false } aes = "0.9" ctr = "0.10" -rpassword = "~7.3" # rpassword >=7.4 requires Rust 1.88 (let_chains), pin to 7.3.x for Rust 1.85 compat - -# Optional dependencies, for wallet-full -rand = { version = "0.10", optional = true, default-features = false } -uuid = { version = "1.10", features = ["v4"], optional = true } [dependencies.multiversx-chain-core] version = "=0.23.0" diff --git a/sdk/core/src/crypto.rs b/sdk/core/src/crypto.rs deleted file mode 100644 index 9a2e0e5d63..0000000000 --- a/sdk/core/src/crypto.rs +++ /dev/null @@ -1,3 +0,0 @@ -mod edwards25519; -pub mod private_key; -pub mod public_key; diff --git a/sdk/core/src/crypto/edwards25519.rs b/sdk/core/src/crypto/edwards25519.rs deleted file mode 100644 index 7aa881b235..0000000000 --- a/sdk/core/src/crypto/edwards25519.rs +++ /dev/null @@ -1,848 +0,0 @@ -#![allow(clippy::identity_op)] - -pub mod completed_group_element; -pub mod constant; -pub mod extended_group_element; -pub mod field_element; -pub mod pre_computed_group_element; -pub mod projective_group_element; - -fn load3(input: Vec) -> i64 { - let mut r = input[0] as i64; - r |= (input[1] as i64) << 8; - r |= (input[2] as i64) << 16; - r -} - -fn load4(input: Vec) -> i64 { - let mut r = input[0] as i64; - r |= (input[1] as i64) << 8; - r |= (input[2] as i64) << 16; - r |= (input[3] as i64) << 24; - r -} - -// The scalars are GF(2^252 + 27742317777372353535851937790883648493). - -// Input: -// a[0]+256*a[1]+...+256^31*a[31] = a -// b[0]+256*b[1]+...+256^31*b[31] = b -// c[0]+256*c[1]+...+256^31*c[31] = c -// -// Output: -// s[0]+256*s[1]+...+256^31*s[31] = (ab+c) mod l -// where l = 2^252 + 27742317777372353535851937790883648493. -pub fn sc_mul_add(a: [u8; 32], b: [u8; 32], c: [u8; 32]) -> [u8; 32] { - let a0 = 2097151 & load3(a[..].to_vec()); - let a1 = 2097151 & (load4(a[2..].to_vec()) >> 5); - let a2 = 2097151 & (load3(a[5..].to_vec()) >> 2); - let a3 = 2097151 & (load4(a[7..].to_vec()) >> 7); - let a4 = 2097151 & (load4(a[10..].to_vec()) >> 4); - let a5 = 2097151 & (load3(a[13..].to_vec()) >> 1); - let a6 = 2097151 & (load4(a[15..].to_vec()) >> 6); - let a7 = 2097151 & (load3(a[18..].to_vec()) >> 3); - let a8 = 2097151 & load3(a[21..].to_vec()); - let a9 = 2097151 & (load4(a[23..].to_vec()) >> 5); - let a10 = 2097151 & (load3(a[26..].to_vec()) >> 2); - let a11 = load4(a[28..].to_vec()) >> 7; - let b0 = 2097151 & load3(b[..].to_vec()); - let b1 = 2097151 & (load4(b[2..].to_vec()) >> 5); - let b2 = 2097151 & (load3(b[5..].to_vec()) >> 2); - let b3 = 2097151 & (load4(b[7..].to_vec()) >> 7); - let b4 = 2097151 & (load4(b[10..].to_vec()) >> 4); - let b5 = 2097151 & (load3(b[13..].to_vec()) >> 1); - let b6 = 2097151 & (load4(b[15..].to_vec()) >> 6); - let b7 = 2097151 & (load3(b[18..].to_vec()) >> 3); - let b8 = 2097151 & load3(b[21..].to_vec()); - let b9 = 2097151 & (load4(b[23..].to_vec()) >> 5); - let b10 = 2097151 & (load3(b[26..].to_vec()) >> 2); - let b11 = load4(b[28..].to_vec()) >> 7; - let c0 = 2097151 & load3(c[..].to_vec()); - let c1 = 2097151 & (load4(c[2..].to_vec()) >> 5); - let c2 = 2097151 & (load3(c[5..].to_vec()) >> 2); - let c3 = 2097151 & (load4(c[7..].to_vec()) >> 7); - let c4 = 2097151 & (load4(c[10..].to_vec()) >> 4); - let c5 = 2097151 & (load3(c[13..].to_vec()) >> 1); - let c6 = 2097151 & (load4(c[15..].to_vec()) >> 6); - let c7 = 2097151 & (load3(c[18..].to_vec()) >> 3); - let c8 = 2097151 & load3(c[21..].to_vec()); - let c9 = 2097151 & (load4(c[23..].to_vec()) >> 5); - let c10 = 2097151 & (load3(c[26..].to_vec()) >> 2); - let c11 = load4(c[28..].to_vec()) >> 7; - let mut carry = [0i64; 23]; - - let mut s0 = c0 + a0 * b0; - let mut s1 = c1 + a0 * b1 + a1 * b0; - let mut s2 = c2 + a0 * b2 + a1 * b1 + a2 * b0; - let mut s3 = c3 + a0 * b3 + a1 * b2 + a2 * b1 + a3 * b0; - let mut s4 = c4 + a0 * b4 + a1 * b3 + a2 * b2 + a3 * b1 + a4 * b0; - let mut s5 = c5 + a0 * b5 + a1 * b4 + a2 * b3 + a3 * b2 + a4 * b1 + a5 * b0; - let mut s6 = c6 + a0 * b6 + a1 * b5 + a2 * b4 + a3 * b3 + a4 * b2 + a5 * b1 + a6 * b0; - let mut s7 = c7 + a0 * b7 + a1 * b6 + a2 * b5 + a3 * b4 + a4 * b3 + a5 * b2 + a6 * b1 + a7 * b0; - let mut s8 = c8 - + a0 * b8 - + a1 * b7 - + a2 * b6 - + a3 * b5 - + a4 * b4 - + a5 * b3 - + a6 * b2 - + a7 * b1 - + a8 * b0; - let mut s9 = c9 - + a0 * b9 - + a1 * b8 - + a2 * b7 - + a3 * b6 - + a4 * b5 - + a5 * b4 - + a6 * b3 - + a7 * b2 - + a8 * b1 - + a9 * b0; - let mut s10 = c10 - + a0 * b10 - + a1 * b9 - + a2 * b8 - + a3 * b7 - + a4 * b6 - + a5 * b5 - + a6 * b4 - + a7 * b3 - + a8 * b2 - + a9 * b1 - + a10 * b0; - let mut s11 = c11 - + a0 * b11 - + a1 * b10 - + a2 * b9 - + a3 * b8 - + a4 * b7 - + a5 * b6 - + a6 * b5 - + a7 * b4 - + a8 * b3 - + a9 * b2 - + a10 * b1 - + a11 * b0; - let mut s12 = a1 * b11 - + a2 * b10 - + a3 * b9 - + a4 * b8 - + a5 * b7 - + a6 * b6 - + a7 * b5 - + a8 * b4 - + a9 * b3 - + a10 * b2 - + a11 * b1; - let mut s13 = a2 * b11 - + a3 * b10 - + a4 * b9 - + a5 * b8 - + a6 * b7 - + a7 * b6 - + a8 * b5 - + a9 * b4 - + a10 * b3 - + a11 * b2; - let mut s14 = - a3 * b11 + a4 * b10 + a5 * b9 + a6 * b8 + a7 * b7 + a8 * b6 + a9 * b5 + a10 * b4 + a11 * b3; - let mut s15 = a4 * b11 + a5 * b10 + a6 * b9 + a7 * b8 + a8 * b7 + a9 * b6 + a10 * b5 + a11 * b4; - let mut s16 = a5 * b11 + a6 * b10 + a7 * b9 + a8 * b8 + a9 * b7 + a10 * b6 + a11 * b5; - let mut s17 = a6 * b11 + a7 * b10 + a8 * b9 + a9 * b8 + a10 * b7 + a11 * b6; - let mut s18 = a7 * b11 + a8 * b10 + a9 * b9 + a10 * b8 + a11 * b7; - let mut s19 = a8 * b11 + a9 * b10 + a10 * b9 + a11 * b8; - let mut s20 = a9 * b11 + a10 * b10 + a11 * b9; - let mut s21 = a10 * b11 + a11 * b10; - let mut s22 = a11 * b11; - let mut s23 = 0i64; - - carry[0] = (s0 + (1 << 20)) >> 21; - s1 += carry[0]; - s0 -= carry[0] << 21; - carry[2] = (s2 + (1 << 20)) >> 21; - s3 += carry[2]; - s2 -= carry[2] << 21; - carry[4] = (s4 + (1 << 20)) >> 21; - s5 += carry[4]; - s4 -= carry[4] << 21; - carry[6] = (s6 + (1 << 20)) >> 21; - s7 += carry[6]; - s6 -= carry[6] << 21; - carry[8] = (s8 + (1 << 20)) >> 21; - s9 += carry[8]; - s8 -= carry[8] << 21; - carry[10] = (s10 + (1 << 20)) >> 21; - s11 += carry[10]; - s10 -= carry[10] << 21; - carry[12] = (s12 + (1 << 20)) >> 21; - s13 += carry[12]; - s12 -= carry[12] << 21; - carry[14] = (s14 + (1 << 20)) >> 21; - s15 += carry[14]; - s14 -= carry[14] << 21; - carry[16] = (s16 + (1 << 20)) >> 21; - s17 += carry[16]; - s16 -= carry[16] << 21; - carry[18] = (s18 + (1 << 20)) >> 21; - s19 += carry[18]; - s18 -= carry[18] << 21; - carry[20] = (s20 + (1 << 20)) >> 21; - s21 += carry[20]; - s20 -= carry[20] << 21; - carry[22] = (s22 + (1 << 20)) >> 21; - s23 += carry[22]; - s22 -= carry[22] << 21; - - carry[1] = (s1 + (1 << 20)) >> 21; - s2 += carry[1]; - s1 -= carry[1] << 21; - carry[3] = (s3 + (1 << 20)) >> 21; - s4 += carry[3]; - s3 -= carry[3] << 21; - carry[5] = (s5 + (1 << 20)) >> 21; - s6 += carry[5]; - s5 -= carry[5] << 21; - carry[7] = (s7 + (1 << 20)) >> 21; - s8 += carry[7]; - s7 -= carry[7] << 21; - carry[9] = (s9 + (1 << 20)) >> 21; - s10 += carry[9]; - s9 -= carry[9] << 21; - carry[11] = (s11 + (1 << 20)) >> 21; - s12 += carry[11]; - s11 -= carry[11] << 21; - carry[13] = (s13 + (1 << 20)) >> 21; - s14 += carry[13]; - s13 -= carry[13] << 21; - carry[15] = (s15 + (1 << 20)) >> 21; - s16 += carry[15]; - s15 -= carry[15] << 21; - carry[17] = (s17 + (1 << 20)) >> 21; - s18 += carry[17]; - s17 -= carry[17] << 21; - carry[19] = (s19 + (1 << 20)) >> 21; - s20 += carry[19]; - s19 -= carry[19] << 21; - carry[21] = (s21 + (1 << 20)) >> 21; - s22 += carry[21]; - s21 -= carry[21] << 21; - - s11 += s23 * 666643; - s12 += s23 * 470296; - s13 += s23 * 654183; - s14 -= s23 * 997805; - s15 += s23 * 136657; - s16 -= s23 * 683901; - // s23 = 0; - - s10 += s22 * 666643; - s11 += s22 * 470296; - s12 += s22 * 654183; - s13 -= s22 * 997805; - s14 += s22 * 136657; - s15 -= s22 * 683901; - // s22 = 0; - - s9 += s21 * 666643; - s10 += s21 * 470296; - s11 += s21 * 654183; - s12 -= s21 * 997805; - s13 += s21 * 136657; - s14 -= s21 * 683901; - // s21 = 0; - - s8 += s20 * 666643; - s9 += s20 * 470296; - s10 += s20 * 654183; - s11 -= s20 * 997805; - s12 += s20 * 136657; - s13 -= s20 * 683901; - // s20 = 0; - - s7 += s19 * 666643; - s8 += s19 * 470296; - s9 += s19 * 654183; - s10 -= s19 * 997805; - s11 += s19 * 136657; - s12 -= s19 * 683901; - // s19 = 0; - - s6 += s18 * 666643; - s7 += s18 * 470296; - s8 += s18 * 654183; - s9 -= s18 * 997805; - s10 += s18 * 136657; - s11 -= s18 * 683901; - // s18 = 0; - - carry[6] = (s6 + (1 << 20)) >> 21; - s7 += carry[6]; - s6 -= carry[6] << 21; - carry[8] = (s8 + (1 << 20)) >> 21; - s9 += carry[8]; - s8 -= carry[8] << 21; - carry[10] = (s10 + (1 << 20)) >> 21; - s11 += carry[10]; - s10 -= carry[10] << 21; - carry[12] = (s12 + (1 << 20)) >> 21; - s13 += carry[12]; - s12 -= carry[12] << 21; - carry[14] = (s14 + (1 << 20)) >> 21; - s15 += carry[14]; - s14 -= carry[14] << 21; - carry[16] = (s16 + (1 << 20)) >> 21; - s17 += carry[16]; - s16 -= carry[16] << 21; - - carry[7] = (s7 + (1 << 20)) >> 21; - s8 += carry[7]; - s7 -= carry[7] << 21; - carry[9] = (s9 + (1 << 20)) >> 21; - s10 += carry[9]; - s9 -= carry[9] << 21; - carry[11] = (s11 + (1 << 20)) >> 21; - s12 += carry[11]; - s11 -= carry[11] << 21; - carry[13] = (s13 + (1 << 20)) >> 21; - s14 += carry[13]; - s13 -= carry[13] << 21; - carry[15] = (s15 + (1 << 20)) >> 21; - s16 += carry[15]; - s15 -= carry[15] << 21; - - s5 += s17 * 666643; - s6 += s17 * 470296; - s7 += s17 * 654183; - s8 -= s17 * 997805; - s9 += s17 * 136657; - s10 -= s17 * 683901; - // s17 = 0; - - s4 += s16 * 666643; - s5 += s16 * 470296; - s6 += s16 * 654183; - s7 -= s16 * 997805; - s8 += s16 * 136657; - s9 -= s16 * 683901; - // s16 = 0; - - s3 += s15 * 666643; - s4 += s15 * 470296; - s5 += s15 * 654183; - s6 -= s15 * 997805; - s7 += s15 * 136657; - s8 -= s15 * 683901; - // s15 = 0; - - s2 += s14 * 666643; - s3 += s14 * 470296; - s4 += s14 * 654183; - s5 -= s14 * 997805; - s6 += s14 * 136657; - s7 -= s14 * 683901; - // s14 = 0; - - s1 += s13 * 666643; - s2 += s13 * 470296; - s3 += s13 * 654183; - s4 -= s13 * 997805; - s5 += s13 * 136657; - s6 -= s13 * 683901; - // s13 = 0; - - s0 += s12 * 666643; - s1 += s12 * 470296; - s2 += s12 * 654183; - s3 -= s12 * 997805; - s4 += s12 * 136657; - s5 -= s12 * 683901; - s12 = 0; - - carry[0] = (s0 + (1 << 20)) >> 21; - s1 += carry[0]; - s0 -= carry[0] << 21; - carry[2] = (s2 + (1 << 20)) >> 21; - s3 += carry[2]; - s2 -= carry[2] << 21; - carry[4] = (s4 + (1 << 20)) >> 21; - s5 += carry[4]; - s4 -= carry[4] << 21; - carry[6] = (s6 + (1 << 20)) >> 21; - s7 += carry[6]; - s6 -= carry[6] << 21; - carry[8] = (s8 + (1 << 20)) >> 21; - s9 += carry[8]; - s8 -= carry[8] << 21; - carry[10] = (s10 + (1 << 20)) >> 21; - s11 += carry[10]; - s10 -= carry[10] << 21; - - carry[1] = (s1 + (1 << 20)) >> 21; - s2 += carry[1]; - s1 -= carry[1] << 21; - carry[3] = (s3 + (1 << 20)) >> 21; - s4 += carry[3]; - s3 -= carry[3] << 21; - carry[5] = (s5 + (1 << 20)) >> 21; - s6 += carry[5]; - s5 -= carry[5] << 21; - carry[7] = (s7 + (1 << 20)) >> 21; - s8 += carry[7]; - s7 -= carry[7] << 21; - carry[9] = (s9 + (1 << 20)) >> 21; - s10 += carry[9]; - s9 -= carry[9] << 21; - carry[11] = (s11 + (1 << 20)) >> 21; - s12 += carry[11]; - s11 -= carry[11] << 21; - - s0 += s12 * 666643; - s1 += s12 * 470296; - s2 += s12 * 654183; - s3 -= s12 * 997805; - s4 += s12 * 136657; - s5 -= s12 * 683901; - s12 = 0; - - carry[0] = s0 >> 21; - s1 += carry[0]; - s0 -= carry[0] << 21; - carry[1] = s1 >> 21; - s2 += carry[1]; - s1 -= carry[1] << 21; - carry[2] = s2 >> 21; - s3 += carry[2]; - s2 -= carry[2] << 21; - carry[3] = s3 >> 21; - s4 += carry[3]; - s3 -= carry[3] << 21; - carry[4] = s4 >> 21; - s5 += carry[4]; - s4 -= carry[4] << 21; - carry[5] = s5 >> 21; - s6 += carry[5]; - s5 -= carry[5] << 21; - carry[6] = s6 >> 21; - s7 += carry[6]; - s6 -= carry[6] << 21; - carry[7] = s7 >> 21; - s8 += carry[7]; - s7 -= carry[7] << 21; - carry[8] = s8 >> 21; - s9 += carry[8]; - s8 -= carry[8] << 21; - carry[9] = s9 >> 21; - s10 += carry[9]; - s9 -= carry[9] << 21; - carry[10] = s10 >> 21; - s11 += carry[10]; - s10 -= carry[10] << 21; - carry[11] = s11 >> 21; - s12 += carry[11]; - s11 -= carry[11] << 21; - - s0 += s12 * 666643; - s1 += s12 * 470296; - s2 += s12 * 654183; - s3 -= s12 * 997805; - s4 += s12 * 136657; - s5 -= s12 * 683901; - // s12 = 0; - - carry[0] = s0 >> 21; - s1 += carry[0]; - s0 -= carry[0] << 21; - carry[1] = s1 >> 21; - s2 += carry[1]; - s1 -= carry[1] << 21; - carry[2] = s2 >> 21; - s3 += carry[2]; - s2 -= carry[2] << 21; - carry[3] = s3 >> 21; - s4 += carry[3]; - s3 -= carry[3] << 21; - carry[4] = s4 >> 21; - s5 += carry[4]; - s4 -= carry[4] << 21; - carry[5] = s5 >> 21; - s6 += carry[5]; - s5 -= carry[5] << 21; - carry[6] = s6 >> 21; - s7 += carry[6]; - s6 -= carry[6] << 21; - carry[7] = s7 >> 21; - s8 += carry[7]; - s7 -= carry[7] << 21; - carry[8] = s8 >> 21; - s9 += carry[8]; - s8 -= carry[8] << 21; - carry[9] = s9 >> 21; - s10 += carry[9]; - s9 -= carry[9] << 21; - carry[10] = s10 >> 21; - s11 += carry[10]; - s10 -= carry[10] << 21; - - [ - (s0 >> 0) as u8, - (s0 >> 8) as u8, - ((s0 >> 16) | (s1 << 5)) as u8, - (s1 >> 3) as u8, - (s1 >> 11) as u8, - ((s1 >> 19) | (s2 << 2)) as u8, - (s2 >> 6) as u8, - ((s2 >> 14) | (s3 << 7)) as u8, - (s3 >> 1) as u8, - (s3 >> 9) as u8, - ((s3 >> 17) | (s4 << 4)) as u8, - (s4 >> 4) as u8, - (s4 >> 12) as u8, - ((s4 >> 20) | (s5 << 1)) as u8, - (s5 >> 7) as u8, - ((s5 >> 15) | (s6 << 6)) as u8, - (s6 >> 2) as u8, - (s6 >> 10) as u8, - ((s6 >> 18) | (s7 << 3)) as u8, - (s7 >> 5) as u8, - (s7 >> 13) as u8, - (s8 >> 0) as u8, - (s8 >> 8) as u8, - ((s8 >> 16) | (s9 << 5)) as u8, - (s9 >> 3) as u8, - (s9 >> 11) as u8, - ((s9 >> 19) | (s10 << 2)) as u8, - (s10 >> 6) as u8, - ((s10 >> 14) | (s11 << 7)) as u8, - (s11 >> 1) as u8, - (s11 >> 9) as u8, - (s11 >> 17) as u8, - ] -} - -// Input: -// s[0]+256*s[1]+...+256^63*s[63] = s -// -// Output: -// s[0]+256*s[1]+...+256^31*s[31] = s mod l -// where l = 2^252 + 27742317777372353535851937790883648493. -pub fn sc_reduce(s: [u8; 64]) -> [u8; 32] { - let mut s0 = 2097151 & load3(s[..].to_vec()); - let mut s1 = 2097151 & (load4(s[2..].to_vec()) >> 5); - let mut s2 = 2097151 & (load3(s[5..].to_vec()) >> 2); - let mut s3 = 2097151 & (load4(s[7..].to_vec()) >> 7); - let mut s4 = 2097151 & (load4(s[10..].to_vec()) >> 4); - let mut s5 = 2097151 & (load3(s[13..].to_vec()) >> 1); - let mut s6 = 2097151 & (load4(s[15..].to_vec()) >> 6); - let mut s7 = 2097151 & (load3(s[18..].to_vec()) >> 3); - let mut s8 = 2097151 & load3(s[21..].to_vec()); - let mut s9 = 2097151 & (load4(s[23..].to_vec()) >> 5); - let mut s10 = 2097151 & (load3(s[26..].to_vec()) >> 2); - let mut s11 = 2097151 & (load4(s[28..].to_vec()) >> 7); - let mut s12 = 2097151 & (load4(s[31..].to_vec()) >> 4); - let mut s13 = 2097151 & (load3(s[34..].to_vec()) >> 1); - let mut s14 = 2097151 & (load4(s[36..].to_vec()) >> 6); - let mut s15 = 2097151 & (load3(s[39..].to_vec()) >> 3); - let mut s16 = 2097151 & load3(s[42..].to_vec()); - let mut s17 = 2097151 & (load4(s[44..].to_vec()) >> 5); - let s18 = 2097151 & (load3(s[47..].to_vec()) >> 2); - let s19 = 2097151 & (load4(s[49..].to_vec()) >> 7); - let s20 = 2097151 & (load4(s[52..].to_vec()) >> 4); - let s21 = 2097151 & (load3(s[55..].to_vec()) >> 1); - let s22 = 2097151 & (load4(s[57..].to_vec()) >> 6); - let s23 = load4(s[60..].to_vec()) >> 3; - - s11 += s23 * 666643; - s12 += s23 * 470296; - s13 += s23 * 654183; - s14 -= s23 * 997805; - s15 += s23 * 136657; - s16 -= s23 * 683901; - // s23 = 0; - - s10 += s22 * 666643; - s11 += s22 * 470296; - s12 += s22 * 654183; - s13 -= s22 * 997805; - s14 += s22 * 136657; - s15 -= s22 * 683901; - // s22 = 0; - - s9 += s21 * 666643; - s10 += s21 * 470296; - s11 += s21 * 654183; - s12 -= s21 * 997805; - s13 += s21 * 136657; - s14 -= s21 * 683901; - // s21 = 0; - - s8 += s20 * 666643; - s9 += s20 * 470296; - s10 += s20 * 654183; - s11 -= s20 * 997805; - s12 += s20 * 136657; - s13 -= s20 * 683901; - // s20 = 0; - - s7 += s19 * 666643; - s8 += s19 * 470296; - s9 += s19 * 654183; - s10 -= s19 * 997805; - s11 += s19 * 136657; - s12 -= s19 * 683901; - // s19 = 0; - - s6 += s18 * 666643; - s7 += s18 * 470296; - s8 += s18 * 654183; - s9 -= s18 * 997805; - s10 += s18 * 136657; - s11 -= s18 * 683901; - // s18 = 0; - - let mut carry = [0i64; 17]; - - carry[6] = (s6 + (1 << 20)) >> 21; - s7 += carry[6]; - s6 -= carry[6] << 21; - carry[8] = (s8 + (1 << 20)) >> 21; - s9 += carry[8]; - s8 -= carry[8] << 21; - carry[10] = (s10 + (1 << 20)) >> 21; - s11 += carry[10]; - s10 -= carry[10] << 21; - carry[12] = (s12 + (1 << 20)) >> 21; - s13 += carry[12]; - s12 -= carry[12] << 21; - carry[14] = (s14 + (1 << 20)) >> 21; - s15 += carry[14]; - s14 -= carry[14] << 21; - carry[16] = (s16 + (1 << 20)) >> 21; - s17 += carry[16]; - s16 -= carry[16] << 21; - - carry[7] = (s7 + (1 << 20)) >> 21; - s8 += carry[7]; - s7 -= carry[7] << 21; - carry[9] = (s9 + (1 << 20)) >> 21; - s10 += carry[9]; - s9 -= carry[9] << 21; - carry[11] = (s11 + (1 << 20)) >> 21; - s12 += carry[11]; - s11 -= carry[11] << 21; - carry[13] = (s13 + (1 << 20)) >> 21; - s14 += carry[13]; - s13 -= carry[13] << 21; - carry[15] = (s15 + (1 << 20)) >> 21; - s16 += carry[15]; - s15 -= carry[15] << 21; - - s5 += s17 * 666643; - s6 += s17 * 470296; - s7 += s17 * 654183; - s8 -= s17 * 997805; - s9 += s17 * 136657; - s10 -= s17 * 683901; - // s17 = 0; - - s4 += s16 * 666643; - s5 += s16 * 470296; - s6 += s16 * 654183; - s7 -= s16 * 997805; - s8 += s16 * 136657; - s9 -= s16 * 683901; - // s16 = 0; - - s3 += s15 * 666643; - s4 += s15 * 470296; - s5 += s15 * 654183; - s6 -= s15 * 997805; - s7 += s15 * 136657; - s8 -= s15 * 683901; - // s15 = 0; - - s2 += s14 * 666643; - s3 += s14 * 470296; - s4 += s14 * 654183; - s5 -= s14 * 997805; - s6 += s14 * 136657; - s7 -= s14 * 683901; - // s14 = 0; - - s1 += s13 * 666643; - s2 += s13 * 470296; - s3 += s13 * 654183; - s4 -= s13 * 997805; - s5 += s13 * 136657; - s6 -= s13 * 683901; - // s13 = 0; - - s0 += s12 * 666643; - s1 += s12 * 470296; - s2 += s12 * 654183; - s3 -= s12 * 997805; - s4 += s12 * 136657; - s5 -= s12 * 683901; - s12 = 0; - - carry[0] = (s0 + (1 << 20)) >> 21; - s1 += carry[0]; - s0 -= carry[0] << 21; - carry[2] = (s2 + (1 << 20)) >> 21; - s3 += carry[2]; - s2 -= carry[2] << 21; - carry[4] = (s4 + (1 << 20)) >> 21; - s5 += carry[4]; - s4 -= carry[4] << 21; - carry[6] = (s6 + (1 << 20)) >> 21; - s7 += carry[6]; - s6 -= carry[6] << 21; - carry[8] = (s8 + (1 << 20)) >> 21; - s9 += carry[8]; - s8 -= carry[8] << 21; - carry[10] = (s10 + (1 << 20)) >> 21; - s11 += carry[10]; - s10 -= carry[10] << 21; - - carry[1] = (s1 + (1 << 20)) >> 21; - s2 += carry[1]; - s1 -= carry[1] << 21; - carry[3] = (s3 + (1 << 20)) >> 21; - s4 += carry[3]; - s3 -= carry[3] << 21; - carry[5] = (s5 + (1 << 20)) >> 21; - s6 += carry[5]; - s5 -= carry[5] << 21; - carry[7] = (s7 + (1 << 20)) >> 21; - s8 += carry[7]; - s7 -= carry[7] << 21; - carry[9] = (s9 + (1 << 20)) >> 21; - s10 += carry[9]; - s9 -= carry[9] << 21; - carry[11] = (s11 + (1 << 20)) >> 21; - s12 += carry[11]; - s11 -= carry[11] << 21; - - s0 += s12 * 666643; - s1 += s12 * 470296; - s2 += s12 * 654183; - s3 -= s12 * 997805; - s4 += s12 * 136657; - s5 -= s12 * 683901; - s12 = 0; - - carry[0] = s0 >> 21; - s1 += carry[0]; - s0 -= carry[0] << 21; - carry[1] = s1 >> 21; - s2 += carry[1]; - s1 -= carry[1] << 21; - carry[2] = s2 >> 21; - s3 += carry[2]; - s2 -= carry[2] << 21; - carry[3] = s3 >> 21; - s4 += carry[3]; - s3 -= carry[3] << 21; - carry[4] = s4 >> 21; - s5 += carry[4]; - s4 -= carry[4] << 21; - carry[5] = s5 >> 21; - s6 += carry[5]; - s5 -= carry[5] << 21; - carry[6] = s6 >> 21; - s7 += carry[6]; - s6 -= carry[6] << 21; - carry[7] = s7 >> 21; - s8 += carry[7]; - s7 -= carry[7] << 21; - carry[8] = s8 >> 21; - s9 += carry[8]; - s8 -= carry[8] << 21; - carry[9] = s9 >> 21; - s10 += carry[9]; - s9 -= carry[9] << 21; - carry[10] = s10 >> 21; - s11 += carry[10]; - s10 -= carry[10] << 21; - carry[11] = s11 >> 21; - s12 += carry[11]; - s11 -= carry[11] << 21; - - s0 += s12 * 666643; - s1 += s12 * 470296; - s2 += s12 * 654183; - s3 -= s12 * 997805; - s4 += s12 * 136657; - s5 -= s12 * 683901; - // s12 = 0; - - carry[0] = s0 >> 21; - s1 += carry[0]; - s0 -= carry[0] << 21; - carry[1] = s1 >> 21; - s2 += carry[1]; - s1 -= carry[1] << 21; - carry[2] = s2 >> 21; - s3 += carry[2]; - s2 -= carry[2] << 21; - carry[3] = s3 >> 21; - s4 += carry[3]; - s3 -= carry[3] << 21; - carry[4] = s4 >> 21; - s5 += carry[4]; - s4 -= carry[4] << 21; - carry[5] = s5 >> 21; - s6 += carry[5]; - s5 -= carry[5] << 21; - carry[6] = s6 >> 21; - s7 += carry[6]; - s6 -= carry[6] << 21; - carry[7] = s7 >> 21; - s8 += carry[7]; - s7 -= carry[7] << 21; - carry[8] = s8 >> 21; - s9 += carry[8]; - s8 -= carry[8] << 21; - carry[9] = s9 >> 21; - s10 += carry[9]; - s9 -= carry[9] << 21; - carry[10] = s10 >> 21; - s11 += carry[10]; - s10 -= carry[10] << 21; - - [ - (s0 >> 0) as u8, - (s0 >> 8) as u8, - ((s0 >> 16) | (s1 << 5)) as u8, - (s1 >> 3) as u8, - (s1 >> 11) as u8, - ((s1 >> 19) | (s2 << 2)) as u8, - (s2 >> 6) as u8, - ((s2 >> 14) | (s3 << 7)) as u8, - (s3 >> 1) as u8, - (s3 >> 9) as u8, - ((s3 >> 17) | (s4 << 4)) as u8, - (s4 >> 4) as u8, - (s4 >> 12) as u8, - ((s4 >> 20) | (s5 << 1)) as u8, - (s5 >> 7) as u8, - ((s5 >> 15) | (s6 << 6)) as u8, - (s6 >> 2) as u8, - (s6 >> 10) as u8, - ((s6 >> 18) | (s7 << 3)) as u8, - (s7 >> 5) as u8, - (s7 >> 13) as u8, - (s8 >> 0) as u8, - (s8 >> 8) as u8, - ((s8 >> 16) | (s9 << 5)) as u8, - (s9 >> 3) as u8, - (s9 >> 11) as u8, - ((s9 >> 19) | (s10 << 2)) as u8, - (s10 >> 6) as u8, - ((s10 >> 14) | (s11 << 7)) as u8, - (s11 >> 1) as u8, - (s11 >> 9) as u8, - (s11 >> 17) as u8, - ] -} diff --git a/sdk/core/src/crypto/edwards25519/completed_group_element.rs b/sdk/core/src/crypto/edwards25519/completed_group_element.rs deleted file mode 100644 index 4341850b98..0000000000 --- a/sdk/core/src/crypto/edwards25519/completed_group_element.rs +++ /dev/null @@ -1,42 +0,0 @@ -use super::{ - extended_group_element::ExtendedGroupElement, field_element::FieldElement, - pre_computed_group_element::PreComputedGroupElement, - projective_group_element::ProjectiveGroupElement, -}; - -#[derive(Default)] -pub struct CompletedGroupElement { - pub x: FieldElement, - pub y: FieldElement, - pub z: FieldElement, - pub t: FieldElement, -} - -impl CompletedGroupElement { - pub fn ge_mixed_add(&mut self, p: &ExtendedGroupElement, q: &PreComputedGroupElement) { - let mut t0 = FieldElement::default(); - self.x.fe_add(&p.y, &p.x); - self.y.fe_sub(&p.y, &p.x); - self.z.fe_mul(&self.x, &q.y_plus_x); - self.y.fe_mul(&self.y.clone(), &q.y_minus_x); - self.t.fe_mul(&q.xy2d, &p.t); - t0.fe_add(&p.z, &p.z); - self.x.fe_sub(&self.z, &self.y); - self.y.fe_add(&self.z, &self.y.clone()); - self.z.fe_add(&t0, &self.t); - self.t.fe_sub(&t0, &self.t.clone()); - } - - pub fn to_extended(&self, r: &mut ExtendedGroupElement) { - r.x.fe_mul(&self.x, &self.t); - r.y.fe_mul(&self.y, &self.z); - r.z.fe_mul(&self.z, &self.t); - r.t.fe_mul(&self.x, &self.y); - } - - pub fn to_projective(&self, r: &mut ProjectiveGroupElement) { - r.x.fe_mul(&self.x, &self.t); - r.y.fe_mul(&self.y, &self.z); - r.z.fe_mul(&self.z, &self.t); - } -} diff --git a/sdk/core/src/crypto/edwards25519/constant.rs b/sdk/core/src/crypto/edwards25519/constant.rs deleted file mode 100644 index cb8d9e36b7..0000000000 --- a/sdk/core/src/crypto/edwards25519/constant.rs +++ /dev/null @@ -1,3654 +0,0 @@ -use super::{field_element::FieldElement, pre_computed_group_element::PreComputedGroupElement}; - -// base contains precomputed multiples of the base-point. See the Ed25519 paper -// for a discussion about how these values are used. -pub static BASE: [[PreComputedGroupElement; 8]; 32] = [ - [ - PreComputedGroupElement { - y_plus_x: FieldElement([ - 25967493, -14356035, 29566456, 3660896, -12694345, 4014787, 27544626, -11754271, - -6079156, 2047605, - ]), - y_minus_x: FieldElement([ - -12545711, 934262, -2722910, 3049990, -727428, 9406986, 12720692, 5043384, - 19500929, -15469378, - ]), - xy2d: FieldElement([ - -8738181, 4489570, 9688441, -14785194, 10184609, -12363380, 29287919, 11864899, - -24514362, -4438546, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -12815894, -12976347, -21581243, 11784320, -25355658, -2750717, -11717903, - -3814571, -358445, -10211303, - ]), - y_minus_x: FieldElement([ - -21703237, 6903825, 27185491, 6451973, -29577724, -9554005, -15616551, 11189268, - -26829678, -5319081, - ]), - xy2d: FieldElement([ - 26966642, 11152617, 32442495, 15396054, 14353839, -12752335, -3128826, -9541118, - -15472047, -4166697, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 15636291, -9688557, 24204773, -7912398, 616977, -16685262, 27787600, -14772189, - 28944400, -1550024, - ]), - y_minus_x: FieldElement([ - 16568933, 4717097, -11556148, -1102322, 15682896, -11807043, 16354577, -11775962, - 7689662, 11199574, - ]), - xy2d: FieldElement([ - 30464156, -5976125, -11779434, -15670865, 23220365, 15915852, 7512774, 10017326, - -17749093, -9920357, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -17036878, 13921892, 10945806, -6033431, 27105052, -16084379, -28926210, 15006023, - 3284568, -6276540, - ]), - y_minus_x: FieldElement([ - 23599295, -8306047, -11193664, -7687416, 13236774, 10506355, 7464579, 9656445, - 13059162, 10374397, - ]), - xy2d: FieldElement([ - 7798556, 16710257, 3033922, 2874086, 28997861, 2835604, 32406664, -3839045, - -641708, -101325, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 10861363, 11473154, 27284546, 1981175, -30064349, 12577861, 32867885, 14515107, - -15438304, 10819380, - ]), - y_minus_x: FieldElement([ - 4708026, 6336745, 20377586, 9066809, -11272109, 6594696, -25653668, 12483688, - -12668491, 5581306, - ]), - xy2d: FieldElement([ - 19563160, 16186464, -29386857, 4097519, 10237984, -4348115, 28542350, 13850243, - -23678021, -15815942, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -15371964, -12862754, 32573250, 4720197, -26436522, 5875511, -19188627, -15224819, - -9818940, -12085777, - ]), - y_minus_x: FieldElement([ - -8549212, 109983, 15149363, 2178705, 22900618, 4543417, 3044240, -15689887, - 1762328, 14866737, - ]), - xy2d: FieldElement([ - -18199695, -15951423, -10473290, 1707278, -17185920, 3916101, -28236412, 3959421, - 27914454, 4383652, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 5153746, 9909285, 1723747, -2777874, 30523605, 5516873, 19480852, 5230134, - -23952439, -15175766, - ]), - y_minus_x: FieldElement([ - -30269007, -3463509, 7665486, 10083793, 28475525, 1649722, 20654025, 16520125, - 30598449, 7715701, - ]), - xy2d: FieldElement([ - 28881845, 14381568, 9657904, 3680757, -20181635, 7843316, -31400660, 1370708, - 29794553, -1409300, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 14499471, -2729599, -33191113, -4254652, 28494862, 14271267, 30290735, 10876454, - -33154098, 2381726, - ]), - y_minus_x: FieldElement([ - -7195431, -2655363, -14730155, 462251, -27724326, 3941372, -6236617, 3696005, - -32300832, 15351955, - ]), - xy2d: FieldElement([ - 27431194, 8222322, 16448760, -3907995, -18707002, 11938355, -32961401, -2970515, - 29551813, 10109425, - ]), - }, - ], - [ - PreComputedGroupElement { - y_plus_x: FieldElement([ - -13657040, -13155431, -31283750, 11777098, 21447386, 6519384, -2378284, -1627556, - 10092783, -4764171, - ]), - y_minus_x: FieldElement([ - 27939166, 14210322, 4677035, 16277044, -22964462, -12398139, -32508754, 12005538, - -17810127, 12803510, - ]), - xy2d: FieldElement([ - 17228999, -15661624, -1233527, 300140, -1224870, -11714777, 30364213, -9038194, - 18016357, 4397660, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -10958843, -7690207, 4776341, -14954238, 27850028, -15602212, -26619106, 14544525, - -17477504, 982639, - ]), - y_minus_x: FieldElement([ - 29253598, 15796703, -2863982, -9908884, 10057023, 3163536, 7332899, -4120128, - -21047696, 9934963, - ]), - xy2d: FieldElement([ - 5793303, 16271923, -24131614, -10116404, 29188560, 1206517, -14747930, 4559895, - -30123922, -10897950, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -27643952, -11493006, 16282657, -11036493, 28414021, -15012264, 24191034, 4541697, - -13338309, 5500568, - ]), - y_minus_x: FieldElement([ - 12650548, -1497113, 9052871, 11355358, -17680037, -8400164, -17430592, 12264343, - 10874051, 13524335, - ]), - xy2d: FieldElement([ - 25556948, -3045990, 714651, 2510400, 23394682, -10415330, 33119038, 5080568, - -22528059, 5376628, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -26088264, -4011052, -17013699, -3537628, -6726793, 1920897, -22321305, -9447443, - 4535768, 1569007, - ]), - y_minus_x: FieldElement([ - -2255422, 14606630, -21692440, -8039818, 28430649, 8775819, -30494562, 3044290, - 31848280, 12543772, - ]), - xy2d: FieldElement([ - -22028579, 2943893, -31857513, 6777306, 13784462, -4292203, -27377195, -2062731, - 7718482, 14474653, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 2385315, 2454213, -22631320, 46603, -4437935, -15680415, 656965, -7236665, - 24316168, -5253567, - ]), - y_minus_x: FieldElement([ - 13741529, 10911568, -33233417, -8603737, -20177830, -1033297, 33040651, -13424532, - -20729456, 8321686, - ]), - xy2d: FieldElement([ - 21060490, -2212744, 15712757, -4336099, 1639040, 10656336, 23845965, -11874838, - -9984458, 608372, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -13672732, -15087586, -10889693, -7557059, -6036909, 11305547, 1123968, -6780577, - 27229399, 23887, - ]), - y_minus_x: FieldElement([ - -23244140, -294205, -11744728, 14712571, -29465699, -2029617, 12797024, -6440308, - -1633405, 16678954, - ]), - xy2d: FieldElement([ - -29500620, 4770662, -16054387, 14001338, 7830047, 9564805, -1508144, -4795045, - -17169265, 4904953, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 24059557, 14617003, 19037157, -15039908, 19766093, -14906429, 5169211, 16191880, - 2128236, -4326833, - ]), - y_minus_x: FieldElement([ - -16981152, 4124966, -8540610, -10653797, 30336522, -14105247, -29806336, 916033, - -6882542, -2986532, - ]), - xy2d: FieldElement([ - -22630907, 12419372, -7134229, -7473371, -16478904, 16739175, 285431, 2763829, - 15736322, 4143876, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 2379352, 11839345, -4110402, -5988665, 11274298, 794957, 212801, -14594663, - 23527084, -16458268, - ]), - y_minus_x: FieldElement([ - 33431127, -11130478, -17838966, -15626900, 8909499, 8376530, -32625340, 4087881, - -15188911, -14416214, - ]), - xy2d: FieldElement([ - 1767683, 7197987, -13205226, -2022635, -13091350, 448826, 5799055, 4357868, - -4774191, -16323038, - ]), - }, - ], - [ - PreComputedGroupElement { - y_plus_x: FieldElement([ - 6721966, 13833823, -23523388, -1551314, 26354293, -11863321, 23365147, -3949732, - 7390890, 2759800, - ]), - y_minus_x: FieldElement([ - 4409041, 2052381, 23373853, 10530217, 7676779, -12885954, 21302353, -4264057, - 1244380, -12919645, - ]), - xy2d: FieldElement([ - -4421239, 7169619, 4982368, -2957590, 30256825, -2777540, 14086413, 9208236, - 15886429, 16489664, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 1996075, 10375649, 14346367, 13311202, -6874135, -16438411, -13693198, 398369, - -30606455, -712933, - ]), - y_minus_x: FieldElement([ - -25307465, 9795880, -2777414, 14878809, -33531835, 14780363, 13348553, 12076947, - -30836462, 5113182, - ]), - xy2d: FieldElement([ - -17770784, 11797796, 31950843, 13929123, -25888302, 12288344, -30341101, -7336386, - 13847711, 5387222, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -18582163, -3416217, 17824843, -2340966, 22744343, -10442611, 8763061, 3617786, - -19600662, 10370991, - ]), - y_minus_x: FieldElement([ - 20246567, -14369378, 22358229, -543712, 18507283, -10413996, 14554437, -8746092, - 32232924, 16763880, - ]), - xy2d: FieldElement([ - 9648505, 10094563, 26416693, 14745928, -30374318, -6472621, 11094161, 15689506, - 3140038, -16510092, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -16160072, 5472695, 31895588, 4744994, 8823515, 10365685, -27224800, 9448613, - -28774454, 366295, - ]), - y_minus_x: FieldElement([ - 19153450, 11523972, -11096490, -6503142, -24647631, 5420647, 28344573, 8041113, - 719605, 11671788, - ]), - xy2d: FieldElement([ - 8678025, 2694440, -6808014, 2517372, 4964326, 11152271, -15432916, -15266516, - 27000813, -10195553, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -15157904, 7134312, 8639287, -2814877, -7235688, 10421742, 564065, 5336097, - 6750977, -14521026, - ]), - y_minus_x: FieldElement([ - 11836410, -3979488, 26297894, 16080799, 23455045, 15735944, 1695823, -8819122, - 8169720, 16220347, - ]), - xy2d: FieldElement([ - -18115838, 8653647, 17578566, -6092619, -8025777, -16012763, -11144307, -2627664, - -5990708, -14166033, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -23308498, -10968312, 15213228, -10081214, -30853605, -11050004, 27884329, 2847284, - 2655861, 1738395, - ]), - y_minus_x: FieldElement([ - -27537433, -14253021, -25336301, -8002780, -9370762, 8129821, 21651608, -3239336, - -19087449, -11005278, - ]), - xy2d: FieldElement([ - 1533110, 3437855, 23735889, 459276, 29970501, 11335377, 26030092, 5821408, - 10478196, 8544890, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 32173121, -16129311, 24896207, 3921497, 22579056, -3410854, 19270449, 12217473, - 17789017, -3395995, - ]), - y_minus_x: FieldElement([ - -30552961, -2228401, -15578829, -10147201, 13243889, 517024, 15479401, -3853233, - 30460520, 1052596, - ]), - xy2d: FieldElement([ - -11614875, 13323618, 32618793, 8175907, -15230173, 12596687, 27491595, -4612359, - 3179268, -9478891, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 31947069, -14366651, -4640583, -15339921, -15125977, -6039709, -14756777, - -16411740, 19072640, -9511060, - ]), - y_minus_x: FieldElement([ - 11685058, 11822410, 3158003, -13952594, 33402194, -4165066, 5977896, -5215017, - 473099, 5040608, - ]), - xy2d: FieldElement([ - -20290863, 8198642, -27410132, 11602123, 1290375, -2799760, 28326862, 1721092, - -19558642, -3131606, - ]), - }, - ], - [ - PreComputedGroupElement { - y_plus_x: FieldElement([ - 7881532, 10687937, 7578723, 7738378, -18951012, -2553952, 21820786, 8076149, - -27868496, 11538389, - ]), - y_minus_x: FieldElement([ - -19935666, 3899861, 18283497, -6801568, -15728660, -11249211, 8754525, 7446702, - -5676054, 5797016, - ]), - xy2d: FieldElement([ - -11295600, -3793569, -15782110, -7964573, 12708869, -8456199, 2014099, -9050574, - -2369172, -5877341, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -22472376, -11568741, -27682020, 1146375, 18956691, 16640559, 1192730, -3714199, - 15123619, 10811505, - ]), - y_minus_x: FieldElement([ - 14352098, -3419715, -18942044, 10822655, 32750596, 4699007, -70363, 15776356, - -28886779, -11974553, - ]), - xy2d: FieldElement([ - -28241164, -8072475, -4978962, -5315317, 29416931, 1847569, -20654173, -16484855, - 4714547, -9600655, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 15200332, 8368572, 19679101, 15970074, -31872674, 1959451, 24611599, -4543832, - -11745876, 12340220, - ]), - y_minus_x: FieldElement([ - 12876937, -10480056, 33134381, 6590940, -6307776, 14872440, 9613953, 8241152, - 15370987, 9608631, - ]), - xy2d: FieldElement([ - -4143277, -12014408, 8446281, -391603, 4407738, 13629032, -7724868, 15866074, - -28210621, -8814099, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 26660628, -15677655, 8393734, 358047, -7401291, 992988, -23904233, 858697, - 20571223, 8420556, - ]), - y_minus_x: FieldElement([ - 14620715, 13067227, -15447274, 8264467, 14106269, 15080814, 33531827, 12516406, - -21574435, -12476749, - ]), - xy2d: FieldElement([ - 236881, 10476226, 57258, -14677024, 6472998, 2466984, 17258519, 7256740, 8791136, - 15069930, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 1276410, -9371918, 22949635, -16322807, -23493039, -5702186, 14711875, 4874229, - -30663140, -2331391, - ]), - y_minus_x: FieldElement([ - 5855666, 4990204, -13711848, 7294284, -7804282, 1924647, -1423175, -7912378, - -33069337, 9234253, - ]), - xy2d: FieldElement([ - 20590503, -9018988, 31529744, -7352666, -2706834, 10650548, 31559055, -11609587, - 18979186, 13396066, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 24474287, 4968103, 22267082, 4407354, 24063882, -8325180, -18816887, 13594782, - 33514650, 7021958, - ]), - y_minus_x: FieldElement([ - -11566906, -6565505, -21365085, 15928892, -26158305, 4315421, -25948728, -3916677, - -21480480, 12868082, - ]), - xy2d: FieldElement([ - -28635013, 13504661, 19988037, -2132761, 21078225, 6443208, -21446107, 2244500, - -12455797, -8089383, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -30595528, 13793479, -5852820, 319136, -25723172, -6263899, 33086546, 8957937, - -15233648, 5540521, - ]), - y_minus_x: FieldElement([ - -11630176, -11503902, -8119500, -7643073, 2620056, 1022908, -23710744, -1568984, - -16128528, -14962807, - ]), - xy2d: FieldElement([ - 23152971, 775386, 27395463, 14006635, -9701118, 4649512, 1689819, 892185, - -11513277, -15205948, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 9770129, 9586738, 26496094, 4324120, 1556511, -3550024, 27453819, 4763127, - -19179614, 5867134, - ]), - y_minus_x: FieldElement([ - -32765025, 1927590, 31726409, -4753295, 23962434, -16019500, 27846559, 5931263, - -29749703, -16108455, - ]), - xy2d: FieldElement([ - 27461885, -2977536, 22380810, 1815854, -23033753, -3031938, 7283490, -15148073, - -19526700, 7734629, - ]), - }, - ], - [ - PreComputedGroupElement { - y_plus_x: FieldElement([ - -8010264, -9590817, -11120403, 6196038, 29344158, -13430885, 7585295, -3176626, - 18549497, 15302069, - ]), - y_minus_x: FieldElement([ - -32658337, -6171222, -7672793, -11051681, 6258878, 13504381, 10458790, -6418461, - -8872242, 8424746, - ]), - xy2d: FieldElement([ - 24687205, 8613276, -30667046, -3233545, 1863892, -1830544, 19206234, 7134917, - -11284482, -828919, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 11334899, -9218022, 8025293, 12707519, 17523892, -10476071, 10243738, -14685461, - -5066034, 16498837, - ]), - y_minus_x: FieldElement([ - 8911542, 6887158, -9584260, -6958590, 11145641, -9543680, 17303925, -14124238, - 6536641, 10543906, - ]), - xy2d: FieldElement([ - -28946384, 15479763, -17466835, 568876, -1497683, 11223454, -2669190, -16625574, - -27235709, 8876771, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -25742899, -12566864, -15649966, -846607, -33026686, -796288, -33481822, 15824474, - -604426, -9039817, - ]), - y_minus_x: FieldElement([ - 10330056, 70051, 7957388, -9002667, 9764902, 15609756, 27698697, -4890037, 1657394, - 3084098, - ]), - xy2d: FieldElement([ - 10477963, -7470260, 12119566, -13250805, 29016247, -5365589, 31280319, 14396151, - -30233575, 15272409, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -12288309, 3169463, 28813183, 16658753, 25116432, -5630466, -25173957, -12636138, - -25014757, 1950504, - ]), - y_minus_x: FieldElement([ - -26180358, 9489187, 11053416, -14746161, -31053720, 5825630, -8384306, -8767532, - 15341279, 8373727, - ]), - xy2d: FieldElement([ - 28685821, 7759505, -14378516, -12002860, -31971820, 4079242, 298136, -10232602, - -2878207, 15190420, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -32932876, 13806336, -14337485, -15794431, -24004620, 10940928, 8669718, 2742393, - -26033313, -6875003, - ]), - y_minus_x: FieldElement([ - -1580388, -11729417, -25979658, -11445023, -17411874, -10912854, 9291594, - -16247779, -12154742, 6048605, - ]), - xy2d: FieldElement([ - -30305315, 14843444, 1539301, 11864366, 20201677, 1900163, 13934231, 5128323, - 11213262, 9168384, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -26280513, 11007847, 19408960, -940758, -18592965, -4328580, -5088060, -11105150, - 20470157, -16398701, - ]), - y_minus_x: FieldElement([ - -23136053, 9282192, 14855179, -15390078, -7362815, -14408560, -22783952, 14461608, - 14042978, 5230683, - ]), - xy2d: FieldElement([ - 29969567, -2741594, -16711867, -8552442, 9175486, -2468974, 21556951, 3506042, - -5933891, -12449708, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -3144746, 8744661, 19704003, 4581278, -20430686, 6830683, -21284170, 8971513, - -28539189, 15326563, - ]), - y_minus_x: FieldElement([ - -19464629, 10110288, -17262528, -3503892, -23500387, 1355669, -15523050, 15300988, - -20514118, 9168260, - ]), - xy2d: FieldElement([ - -5353335, 4488613, -23803248, 16314347, 7780487, -15638939, -28948358, 9601605, - 33087103, -9011387, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -19443170, -15512900, -20797467, -12445323, -29824447, 10229461, -27444329, - -15000531, -5996870, 15664672, - ]), - y_minus_x: FieldElement([ - 23294591, -16632613, -22650781, -8470978, 27844204, 11461195, 13099750, -2460356, - 18151676, 13417686, - ]), - xy2d: FieldElement([ - -24722913, -4176517, -31150679, 5988919, -26858785, 6685065, 1661597, -12551441, - 15271676, -15452665, - ]), - }, - ], - [ - PreComputedGroupElement { - y_plus_x: FieldElement([ - 11433042, -13228665, 8239631, -5279517, -1985436, -725718, -18698764, 2167544, - -6921301, -13440182, - ]), - y_minus_x: FieldElement([ - -31436171, 15575146, 30436815, 12192228, -22463353, 9395379, -9917708, -8638997, - 12215110, 12028277, - ]), - xy2d: FieldElement([ - 14098400, 6555944, 23007258, 5757252, -15427832, -12950502, 30123440, 4617780, - -16900089, -655628, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -4026201, -15240835, 11893168, 13718664, -14809462, 1847385, -15819999, 10154009, - 23973261, -12684474, - ]), - y_minus_x: FieldElement([ - -26531820, -3695990, -1908898, 2534301, -31870557, -16550355, 18341390, -11419951, - 32013174, -10103539, - ]), - xy2d: FieldElement([ - -25479301, 10876443, -11771086, -14625140, -12369567, 1838104, 21911214, 6354752, - 4425632, -837822, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -10433389, -14612966, 22229858, -3091047, -13191166, 776729, -17415375, -12020462, - 4725005, 14044970, - ]), - y_minus_x: FieldElement([ - 19268650, -7304421, 1555349, 8692754, -21474059, -9910664, 6347390, -1411784, - -19522291, -16109756, - ]), - xy2d: FieldElement([ - -24864089, 12986008, -10898878, -5558584, -11312371, -148526, 19541418, 8180106, - 9282262, 10282508, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -26205082, 4428547, -8661196, -13194263, 4098402, -14165257, 15522535, 8372215, - 5542595, -10702683, - ]), - y_minus_x: FieldElement([ - -10562541, 14895633, 26814552, -16673850, -17480754, -2489360, -2781891, 6993761, - -18093885, 10114655, - ]), - xy2d: FieldElement([ - -20107055, -929418, 31422704, 10427861, -7110749, 6150669, -29091755, -11529146, - 25953725, -106158, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -4234397, -8039292, -9119125, 3046000, 2101609, -12607294, 19390020, 6094296, - -3315279, 12831125, - ]), - y_minus_x: FieldElement([ - -15998678, 7578152, 5310217, 14408357, -33548620, -224739, 31575954, 6326196, - 7381791, -2421839, - ]), - xy2d: FieldElement([ - -20902779, 3296811, 24736065, -16328389, 18374254, 7318640, 6295303, 8082724, - -15362489, 12339664, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 27724736, 2291157, 6088201, -14184798, 1792727, 5857634, 13848414, 15768922, - 25091167, 14856294, - ]), - y_minus_x: FieldElement([ - -18866652, 8331043, 24373479, 8541013, -701998, -9269457, 12927300, -12695493, - -22182473, -9012899, - ]), - xy2d: FieldElement([ - -11423429, -5421590, 11632845, 3405020, 30536730, -11674039, -27260765, 13866390, - 30146206, 9142070, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 3924129, -15307516, -13817122, -10054960, 12291820, -668366, -27702774, 9326384, - -8237858, 4171294, - ]), - y_minus_x: FieldElement([ - -15921940, 16037937, 6713787, 16606682, -21612135, 2790944, 26396185, 3731949, - 345228, -5462949, - ]), - xy2d: FieldElement([ - -21327538, 13448259, 25284571, 1143661, 20614966, -8849387, 2031539, -12391231, - -16253183, -13582083, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 31016211, -16722429, 26371392, -14451233, -5027349, 14854137, 17477601, 3842657, - 28012650, -16405420, - ]), - y_minus_x: FieldElement([ - -5075835, 9368966, -8562079, -4600902, -15249953, 6970560, -9189873, 16292057, - -8867157, 3507940, - ]), - xy2d: FieldElement([ - 29439664, 3537914, 23333589, 6997794, -17555561, -11018068, -15209202, -15051267, - -9164929, 6580396, - ]), - }, - ], - [ - PreComputedGroupElement { - y_plus_x: FieldElement([ - -12185861, -7679788, 16438269, 10826160, -8696817, -6235611, 17860444, -9273846, - -2095802, 9304567, - ]), - y_minus_x: FieldElement([ - 20714564, -4336911, 29088195, 7406487, 11426967, -5095705, 14792667, -14608617, - 5289421, -477127, - ]), - xy2d: FieldElement([ - -16665533, -10650790, -6160345, -13305760, 9192020, -1802462, 17271490, 12349094, - 26939669, -3752294, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -12889898, 9373458, 31595848, 16374215, 21471720, 13221525, -27283495, -12348559, - -3698806, 117887, - ]), - y_minus_x: FieldElement([ - 22263325, -6560050, 3984570, -11174646, -15114008, -566785, 28311253, 5358056, - -23319780, 541964, - ]), - xy2d: FieldElement([ - 16259219, 3261970, 2309254, -15534474, -16885711, -4581916, 24134070, -16705829, - -13337066, -13552195, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 9378160, -13140186, -22845982, -12745264, 28198281, -7244098, -2399684, -717351, - 690426, 14876244, - ]), - y_minus_x: FieldElement([ - 24977353, -314384, -8223969, -13465086, 28432343, -1176353, -13068804, -12297348, - -22380984, 6618999, - ]), - xy2d: FieldElement([ - -1538174, 11685646, 12944378, 13682314, -24389511, -14413193, 8044829, -13817328, - 32239829, -5652762, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -18603066, 4762990, -926250, 8885304, -28412480, -3187315, 9781647, -10350059, - 32779359, 5095274, - ]), - y_minus_x: FieldElement([ - -33008130, -5214506, -32264887, -3685216, 9460461, -9327423, -24601656, 14506724, - 21639561, -2630236, - ]), - xy2d: FieldElement([ - -16400943, -13112215, 25239338, 15531969, 3987758, -4499318, -1289502, -6863535, - 17874574, 558605, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -13600129, 10240081, 9171883, 16131053, -20869254, 9599700, 33499487, 5080151, - 2085892, 5119761, - ]), - y_minus_x: FieldElement([ - -22205145, -2519528, -16381601, 414691, -25019550, 2170430, 30634760, -8363614, - -31999993, -5759884, - ]), - xy2d: FieldElement([ - -6845704, 15791202, 8550074, -1312654, 29928809, -12092256, 27534430, -7192145, - -22351378, 12961482, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -24492060, -9570771, 10368194, 11582341, -23397293, -2245287, 16533930, 8206996, - -30194652, -5159638, - ]), - y_minus_x: FieldElement([ - -11121496, -3382234, 2307366, 6362031, -135455, 8868177, -16835630, 7031275, - 7589640, 8945490, - ]), - xy2d: FieldElement([ - -32152748, 8917967, 6661220, -11677616, -1192060, -15793393, 7251489, -11182180, - 24099109, -14456170, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 5019558, -7907470, 4244127, -14714356, -26933272, 6453165, -19118182, -13289025, - -6231896, -10280736, - ]), - y_minus_x: FieldElement([ - 10853594, 10721687, 26480089, 5861829, -22995819, 1972175, -1866647, -10557898, - -3363451, -6441124, - ]), - xy2d: FieldElement([ - -17002408, 5906790, 221599, -6563147, 7828208, -13248918, 24362661, -2008168, - -13866408, 7421392, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 8139927, -6546497, 32257646, -5890546, 30375719, 1886181, -21175108, 15441252, - 28826358, -4123029, - ]), - y_minus_x: FieldElement([ - 6267086, 9695052, 7709135, -16603597, -32869068, -1886135, 14795160, -7840124, - 13746021, -1742048, - ]), - xy2d: FieldElement([ - 28584902, 7787108, -6732942, -15050729, 22846041, -7571236, -3181936, -363524, - 4771362, -8419958, - ]), - }, - ], - [ - PreComputedGroupElement { - y_plus_x: FieldElement([ - 24949256, 6376279, -27466481, -8174608, -18646154, -9930606, 33543569, -12141695, - 3569627, 11342593, - ]), - y_minus_x: FieldElement([ - 26514989, 4740088, 27912651, 3697550, 19331575, -11472339, 6809886, 4608608, - 7325975, -14801071, - ]), - xy2d: FieldElement([ - -11618399, -14554430, -24321212, 7655128, -1369274, 5214312, -27400540, 10258390, - -17646694, -8186692, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 11431204, 15823007, 26570245, 14329124, 18029990, 4796082, -31446179, 15580664, - 9280358, -3973687, - ]), - y_minus_x: FieldElement([ - -160783, -10326257, -22855316, -4304997, -20861367, -13621002, -32810901, - -11181622, -15545091, 4387441, - ]), - xy2d: FieldElement([ - -20799378, 12194512, 3937617, -5805892, -27154820, 9340370, -24513992, 8548137, - 20617071, -7482001, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -938825, -3930586, -8714311, 16124718, 24603125, -6225393, -13775352, -11875822, - 24345683, 10325460, - ]), - y_minus_x: FieldElement([ - -19855277, -1568885, -22202708, 8714034, 14007766, 6928528, 16318175, -1010689, - 4766743, 3552007, - ]), - xy2d: FieldElement([ - -21751364, -16730916, 1351763, -803421, -4009670, 3950935, 3217514, 14481909, - 10988822, -3994762, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 15564307, -14311570, 3101243, 5684148, 30446780, -8051356, 12677127, -6505343, - -8295852, 13296005, - ]), - y_minus_x: FieldElement([ - -9442290, 6624296, -30298964, -11913677, -4670981, -2057379, 31521204, 9614054, - -30000824, 12074674, - ]), - xy2d: FieldElement([ - 4771191, -135239, 14290749, -13089852, 27992298, 14998318, -1413936, -1556716, - 29832613, -16391035, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 7064884, -7541174, -19161962, -5067537, -18891269, -2912736, 25825242, 5293297, - -27122660, 13101590, - ]), - y_minus_x: FieldElement([ - -2298563, 2439670, -7466610, 1719965, -27267541, -16328445, 32512469, -5317593, - -30356070, -4190957, - ]), - xy2d: FieldElement([ - -30006540, 10162316, -33180176, 3981723, -16482138, -13070044, 14413974, 9515896, - 19568978, 9628812, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 33053803, 199357, 15894591, 1583059, 27380243, -4580435, -17838894, -6106839, - -6291786, 3437740, - ]), - y_minus_x: FieldElement([ - -18978877, 3884493, 19469877, 12726490, 15913552, 13614290, -22961733, 70104, - 7463304, 4176122, - ]), - xy2d: FieldElement([ - -27124001, 10659917, 11482427, -16070381, 12771467, -6635117, -32719404, -5322751, - 24216882, 5944158, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 8894125, 7450974, -2664149, -9765752, -28080517, -12389115, 19345746, 14680796, - 11632993, 5847885, - ]), - y_minus_x: FieldElement([ - 26942781, -2315317, 9129564, -4906607, 26024105, 11769399, -11518837, 6367194, - -9727230, 4782140, - ]), - xy2d: FieldElement([ - 19916461, -4828410, -22910704, -11414391, 25606324, -5972441, 33253853, 8220911, - 6358847, -1873857, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 801428, -2081702, 16569428, 11065167, 29875704, 96627, 7908388, -4480480, - -13538503, 1387155, - ]), - y_minus_x: FieldElement([ - 19646058, 5720633, -11416706, 12814209, 11607948, 12749789, 14147075, 15156355, - -21866831, 11835260, - ]), - xy2d: FieldElement([ - 19299512, 1155910, 28703737, 14890794, 2925026, 7269399, 26121523, 15467869, - -26560550, 5052483, - ]), - }, - ], - [ - PreComputedGroupElement { - y_plus_x: FieldElement([ - -3017432, 10058206, 1980837, 3964243, 22160966, 12322533, -6431123, -12618185, - 12228557, -7003677, - ]), - y_minus_x: FieldElement([ - 32944382, 14922211, -22844894, 5188528, 21913450, -8719943, 4001465, 13238564, - -6114803, 8653815, - ]), - xy2d: FieldElement([ - 22865569, -4652735, 27603668, -12545395, 14348958, 8234005, 24808405, 5719875, - 28483275, 2841751, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -16420968, -1113305, -327719, -12107856, 21886282, -15552774, -1887966, -315658, - 19932058, -12739203, - ]), - y_minus_x: FieldElement([ - -11656086, 10087521, -8864888, -5536143, -19278573, -3055912, 3999228, 13239134, - -4777469, -13910208, - ]), - xy2d: FieldElement([ - 1382174, -11694719, 17266790, 9194690, -13324356, 9720081, 20403944, 11284705, - -14013818, 3093230, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 16650921, -11037932, -1064178, 1570629, -8329746, 7352753, -302424, 16271225, - -24049421, -6691850, - ]), - y_minus_x: FieldElement([ - -21911077, -5927941, -4611316, -5560156, -31744103, -10785293, 24123614, 15193618, - -21652117, -16739389, - ]), - xy2d: FieldElement([ - -9935934, -4289447, -25279823, 4372842, 2087473, 10399484, 31870908, 14690798, - 17361620, 11864968, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -11307610, 6210372, 13206574, 5806320, -29017692, -13967200, -12331205, -7486601, - -25578460, -16240689, - ]), - y_minus_x: FieldElement([ - 14668462, -12270235, 26039039, 15305210, 25515617, 4542480, 10453892, 6577524, - 9145645, -6443880, - ]), - xy2d: FieldElement([ - 5974874, 3053895, -9433049, -10385191, -31865124, 3225009, -7972642, 3936128, - -5652273, -3050304, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 30625386, -4729400, -25555961, -12792866, -20484575, 7695099, 17097188, -16303496, - -27999779, 1803632, - ]), - y_minus_x: FieldElement([ - -3553091, 9865099, -5228566, 4272701, -5673832, -16689700, 14911344, 12196514, - -21405489, 7047412, - ]), - xy2d: FieldElement([ - 20093277, 9920966, -11138194, -5343857, 13161587, 12044805, -32856851, 4124601, - -32343828, -10257566, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -20788824, 14084654, -13531713, 7842147, 19119038, -13822605, 4752377, -8714640, - -21679658, 2288038, - ]), - y_minus_x: FieldElement([ - -26819236, -3283715, 29965059, 3039786, -14473765, 2540457, 29457502, 14625692, - -24819617, 12570232, - ]), - xy2d: FieldElement([ - -1063558, -11551823, 16920318, 12494842, 1278292, -5869109, -21159943, -3498680, - -11974704, 4724943, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 17960970, -11775534, -4140968, -9702530, -8876562, -1410617, -12907383, -8659932, - -29576300, 1903856, - ]), - y_minus_x: FieldElement([ - 23134274, -14279132, -10681997, -1611936, 20684485, 15770816, -12989750, 3190296, - 26955097, 14109738, - ]), - xy2d: FieldElement([ - 15308788, 5320727, -30113809, -14318877, 22902008, 7767164, 29425325, -11277562, - 31960942, 11934971, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -27395711, 8435796, 4109644, 12222639, -24627868, 14818669, 20638173, 4875028, - 10491392, 1379718, - ]), - y_minus_x: FieldElement([ - -13159415, 9197841, 3875503, -8936108, -1383712, -5879801, 33518459, 16176658, - 21432314, 12180697, - ]), - xy2d: FieldElement([ - -11787308, 11500838, 13787581, -13832590, -22430679, 10140205, 1465425, 12689540, - -10301319, -13872883, - ]), - }, - ], - [ - PreComputedGroupElement { - y_plus_x: FieldElement([ - 5414091, -15386041, -21007664, 9643570, 12834970, 1186149, -2622916, -1342231, - 26128231, 6032912, - ]), - y_minus_x: FieldElement([ - -26337395, -13766162, 32496025, -13653919, 17847801, -12669156, 3604025, 8316894, - -25875034, -10437358, - ]), - xy2d: FieldElement([ - 3296484, 6223048, 24680646, -12246460, -23052020, 5903205, -8862297, -4639164, - 12376617, 3188849, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 29190488, -14659046, 27549113, -1183516, 3520066, -10697301, 32049515, -7309113, - -16109234, -9852307, - ]), - y_minus_x: FieldElement([ - -14744486, -9309156, 735818, -598978, -20407687, -5057904, 25246078, -15795669, - 18640741, -960977, - ]), - xy2d: FieldElement([ - -6928835, -16430795, 10361374, 5642961, 4910474, 12345252, -31638386, -494430, - 10530747, 1053335, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -29265967, -14186805, -13538216, -12117373, -19457059, -10655384, -31462369, - -2948985, 24018831, 15026644, - ]), - y_minus_x: FieldElement([ - -22592535, -3145277, -2289276, 5953843, -13440189, 9425631, 25310643, 13003497, - -2314791, -15145616, - ]), - xy2d: FieldElement([ - -27419985, -603321, -8043984, -1669117, -26092265, 13987819, -27297622, 187899, - -23166419, -2531735, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -21744398, -13810475, 1844840, 5021428, -10434399, -15911473, 9716667, 16266922, - -5070217, 726099, - ]), - y_minus_x: FieldElement([ - 29370922, -6053998, 7334071, -15342259, 9385287, 2247707, -13661962, -4839461, - 30007388, -15823341, - ]), - xy2d: FieldElement([ - -936379, 16086691, 23751945, -543318, -1167538, -5189036, 9137109, 730663, 9835848, - 4555336, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -23376435, 1410446, -22253753, -12899614, 30867635, 15826977, 17693930, 544696, - -11985298, 12422646, - ]), - y_minus_x: FieldElement([ - 31117226, -12215734, -13502838, 6561947, -9876867, -12757670, -5118685, -4096706, - 29120153, 13924425, - ]), - xy2d: FieldElement([ - -17400879, -14233209, 19675799, -2734756, -11006962, -5858820, -9383939, -11317700, - 7240931, -237388, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -31361739, -11346780, -15007447, -5856218, -22453340, -12152771, 1222336, 4389483, - 3293637, -15551743, - ]), - y_minus_x: FieldElement([ - -16684801, -14444245, 11038544, 11054958, -13801175, -3338533, -24319580, 7733547, - 12796905, -6335822, - ]), - xy2d: FieldElement([ - -8759414, -10817836, -25418864, 10783769, -30615557, -9746811, -28253339, 3647836, - 3222231, -11160462, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 18606113, 1693100, -25448386, -15170272, 4112353, 10045021, 23603893, -2048234, - -7550776, 2484985, - ]), - y_minus_x: FieldElement([ - 9255317, -3131197, -12156162, -1004256, 13098013, -9214866, 16377220, -2102812, - -19802075, -3034702, - ]), - xy2d: FieldElement([ - -22729289, 7496160, -5742199, 11329249, 19991973, -3347502, -31718148, 9936966, - -30097688, -10618797, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 21878590, -5001297, 4338336, 13643897, -3036865, 13160960, 19708896, 5415497, - -7360503, -4109293, - ]), - y_minus_x: FieldElement([ - 27736861, 10103576, 12500508, 8502413, -3413016, -9633558, 10436918, -1550276, - -23659143, -8132100, - ]), - xy2d: FieldElement([ - 19492550, -12104365, -29681976, -852630, -3208171, 12403437, 30066266, 8367329, - 13243957, 8709688, - ]), - }, - ], - [ - PreComputedGroupElement { - y_plus_x: FieldElement([ - 12015105, 2801261, 28198131, 10151021, 24818120, -4743133, -11194191, -5645734, - 5150968, 7274186, - ]), - y_minus_x: FieldElement([ - 2831366, -12492146, 1478975, 6122054, 23825128, -12733586, 31097299, 6083058, - 31021603, -9793610, - ]), - xy2d: FieldElement([ - -2529932, -2229646, 445613, 10720828, -13849527, -11505937, -23507731, 16354465, - 15067285, -14147707, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 7840942, 14037873, -33364863, 15934016, -728213, -3642706, 21403988, 1057586, - -19379462, -12403220, - ]), - y_minus_x: FieldElement([ - 915865, -16469274, 15608285, -8789130, -24357026, 6060030, -17371319, 8410997, - -7220461, 16527025, - ]), - xy2d: FieldElement([ - 32922597, -556987, 20336074, -16184568, 10903705, -5384487, 16957574, 52992, - 23834301, 6588044, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 32752030, 11232950, 3381995, -8714866, 22652988, -10744103, 17159699, 16689107, - -20314580, -1305992, - ]), - y_minus_x: FieldElement([ - -4689649, 9166776, -25710296, -10847306, 11576752, 12733943, 7924251, -2752281, - 1976123, -7249027, - ]), - xy2d: FieldElement([ - 21251222, 16309901, -2983015, -6783122, 30810597, 12967303, 156041, -3371252, - 12331345, -8237197, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 8651614, -4477032, -16085636, -4996994, 13002507, 2950805, 29054427, -5106970, - 10008136, -4667901, - ]), - y_minus_x: FieldElement([ - 31486080, 15114593, -14261250, 12951354, 14369431, -7387845, 16347321, -13662089, - 8684155, -10532952, - ]), - xy2d: FieldElement([ - 19443825, 11385320, 24468943, -9659068, -23919258, 2187569, -26263207, -6086921, - 31316348, 14219878, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -28594490, 1193785, 32245219, 11392485, 31092169, 15722801, 27146014, 6992409, - 29126555, 9207390, - ]), - y_minus_x: FieldElement([ - 32382935, 1110093, 18477781, 11028262, -27411763, -7548111, -4980517, 10843782, - -7957600, -14435730, - ]), - xy2d: FieldElement([ - 2814918, 7836403, 27519878, -7868156, -20894015, -11553689, -21494559, 8550130, - 28346258, 1994730, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -19578299, 8085545, -14000519, -3948622, 2785838, -16231307, -19516951, 7174894, - 22628102, 8115180, - ]), - y_minus_x: FieldElement([ - -30405132, 955511, -11133838, -15078069, -32447087, -13278079, -25651578, 3317160, - -9943017, 930272, - ]), - xy2d: FieldElement([ - -15303681, -6833769, 28856490, 1357446, 23421993, 1057177, 24091212, -1388970, - -22765376, -10650715, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -22751231, -5303997, -12907607, -12768866, -15811511, -7797053, -14839018, - -16554220, -1867018, 8398970, - ]), - y_minus_x: FieldElement([ - -31969310, 2106403, -4736360, 1362501, 12813763, 16200670, 22981545, -6291273, - 18009408, -15772772, - ]), - xy2d: FieldElement([ - -17220923, -9545221, -27784654, 14166835, 29815394, 7444469, 29551787, -3727419, - 19288549, 1325865, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 15100157, -15835752, -23923978, -1005098, -26450192, 15509408, 12376730, -3479146, - 33166107, -8042750, - ]), - y_minus_x: FieldElement([ - 20909231, 13023121, -9209752, 16251778, -5778415, -8094914, 12412151, 10018715, - 2213263, -13878373, - ]), - xy2d: FieldElement([ - 32529814, -11074689, 30361439, -16689753, -9135940, 1513226, 22922121, 6382134, - -5766928, 8371348, - ]), - }, - ], - [ - PreComputedGroupElement { - y_plus_x: FieldElement([ - 9923462, 11271500, 12616794, 3544722, -29998368, -1721626, 12891687, -8193132, - -26442943, 10486144, - ]), - y_minus_x: FieldElement([ - -22597207, -7012665, 8587003, -8257861, 4084309, -12970062, 361726, 2610596, - -23921530, -11455195, - ]), - xy2d: FieldElement([ - 5408411, -1136691, -4969122, 10561668, 24145918, 14240566, 31319731, -4235541, - 19985175, -3436086, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -13994457, 16616821, 14549246, 3341099, 32155958, 13648976, -17577068, 8849297, - 65030, 8370684, - ]), - y_minus_x: FieldElement([ - -8320926, -12049626, 31204563, 5839400, -20627288, -1057277, -19442942, 6922164, - 12743482, -9800518, - ]), - xy2d: FieldElement([ - -2361371, 12678785, 28815050, 4759974, -23893047, 4884717, 23783145, 11038569, - 18800704, 255233, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -5269658, -1773886, 13957886, 7990715, 23132995, 728773, 13393847, 9066957, - 19258688, -14753793, - ]), - y_minus_x: FieldElement([ - -2936654, -10827535, -10432089, 14516793, -3640786, 4372541, -31934921, 2209390, - -1524053, 2055794, - ]), - xy2d: FieldElement([ - 580882, 16705327, 5468415, -2683018, -30926419, -14696000, -7203346, -8994389, - -30021019, 7394435, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 23838809, 1822728, -15738443, 15242727, 8318092, -3733104, -21672180, -3492205, - -4821741, 14799921, - ]), - y_minus_x: FieldElement([ - 13345610, 9759151, 3371034, -16137791, 16353039, 8577942, 31129804, 13496856, - -9056018, 7402518, - ]), - xy2d: FieldElement([ - 2286874, -4435931, -20042458, -2008336, -13696227, 5038122, 11006906, -15760352, - 8205061, 1607563, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 14414086, -8002132, 3331830, -3208217, 22249151, -5594188, 18364661, -2906958, - 30019587, -9029278, - ]), - y_minus_x: FieldElement([ - -27688051, 1585953, -10775053, 931069, -29120221, -11002319, -14410829, 12029093, - 9944378, 8024, - ]), - xy2d: FieldElement([ - 4368715, -3709630, 29874200, -15022983, -20230386, -11410704, -16114594, -999085, - -8142388, 5640030, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 10299610, 13746483, 11661824, 16234854, 7630238, 5998374, 9809887, -16694564, - 15219798, -14327783, - ]), - y_minus_x: FieldElement([ - 27425505, -5719081, 3055006, 10660664, 23458024, 595578, -15398605, -1173195, - -18342183, 9742717, - ]), - xy2d: FieldElement([ - 6744077, 2427284, 26042789, 2720740, -847906, 1118974, 32324614, 7406442, 12420155, - 1994844, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 14012521, -5024720, -18384453, -9578469, -26485342, -3936439, -13033478, -10909803, - 24319929, -6446333, - ]), - y_minus_x: FieldElement([ - 16412690, -4507367, 10772641, 15929391, -17068788, -4658621, 10555945, -10484049, - -30102368, -4739048, - ]), - xy2d: FieldElement([ - 22397382, -7767684, -9293161, -12792868, 17166287, -9755136, -27333065, 6199366, - 21880021, -12250760, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -4283307, 5368523, -31117018, 8163389, -30323063, 3209128, 16557151, 8890729, - 8840445, 4957760, - ]), - y_minus_x: FieldElement([ - -15447727, 709327, -6919446, -10870178, -29777922, 6522332, -21720181, 12130072, - -14796503, 5005757, - ]), - xy2d: FieldElement([ - -2114751, -14308128, 23019042, 15765735, -25269683, 6002752, 10183197, -13239326, - -16395286, -2176112, - ]), - }, - ], - [ - PreComputedGroupElement { - y_plus_x: FieldElement([ - -19025756, 1632005, 13466291, -7995100, -23640451, 16573537, -32013908, -3057104, - 22208662, 2000468, - ]), - y_minus_x: FieldElement([ - 3065073, -1412761, -25598674, -361432, -17683065, -5703415, -8164212, 11248527, - -3691214, -7414184, - ]), - xy2d: FieldElement([ - 10379208, -6045554, 8877319, 1473647, -29291284, -12507580, 16690915, 2553332, - -3132688, 16400289, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 15716668, 1254266, -18472690, 7446274, -8448918, 6344164, -22097271, -7285580, - 26894937, 9132066, - ]), - y_minus_x: FieldElement([ - 24158887, 12938817, 11085297, -8177598, -28063478, -4457083, -30576463, 64452, - -6817084, -2692882, - ]), - xy2d: FieldElement([ - 13488534, 7794716, 22236231, 5989356, 25426474, -12578208, 2350710, -3418511, - -4688006, 2364226, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 16335052, 9132434, 25640582, 6678888, 1725628, 8517937, -11807024, -11697457, - 15445875, -7798101, - ]), - y_minus_x: FieldElement([ - 29004207, -7867081, 28661402, -640412, -12794003, -7943086, 31863255, -4135540, - -278050, -15759279, - ]), - xy2d: FieldElement([ - -6122061, -14866665, -28614905, 14569919, -10857999, -3591829, 10343412, -6976290, - -29828287, -10815811, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 27081650, 3463984, 14099042, -4517604, 1616303, -6205604, 29542636, 15372179, - 17293797, 960709, - ]), - y_minus_x: FieldElement([ - 20263915, 11434237, -5765435, 11236810, 13505955, -10857102, -16111345, 6493122, - -19384511, 7639714, - ]), - xy2d: FieldElement([ - -2830798, -14839232, 25403038, -8215196, -8317012, -16173699, 18006287, -16043750, - 29994677, -15808121, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 9769828, 5202651, -24157398, -13631392, -28051003, -11561624, -24613141, -13860782, - -31184575, 709464, - ]), - y_minus_x: FieldElement([ - 12286395, 13076066, -21775189, -1176622, -25003198, 4057652, -32018128, -8890874, - 16102007, 13205847, - ]), - xy2d: FieldElement([ - 13733362, 5599946, 10557076, 3195751, -5557991, 8536970, -25540170, 8525972, - 10151379, 10394400, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 4024660, -16137551, 22436262, 12276534, -9099015, -2686099, 19698229, 11743039, - -33302334, 8934414, - ]), - y_minus_x: FieldElement([ - -15879800, -4525240, -8580747, -2934061, 14634845, -698278, -9449077, 3137094, - -11536886, 11721158, - ]), - xy2d: FieldElement([ - 17555939, -5013938, 8268606, 2331751, -22738815, 9761013, 9319229, 8835153, - -9205489, -1280045, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -461409, -7830014, 20614118, 16688288, -7514766, -4807119, 22300304, 505429, - 6108462, -6183415, - ]), - y_minus_x: FieldElement([ - -5070281, 12367917, -30663534, 3234473, 32617080, -8422642, 29880583, -13483331, - -26898490, -7867459, - ]), - xy2d: FieldElement([ - -31975283, 5726539, 26934134, 10237677, -3173717, -605053, 24199304, 3795095, - 7592688, -14992079, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 21594432, -14964228, 17466408, -4077222, 32537084, 2739898, 6407723, 12018833, - -28256052, 4298412, - ]), - y_minus_x: FieldElement([ - -20650503, -11961496, -27236275, 570498, 3767144, -1717540, 13891942, -1569194, - 13717174, 10805743, - ]), - xy2d: FieldElement([ - -14676630, -15644296, 15287174, 11927123, 24177847, -8175568, -796431, 14860609, - -26938930, -5863836, - ]), - }, - ], - [ - PreComputedGroupElement { - y_plus_x: FieldElement([ - 12962541, 5311799, -10060768, 11658280, 18855286, -7954201, 13286263, -12808704, - -4381056, 9882022, - ]), - y_minus_x: FieldElement([ - 18512079, 11319350, -20123124, 15090309, 18818594, 5271736, -22727904, 3666879, - -23967430, -3299429, - ]), - xy2d: FieldElement([ - -6789020, -3146043, 16192429, 13241070, 15898607, -14206114, -10084880, -6661110, - -2403099, 5276065, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 30169808, -5317648, 26306206, -11750859, 27814964, 7069267, 7152851, 3684982, - 1449224, 13082861, - ]), - y_minus_x: FieldElement([ - 10342826, 3098505, 2119311, 193222, 25702612, 12233820, 23697382, 15056736, - -21016438, -8202000, - ]), - xy2d: FieldElement([ - -33150110, 3261608, 22745853, 7948688, 19370557, -15177665, -26171976, 6482814, - -10300080, -11060101, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 32869458, -5408545, 25609743, 15678670, -10687769, -15471071, 26112421, 2521008, - -22664288, 6904815, - ]), - y_minus_x: FieldElement([ - 29506923, 4457497, 3377935, -9796444, -30510046, 12935080, 1561737, 3841096, - -29003639, -6657642, - ]), - xy2d: FieldElement([ - 10340844, -6630377, -18656632, -2278430, 12621151, -13339055, 30878497, -11824370, - -25584551, 5181966, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 25940115, -12658025, 17324188, -10307374, -8671468, 15029094, 24396252, -16450922, - -2322852, -12388574, - ]), - y_minus_x: FieldElement([ - -21765684, 9916823, -1300409, 4079498, -1028346, 11909559, 1782390, 12641087, - 20603771, -6561742, - ]), - xy2d: FieldElement([ - -18882287, -11673380, 24849422, 11501709, 13161720, -4768874, 1925523, 11914390, - 4662781, 7820689, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 12241050, -425982, 8132691, 9393934, 32846760, -1599620, 29749456, 12172924, - 16136752, 15264020, - ]), - y_minus_x: FieldElement([ - -10349955, -14680563, -8211979, 2330220, -17662549, -14545780, 10658213, 6671822, - 19012087, 3772772, - ]), - xy2d: FieldElement([ - 3753511, -3421066, 10617074, 2028709, 14841030, -6721664, 28718732, -15762884, - 20527771, 12988982, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -14822485, -5797269, -3707987, 12689773, -898983, -10914866, -24183046, -10564943, - 3299665, -12424953, - ]), - y_minus_x: FieldElement([ - -16777703, -15253301, -9642417, 4978983, 3308785, 8755439, 6943197, 6461331, - -25583147, 8991218, - ]), - xy2d: FieldElement([ - -17226263, 1816362, -1673288, -6086439, 31783888, -8175991, -32948145, 7417950, - -30242287, 1507265, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 29692663, 6829891, -10498800, 4334896, 20945975, -11906496, -28887608, 8209391, - 14606362, -10647073, - ]), - y_minus_x: FieldElement([ - -3481570, 8707081, 32188102, 5672294, 22096700, 1711240, -33020695, 9761487, - 4170404, -2085325, - ]), - xy2d: FieldElement([ - -11587470, 14855945, -4127778, -1531857, -26649089, 15084046, 22186522, 16002000, - -14276837, -8400798, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -4811456, 13761029, -31703877, -2483919, -3312471, 7869047, -7113572, -9620092, - 13240845, 10965870, - ]), - y_minus_x: FieldElement([ - -7742563, -8256762, -14768334, -13656260, -23232383, 12387166, 4498947, 14147411, - 29514390, 4302863, - ]), - xy2d: FieldElement([ - -13413405, -12407859, 20757302, -13801832, 14785143, 8976368, -5061276, -2144373, - 17846988, -13971927, - ]), - }, - ], - [ - PreComputedGroupElement { - y_plus_x: FieldElement([ - -2244452, -754728, -4597030, -1066309, -6247172, 1455299, -21647728, -9214789, - -5222701, 12650267, - ]), - y_minus_x: FieldElement([ - -9906797, -16070310, 21134160, 12198166, -27064575, 708126, 387813, 13770293, - -19134326, 10958663, - ]), - xy2d: FieldElement([ - 22470984, 12369526, 23446014, -5441109, -21520802, -9698723, -11772496, -11574455, - -25083830, 4271862, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -25169565, -10053642, -19909332, 15361595, -5984358, 2159192, 75375, -4278529, - -32526221, 8469673, - ]), - y_minus_x: FieldElement([ - 15854970, 4148314, -8893890, 7259002, 11666551, 13824734, -30531198, 2697372, - 24154791, -9460943, - ]), - xy2d: FieldElement([ - 15446137, -15806644, 29759747, 14019369, 30811221, -9610191, -31582008, 12840104, - 24913809, 9815020, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -4709286, -5614269, -31841498, -12288893, -14443537, 10799414, -9103676, 13438769, - 18735128, 9466238, - ]), - y_minus_x: FieldElement([ - 11933045, 9281483, 5081055, -5183824, -2628162, -4905629, -7727821, -10896103, - -22728655, 16199064, - ]), - xy2d: FieldElement([ - 14576810, 379472, -26786533, -8317236, -29426508, -10812974, -102766, 1876699, - 30801119, 2164795, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 15995086, 3199873, 13672555, 13712240, -19378835, -4647646, -13081610, -15496269, - -13492807, 1268052, - ]), - y_minus_x: FieldElement([ - -10290614, -3659039, -3286592, 10948818, 23037027, 3794475, -3470338, -12600221, - -17055369, 3565904, - ]), - xy2d: FieldElement([ - 29210088, -9419337, -5919792, -4952785, 10834811, -13327726, -16512102, -10820713, - -27162222, -14030531, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -13161890, 15508588, 16663704, -8156150, -28349942, 9019123, -29183421, -3769423, - 2244111, -14001979, - ]), - y_minus_x: FieldElement([ - -5152875, -3800936, -9306475, -6071583, 16243069, 14684434, -25673088, -16180800, - 13491506, 4641841, - ]), - xy2d: FieldElement([ - 10813417, 643330, -19188515, -728916, 30292062, -16600078, 27548447, -7721242, - 14476989, -12767431, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 10292079, 9984945, 6481436, 8279905, -7251514, 7032743, 27282937, -1644259, - -27912810, 12651324, - ]), - y_minus_x: FieldElement([ - -31185513, -813383, 22271204, 11835308, 10201545, 15351028, 17099662, 3988035, - 21721536, -3148940, - ]), - xy2d: FieldElement([ - 10202177, -6545839, -31373232, -9574638, -32150642, -8119683, -12906320, 3852694, - 13216206, 14842320, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -15815640, -10601066, -6538952, -7258995, -6984659, -6581778, -31500847, 13765824, - -27434397, 9900184, - ]), - y_minus_x: FieldElement([ - 14465505, -13833331, -32133984, -14738873, -27443187, 12990492, 33046193, 15796406, - -7051866, -8040114, - ]), - xy2d: FieldElement([ - 30924417, -8279620, 6359016, -12816335, 16508377, 9071735, -25488601, 15413635, - 9524356, -7018878, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 12274201, -13175547, 32627641, -1785326, 6736625, 13267305, 5237659, -5109483, - 15663516, 4035784, - ]), - y_minus_x: FieldElement([ - -2951309, 8903985, 17349946, 601635, -16432815, -4612556, -13732739, -15889334, - -22258478, 4659091, - ]), - xy2d: FieldElement([ - -16916263, -4952973, -30393711, -15158821, 20774812, 15897498, 5736189, 15026997, - -2178256, -13455585, - ]), - }, - ], - [ - PreComputedGroupElement { - y_plus_x: FieldElement([ - -8858980, -2219056, 28571666, -10155518, -474467, -10105698, -3801496, 278095, - 23440562, -290208, - ]), - y_minus_x: FieldElement([ - 10226241, -5928702, 15139956, 120818, -14867693, 5218603, 32937275, 11551483, - -16571960, -7442864, - ]), - xy2d: FieldElement([ - 17932739, -12437276, -24039557, 10749060, 11316803, 7535897, 22503767, 5561594, - -3646624, 3898661, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 7749907, -969567, -16339731, -16464, -25018111, 15122143, -1573531, 7152530, - 21831162, 1245233, - ]), - y_minus_x: FieldElement([ - 26958459, -14658026, 4314586, 8346991, -5677764, 11960072, -32589295, -620035, - -30402091, -16716212, - ]), - xy2d: FieldElement([ - -12165896, 9166947, 33491384, 13673479, 29787085, 13096535, 6280834, 14587357, - -22338025, 13987525, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -24349909, 7778775, 21116000, 15572597, -4833266, -5357778, -4300898, -5124639, - -7469781, -2858068, - ]), - y_minus_x: FieldElement([ - 9681908, -6737123, -31951644, 13591838, -6883821, 386950, 31622781, 6439245, - -14581012, 4091397, - ]), - xy2d: FieldElement([ - -8426427, 1470727, -28109679, -1596990, 3978627, -5123623, -19622683, 12092163, - 29077877, -14741988, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 5269168, -6859726, -13230211, -8020715, 25932563, 1763552, -5606110, -5505881, - -20017847, 2357889, - ]), - y_minus_x: FieldElement([ - 32264008, -15407652, -5387735, -1160093, -2091322, -3946900, 23104804, -12869908, - 5727338, 189038, - ]), - xy2d: FieldElement([ - 14609123, -8954470, -6000566, -16622781, -14577387, -7743898, -26745169, 10942115, - -25888931, -14884697, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 20513500, 5557931, -15604613, 7829531, 26413943, -2019404, -21378968, 7471781, - 13913677, -5137875, - ]), - y_minus_x: FieldElement([ - -25574376, 11967826, 29233242, 12948236, -6754465, 4713227, -8940970, 14059180, - 12878652, 8511905, - ]), - xy2d: FieldElement([ - -25656801, 3393631, -2955415, -7075526, -2250709, 9366908, -30223418, 6812974, - 5568676, -3127656, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 11630004, 12144454, 2116339, 13606037, 27378885, 15676917, -17408753, -13504373, - -14395196, 8070818, - ]), - y_minus_x: FieldElement([ - 27117696, -10007378, -31282771, -5570088, 1127282, 12772488, -29845906, 10483306, - -11552749, -1028714, - ]), - xy2d: FieldElement([ - 10637467, -5688064, 5674781, 1072708, -26343588, -6982302, -1683975, 9177853, - -27493162, 15431203, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 20525145, 10892566, -12742472, 12779443, -29493034, 16150075, -28240519, 14943142, - -15056790, -7935931, - ]), - y_minus_x: FieldElement([ - -30024462, 5626926, -551567, -9981087, 753598, 11981191, 25244767, -3239766, - -3356550, 9594024, - ]), - xy2d: FieldElement([ - -23752644, 2636870, -5163910, -10103818, 585134, 7877383, 11345683, -6492290, - 13352335, -10977084, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -1931799, -5407458, 3304649, -12884869, 17015806, -4877091, -29783850, -7752482, - -13215537, -319204, - ]), - y_minus_x: FieldElement([ - 20239939, 6607058, 6203985, 3483793, -18386976, -779229, -20723742, 15077870, - -22750759, 14523817, - ]), - xy2d: FieldElement([ - 27406042, -6041657, 27423596, -4497394, 4996214, 10002360, -28842031, -4545494, - -30172742, -4805667, - ]), - }, - ], - [ - PreComputedGroupElement { - y_plus_x: FieldElement([ - 11374242, 12660715, 17861383, -12540833, 10935568, 1099227, -13886076, -9091740, - -27727044, 11358504, - ]), - y_minus_x: FieldElement([ - -12730809, 10311867, 1510375, 10778093, -2119455, -9145702, 32676003, 11149336, - -26123651, 4985768, - ]), - xy2d: FieldElement([ - -19096303, 341147, -6197485, -239033, 15756973, -8796662, -983043, 13794114, - -19414307, -15621255, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 6490081, 11940286, 25495923, -7726360, 8668373, -8751316, 3367603, 6970005, - -1691065, -9004790, - ]), - y_minus_x: FieldElement([ - 1656497, 13457317, 15370807, 6364910, 13605745, 8362338, -19174622, -5475723, - -16796596, -5031438, - ]), - xy2d: FieldElement([ - -22273315, -13524424, -64685, -4334223, -18605636, -10921968, -20571065, -7007978, - -99853, -10237333, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 17747465, 10039260, 19368299, -4050591, -20630635, -16041286, 31992683, -15857976, - -29260363, -5511971, - ]), - y_minus_x: FieldElement([ - 31932027, -4986141, -19612382, 16366580, 22023614, 88450, 11371999, -3744247, - 4882242, -10626905, - ]), - xy2d: FieldElement([ - 29796507, 37186, 19818052, 10115756, -11829032, 3352736, 18551198, 3272828, - -5190932, -4162409, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 12501286, 4044383, -8612957, -13392385, -32430052, 5136599, -19230378, -3529697, - 330070, -3659409, - ]), - y_minus_x: FieldElement([ - 6384877, 2899513, 17807477, 7663917, -2358888, 12363165, 25366522, -8573892, - -271295, 12071499, - ]), - xy2d: FieldElement([ - -8365515, -4042521, 25133448, -4517355, -6211027, 2265927, -32769618, 1936675, - -5159697, 3829363, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 28425966, -5835433, -577090, -4697198, -14217555, 6870930, 7921550, -6567787, - 26333140, 14267664, - ]), - y_minus_x: FieldElement([ - -11067219, 11871231, 27385719, -10559544, -4585914, -11189312, 10004786, -8709488, - -21761224, 8930324, - ]), - xy2d: FieldElement([ - -21197785, -16396035, 25654216, -1725397, 12282012, 11008919, 1541940, 4757911, - -26491501, -16408940, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 13537262, -7759490, -20604840, 10961927, -5922820, -13218065, -13156584, 6217254, - -15943699, 13814990, - ]), - y_minus_x: FieldElement([ - -17422573, 15157790, 18705543, 29619, 24409717, -260476, 27361681, 9257833, - -1956526, -1776914, - ]), - xy2d: FieldElement([ - -25045300, -10191966, 15366585, 15166509, -13105086, 8423556, -29171540, 12361135, - -18685978, 4578290, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 24579768, 3711570, 1342322, -11180126, -27005135, 14124956, -22544529, 14074919, - 21964432, 8235257, - ]), - y_minus_x: FieldElement([ - -6528613, -2411497, 9442966, -5925588, 12025640, -1487420, -2981514, -1669206, - 13006806, 2355433, - ]), - xy2d: FieldElement([ - -16304899, -13605259, -6632427, -5142349, 16974359, -10911083, 27202044, 1719366, - 1141648, -12796236, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -12863944, -13219986, -8318266, -11018091, -6810145, -4843894, 13475066, -3133972, - 32674895, 13715045, - ]), - y_minus_x: FieldElement([ - 11423335, -5468059, 32344216, 8962751, 24989809, 9241752, -13265253, 16086212, - -28740881, -15642093, - ]), - xy2d: FieldElement([ - -1409668, 12530728, -6368726, 10847387, 19531186, -14132160, -11709148, 7791794, - -27245943, 4383347, - ]), - }, - ], - [ - PreComputedGroupElement { - y_plus_x: FieldElement([ - -28970898, 5271447, -1266009, -9736989, -12455236, 16732599, -4862407, -4906449, - 27193557, 6245191, - ]), - y_minus_x: FieldElement([ - -15193956, 5362278, -1783893, 2695834, 4960227, 12840725, 23061898, 3260492, - 22510453, 8577507, - ]), - xy2d: FieldElement([ - -12632451, 11257346, -32692994, 13548177, -721004, 10879011, 31168030, 13952092, - -29571492, -3635906, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 3877321, -9572739, 32416692, 5405324, -11004407, -13656635, 3759769, 11935320, - 5611860, 8164018, - ]), - y_minus_x: FieldElement([ - -16275802, 14667797, 15906460, 12155291, -22111149, -9039718, 32003002, -8832289, - 5773085, -8422109, - ]), - xy2d: FieldElement([ - -23788118, -8254300, 1950875, 8937633, 18686727, 16459170, -905725, 12376320, - 31632953, 190926, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -24593607, -16138885, -8423991, 13378746, 14162407, 6901328, -8288749, 4508564, - -25341555, -3627528, - ]), - y_minus_x: FieldElement([ - 8884438, -5884009, 6023974, 10104341, -6881569, -4941533, 18722941, -14786005, - -1672488, 827625, - ]), - xy2d: FieldElement([ - -32720583, -16289296, -32503547, 7101210, 13354605, 2659080, -1800575, -14108036, - -24878478, 1541286, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 2901347, -1117687, 3880376, -10059388, -17620940, -3612781, -21802117, -3567481, - 20456845, -1885033, - ]), - y_minus_x: FieldElement([ - 27019610, 12299467, -13658288, -1603234, -12861660, -4861471, -19540150, -5016058, - 29439641, 15138866, - ]), - xy2d: FieldElement([ - 21536104, -6626420, -32447818, -10690208, -22408077, 5175814, -5420040, -16361163, - 7779328, 109896, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 30279744, 14648750, -8044871, 6425558, 13639621, -743509, 28698390, 12180118, - 23177719, -554075, - ]), - y_minus_x: FieldElement([ - 26572847, 3405927, -31701700, 12890905, -19265668, 5335866, -6493768, 2378492, - 4439158, -13279347, - ]), - xy2d: FieldElement([ - -22716706, 3489070, -9225266, -332753, 18875722, -1140095, 14819434, -12731527, - -17717757, -5461437, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -5056483, 16566551, 15953661, 3767752, -10436499, 15627060, -820954, 2177225, - 8550082, -15114165, - ]), - y_minus_x: FieldElement([ - -18473302, 16596775, -381660, 15663611, 22860960, 15585581, -27844109, -3582739, - -23260460, -8428588, - ]), - xy2d: FieldElement([ - -32480551, 15707275, -8205912, -5652081, 29464558, 2713815, -22725137, 15860482, - -21902570, 1494193, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -19562091, -14087393, -25583872, -9299552, 13127842, 759709, 21923482, 16529112, - 8742704, 12967017, - ]), - y_minus_x: FieldElement([ - -28464899, 1553205, 32536856, -10473729, -24691605, -406174, -8914625, -2933896, - -29903758, 15553883, - ]), - xy2d: FieldElement([ - 21877909, 3230008, 9881174, 10539357, -4797115, 2841332, 11543572, 14513274, - 19375923, -12647961, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 8832269, -14495485, 13253511, 5137575, 5037871, 4078777, 24880818, -6222716, - 2862653, 9455043, - ]), - y_minus_x: FieldElement([ - 29306751, 5123106, 20245049, -14149889, 9592566, 8447059, -2077124, -2990080, - 15511449, 4789663, - ]), - xy2d: FieldElement([ - -20679756, 7004547, 8824831, -9434977, -4045704, -3750736, -5754762, 108893, - 23513200, 16652362, - ]), - }, - ], - [ - PreComputedGroupElement { - y_plus_x: FieldElement([ - -33256173, 4144782, -4476029, -6579123, 10770039, -7155542, -6650416, -12936300, - -18319198, 10212860, - ]), - y_minus_x: FieldElement([ - 2756081, 8598110, 7383731, -6859892, 22312759, -1105012, 21179801, 2600940, - -9988298, -12506466, - ]), - xy2d: FieldElement([ - -24645692, 13317462, -30449259, -15653928, 21365574, -10869657, 11344424, 864440, - -2499677, -16710063, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -26432803, 6148329, -17184412, -14474154, 18782929, -275997, -22561534, 211300, - 2719757, 4940997, - ]), - y_minus_x: FieldElement([ - -1323882, 3911313, -6948744, 14759765, -30027150, 7851207, 21690126, 8518463, - 26699843, 5276295, - ]), - xy2d: FieldElement([ - -13149873, -6429067, 9396249, 365013, 24703301, -10488939, 1321586, 149635, - -15452774, 7159369, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 9987780, -3404759, 17507962, 9505530, 9731535, -2165514, 22356009, 8312176, - 22477218, -8403385, - ]), - y_minus_x: FieldElement([ - 18155857, -16504990, 19744716, 9006923, 15154154, -10538976, 24256460, -4864995, - -22548173, 9334109, - ]), - xy2d: FieldElement([ - 2986088, -4911893, 10776628, -3473844, 10620590, -7083203, -21413845, 14253545, - -22587149, 536906, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 4377756, 8115836, 24567078, 15495314, 11625074, 13064599, 7390551, 10589625, - 10838060, -15420424, - ]), - y_minus_x: FieldElement([ - -19342404, 867880, 9277171, -3218459, -14431572, -1986443, 19295826, -15796950, - 6378260, 699185, - ]), - xy2d: FieldElement([ - 7895026, 4057113, -7081772, -13077756, -17886831, -323126, -716039, 15693155, - -5045064, -13373962, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -7737563, -5869402, -14566319, -7406919, 11385654, 13201616, 31730678, -10962840, - -3918636, -9669325, - ]), - y_minus_x: FieldElement([ - 10188286, -15770834, -7336361, 13427543, 22223443, 14896287, 30743455, 7116568, - -21786507, 5427593, - ]), - xy2d: FieldElement([ - 696102, 13206899, 27047647, -10632082, 15285305, -9853179, 10798490, -4578720, - 19236243, 12477404, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -11229439, 11243796, -17054270, -8040865, -788228, -8167967, -3897669, 11180504, - -23169516, 7733644, - ]), - y_minus_x: FieldElement([ - 17800790, -14036179, -27000429, -11766671, 23887827, 3149671, 23466177, -10538171, - 10322027, 15313801, - ]), - xy2d: FieldElement([ - 26246234, 11968874, 32263343, -5468728, 6830755, -13323031, -15794704, -101982, - -24449242, 10890804, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -31365647, 10271363, -12660625, -6267268, 16690207, -13062544, -14982212, 16484931, - 25180797, -5334884, - ]), - y_minus_x: FieldElement([ - -586574, 10376444, -32586414, -11286356, 19801893, 10997610, 2276632, 9482883, - 316878, 13820577, - ]), - xy2d: FieldElement([ - -9882808, -4510367, -2115506, 16457136, -11100081, 11674996, 30756178, -7515054, - 30696930, -3712849, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 32988917, -9603412, 12499366, 7910787, -10617257, -11931514, -7342816, -9985397, - -32349517, 7392473, - ]), - y_minus_x: FieldElement([ - -8855661, 15927861, 9866406, -3649411, -2396914, -16655781, -30409476, -9134995, - 25112947, -2926644, - ]), - xy2d: FieldElement([ - -2504044, -436966, 25621774, -5678772, 15085042, -5479877, -24884878, -13526194, - 5537438, -13914319, - ]), - }, - ], - [ - PreComputedGroupElement { - y_plus_x: FieldElement([ - -11225584, 2320285, -9584280, 10149187, -33444663, 5808648, -14876251, -1729667, - 31234590, 6090599, - ]), - y_minus_x: FieldElement([ - -9633316, 116426, 26083934, 2897444, -6364437, -2688086, 609721, 15878753, - -6970405, -9034768, - ]), - xy2d: FieldElement([ - -27757857, 247744, -15194774, -9002551, 23288161, -10011936, -23869595, 6503646, - 20650474, 1804084, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -27589786, 15456424, 8972517, 8469608, 15640622, 4439847, 3121995, -10329713, - 27842616, -202328, - ]), - y_minus_x: FieldElement([ - -15306973, 2839644, 22530074, 10026331, 4602058, 5048462, 28248656, 5031932, - -11375082, 12714369, - ]), - xy2d: FieldElement([ - 20807691, -7270825, 29286141, 11421711, -27876523, -13868230, -21227475, 1035546, - -19733229, 12796920, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 12076899, -14301286, -8785001, -11848922, -25012791, 16400684, -17591495, - -12899438, 3480665, -15182815, - ]), - y_minus_x: FieldElement([ - -32361549, 5457597, 28548107, 7833186, 7303070, -11953545, -24363064, -15921875, - -33374054, 2771025, - ]), - xy2d: FieldElement([ - -21389266, 421932, 26597266, 6860826, 22486084, -6737172, -17137485, -4210226, - -24552282, 15673397, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -20184622, 2338216, 19788685, -9620956, -4001265, -8740893, -20271184, 4733254, - 3727144, -12934448, - ]), - y_minus_x: FieldElement([ - 6120119, 814863, -11794402, -622716, 6812205, -15747771, 2019594, 7975683, - 31123697, -10958981, - ]), - xy2d: FieldElement([ - 30069250, -11435332, 30434654, 2958439, 18399564, -976289, 12296869, 9204260, - -16432438, 9648165, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 32705432, -1550977, 30705658, 7451065, -11805606, 9631813, 3305266, 5248604, - -26008332, -11377501, - ]), - y_minus_x: FieldElement([ - 17219865, 2375039, -31570947, -5575615, -19459679, 9219903, 294711, 15298639, - 2662509, -16297073, - ]), - xy2d: FieldElement([ - -1172927, -7558695, -4366770, -4287744, -21346413, -8434326, 32087529, -1222777, - 32247248, -14389861, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 14312628, 1221556, 17395390, -8700143, -4945741, -8684635, -28197744, -9637817, - -16027623, -13378845, - ]), - y_minus_x: FieldElement([ - -1428825, -9678990, -9235681, 6549687, -7383069, -468664, 23046502, 9803137, - 17597934, 2346211, - ]), - xy2d: FieldElement([ - 18510800, 15337574, 26171504, 981392, -22241552, 7827556, -23491134, -11323352, - 3059833, -11782870, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 10141598, 6082907, 17829293, -1947643, 9830092, 13613136, -25556636, -5544586, - -33502212, 3592096, - ]), - y_minus_x: FieldElement([ - 33114168, -15889352, -26525686, -13343397, 33076705, 8716171, 1151462, 1521897, - -982665, -6837803, - ]), - xy2d: FieldElement([ - -32939165, -4255815, 23947181, -324178, -33072974, -12305637, -16637686, 3891704, - 26353178, 693168, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 30374239, 1595580, -16884039, 13186931, 4600344, 406904, 9585294, -400668, - 31375464, 14369965, - ]), - y_minus_x: FieldElement([ - -14370654, -7772529, 1510301, 6434173, -18784789, -6262728, 32732230, -13108839, - 17901441, 16011505, - ]), - xy2d: FieldElement([ - 18171223, -11934626, -12500402, 15197122, -11038147, -15230035, -19172240, - -16046376, 8764035, 12309598, - ]), - }, - ], - [ - PreComputedGroupElement { - y_plus_x: FieldElement([ - 5975908, -5243188, -19459362, -9681747, -11541277, 14015782, -23665757, 1228319, - 17544096, -10593782, - ]), - y_minus_x: FieldElement([ - 5811932, -1715293, 3442887, -2269310, -18367348, -8359541, -18044043, -15410127, - -5565381, 12348900, - ]), - xy2d: FieldElement([ - -31399660, 11407555, 25755363, 6891399, -3256938, 14872274, -24849353, 8141295, - -10632534, -585479, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -12675304, 694026, -5076145, 13300344, 14015258, -14451394, -9698672, -11329050, - 30944593, 1130208, - ]), - y_minus_x: FieldElement([ - 8247766, -6710942, -26562381, -7709309, -14401939, -14648910, 4652152, 2488540, - 23550156, -271232, - ]), - xy2d: FieldElement([ - 17294316, -3788438, 7026748, 15626851, 22990044, 113481, 2267737, -5908146, - -408818, -137719, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 16091085, -16253926, 18599252, 7340678, 2137637, -1221657, -3364161, 14550936, - 3260525, -7166271, - ]), - y_minus_x: FieldElement([ - -4910104, -13332887, 18550887, 10864893, -16459325, -7291596, -23028869, -13204905, - -12748722, 2701326, - ]), - xy2d: FieldElement([ - -8574695, 16099415, 4629974, -16340524, -20786213, -6005432, -10018363, 9276971, - 11329923, 1862132, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 14763076, -15903608, -30918270, 3689867, 3511892, 10313526, -21951088, 12219231, - -9037963, -940300, - ]), - y_minus_x: FieldElement([ - 8894987, -3446094, 6150753, 3013931, 301220, 15693451, -31981216, -2909717, - -15438168, 11595570, - ]), - xy2d: FieldElement([ - 15214962, 3537601, -26238722, -14058872, 4418657, -15230761, 13947276, 10730794, - -13489462, -4363670, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -2538306, 7682793, 32759013, 263109, -29984731, -7955452, -22332124, -10188635, - 977108, 699994, - ]), - y_minus_x: FieldElement([ - -12466472, 4195084, -9211532, 550904, -15565337, 12917920, 19118110, -439841, - -30534533, -14337913, - ]), - xy2d: FieldElement([ - 31788461, -14507657, 4799989, 7372237, 8808585, -14747943, 9408237, -10051775, - 12493932, -5409317, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -25680606, 5260744, -19235809, -6284470, -3695942, 16566087, 27218280, 2607121, - 29375955, 6024730, - ]), - y_minus_x: FieldElement([ - 842132, -2794693, -4763381, -8722815, 26332018, -12405641, 11831880, 6985184, - -9940361, 2854096, - ]), - xy2d: FieldElement([ - -4847262, -7969331, 2516242, -5847713, 9695691, -7221186, 16512645, 960770, - 12121869, 16648078, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -15218652, 14667096, -13336229, 2013717, 30598287, -464137, -31504922, -7882064, - 20237806, 2838411, - ]), - y_minus_x: FieldElement([ - -19288047, 4453152, 15298546, -16178388, 22115043, -15972604, 12544294, -13470457, - 1068881, -12499905, - ]), - xy2d: FieldElement([ - -9558883, -16518835, 33238498, 13506958, 30505848, -1114596, -8486907, -2630053, - 12521378, 4845654, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -28198521, 10744108, -2958380, 10199664, 7759311, -13088600, 3409348, -873400, - -6482306, -12885870, - ]), - y_minus_x: FieldElement([ - -23561822, 6230156, -20382013, 10655314, -24040585, -11621172, 10477734, -1240216, - -3113227, 13974498, - ]), - xy2d: FieldElement([ - 12966261, 15550616, -32038948, -1615346, 21025980, -629444, 5642325, 7188737, - 18895762, 12629579, - ]), - }, - ], - [ - PreComputedGroupElement { - y_plus_x: FieldElement([ - 14741879, -14946887, 22177208, -11721237, 1279741, 8058600, 11758140, 789443, - 32195181, 3895677, - ]), - y_minus_x: FieldElement([ - 10758205, 15755439, -4509950, 9243698, -4879422, 6879879, -2204575, -3566119, - -8982069, 4429647, - ]), - xy2d: FieldElement([ - -2453894, 15725973, -20436342, -10410672, -5803908, -11040220, -7135870, -11642895, - 18047436, -15281743, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -25173001, -11307165, 29759956, 11776784, -22262383, -15820455, 10993114, - -12850837, -17620701, -9408468, - ]), - y_minus_x: FieldElement([ - 21987233, 700364, -24505048, 14972008, -7774265, -5718395, 32155026, 2581431, - -29958985, 8773375, - ]), - xy2d: FieldElement([ - -25568350, 454463, -13211935, 16126715, 25240068, 8594567, 20656846, 12017935, - -7874389, -13920155, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 6028182, 6263078, -31011806, -11301710, -818919, 2461772, -31841174, -5468042, - -1721788, -2776725, - ]), - y_minus_x: FieldElement([ - -12278994, 16624277, 987579, -5922598, 32908203, 1248608, 7719845, -4166698, - 28408820, 6816612, - ]), - xy2d: FieldElement([ - -10358094, -8237829, 19549651, -12169222, 22082623, 16147817, 20613181, 13982702, - -10339570, 5067943, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -30505967, -3821767, 12074681, 13582412, -19877972, 2443951, -19719286, 12746132, - 5331210, -10105944, - ]), - y_minus_x: FieldElement([ - 30528811, 3601899, -1957090, 4619785, -27361822, -15436388, 24180793, -12570394, - 27679908, -1648928, - ]), - xy2d: FieldElement([ - 9402404, -13957065, 32834043, 10838634, -26580150, -13237195, 26653274, -8685565, - 22611444, -12715406, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 22190590, 1118029, 22736441, 15130463, -30460692, -5991321, 19189625, -4648942, - 4854859, 6622139, - ]), - y_minus_x: FieldElement([ - -8310738, -2953450, -8262579, -3388049, -10401731, -271929, 13424426, -3567227, - 26404409, 13001963, - ]), - xy2d: FieldElement([ - -31241838, -15415700, -2994250, 8939346, 11562230, -12840670, -26064365, -11621720, - -15405155, 11020693, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 1866042, -7949489, -7898649, -10301010, 12483315, 13477547, 3175636, -12424163, - 28761762, 1406734, - ]), - y_minus_x: FieldElement([ - -448555, -1777666, 13018551, 3194501, -9580420, -11161737, 24760585, -4347088, - 25577411, -13378680, - ]), - xy2d: FieldElement([ - -24290378, 4759345, -690653, -1852816, 2066747, 10693769, -29595790, 9884936, - -9368926, 4745410, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -9141284, 6049714, -19531061, -4341411, -31260798, 9944276, -15462008, -11311852, - 10931924, -11931931, - ]), - y_minus_x: FieldElement([ - -16561513, 14112680, -8012645, 4817318, -8040464, -11414606, -22853429, 10856641, - -20470770, 13434654, - ]), - xy2d: FieldElement([ - 22759489, -10073434, -16766264, -1871422, 13637442, -10168091, 1765144, -12654326, - 28445307, -5364710, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 29875063, 12493613, 2795536, -3786330, 1710620, 15181182, -10195717, -8788675, - 9074234, 1167180, - ]), - y_minus_x: FieldElement([ - -26205683, 11014233, -9842651, -2635485, -26908120, 7532294, -18716888, -9535498, - 3843903, 9367684, - ]), - xy2d: FieldElement([ - -10969595, -6403711, 9591134, 9582310, 11349256, 108879, 16235123, 8601684, - -139197, 4242895, - ]), - }, - ], - [ - PreComputedGroupElement { - y_plus_x: FieldElement([ - 22092954, -13191123, -2042793, -11968512, 32186753, -11517388, -6574341, 2470660, - -27417366, 16625501, - ]), - y_minus_x: FieldElement([ - -11057722, 3042016, 13770083, -9257922, 584236, -544855, -7770857, 2602725, - -27351616, 14247413, - ]), - xy2d: FieldElement([ - 6314175, -10264892, -32772502, 15957557, -10157730, 168750, -8618807, 14290061, - 27108877, -1180880, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -8586597, -7170966, 13241782, 10960156, -32991015, -13794596, 33547976, -11058889, - -27148451, 981874, - ]), - y_minus_x: FieldElement([ - 22833440, 9293594, -32649448, -13618667, -9136966, 14756819, -22928859, -13970780, - -10479804, -16197962, - ]), - xy2d: FieldElement([ - -7768587, 3326786, -28111797, 10783824, 19178761, 14905060, 22680049, 13906969, - -15933690, 3797899, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 21721356, -4212746, -12206123, 9310182, -3882239, -13653110, 23740224, -2709232, - 20491983, -8042152, - ]), - y_minus_x: FieldElement([ - 9209270, -15135055, -13256557, -6167798, -731016, 15289673, 25947805, 15286587, - 30997318, -6703063, - ]), - xy2d: FieldElement([ - 7392032, 16618386, 23946583, -8039892, -13265164, -1533858, -14197445, -2321576, - 17649998, -250080, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -9301088, -14193827, 30609526, -3049543, -25175069, -1283752, -15241566, -9525724, - -2233253, 7662146, - ]), - y_minus_x: FieldElement([ - -17558673, 1763594, -33114336, 15908610, -30040870, -12174295, 7335080, -8472199, - -3174674, 3440183, - ]), - xy2d: FieldElement([ - -19889700, -5977008, -24111293, -9688870, 10799743, -16571957, 40450, -4431835, - 4862400, 1133, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -32856209, -7873957, -5422389, 14860950, -16319031, 7956142, 7258061, 311861, - -30594991, -7379421, - ]), - y_minus_x: FieldElement([ - -3773428, -1565936, 28985340, 7499440, 24445838, 9325937, 29727763, 16527196, - 18278453, 15405622, - ]), - xy2d: FieldElement([ - -4381906, 8508652, -19898366, -3674424, -5984453, 15149970, -13313598, 843523, - -21875062, 13626197, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 2281448, -13487055, -10915418, -2609910, 1879358, 16164207, -10783882, 3953792, - 13340839, 15928663, - ]), - y_minus_x: FieldElement([ - 31727126, -7179855, -18437503, -8283652, 2875793, -16390330, -25269894, -7014826, - -23452306, 5964753, - ]), - xy2d: FieldElement([ - 4100420, -5959452, -17179337, 6017714, -18705837, 12227141, -26684835, 11344144, - 2538215, -7570755, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -9433605, 6123113, 11159803, -2156608, 30016280, 14966241, -20474983, 1485421, - -629256, -15958862, - ]), - y_minus_x: FieldElement([ - -26804558, 4260919, 11851389, 9658551, -32017107, 16367492, -20205425, -13191288, - 11659922, -11115118, - ]), - xy2d: FieldElement([ - 26180396, 10015009, -30844224, -8581293, 5418197, 9480663, 2231568, -10170080, - 33100372, -1306171, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 15121113, -5201871, -10389905, 15427821, -27509937, -15992507, 21670947, 4486675, - -5931810, -14466380, - ]), - y_minus_x: FieldElement([ - 16166486, -9483733, -11104130, 6023908, -31926798, -1364923, 2340060, -16254968, - -10735770, -10039824, - ]), - xy2d: FieldElement([ - 28042865, -3557089, -12126526, 12259706, -3717498, -6945899, 6766453, -8689599, - 18036436, 5803270, - ]), - }, - ], - [ - PreComputedGroupElement { - y_plus_x: FieldElement([ - -817581, 6763912, 11803561, 1585585, 10958447, -2671165, 23855391, 4598332, - -6159431, -14117438, - ]), - y_minus_x: FieldElement([ - -31031306, -14256194, 17332029, -2383520, 31312682, -5967183, 696309, 50292, - -20095739, 11763584, - ]), - xy2d: FieldElement([ - -594563, -2514283, -32234153, 12643980, 12650761, 14811489, 665117, -12613632, - -19773211, -10713562, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 30464590, -11262872, -4127476, -12734478, 19835327, -7105613, -24396175, 2075773, - -17020157, 992471, - ]), - y_minus_x: FieldElement([ - 18357185, -6994433, 7766382, 16342475, -29324918, 411174, 14578841, 8080033, - -11574335, -10601610, - ]), - xy2d: FieldElement([ - 19598397, 10334610, 12555054, 2555664, 18821899, -10339780, 21873263, 16014234, - 26224780, 16452269, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -30223925, 5145196, 5944548, 16385966, 3976735, 2009897, -11377804, -7618186, - -20533829, 3698650, - ]), - y_minus_x: FieldElement([ - 14187449, 3448569, -10636236, -10810935, -22663880, -3433596, 7268410, -10890444, - 27394301, 12015369, - ]), - xy2d: FieldElement([ - 19695761, 16087646, 28032085, 12999827, 6817792, 11427614, 20244189, -1312777, - -13259127, -3402461, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 30860103, 12735208, -1888245, -4699734, -16974906, 2256940, -8166013, 12298312, - -8550524, -10393462, - ]), - y_minus_x: FieldElement([ - -5719826, -11245325, -1910649, 15569035, 26642876, -7587760, -5789354, -15118654, - -4976164, 12651793, - ]), - xy2d: FieldElement([ - -2848395, 9953421, 11531313, -5282879, 26895123, -12697089, -13118820, -16517902, - 9768698, -2533218, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -24719459, 1894651, -287698, -4704085, 15348719, -8156530, 32767513, 12765450, - 4940095, 10678226, - ]), - y_minus_x: FieldElement([ - 18860224, 15980149, -18987240, -1562570, -26233012, -11071856, -7843882, 13944024, - -24372348, 16582019, - ]), - xy2d: FieldElement([ - -15504260, 4970268, -29893044, 4175593, -20993212, -2199756, -11704054, 15444560, - -11003761, 7989037, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 31490452, 5568061, -2412803, 2182383, -32336847, 4531686, -32078269, 6200206, - -19686113, -14800171, - ]), - y_minus_x: FieldElement([ - -17308668, -15879940, -31522777, -2831, -32887382, 16375549, 8680158, -16371713, - 28550068, -6857132, - ]), - xy2d: FieldElement([ - -28126887, -5688091, 16837845, -1820458, -6850681, 12700016, -30039981, 4364038, - 1155602, 5988841, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 21890435, -13272907, -12624011, 12154349, -7831873, 15300496, 23148983, -4470481, - 24618407, 8283181, - ]), - y_minus_x: FieldElement([ - -33136107, -10512751, 9975416, 6841041, -31559793, 16356536, 3070187, -7025928, - 1466169, 10740210, - ]), - xy2d: FieldElement([ - -1509399, -15488185, -13503385, -10655916, 32799044, 909394, -13938903, -5779719, - -32164649, -15327040, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 3960823, -14267803, -28026090, -15918051, -19404858, 13146868, 15567327, 951507, - -3260321, -573935, - ]), - y_minus_x: FieldElement([ - 24740841, 5052253, -30094131, 8961361, 25877428, 6165135, -24368180, 14397372, - -7380369, -6144105, - ]), - xy2d: FieldElement([ - -28888365, 3510803, -28103278, -1158478, -11238128, -10631454, -15441463, - -14453128, -1625486, -6494814, - ]), - }, - ], - [ - PreComputedGroupElement { - y_plus_x: FieldElement([ - 793299, -9230478, 8836302, -6235707, -27360908, -2369593, 33152843, -4885251, - -9906200, -621852, - ]), - y_minus_x: FieldElement([ - 5666233, 525582, 20782575, -8038419, -24538499, 14657740, 16099374, 1468826, - -6171428, -15186581, - ]), - xy2d: FieldElement([ - -4859255, -3779343, -2917758, -6748019, 7778750, 11688288, -30404353, -9871238, - -1558923, -9863646, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 10896332, -7719704, 824275, 472601, -19460308, 3009587, 25248958, 14783338, - -30581476, -15757844, - ]), - y_minus_x: FieldElement([ - 10566929, 12612572, -31944212, 11118703, -12633376, 12362879, 21752402, 8822496, - 24003793, 14264025, - ]), - xy2d: FieldElement([ - 27713862, -7355973, -11008240, 9227530, 27050101, 2504721, 23886875, -13117525, - 13958495, -5732453, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -23481610, 4867226, -27247128, 3900521, 29838369, -8212291, -31889399, -10041781, - 7340521, -15410068, - ]), - y_minus_x: FieldElement([ - 4646514, -8011124, -22766023, -11532654, 23184553, 8566613, 31366726, -1381061, - -15066784, -10375192, - ]), - xy2d: FieldElement([ - -17270517, 12723032, -16993061, 14878794, 21619651, -6197576, 27584817, 3093888, - -8843694, 3849921, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -9064912, 2103172, 25561640, -15125738, -5239824, 9582958, 32477045, -9017955, - 5002294, -15550259, - ]), - y_minus_x: FieldElement([ - -12057553, -11177906, 21115585, -13365155, 8808712, -12030708, 16489530, 13378448, - -25845716, 12741426, - ]), - xy2d: FieldElement([ - -5946367, 10645103, -30911586, 15390284, -3286982, -7118677, 24306472, 15852464, - 28834118, -7646072, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -17335748, -9107057, -24531279, 9434953, -8472084, -583362, -13090771, 455841, - 20461858, 5491305, - ]), - y_minus_x: FieldElement([ - 13669248, -16095482, -12481974, -10203039, -14569770, -11893198, -24995986, - 11293807, -28588204, -9421832, - ]), - xy2d: FieldElement([ - 28497928, 6272777, -33022994, 14470570, 8906179, -1225630, 18504674, -14165166, - 29867745, -8795943, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -16207023, 13517196, -27799630, -13697798, 24009064, -6373891, -6367600, -13175392, - 22853429, -4012011, - ]), - y_minus_x: FieldElement([ - 24191378, 16712145, -13931797, 15217831, 14542237, 1646131, 18603514, -11037887, - 12876623, -2112447, - ]), - xy2d: FieldElement([ - 17902668, 4518229, -411702, -2829247, 26878217, 5258055, -12860753, 608397, - 16031844, 3723494, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -28632773, 12763728, -20446446, 7577504, 33001348, -13017745, 17558842, -7872890, - 23896954, -4314245, - ]), - y_minus_x: FieldElement([ - -20005381, -12011952, 31520464, 605201, 2543521, 5991821, -2945064, 7229064, - -9919646, -8826859, - ]), - xy2d: FieldElement([ - 28816045, 298879, -28165016, -15920938, 19000928, -1665890, -12680833, -2949325, - -18051778, -2082915, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 16000882, -344896, 3493092, -11447198, -29504595, -13159789, 12577740, 16041268, - -19715240, 7847707, - ]), - y_minus_x: FieldElement([ - 10151868, 10572098, 27312476, 7922682, 14825339, 4723128, -32855931, -6519018, - -10020567, 3852848, - ]), - xy2d: FieldElement([ - -11430470, 15697596, -21121557, -4420647, 5386314, 15063598, 16514493, -15932110, - 29330899, -15076224, - ]), - }, - ], - [ - PreComputedGroupElement { - y_plus_x: FieldElement([ - -25499735, -4378794, -15222908, -6901211, 16615731, 2051784, 3303702, 15490, - -27548796, 12314391, - ]), - y_minus_x: FieldElement([ - 15683520, -6003043, 18109120, -9980648, 15337968, -5997823, -16717435, 15921866, - 16103996, -3731215, - ]), - xy2d: FieldElement([ - -23169824, -10781249, 13588192, -1628807, -3798557, -1074929, -19273607, 5402699, - -29815713, -9841101, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 23190676, 2384583, -32714340, 3462154, -29903655, -1529132, -11266856, 8911517, - -25205859, 2739713, - ]), - y_minus_x: FieldElement([ - 21374101, -3554250, -33524649, 9874411, 15377179, 11831242, -33529904, 6134907, - 4931255, 11987849, - ]), - xy2d: FieldElement([ - -7732, -2978858, -16223486, 7277597, 105524, -322051, -31480539, 13861388, - -30076310, 10117930, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -29501170, -10744872, -26163768, 13051539, -25625564, 5089643, -6325503, 6704079, - 12890019, 15728940, - ]), - y_minus_x: FieldElement([ - -21972360, -11771379, -951059, -4418840, 14704840, 2695116, 903376, -10428139, - 12885167, 8311031, - ]), - xy2d: FieldElement([ - -17516482, 5352194, 10384213, -13811658, 7506451, 13453191, 26423267, 4384730, - 1888765, -5435404, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -25817338, -3107312, -13494599, -3182506, 30896459, -13921729, -32251644, - -12707869, -19464434, -3340243, - ]), - y_minus_x: FieldElement([ - -23607977, -2665774, -526091, 4651136, 5765089, 4618330, 6092245, 14845197, - 17151279, -9854116, - ]), - xy2d: FieldElement([ - -24830458, -12733720, -15165978, 10367250, -29530908, -265356, 22825805, -7087279, - -16866484, 16176525, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -23583256, 6564961, 20063689, 3798228, -4740178, 7359225, 2006182, -10363426, - -28746253, -10197509, - ]), - y_minus_x: FieldElement([ - -10626600, -4486402, -13320562, -5125317, 3432136, -6393229, 23632037, -1940610, - 32808310, 1099883, - ]), - xy2d: FieldElement([ - 15030977, 5768825, -27451236, -2887299, -6427378, -15361371, -15277896, -6809350, - 2051441, -15225865, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -3362323, -7239372, 7517890, 9824992, 23555850, 295369, 5148398, -14154188, - -22686354, 16633660, - ]), - y_minus_x: FieldElement([ - 4577086, -16752288, 13249841, -15304328, 19958763, -14537274, 18559670, -10759549, - 8402478, -9864273, - ]), - xy2d: FieldElement([ - -28406330, -1051581, -26790155, -907698, -17212414, -11030789, 9453451, -14980072, - 17983010, 9967138, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -25762494, 6524722, 26585488, 9969270, 24709298, 1220360, -1677990, 7806337, - 17507396, 3651560, - ]), - y_minus_x: FieldElement([ - -10420457, -4118111, 14584639, 15971087, -15768321, 8861010, 26556809, -5574557, - -18553322, -11357135, - ]), - xy2d: FieldElement([ - 2839101, 14284142, 4029895, 3472686, 14402957, 12689363, -26642121, 8459447, - -5605463, -7621941, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -4839289, -3535444, 9744961, 2871048, 25113978, 3187018, -25110813, -849066, - 17258084, -7977739, - ]), - y_minus_x: FieldElement([ - 18164541, -10595176, -17154882, -1542417, 19237078, -9745295, 23357533, -15217008, - 26908270, 12150756, - ]), - xy2d: FieldElement([ - -30264870, -7647865, 5112249, -7036672, -1499807, -6974257, 43168, -5537701, - -32302074, 16215819, - ]), - }, - ], - [ - PreComputedGroupElement { - y_plus_x: FieldElement([ - -6898905, 9824394, -12304779, -4401089, -31397141, -6276835, 32574489, 12532905, - -7503072, -8675347, - ]), - y_minus_x: FieldElement([ - -27343522, -16515468, -27151524, -10722951, 946346, 16291093, 254968, 7168080, - 21676107, -1943028, - ]), - xy2d: FieldElement([ - 21260961, -8424752, -16831886, -11920822, -23677961, 3968121, -3651949, -6215466, - -3556191, -7913075, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 16544754, 13250366, -16804428, 15546242, -4583003, 12757258, -2462308, -8680336, - -18907032, -9662799, - ]), - y_minus_x: FieldElement([ - -2415239, -15577728, 18312303, 4964443, -15272530, -12653564, 26820651, 16690659, - 25459437, -4564609, - ]), - xy2d: FieldElement([ - -25144690, 11425020, 28423002, -11020557, -6144921, -15826224, 9142795, -2391602, - -6432418, -1644817, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -23104652, 6253476, 16964147, -3768872, -25113972, -12296437, -27457225, -16344658, - 6335692, 7249989, - ]), - y_minus_x: FieldElement([ - -30333227, 13979675, 7503222, -12368314, -11956721, -4621693, -30272269, 2682242, - 25993170, -12478523, - ]), - xy2d: FieldElement([ - 4364628, 5930691, 32304656, -10044554, -8054781, 15091131, 22857016, -10598955, - 31820368, 15075278, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 31879134, -8918693, 17258761, 90626, -8041836, -4917709, 24162788, -9650886, - -17970238, 12833045, - ]), - y_minus_x: FieldElement([ - 19073683, 14851414, -24403169, -11860168, 7625278, 11091125, -19619190, 2074449, - -9413939, 14905377, - ]), - xy2d: FieldElement([ - 24483667, -11935567, -2518866, -11547418, -1553130, 15355506, -25282080, 9253129, - 27628530, -7555480, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 17597607, 8340603, 19355617, 552187, 26198470, -3176583, 4593324, -9157582, - -14110875, 15297016, - ]), - y_minus_x: FieldElement([ - 510886, 14337390, -31785257, 16638632, 6328095, 2713355, -20217417, -11864220, - 8683221, 2921426, - ]), - xy2d: FieldElement([ - 18606791, 11874196, 27155355, -5281482, -24031742, 6265446, -25178240, -1278924, - 4674690, 13890525, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 13609624, 13069022, -27372361, -13055908, 24360586, 9592974, 14977157, 9835105, - 4389687, 288396, - ]), - y_minus_x: FieldElement([ - 9922506, -519394, 13613107, 5883594, -18758345, -434263, -12304062, 8317628, - 23388070, 16052080, - ]), - xy2d: FieldElement([ - 12720016, 11937594, -31970060, -5028689, 26900120, 8561328, -20155687, -11632979, - -14754271, -10812892, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 15961858, 14150409, 26716931, -665832, -22794328, 13603569, 11829573, 7467844, - -28822128, 929275, - ]), - y_minus_x: FieldElement([ - 11038231, -11582396, -27310482, -7316562, -10498527, -16307831, -23479533, - -9371869, -21393143, 2465074, - ]), - xy2d: FieldElement([ - 20017163, -4323226, 27915242, 1529148, 12396362, 15675764, 13817261, -9658066, - 2463391, -4622140, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -16358878, -12663911, -12065183, 4996454, -1256422, 1073572, 9583558, 12851107, - 4003896, 12673717, - ]), - y_minus_x: FieldElement([ - -1731589, -15155870, -3262930, 16143082, 19294135, 13385325, 14741514, -9103726, - 7903886, 2348101, - ]), - xy2d: FieldElement([ - 24536016, -16515207, 12715592, -3862155, 1511293, 10047386, -3842346, -7129159, - -28377538, 10048127, - ]), - }, - ], - [ - PreComputedGroupElement { - y_plus_x: FieldElement([ - -12622226, -6204820, 30718825, 2591312, -10617028, 12192840, 18873298, -7297090, - -32297756, 15221632, - ]), - y_minus_x: FieldElement([ - -26478122, -11103864, 11546244, -1852483, 9180880, 7656409, -21343950, 2095755, - 29769758, 6593415, - ]), - xy2d: FieldElement([ - -31994208, -2907461, 4176912, 3264766, 12538965, -868111, 26312345, -6118678, - 30958054, 8292160, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 31429822, -13959116, 29173532, 15632448, 12174511, -2760094, 32808831, 3977186, - 26143136, -3148876, - ]), - y_minus_x: FieldElement([ - 22648901, 1402143, -22799984, 13746059, 7936347, 365344, -8668633, -1674433, - -3758243, -2304625, - ]), - xy2d: FieldElement([ - -15491917, 8012313, -2514730, -12702462, -23965846, -10254029, -1612713, -1535569, - -16664475, 8194478, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 27338066, -7507420, -7414224, 10140405, -19026427, -6589889, 27277191, 8855376, - 28572286, 3005164, - ]), - y_minus_x: FieldElement([ - 26287124, 4821776, 25476601, -4145903, -3764513, -15788984, -18008582, 1182479, - -26094821, -13079595, - ]), - xy2d: FieldElement([ - -7171154, 3178080, 23970071, 6201893, -17195577, -4489192, -21876275, -13982627, - 32208683, -1198248, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -16657702, 2817643, -10286362, 14811298, 6024667, 13349505, -27315504, -10497842, - -27672585, -11539858, - ]), - y_minus_x: FieldElement([ - 15941029, -9405932, -21367050, 8062055, 31876073, -238629, -15278393, -1444429, - 15397331, -4130193, - ]), - xy2d: FieldElement([ - 8934485, -13485467, -23286397, -13423241, -32446090, 14047986, 31170398, -1441021, - -27505566, 15087184, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -18357243, -2156491, 24524913, -16677868, 15520427, -6360776, -15502406, 11461896, - 16788528, -5868942, - ]), - y_minus_x: FieldElement([ - -1947386, 16013773, 21750665, 3714552, -17401782, -16055433, -3770287, -10323320, - 31322514, -11615635, - ]), - xy2d: FieldElement([ - 21426655, -5650218, -13648287, -5347537, -28812189, -4920970, -18275391, -14621414, - 13040862, -12112948, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 11293895, 12478086, -27136401, 15083750, -29307421, 14748872, 14555558, -13417103, - 1613711, 4896935, - ]), - y_minus_x: FieldElement([ - -25894883, 15323294, -8489791, -8057900, 25967126, -13425460, 2825960, -4897045, - -23971776, -11267415, - ]), - xy2d: FieldElement([ - -15924766, -5229880, -17443532, 6410664, 3622847, 10243618, 20615400, 12405433, - -23753030, -8436416, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -7091295, 12556208, -20191352, 9025187, -17072479, 4333801, 4378436, 2432030, - 23097949, -566018, - ]), - y_minus_x: FieldElement([ - 4565804, -16025654, 20084412, -7842817, 1724999, 189254, 24767264, 10103221, - -18512313, 2424778, - ]), - xy2d: FieldElement([ - 366633, -11976806, 8173090, -6890119, 30788634, 5745705, -7168678, 1344109, - -3642553, 12412659, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -24001791, 7690286, 14929416, -168257, -32210835, -13412986, 24162697, -15326504, - -3141501, 11179385, - ]), - y_minus_x: FieldElement([ - 18289522, -14724954, 8056945, 16430056, -21729724, 7842514, -6001441, -1486897, - -18684645, -11443503, - ]), - xy2d: FieldElement([ - 476239, 6601091, -6152790, -9723375, 17503545, -4863900, 27672959, 13403813, - 11052904, 5219329, - ]), - }, - ], - [ - PreComputedGroupElement { - y_plus_x: FieldElement([ - 20678546, -8375738, -32671898, 8849123, -5009758, 14574752, 31186971, -3973730, - 9014762, -8579056, - ]), - y_minus_x: FieldElement([ - -13644050, -10350239, -15962508, 5075808, -1514661, -11534600, -33102500, 9160280, - 8473550, -3256838, - ]), - xy2d: FieldElement([ - 24900749, 14435722, 17209120, -15292541, -22592275, 9878983, -7689309, -16335821, - -24568481, 11788948, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -3118155, -11395194, -13802089, 14797441, 9652448, -6845904, -20037437, 10410733, - -24568470, -1458691, - ]), - y_minus_x: FieldElement([ - -15659161, 16736706, -22467150, 10215878, -9097177, 7563911, 11871841, -12505194, - -18513325, 8464118, - ]), - xy2d: FieldElement([ - -23400612, 8348507, -14585951, -861714, -3950205, -6373419, 14325289, 8628612, - 33313881, -8370517, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -20186973, -4967935, 22367356, 5271547, -1097117, -4788838, -24805667, -10236854, - -8940735, -5818269, - ]), - y_minus_x: FieldElement([ - -6948785, -1795212, -32625683, -16021179, 32635414, -7374245, 15989197, -12838188, - 28358192, -4253904, - ]), - xy2d: FieldElement([ - -23561781, -2799059, -32351682, -1661963, -9147719, 10429267, -16637684, 4072016, - -5351664, 5596589, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -28236598, -3390048, 12312896, 6213178, 3117142, 16078565, 29266239, 2557221, - 1768301, 15373193, - ]), - y_minus_x: FieldElement([ - -7243358, -3246960, -4593467, -7553353, -127927, -912245, -1090902, -4504991, - -24660491, 3442910, - ]), - xy2d: FieldElement([ - -30210571, 5124043, 14181784, 8197961, 18964734, -11939093, 22597931, 7176455, - -18585478, 13365930, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -7877390, -1499958, 8324673, 4690079, 6261860, 890446, 24538107, -8570186, - -9689599, -3031667, - ]), - y_minus_x: FieldElement([ - 25008904, -10771599, -4305031, -9638010, 16265036, 15721635, 683793, -11823784, - 15723479, -15163481, - ]), - xy2d: FieldElement([ - -9660625, 12374379, -27006999, -7026148, -7724114, -12314514, 11879682, 5400171, - 519526, -1235876, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 22258397, -16332233, -7869817, 14613016, -22520255, -2950923, -20353881, 7315967, - 16648397, 7605640, - ]), - y_minus_x: FieldElement([ - -8081308, -8464597, -8223311, 9719710, 19259459, -15348212, 23994942, -5281555, - -9468848, 4763278, - ]), - xy2d: FieldElement([ - -21699244, 9220969, -15730624, 1084137, -25476107, -2852390, 31088447, -7764523, - -11356529, 728112, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 26047220, -11751471, -6900323, -16521798, 24092068, 9158119, -4273545, -12555558, - -29365436, -5498272, - ]), - y_minus_x: FieldElement([ - 17510331, -322857, 5854289, 8403524, 17133918, -3112612, -28111007, 12327945, - 10750447, 10014012, - ]), - xy2d: FieldElement([ - -10312768, 3936952, 9156313, -8897683, 16498692, -994647, -27481051, -666732, - 3424691, 7540221, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 30322361, -6964110, 11361005, -4143317, 7433304, 4989748, -7071422, -16317219, - -9244265, 15258046, - ]), - y_minus_x: FieldElement([ - 13054562, -2779497, 19155474, 469045, -12482797, 4566042, 5631406, 2711395, - 1062915, -5136345, - ]), - xy2d: FieldElement([ - -19240248, -11254599, -29509029, -7499965, -5835763, 13005411, -6066489, 12194497, - 32960380, 1459310, - ]), - }, - ], - [ - PreComputedGroupElement { - y_plus_x: FieldElement([ - 19852034, 7027924, 23669353, 10020366, 8586503, -6657907, 394197, -6101885, - 18638003, -11174937, - ]), - y_minus_x: FieldElement([ - 31395534, 15098109, 26581030, 8030562, -16527914, -5007134, 9012486, -7584354, - -6643087, -5442636, - ]), - xy2d: FieldElement([ - -9192165, -2347377, -1997099, 4529534, 25766844, 607986, -13222, 9677543, - -32294889, -6456008, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -2444496, -149937, 29348902, 8186665, 1873760, 12489863, -30934579, -7839692, - -7852844, -8138429, - ]), - y_minus_x: FieldElement([ - -15236356, -15433509, 7766470, 746860, 26346930, -10221762, -27333451, 10754588, - -9431476, 5203576, - ]), - xy2d: FieldElement([ - 31834314, 14135496, -770007, 5159118, 20917671, -16768096, -7467973, -7337524, - 31809243, 7347066, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -9606723, -11874240, 20414459, 13033986, 13716524, -11691881, 19797970, -12211255, - 15192876, -2087490, - ]), - y_minus_x: FieldElement([ - -12663563, -2181719, 1168162, -3804809, 26747877, -14138091, 10609330, 12694420, - 33473243, -13382104, - ]), - xy2d: FieldElement([ - 33184999, 11180355, 15832085, -11385430, -1633671, 225884, 15089336, -11023903, - -6135662, 14480053, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 31308717, -5619998, 31030840, -1897099, 15674547, -6582883, 5496208, 13685227, - 27595050, 8737275, - ]), - y_minus_x: FieldElement([ - -20318852, -15150239, 10933843, -16178022, 8335352, -7546022, -31008351, -12610604, - 26498114, 66511, - ]), - xy2d: FieldElement([ - 22644454, -8761729, -16671776, 4884562, -3105614, -13559366, 30540766, -4286747, - -13327787, -7515095, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -28017847, 9834845, 18617207, -2681312, -3401956, -13307506, 8205540, 13585437, - -17127465, 15115439, - ]), - y_minus_x: FieldElement([ - 23711543, -672915, 31206561, -8362711, 6164647, -9709987, -33535882, -1426096, - 8236921, 16492939, - ]), - xy2d: FieldElement([ - -23910559, -13515526, -26299483, -4503841, 25005590, -7687270, 19574902, 10071562, - 6708380, -6222424, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 2101391, -4930054, 19702731, 2367575, -15427167, 1047675, 5301017, 9328700, - 29955601, -11678310, - ]), - y_minus_x: FieldElement([ - 3096359, 9271816, -21620864, -15521844, -14847996, -7592937, -25892142, -12635595, - -9917575, 6216608, - ]), - xy2d: FieldElement([ - -32615849, 338663, -25195611, 2510422, -29213566, -13820213, 24822830, -6146567, - -26767480, 7525079, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -23066649, -13985623, 16133487, -7896178, -3389565, 778788, -910336, -2782495, - -19386633, 11994101, - ]), - y_minus_x: FieldElement([ - 21691500, -13624626, -641331, -14367021, 3285881, -3483596, -25064666, 9718258, - -7477437, 13381418, - ]), - xy2d: FieldElement([ - 18445390, -4202236, 14979846, 11622458, -1727110, -3582980, 23111648, -6375247, - 28535282, 15779576, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 30098053, 3089662, -9234387, 16662135, -21306940, 11308411, -14068454, 12021730, - 9955285, -16303356, - ]), - y_minus_x: FieldElement([ - 9734894, -14576830, -7473633, -9138735, 2060392, 11313496, -18426029, 9924399, - 20194861, 13380996, - ]), - xy2d: FieldElement([ - -26378102, -7965207, -22167821, 15789297, -18055342, -6168792, -1984914, 15707771, - 26342023, 10146099, - ]), - }, - ], - [ - PreComputedGroupElement { - y_plus_x: FieldElement([ - -26016874, -219943, 21339191, -41388, 19745256, -2878700, -29637280, 2227040, - 21612326, -545728, - ]), - y_minus_x: FieldElement([ - -13077387, 1184228, 23562814, -5970442, -20351244, -6348714, 25764461, 12243797, - -20856566, 11649658, - ]), - xy2d: FieldElement([ - -10031494, 11262626, 27384172, 2271902, 26947504, -15997771, 39944, 6114064, - 33514190, 2333242, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -21433588, -12421821, 8119782, 7219913, -21830522, -9016134, -6679750, -12670638, - 24350578, -13450001, - ]), - y_minus_x: FieldElement([ - -4116307, -11271533, -23886186, 4843615, -30088339, 690623, -31536088, -10406836, - 8317860, 12352766, - ]), - xy2d: FieldElement([ - 18200138, -14475911, -33087759, -2696619, -23702521, -9102511, -23552096, -2287550, - 20712163, 6719373, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 26656208, 6075253, -7858556, 1886072, -28344043, 4262326, 11117530, -3763210, - 26224235, -3297458, - ]), - y_minus_x: FieldElement([ - -17168938, -14854097, -3395676, -16369877, -19954045, 14050420, 21728352, 9493610, - 18620611, -16428628, - ]), - xy2d: FieldElement([ - -13323321, 13325349, 11432106, 5964811, 18609221, 6062965, -5269471, -9725556, - -30701573, -16479657, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -23860538, -11233159, 26961357, 1640861, -32413112, -16737940, 12248509, -5240639, - 13735342, 1934062, - ]), - y_minus_x: FieldElement([ - 25089769, 6742589, 17081145, -13406266, 21909293, -16067981, -15136294, -3765346, - -21277997, 5473616, - ]), - xy2d: FieldElement([ - 31883677, -7961101, 1083432, -11572403, 22828471, 13290673, -7125085, 12469656, - 29111212, -5451014, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 24244947, -15050407, -26262976, 2791540, -14997599, 16666678, 24367466, 6388839, - -10295587, 452383, - ]), - y_minus_x: FieldElement([ - -25640782, -3417841, 5217916, 16224624, 19987036, -4082269, -24236251, -5915248, - 15766062, 8407814, - ]), - xy2d: FieldElement([ - -20406999, 13990231, 15495425, 16395525, 5377168, 15166495, -8917023, -4388953, - -8067909, 2276718, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 30157918, 12924066, -17712050, 9245753, 19895028, 3368142, -23827587, 5096219, - 22740376, -7303417, - ]), - y_minus_x: FieldElement([ - 2041139, -14256350, 7783687, 13876377, -25946985, -13352459, 24051124, 13742383, - -15637599, 13295222, - ]), - xy2d: FieldElement([ - 33338237, -8505733, 12532113, 7977527, 9106186, -1715251, -17720195, -4612972, - -4451357, -14669444, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -20045281, 5454097, -14346548, 6447146, 28862071, 1883651, -2469266, -4141880, - 7770569, 9620597, - ]), - y_minus_x: FieldElement([ - 23208068, 7979712, 33071466, 8149229, 1758231, -10834995, 30945528, -1694323, - -33502340, -14767970, - ]), - xy2d: FieldElement([ - 1439958, -16270480, -1079989, -793782, 4625402, 10647766, -5043801, 1220118, - 30494170, -11440799, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -5037580, -13028295, -2970559, -3061767, 15640974, -6701666, -26739026, 926050, - -1684339, -13333647, - ]), - y_minus_x: FieldElement([ - 13908495, -3549272, 30919928, -6273825, -21521863, 7989039, 9021034, 9078865, - 3353509, 4033511, - ]), - xy2d: FieldElement([ - -29663431, -15113610, 32259991, -344482, 24295849, -12912123, 23161163, 8839127, - 27485041, 7356032, - ]), - }, - ], - [ - PreComputedGroupElement { - y_plus_x: FieldElement([ - 9661027, 705443, 11980065, -5370154, -1628543, 14661173, -6346142, 2625015, - 28431036, -16771834, - ]), - y_minus_x: FieldElement([ - -23839233, -8311415, -25945511, 7480958, -17681669, -8354183, -22545972, 14150565, - 15970762, 4099461, - ]), - xy2d: FieldElement([ - 29262576, 16756590, 26350592, -8793563, 8529671, -11208050, 13617293, -9937143, - 11465739, 8317062, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -25493081, -6962928, 32500200, -9419051, -23038724, -2302222, 14898637, 3848455, - 20969334, -5157516, - ]), - y_minus_x: FieldElement([ - -20384450, -14347713, -18336405, 13884722, -33039454, 2842114, -21610826, -3649888, - 11177095, 14989547, - ]), - xy2d: FieldElement([ - -24496721, -11716016, 16959896, 2278463, 12066309, 10137771, 13515641, 2581286, - -28487508, 9930240, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -17751622, -2097826, 16544300, -13009300, -15914807, -14949081, 18345767, - -13403753, 16291481, -5314038, - ]), - y_minus_x: FieldElement([ - -33229194, 2553288, 32678213, 9875984, 8534129, 6889387, -9676774, 6957617, - 4368891, 9788741, - ]), - xy2d: FieldElement([ - 16660756, 7281060, -10830758, 12911820, 20108584, -8101676, -21722536, -8613148, - 16250552, -11111103, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -19765507, 2390526, -16551031, 14161980, 1905286, 6414907, 4689584, 10604807, - -30190403, 4782747, - ]), - y_minus_x: FieldElement([ - -1354539, 14736941, -7367442, -13292886, 7710542, -14155590, -9981571, 4383045, - 22546403, 437323, - ]), - xy2d: FieldElement([ - 31665577, -12180464, -16186830, 1491339, -18368625, 3294682, 27343084, 2786261, - -30633590, -14097016, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -14467279, -683715, -33374107, 7448552, 19294360, 14334329, -19690631, 2355319, - -19284671, -6114373, - ]), - y_minus_x: FieldElement([ - 15121312, -15796162, 6377020, -6031361, -10798111, -12957845, 18952177, 15496498, - -29380133, 11754228, - ]), - xy2d: FieldElement([ - -2637277, -13483075, 8488727, -14303896, 12728761, -1622493, 7141596, 11724556, - 22761615, -10134141, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - 16918416, 11729663, -18083579, 3022987, -31015732, -13339659, -28741185, -12227393, - 32851222, 11717399, - ]), - y_minus_x: FieldElement([ - 11166634, 7338049, -6722523, 4531520, -29468672, -7302055, 31474879, 3483633, - -1193175, -4030831, - ]), - xy2d: FieldElement([ - -185635, 9921305, 31456609, -13536438, -12013818, 13348923, 33142652, 6546660, - -19985279, -3948376, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -32460596, 11266712, -11197107, -7899103, 31703694, 3855903, -8537131, -12833048, - -30772034, -15486313, - ]), - y_minus_x: FieldElement([ - -18006477, 12709068, 3991746, -6479188, -21491523, -10550425, -31135347, -16049879, - 10928917, 3011958, - ]), - xy2d: FieldElement([ - -6957757, -15594337, 31696059, 334240, 29576716, 14796075, -30831056, -12805180, - 18008031, 10258577, - ]), - }, - PreComputedGroupElement { - y_plus_x: FieldElement([ - -22448644, 15655569, 7018479, -4410003, -30314266, -1201591, -1853465, 1367120, - 25127874, 6671743, - ]), - y_minus_x: FieldElement([ - 29701166, -14373934, -10878120, 9279288, -17568, 13127210, 21382910, 11042292, - 25838796, 4642684, - ]), - xy2d: FieldElement([ - -20430234, 14955537, -24126347, 8124619, -5369288, -5990470, 30468147, -13900640, - 18423289, 4177476, - ]), - }, - ], -]; diff --git a/sdk/core/src/crypto/edwards25519/extended_group_element.rs b/sdk/core/src/crypto/edwards25519/extended_group_element.rs deleted file mode 100644 index 6315fc5627..0000000000 --- a/sdk/core/src/crypto/edwards25519/extended_group_element.rs +++ /dev/null @@ -1,103 +0,0 @@ -use super::{ - completed_group_element::CompletedGroupElement, field_element::FieldElement, - pre_computed_group_element::PreComputedGroupElement, - projective_group_element::ProjectiveGroupElement, -}; - -#[derive(Default, Copy, Clone, Debug)] -pub struct ExtendedGroupElement { - pub x: FieldElement, - pub y: FieldElement, - pub z: FieldElement, - pub t: FieldElement, -} - -impl ExtendedGroupElement { - pub fn to_projective(self, r: &mut ProjectiveGroupElement) { - r.x.fe_copy(&self.x); - r.y.fe_copy(&self.y); - r.z.fe_copy(&self.z); - } - - pub fn double(&self, r: &mut CompletedGroupElement) { - let mut q = ProjectiveGroupElement::default(); - - self.to_projective(&mut q); - q.double(r); - } - - pub fn zero(&mut self) { - self.x.fe_zero(); - self.y.fe_one(); - self.z.fe_one(); - self.t.fe_zero(); - } - - // ge_scalar_mult_base computes h = a*B, where - // a = a[0]+256*a[1]+...+256^31 a[31] - // B is the Ed25519 base point (x,4/5) with x positive. - // - // Preconditions: - // a[31] <= 127 - #[allow(clippy::needless_range_loop)] - pub fn ge_scalar_mult_base(&mut self, a: [u8; 32]) { - let mut e = [0i8; 64]; - for (i, v) in a.iter().enumerate() { - e[2 * i] = (v & 15) as i8; - e[2 * i + 1] = ((v >> 4) & 15) as i8; - } - - // each e[i] is between 0 and 15 and e[63] is between 0 and 7. - - let mut carry: i8 = 0; - for i in 0..63 { - e[i] += carry; - carry = (e[i] + 8) >> 4; - e[i] -= carry << 4; - } - - e[63] += carry; - // each e[i] is between -8 and 8. - - self.zero(); - let mut t = PreComputedGroupElement::default(); - let mut r = CompletedGroupElement::default(); - for i in (1..64).step_by(2) { - t.select_point(i / 2, e[i as usize] as i32); - r.ge_mixed_add(self, &t); - r.to_extended(self); - } - - let mut s = ProjectiveGroupElement::default(); - - self.double(&mut r); - r.to_projective(&mut s); - s.double(&mut r); - r.to_projective(&mut s); - s.double(&mut r); - r.to_projective(&mut s); - s.double(&mut r); - r.to_extended(self); - - for i in (0..64).step_by(2) { - t.select_point(i / 2, e[i as usize] as i32); - r.ge_mixed_add(self, &t); - r.to_extended(self); - } - } - - pub fn to_bytes(self) -> [u8; 32] { - let mut recip = FieldElement::default(); - let mut x = FieldElement::default(); - let mut y = FieldElement::default(); - - recip.fe_invert(&self.z); - x.fe_mul(&self.x, &recip); - y.fe_mul(&self.y, &recip); - let mut s = y.to_bytes(); - - s[31] ^= x.fe_is_negative() << 7; - - s - } -} diff --git a/sdk/core/src/crypto/edwards25519/field_element.rs b/sdk/core/src/crypto/edwards25519/field_element.rs deleted file mode 100644 index afa56c4dda..0000000000 --- a/sdk/core/src/crypto/edwards25519/field_element.rs +++ /dev/null @@ -1,637 +0,0 @@ -use std::marker::Copy; - -#[derive(Default, Copy, Clone, Debug)] -pub struct FieldElement(pub [i32; 10]); - -const ZERO: FieldElement = FieldElement([0; 10]); - -impl FieldElement { - pub fn fe_zero(&mut self) { - self.0.copy_from_slice(&ZERO.0); - } - - pub fn fe_one(&mut self) { - self.fe_zero(); - self.0[0] = 1; - } - - pub fn fe_add(&mut self, a: &FieldElement, b: &FieldElement) { - self.0[0] = a.0[0] + b.0[0]; - self.0[1] = a.0[1] + b.0[1]; - self.0[2] = a.0[2] + b.0[2]; - self.0[3] = a.0[3] + b.0[3]; - self.0[4] = a.0[4] + b.0[4]; - self.0[5] = a.0[5] + b.0[5]; - self.0[6] = a.0[6] + b.0[6]; - self.0[7] = a.0[7] + b.0[7]; - self.0[8] = a.0[8] + b.0[8]; - self.0[9] = a.0[9] + b.0[9]; - } - - pub fn fe_sub(&mut self, a: &FieldElement, b: &FieldElement) { - self.0[0] = a.0[0] - b.0[0]; - self.0[1] = a.0[1] - b.0[1]; - self.0[2] = a.0[2] - b.0[2]; - self.0[3] = a.0[3] - b.0[3]; - self.0[4] = a.0[4] - b.0[4]; - self.0[5] = a.0[5] - b.0[5]; - self.0[6] = a.0[6] - b.0[6]; - self.0[7] = a.0[7] - b.0[7]; - self.0[8] = a.0[8] - b.0[8]; - self.0[9] = a.0[9] - b.0[9]; - } - - fn fe_square_internal(&self) -> (i64, i64, i64, i64, i64, i64, i64, i64, i64, i64) { - let f0 = self.0[0] as i64; - let f1 = self.0[1] as i64; - let f2 = self.0[2] as i64; - let f3 = self.0[3] as i64; - let f4 = self.0[4] as i64; - let f5 = self.0[5] as i64; - let f6 = self.0[6] as i64; - let f7 = self.0[7] as i64; - let f8 = self.0[8] as i64; - let f9 = self.0[9] as i64; - let f0_2 = (2 * self.0[0]) as i64; - let f1_2 = (2 * self.0[1]) as i64; - let f2_2 = (2 * self.0[2]) as i64; - let f3_2 = (2 * self.0[3]) as i64; - let f4_2 = (2 * self.0[4]) as i64; - let f5_2 = (2 * self.0[5]) as i64; - let f6_2 = (2 * self.0[6]) as i64; - let f7_2 = (2 * self.0[7]) as i64; - let f5_38 = 38 * f5; // 1.31*2^30 - let f6_19 = 19 * f6; // 1.31*2^30 - let f7_38 = 38 * f7; // 1.31*2^30 - let f8_19 = 19 * f8; // 1.31*2^30 - let f9_38 = 38 * f9; // 1.31*2^30 - - let h0 = f0 * f0 + f1_2 * f9_38 + f2_2 * f8_19 + f3_2 * f7_38 + f4_2 * f6_19 + f5 * f5_38; - let h1 = f0_2 * f1 + f2 * f9_38 + f3_2 * f8_19 + f4 * f7_38 + f5_2 * f6_19; - let h2 = f0_2 * f2 + f1_2 * f1 + f3_2 * f9_38 + f4_2 * f8_19 + f5_2 * f7_38 + f6 * f6_19; - let h3 = f0_2 * f3 + f1_2 * f2 + f4 * f9_38 + f5_2 * f8_19 + f6 * f7_38; - let h4 = f0_2 * f4 + f1_2 * f3_2 + f2 * f2 + f5_2 * f9_38 + f6_2 * f8_19 + f7 * f7_38; - let h5 = f0_2 * f5 + f1_2 * f4 + f2_2 * f3 + f6 * f9_38 + f7_2 * f8_19; - let h6 = f0_2 * f6 + f1_2 * f5_2 + f2_2 * f4 + f3_2 * f3 + f7_2 * f9_38 + f8 * f8_19; - let h7 = f0_2 * f7 + f1_2 * f6 + f2_2 * f5 + f3_2 * f4 + f8 * f9_38; - let h8 = f0_2 * f8 + f1_2 * f7_2 + f2_2 * f6 + f3_2 * f5_2 + f4 * f4 + f9 * f9_38; - let h9 = f0_2 * f9 + f1_2 * f8 + f2_2 * f7 + f3_2 * f6 + f4_2 * f5; - - (h0, h1, h2, h3, h4, h5, h6, h7, h8, h9) - } - - // fe_square sets h = 2 * f * f - // - // Can overlap h with f. - // - // Preconditions: - // |f| bounded by 1.65*2^26,1.65*2^25,1.65*2^26,1.65*2^25,etc. - // - // Postconditions: - // |h| bounded by 1.01*2^25,1.01*2^24,1.01*2^25,1.01*2^24,etc. - // See fe_mul.c for discussion of implementation strategy. - pub fn fe_square(&mut self, f: &FieldElement) { - let (h0, h1, h2, h3, h4, h5, h6, h7, h8, h9) = f.fe_square_internal(); - self.fe_combine(h0, h1, h2, h3, h4, h5, h6, h7, h8, h9); - } - - pub fn fe_square_2(&mut self, f: &FieldElement) { - let (mut h0, mut h1, mut h2, mut h3, mut h4, mut h5, mut h6, mut h7, mut h8, mut h9) = - f.fe_square_internal(); - - h0 += h0; - h1 += h1; - h2 += h2; - h3 += h3; - h4 += h4; - h5 += h5; - h6 += h6; - h7 += h7; - h8 += h8; - h9 += h9; - - self.fe_combine(h0, h1, h2, h3, h4, h5, h6, h7, h8, h9); - } - - pub fn fe_copy(&mut self, src: &FieldElement) { - self.0.copy_from_slice(&src.0); - } - - pub fn fe_cmove(&mut self, g: &FieldElement, b: i32) { - let b = -b; - self.0[0] ^= b & (self.0[0] ^ g.0[0]); - self.0[1] ^= b & (self.0[1] ^ g.0[1]); - self.0[2] ^= b & (self.0[2] ^ g.0[2]); - self.0[3] ^= b & (self.0[3] ^ g.0[3]); - self.0[4] ^= b & (self.0[4] ^ g.0[4]); - self.0[5] ^= b & (self.0[5] ^ g.0[5]); - self.0[6] ^= b & (self.0[6] ^ g.0[6]); - self.0[7] ^= b & (self.0[7] ^ g.0[7]); - self.0[8] ^= b & (self.0[8] ^ g.0[8]); - self.0[9] ^= b & (self.0[9] ^ g.0[9]); - } - - // FeNeg sets h = -f - // - // Preconditions: - // |f| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc. - // - // Postconditions: - // |h| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc. - pub fn fe_neg(&mut self, f: &FieldElement) { - self.0[0] = -f.0[0]; - self.0[1] = -f.0[1]; - self.0[2] = -f.0[2]; - self.0[3] = -f.0[3]; - self.0[4] = -f.0[4]; - self.0[5] = -f.0[5]; - self.0[6] = -f.0[6]; - self.0[7] = -f.0[7]; - self.0[8] = -f.0[8]; - self.0[9] = -f.0[9]; - } - - #[allow(clippy::too_many_arguments)] - pub fn fe_combine( - &mut self, - h0: i64, - h1: i64, - h2: i64, - h3: i64, - h4: i64, - h5: i64, - h6: i64, - h7: i64, - h8: i64, - h9: i64, - ) { - let mut h0 = h0; - let mut h1 = h1; - let mut h2 = h2; - let mut h3 = h3; - let mut h4 = h4; - let mut h5 = h5; - let mut h6 = h6; - let mut h7 = h7; - let mut h8 = h8; - let mut h9 = h9; - - /* - |h0| <= (1.1*1.1*2^52*(1+19+19+19+19)+1.1*1.1*2^50*(38+38+38+38+38)) - i.e. |h0| <= 1.2*2^59; narrower ranges for h2, h4, h6, h8 - |h1| <= (1.1*1.1*2^51*(1+1+19+19+19+19+19+19+19+19)) - i.e. |h1| <= 1.5*2^58; narrower ranges for h3, h5, h7, h9 - */ - - let mut c0 = (h0 + (1 << 25)) >> 26; - h1 += c0; - h0 -= c0 << 26; - let c4 = (h4 + (1 << 25)) >> 26; - h5 += c4; - h4 -= c4 << 26; - /* |h0| <= 2^25 */ - /* |h4| <= 2^25 */ - /* |h1| <= 1.51*2^58 */ - /* |h5| <= 1.51*2^58 */ - - let c1 = (h1 + (1 << 24)) >> 25; - h2 += c1; - h1 -= c1 << 25; - let c5 = (h5 + (1 << 24)) >> 25; - h6 += c5; - h5 -= c5 << 25; - /* |h1| <= 2^24; from now on fits into int32 */ - /* |h5| <= 2^24; from now on fits into int32 */ - /* |h2| <= 1.21*2^59 */ - /* |h6| <= 1.21*2^59 */ - - let c2 = (h2 + (1 << 25)) >> 26; - h3 += c2; - h2 -= c2 << 26; - let c6 = (h6 + (1 << 25)) >> 26; - h7 += c6; - h6 -= c6 << 26; - /* |h2| <= 2^25; from now on fits into int32 unchanged */ - /* |h6| <= 2^25; from now on fits into int32 unchanged */ - /* |h3| <= 1.51*2^58 */ - /* |h7| <= 1.51*2^58 */ - - let c3 = (h3 + (1 << 24)) >> 25; - h4 += c3; - h3 -= c3 << 25; - let c7 = (h7 + (1 << 24)) >> 25; - h8 += c7; - h7 -= c7 << 25; - /* |h3| <= 2^24; from now on fits into int32 unchanged */ - /* |h7| <= 2^24; from now on fits into int32 unchanged */ - /* |h4| <= 1.52*2^33 */ - /* |h8| <= 1.52*2^33 */ - - let c4 = (h4 + (1 << 25)) >> 26; - h5 += c4; - h4 -= c4 << 26; - let c8 = (h8 + (1 << 25)) >> 26; - h9 += c8; - h8 -= c8 << 26; - /* |h4| <= 2^25; from now on fits into int32 unchanged */ - /* |h8| <= 2^25; from now on fits into int32 unchanged */ - /* |h5| <= 1.01*2^24 */ - /* |h9| <= 1.51*2^58 */ - - let c9 = (h9 + (1 << 24)) >> 25; - h0 += c9 * 19; - h9 -= c9 << 25; - /* |h9| <= 2^24; from now on fits into int32 unchanged */ - /* |h0| <= 1.8*2^37 */ - - c0 = (h0 + (1 << 25)) >> 26; - h1 += c0; - h0 -= c0 << 26; - /* |h0| <= 2^25; from now on fits into int32 unchanged */ - /* |h1| <= 1.01*2^24 */ - - self.0[0] = h0 as i32; - self.0[1] = h1 as i32; - self.0[2] = h2 as i32; - self.0[3] = h3 as i32; - self.0[4] = h4 as i32; - self.0[5] = h5 as i32; - self.0[6] = h6 as i32; - self.0[7] = h7 as i32; - self.0[8] = h8 as i32; - self.0[9] = h9 as i32; - } - - // FeMul calculates h = f * g - // Can overlap h with f or g. - // - // Preconditions: - // |f| bounded by 1.1*2^26,1.1*2^25,1.1*2^26,1.1*2^25,etc. - // |g| bounded by 1.1*2^26,1.1*2^25,1.1*2^26,1.1*2^25,etc. - // - // Postconditions: - // |h| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc. - // - // Notes on implementation strategy: - // - // Using schoolbook multiplication. - // Karatsuba would save a little in some cost models. - // - // Most multiplications by 2 and 19 are 32-bit precomputations; - // cheaper than 64-bit postcomputations. - // - // There is one remaining multiplication by 19 in the carry chain; - // one *19 precomputation can be merged into this, - // but the resulting data flow is considerably less clean. - // - // There are 12 carries below. - // 10 of them are 2-way parallelizable and vectorizable. - // Can get away with 11 carries, but then data flow is much deeper. - // - // With tighter constraints on inputs, can squeeze carries into int32. - pub fn fe_mul(&mut self, f: &FieldElement, g: &FieldElement) { - let f0 = f.0[0] as i64; - let f1 = f.0[1] as i64; - let f2 = f.0[2] as i64; - let f3 = f.0[3] as i64; - let f4 = f.0[4] as i64; - let f5 = f.0[5] as i64; - let f6 = f.0[6] as i64; - let f7 = f.0[7] as i64; - let f8 = f.0[8] as i64; - let f9 = f.0[9] as i64; - - let f1_2 = (2 * f.0[1]) as i64; - let f3_2 = (2 * f.0[3]) as i64; - let f5_2 = (2 * f.0[5]) as i64; - let f7_2 = (2 * f.0[7]) as i64; - let f9_2 = (2 * f.0[9]) as i64; - - let g0 = g.0[0] as i64; - let g1 = g.0[1] as i64; - let g2 = g.0[2] as i64; - let g3 = g.0[3] as i64; - let g4 = g.0[4] as i64; - let g5 = g.0[5] as i64; - let g6 = g.0[6] as i64; - let g7 = g.0[7] as i64; - let g8 = g.0[8] as i64; - let g9 = g.0[9] as i64; - - let g1_19 = (19 * g.0[1]) as i64; /* 1.4*2^29 */ - let g2_19 = (19 * g.0[2]) as i64; /* 1.4*2^30; still ok */ - let g3_19 = (19 * g.0[3]) as i64; - let g4_19 = (19 * g.0[4]) as i64; - let g5_19 = (19 * g.0[5]) as i64; - let g6_19 = (19 * g.0[6]) as i64; - let g7_19 = (19 * g.0[7]) as i64; - let g8_19 = (19 * g.0[8]) as i64; - let g9_19 = (19 * g.0[9]) as i64; - - let h0 = f0 * g0 - + f1_2 * g9_19 - + f2 * g8_19 - + f3_2 * g7_19 - + f4 * g6_19 - + f5_2 * g5_19 - + f6 * g4_19 - + f7_2 * g3_19 - + f8 * g2_19 - + f9_2 * g1_19; - let h1 = f0 * g1 - + f1 * g0 - + f2 * g9_19 - + f3 * g8_19 - + f4 * g7_19 - + f5 * g6_19 - + f6 * g5_19 - + f7 * g4_19 - + f8 * g3_19 - + f9 * g2_19; - let h2 = f0 * g2 - + f1_2 * g1 - + f2 * g0 - + f3_2 * g9_19 - + f4 * g8_19 - + f5_2 * g7_19 - + f6 * g6_19 - + f7_2 * g5_19 - + f8 * g4_19 - + f9_2 * g3_19; - let h3 = f0 * g3 - + f1 * g2 - + f2 * g1 - + f3 * g0 - + f4 * g9_19 - + f5 * g8_19 - + f6 * g7_19 - + f7 * g6_19 - + f8 * g5_19 - + f9 * g4_19; - let h4 = f0 * g4 - + f1_2 * g3 - + f2 * g2 - + f3_2 * g1 - + f4 * g0 - + f5_2 * g9_19 - + f6 * g8_19 - + f7_2 * g7_19 - + f8 * g6_19 - + f9_2 * g5_19; - let h5 = f0 * g5 - + f1 * g4 - + f2 * g3 - + f3 * g2 - + f4 * g1 - + f5 * g0 - + f6 * g9_19 - + f7 * g8_19 - + f8 * g7_19 - + f9 * g6_19; - let h6 = f0 * g6 - + f1_2 * g5 - + f2 * g4 - + f3_2 * g3 - + f4 * g2 - + f5_2 * g1 - + f6 * g0 - + f7_2 * g9_19 - + f8 * g8_19 - + f9_2 * g7_19; - let h7 = f0 * g7 - + f1 * g6 - + f2 * g5 - + f3 * g4 - + f4 * g3 - + f5 * g2 - + f6 * g1 - + f7 * g0 - + f8 * g9_19 - + f9 * g8_19; - let h8 = f0 * g8 - + f1_2 * g7 - + f2 * g6 - + f3_2 * g5 - + f4 * g4 - + f5_2 * g3 - + f6 * g2 - + f7_2 * g1 - + f8 * g0 - + f9_2 * g9_19; - let h9 = f0 * g9 - + f1 * g8 - + f2 * g7 - + f3 * g6 - + f4 * g5 - + f5 * g4 - + f6 * g3 - + f7 * g2 - + f8 * g1 - + f9 * g0; - - self.fe_combine(h0, h1, h2, h3, h4, h5, h6, h7, h8, h9); - } - - pub fn fe_invert(&mut self, z: &FieldElement) { - let mut t0 = FieldElement::default(); - let mut t1 = FieldElement::default(); - let mut t2 = FieldElement::default(); - let mut t3 = FieldElement::default(); - - t0.fe_square(z); // 2^1 - t1.fe_square(&t0); // 2^2 - - for _ in 1..2 { - // 2^3 - t1.fe_square(&t1.clone()); - } - - t1.fe_mul(z, &t1.clone()); // 2^3 + 2^0 - t0.fe_mul(&t0.clone(), &t1); // 2^3 + 2^1 + 2^0 - t2.fe_square(&t0); // 2^4 + 2^2 + 2^1 - t1.fe_mul(&t1.clone(), &t2); // 2^4 + 2^3 + 2^2 + 2^1 + 2^0 - t2.fe_square(&t1); // 5,4,3,2,1 - - for _ in 1..5 { - // 9,8,7,6,5 - t2.fe_square(&t2.clone()); - } - - t1.fe_mul(&t2, &t1.clone()); // 9,8,7,6,5,4,3,2,1,0 - t2.fe_square(&t1); // 10..1 - - for _ in 1..10 { - // 19..10 - t2.fe_square(&t2.clone()); - } - - t2.fe_mul(&t2.clone(), &t1); // 19..0 - t3.fe_square(&t2); // 20..1 - - for _ in 1..20 { - // 39..20 - t3.fe_square(&t3.clone()); - } - - t2.fe_mul(&t3, &t2.clone()); // 39..0 - t2.fe_square(&t2.clone()); // 40..1 - - for _ in 1..10 { - // 49..10 - t2.fe_square(&t2.clone()); - } - - t1.fe_mul(&t2, &t1.clone()); // 49..0 - t2.fe_square(&t1); // 50..1 - - for _ in 1..50 { - // 99..50 - t2.fe_square(&t2.clone()); - } - - t2.fe_mul(&t2.clone(), &t1); // 99..0 - t3.fe_square(&t2); // 100..1 - - for _ in 1..100 { - // 199..100 - t3.fe_square(&t3.clone()); - } - - t2.fe_mul(&t3, &t2.clone()); // 199..0 - t2.fe_square(&t2.clone()); // 200..1 - - for _ in 1..50 { - // 249..50 - t2.fe_square(&t2.clone()); - } - - t1.fe_mul(&t2, &t1.clone()); // 249..0 - t1.fe_square(&t1.clone()); // 250..1 - - for _ in 1..5 { - // 254..5 - t1.fe_square(&t1.clone()); - } - - self.fe_mul(&t1, &t0); // 254..5,3,1,0 - } - - // to_bytes marshals h to s. - // Preconditions: - // |h| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc. - // - // Write p=2^255-19; q=floor(h/p). - // Basic claim: q = floor(2^(-255)(h + 19 2^(-25)h9 + 2^(-1))). - // - // Proof: - // Have |h|<=p so |q|<=1 so |19^2 2^(-255) q|<1/4. - // Also have |h-2^230 h9|<2^230 so |19 2^(-255)(h-2^230 h9)|<1/4. - // - // Write y=2^(-1)-19^2 2^(-255)q-19 2^(-255)(h-2^230 h9). - // Then 0 [u8; 32] { - let mut carry = [0i32; 10]; - - let mut q = (19 * self.0[9] + (1 << 24)) >> 25; - q = (self.0[0] + q) >> 26; - q = (self.0[1] + q) >> 25; - q = (self.0[2] + q) >> 26; - q = (self.0[3] + q) >> 25; - q = (self.0[4] + q) >> 26; - q = (self.0[5] + q) >> 25; - q = (self.0[6] + q) >> 26; - q = (self.0[7] + q) >> 25; - q = (self.0[8] + q) >> 26; - q = (self.0[9] + q) >> 25; - - // Goal: Output h-(2^255-19)q, which is between 0 and 2^255-20. - self.0[0] += 19 * q; - // Goal: Output h-2^255 q, which is between 0 and 2^255-20. - - carry[0] = self.0[0] >> 26; - self.0[1] += carry[0]; - self.0[0] -= carry[0] << 26; - carry[1] = self.0[1] >> 25; - self.0[2] += carry[1]; - self.0[1] -= carry[1] << 25; - carry[2] = self.0[2] >> 26; - self.0[3] += carry[2]; - self.0[2] -= carry[2] << 26; - carry[3] = self.0[3] >> 25; - self.0[4] += carry[3]; - self.0[3] -= carry[3] << 25; - carry[4] = self.0[4] >> 26; - self.0[5] += carry[4]; - self.0[4] -= carry[4] << 26; - carry[5] = self.0[5] >> 25; - self.0[6] += carry[5]; - self.0[5] -= carry[5] << 25; - carry[6] = self.0[6] >> 26; - self.0[7] += carry[6]; - self.0[6] -= carry[6] << 26; - carry[7] = self.0[7] >> 25; - self.0[8] += carry[7]; - self.0[7] -= carry[7] << 25; - carry[8] = self.0[8] >> 26; - self.0[9] += carry[8]; - self.0[8] -= carry[8] << 26; - carry[9] = self.0[9] >> 25; - self.0[9] -= carry[9] << 25; - // h10 = carry9 - - // Goal: Output h[0]+...+2^255 h10-2^255 q, which is between 0 and 2^255-20. - // Have h[0]+...+2^230 h[9] between 0 and 2^255-1; - // evidently 2^255 h10-2^255 q = 0. - // Goal: Output h[0]+...+2^230 h[9]. - - [ - (self.0[0] >> 0) as u8, - (self.0[0] >> 8) as u8, - (self.0[0] >> 16) as u8, - ((self.0[0] >> 24) | (self.0[1] << 2)) as u8, - (self.0[1] >> 6) as u8, - (self.0[1] >> 14) as u8, - ((self.0[1] >> 22) | (self.0[2] << 3)) as u8, - (self.0[2] >> 5) as u8, - (self.0[2] >> 13) as u8, - ((self.0[2] >> 21) | (self.0[3] << 5)) as u8, - (self.0[3] >> 3) as u8, - (self.0[3] >> 11) as u8, - ((self.0[3] >> 19) | (self.0[4] << 6)) as u8, - (self.0[4] >> 2) as u8, - (self.0[4] >> 10) as u8, - (self.0[4] >> 18) as u8, - (self.0[5] >> 0) as u8, - (self.0[5] >> 8) as u8, - (self.0[5] >> 16) as u8, - ((self.0[5] >> 24) | (self.0[6] << 1)) as u8, - (self.0[6] >> 7) as u8, - (self.0[6] >> 15) as u8, - ((self.0[6] >> 23) | (self.0[7] << 3)) as u8, - (self.0[7] >> 5) as u8, - (self.0[7] >> 13) as u8, - ((self.0[7] >> 21) | (self.0[8] << 4)) as u8, - (self.0[8] >> 4) as u8, - (self.0[8] >> 12) as u8, - ((self.0[8] >> 20) | (self.0[9] << 6)) as u8, - (self.0[9] >> 2) as u8, - (self.0[9] >> 10) as u8, - (self.0[9] >> 18) as u8, - ] - } - - pub fn fe_is_negative(&mut self) -> u8 { - let s = self.to_bytes(); - s[0] & 1 - } -} diff --git a/sdk/core/src/crypto/edwards25519/pre_computed_group_element.rs b/sdk/core/src/crypto/edwards25519/pre_computed_group_element.rs deleted file mode 100644 index 88da9d3f03..0000000000 --- a/sdk/core/src/crypto/edwards25519/pre_computed_group_element.rs +++ /dev/null @@ -1,46 +0,0 @@ -use super::{constant::BASE, field_element::FieldElement}; -use std::marker::Copy; - -#[derive(Default, Copy, Clone, Debug)] -pub struct PreComputedGroupElement { - pub y_plus_x: FieldElement, - pub y_minus_x: FieldElement, - pub xy2d: FieldElement, -} - -impl PreComputedGroupElement { - pub fn zero(&mut self) { - self.y_plus_x.fe_one(); - self.y_minus_x.fe_one(); - self.xy2d.fe_zero(); - } - - pub fn cmove(&mut self, u: &PreComputedGroupElement, b: i32) { - self.y_plus_x.fe_cmove(&u.y_plus_x, b); - self.y_minus_x.fe_cmove(&u.y_minus_x, b); - self.xy2d.fe_cmove(&u.xy2d, b); - } - - pub fn select_point(&mut self, pos: i32, b: i32) { - let mut minus_t = PreComputedGroupElement::default(); - let b_negative = (b >> 31) & 1; - let b_abs = b - (((-b_negative) & b) << 1); - - self.zero(); - - for i in 0..8 { - self.cmove(&BASE[pos as usize][i as usize], equal(b_abs, i + 1)); - } - - minus_t.y_plus_x.fe_copy(&self.y_minus_x); - minus_t.y_minus_x.fe_copy(&self.y_plus_x); - minus_t.xy2d.fe_neg(&self.xy2d); - self.cmove(&minus_t, b_negative); - } -} - -// equal returns 1 if b == c and 0 otherwise, assuming that b and c are -// non-negative. -fn equal(b: i32, c: i32) -> i32 { - if b == c { 1 } else { 0 } -} diff --git a/sdk/core/src/crypto/edwards25519/projective_group_element.rs b/sdk/core/src/crypto/edwards25519/projective_group_element.rs deleted file mode 100644 index 1f2a18f7fc..0000000000 --- a/sdk/core/src/crypto/edwards25519/projective_group_element.rs +++ /dev/null @@ -1,24 +0,0 @@ -use super::{completed_group_element::CompletedGroupElement, field_element::FieldElement}; - -#[derive(Default)] -pub struct ProjectiveGroupElement { - pub x: FieldElement, - pub y: FieldElement, - pub z: FieldElement, -} - -impl ProjectiveGroupElement { - pub fn double(&self, r: &mut CompletedGroupElement) { - let mut t0 = FieldElement::default(); - - r.x.fe_square(&self.x); - r.z.fe_square(&self.y); - r.t.fe_square_2(&self.z); - r.y.fe_add(&self.x, &self.y); - t0.fe_square(&r.y); - r.y.fe_add(&r.z, &r.x); - r.z.fe_sub(&r.z.clone(), &r.x); - r.x.fe_sub(&t0, &r.y); - r.t.fe_sub(&r.t.clone(), &r.z.clone()); - } -} diff --git a/sdk/core/src/crypto/private_key.rs b/sdk/core/src/crypto/private_key.rs deleted file mode 100644 index 77b00c0eef..0000000000 --- a/sdk/core/src/crypto/private_key.rs +++ /dev/null @@ -1,157 +0,0 @@ -use std::fmt::Display; - -use super::edwards25519::{sc_mul_add, sc_reduce}; -use crate::crypto::edwards25519::extended_group_element::ExtendedGroupElement; -use anyhow::{Result, anyhow}; -use serde::{ - de::{Deserialize, Deserializer}, - ser::{Serialize, Serializer}, -}; -use sha2::{Digest, Sha512}; - -pub const PRIVATE_KEY_LENGTH: usize = 64; -pub const SIGNATURE_LENGTH: usize = 64; -pub const SEED_LENGTH: usize = 32; - -#[derive(Copy, Clone, Debug)] -pub struct PrivateKey(pub [u8; PRIVATE_KEY_LENGTH]); - -impl PrivateKey { - pub fn from_bytes(bytes: &[u8]) -> Result { - match bytes.len() { - SEED_LENGTH => { - let mut h: Sha512 = Sha512::new(); - let mut hash: [u8; 64] = [0u8; 64]; - let mut digest: [u8; 32] = [0u8; 32]; - - h.update(bytes); - hash.copy_from_slice(h.finalize().as_ref()); - - digest.copy_from_slice(&hash[..32]); - - digest[0] &= 248; - digest[31] &= 127; - digest[31] |= 64; - - let mut a = ExtendedGroupElement::default(); - a.ge_scalar_mult_base(digest); - let public_key_bytes = a.to_bytes(); - - let merge: Vec = [bytes.to_vec(), public_key_bytes.to_vec()] - .concat() - .into_iter() - .collect(); - let mut bits: [u8; 64] = [0u8; 64]; - bits.copy_from_slice(&merge[..64]); - - Ok(PrivateKey(bits)) - } - PRIVATE_KEY_LENGTH => { - let mut bits: [u8; 64] = [0u8; 64]; - bits.copy_from_slice(&bytes[..64]); - - Ok(PrivateKey(bits)) - } - _ => Err(anyhow!("Invalid secret key length")), - } - } - - pub fn from_hex_str(pk: &str) -> Result { - let bytes = hex::decode(pk)?; - PrivateKey::from_bytes(bytes.as_slice()) - } - - /// Currently not in use. - /// - /// Guarded by feature "wallet-full", to avoid unnecessarily importing `rand`. - #[cfg(feature = "wallet-full")] - pub fn generate(r: &mut T) -> PrivateKey - where - T: rand::CryptoRng + rand::Rng, - { - let mut secret_key = PrivateKey([0u8; 64]); - - r.fill_bytes(&mut secret_key.0); - - secret_key - } - - pub fn to_bytes(&self) -> [u8; PRIVATE_KEY_LENGTH] { - self.0 - } - - pub fn as_bytes(&self) -> &[u8; PRIVATE_KEY_LENGTH] { - &self.0 - } - - pub fn sign(&self, message: Vec) -> [u8; 64] { - let mut h: Sha512 = Sha512::new(); - h.update(&self.0[..32]); - - let mut digest1 = [0u8; 64]; - let mut message_digest = [0u8; 64]; - let mut hram_digest = [0u8; 64]; - let mut expanded_secret_key = [0u8; 32]; - - digest1.copy_from_slice(h.finalize_reset().as_ref()); - expanded_secret_key.copy_from_slice(&digest1[..32]); - expanded_secret_key[0] &= 248; - expanded_secret_key[31] &= 63; - expanded_secret_key[31] |= 64; - - h.update(&digest1[32..]); - h.update(&message); - message_digest.copy_from_slice(h.finalize_reset().as_ref()); - - let message_digest_reduced = sc_reduce(message_digest); - let mut r = ExtendedGroupElement::default(); - r.ge_scalar_mult_base(message_digest_reduced); - - let encoded_r = r.to_bytes(); - - h.update(encoded_r); - h.update(&self.0[32..]); - h.update(&message); - hram_digest.copy_from_slice(h.finalize_reset().as_ref()); - - let hram_digest_reduced = sc_reduce(hram_digest); - - let s = sc_mul_add( - hram_digest_reduced, - expanded_secret_key, - message_digest_reduced, - ); - - let mut signature = [0u8; 64]; - - signature[..32].copy_from_slice(&encoded_r); - signature[32..].copy_from_slice(&s); - - signature - } -} - -impl Display for PrivateKey { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - hex::encode(&self.0[..32]).fmt(f) - } -} - -impl Serialize for PrivateKey { - fn serialize(&self, serializer: S) -> Result - where - S: Serializer, - { - serializer.serialize_str(self.to_string().as_str()) - } -} - -impl<'de> Deserialize<'de> for PrivateKey { - fn deserialize(deserializer: D) -> Result - where - D: Deserializer<'de>, - { - let s = String::deserialize(deserializer)?; - Ok(Self::from_hex_str(s.as_str()).unwrap()) - } -} diff --git a/sdk/core/src/crypto/public_key.rs b/sdk/core/src/crypto/public_key.rs deleted file mode 100644 index 6ad8604ecb..0000000000 --- a/sdk/core/src/crypto/public_key.rs +++ /dev/null @@ -1,71 +0,0 @@ -use std::fmt::Display; - -use super::private_key::PrivateKey; -use anyhow::Result; -use multiversx_chain_core::types::Address; -use serde::{ - de::{Deserialize, Deserializer}, - ser::{Serialize, Serializer}, -}; - -pub const PUBLIC_KEY_LENGTH: usize = 32; - -#[derive(Copy, Clone, Debug)] -pub struct PublicKey([u8; PUBLIC_KEY_LENGTH]); - -impl PublicKey { - pub fn to_bytes(&self) -> [u8; PUBLIC_KEY_LENGTH] { - self.0 - } - - pub fn as_bytes(&self) -> &[u8; PUBLIC_KEY_LENGTH] { - &self.0 - } - - pub fn to_address(&self) -> Address { - self.0.into() - } - - pub fn from_hex_str(pk: &str) -> Result { - let bytes = hex::decode(pk)?; - let mut bits: [u8; 32] = [0u8; 32]; - bits.copy_from_slice(&bytes[32..]); - Ok(Self(bits)) - } -} - -impl From<&PrivateKey> for PublicKey { - fn from(private_key: &PrivateKey) -> PublicKey { - let bytes = private_key.to_bytes(); - - let mut bits: [u8; 32] = [0u8; 32]; - bits.copy_from_slice(&bytes[32..]); - - PublicKey(bits) - } -} - -impl Display for PublicKey { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - hex::encode(self.0).fmt(f) - } -} - -impl Serialize for PublicKey { - fn serialize(&self, serializer: S) -> Result - where - S: Serializer, - { - serializer.serialize_str(self.to_string().as_str()) - } -} - -impl<'de> Deserialize<'de> for PublicKey { - fn deserialize(deserializer: D) -> Result - where - D: Deserializer<'de>, - { - let s = String::deserialize(deserializer)?; - Ok(Self::from_hex_str(s.as_str()).unwrap()) - } -} diff --git a/sdk/core/src/data.rs b/sdk/core/src/data.rs index 16e6830e57..5d9c96f416 100644 --- a/sdk/core/src/data.rs +++ b/sdk/core/src/data.rs @@ -2,7 +2,6 @@ pub mod account; pub mod account_storage; pub mod esdt; pub mod hyperblock; -pub mod keystore; pub mod network_config; pub mod network_economics; pub mod network_status; diff --git a/sdk/core/src/data/keystore.rs b/sdk/core/src/data/keystore.rs deleted file mode 100644 index 31e6b6538a..0000000000 --- a/sdk/core/src/data/keystore.rs +++ /dev/null @@ -1,61 +0,0 @@ -use serde::{Deserialize, Serialize}; - -pub const KDF_N: u32 = 4096; -pub const KDF_R: u32 = 8; -pub const KDF_P: u32 = 1; -pub const KDF_DKLEN: usize = 32; -pub const KEYSTORE_VERSION: u32 = 4; - -#[derive(Debug)] -pub enum WalletError { - InvalidPassword, - InvalidKdf, - InvalidCipher, -} - -#[derive(Debug)] -pub enum InsertPassword { - Plaintext(String), - StandardInput, -} - -#[derive(Debug, Serialize, Deserialize)] -pub struct CryptoParams { - pub iv: String, -} - -#[derive(Debug, Serialize, Deserialize)] -pub struct KdfParams { - pub dklen: u32, - pub salt: String, - pub n: u32, - pub r: u32, - pub p: u32, -} - -#[derive(Debug, Serialize, Deserialize)] -pub struct Crypto { - pub ciphertext: String, - pub cipherparams: CryptoParams, - pub cipher: String, - pub kdf: String, - pub kdfparams: KdfParams, - pub mac: String, -} - -#[derive(Debug, Serialize, Deserialize)] -pub struct Keystore { - pub version: u32, - pub kind: String, - pub id: String, - pub address: String, - pub bech32: String, - pub crypto: Crypto, -} - -#[derive(Clone, Debug)] -pub struct DecryptionParams { - pub derived_key_first_half: Vec, - pub iv: Vec, - pub data: Vec, -} diff --git a/sdk/core/src/data/network_config.rs b/sdk/core/src/data/network_config.rs index e0158022e3..eafe9d8c8a 100644 --- a/sdk/core/src/data/network_config.rs +++ b/sdk/core/src/data/network_config.rs @@ -1,3 +1,4 @@ +use multiversx_chain_core::std::Bech32Hrp; use serde::{Deserialize, Serialize}; // NetworkConfig holds the network configuration parameters @@ -6,7 +7,7 @@ pub struct NetworkConfig { #[serde(rename = "erd_chain_id")] pub chain_id: String, #[serde(rename = "erd_address_hrp", default = "default_hrp")] - pub address_hrp: String, + pub address_hrp: Bech32Hrp, #[serde(rename = "erd_denomination")] pub denomination: i32, #[serde(rename = "erd_gas_per_data_byte")] @@ -48,6 +49,6 @@ pub struct NetworkConfigResponse { pub data: Option, } -fn default_hrp() -> String { - "erd".to_string() +fn default_hrp() -> Bech32Hrp { + Bech32Hrp::default() } diff --git a/sdk/core/src/data/transaction/multiple_transactions.rs b/sdk/core/src/data/transaction/multiple_transactions.rs index c6d849f696..4d79ecc781 100644 --- a/sdk/core/src/data/transaction/multiple_transactions.rs +++ b/sdk/core/src/data/transaction/multiple_transactions.rs @@ -7,7 +7,7 @@ use serde::{Deserialize, Serialize}; /// Corresponds to [`MultipleTransactionsResponseData`](https://github.com/multiversx/mx-chain-proxy-go/blob/master/data/transaction.go) in mx-chain-proxy-go. #[derive(Debug, Clone, Serialize, Deserialize)] pub struct MultipleTransactionsResponseData { - #[serde(rename = "txsSent")] + #[serde(rename = "txsSent", default)] pub num_of_sent_txs: u64, #[serde(rename = "txsHashes")] pub txs_hashes: HashMap, diff --git a/sdk/core/src/data/transaction/transaction_request.rs b/sdk/core/src/data/transaction/transaction_request.rs index 39b5ec5c71..a9aed0fb87 100644 --- a/sdk/core/src/data/transaction/transaction_request.rs +++ b/sdk/core/src/data/transaction/transaction_request.rs @@ -1,3 +1,4 @@ +use crate::wallet::WalletSignature; use multiversx_chain_core::std::Bech32Address; use serde::{Deserialize, Serialize}; @@ -16,7 +17,7 @@ pub struct Transaction { #[serde(skip_serializing_if = "Option::is_none")] pub data: Option, #[serde(skip_serializing_if = "Option::is_none")] - pub signature: Option, + pub signature: Option, #[serde(rename = "chainID")] pub chain_id: String, pub version: u32, diff --git a/sdk/core/src/data/vm.rs b/sdk/core/src/data/vm.rs index 74a6943747..ce0f17e6b1 100644 --- a/sdk/core/src/data/vm.rs +++ b/sdk/core/src/data/vm.rs @@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize}; use serde_repr::{Deserialize_repr, Serialize_repr}; use std::collections::HashMap; -use crate::utils::base64_decode; +use multiversx_chain_core::std::base64_decode; #[derive(Serialize_repr, Deserialize_repr, Debug, Clone)] #[repr(u8)] @@ -107,7 +107,10 @@ impl VMOutputApi { } pub fn return_data_base64_decode(&self) -> Vec> { - self.return_data().iter().map(base64_decode).collect() + self.return_data() + .iter() + .map(|d| base64_decode(d).expect("invalid base64 in return data")) + .collect() } pub fn is_ok(&self) -> bool { diff --git a/sdk/core/src/gateway/gateway_chain_simulator_add_keys.rs b/sdk/core/src/gateway/gateway_chain_simulator_add_keys.rs index 480c9a3f20..f45ab7fa73 100644 --- a/sdk/core/src/gateway/gateway_chain_simulator_add_keys.rs +++ b/sdk/core/src/gateway/gateway_chain_simulator_add_keys.rs @@ -2,7 +2,8 @@ use std::collections::HashMap; use anyhow::anyhow; -use crate::{gateway::ADD_KEYS, utils::base64_encode}; +use crate::gateway::ADD_KEYS; +use multiversx_chain_core::std::base64_encode; use super::{ GatewayRequest, GatewayRequestType, gateway_chain_simulator_blocks::GenerateBlocksResponse, diff --git a/sdk/core/src/lib.rs b/sdk/core/src/lib.rs index c16cef68a6..40402370bd 100644 --- a/sdk/core/src/lib.rs +++ b/sdk/core/src/lib.rs @@ -3,12 +3,10 @@ #![allow(clippy::collapsible_if)] #![allow(clippy::manual_is_multiple_of)] -pub mod crypto; pub mod data; pub mod gateway; pub mod retrieve_tx_on_network; pub mod test_wallets; -pub mod utils; pub mod validator; pub mod wallet; diff --git a/sdk/core/src/retrieve_tx_on_network.rs b/sdk/core/src/retrieve_tx_on_network.rs index 25bd2e6abb..66c754930d 100644 --- a/sdk/core/src/retrieve_tx_on_network.rs +++ b/sdk/core/src/retrieve_tx_on_network.rs @@ -1,11 +1,13 @@ use crate::{ data::transaction::{ApiLogs, ApiTransactionResult, Events, LogData}, gateway::{GetTxInfo, GetTxProcessStatus}, - utils::base64_encode, }; use anyhow::{Context, Result}; use log::info; -use multiversx_chain_core::{std::Bech32Address, types::ReturnCode}; +use multiversx_chain_core::{ + std::{Bech32Address, base64_encode}, + types::ReturnCode, +}; use crate::gateway::GatewayAsyncService; diff --git a/sdk/core/src/test_wallets.rs b/sdk/core/src/test_wallets.rs index 4121b73f55..b0a8c25f4b 100644 --- a/sdk/core/src/test_wallets.rs +++ b/sdk/core/src/test_wallets.rs @@ -39,68 +39,64 @@ const WALLETS: &[(&str, &str)] = &[ ("s2onja", SZONJA_PEM), ]; -fn test_wallet(pem_file_contents: &str) -> Wallet { - Wallet::from_pem_file_contents(pem_file_contents.to_string()).unwrap() -} - /// Test wallet. Do not use on mainnet. pub fn alice() -> Wallet { - test_wallet(ALICE_PEM) + Wallet::new_test_wallet("alice", ALICE_PEM) } /// Test wallet. Do not use on mainnet. pub fn bob() -> Wallet { - test_wallet(BOB_PEM) + Wallet::new_test_wallet("bob", BOB_PEM) } /// Test wallet. Do not use on mainnet. pub fn carol() -> Wallet { - test_wallet(CAROL_PEM) + Wallet::new_test_wallet("carol", CAROL_PEM) } /// Test wallet. Do not use on mainnet. pub fn dan() -> Wallet { - test_wallet(DAN_PEM) + Wallet::new_test_wallet("dan", DAN_PEM) } /// Test wallet. Do not use on mainnet. pub fn eve() -> Wallet { - test_wallet(EVE_PEM) + Wallet::new_test_wallet("eve", EVE_PEM) } /// Test wallet. Do not use on mainnet. pub fn frank() -> Wallet { - test_wallet(FRANK_PEM) + Wallet::new_test_wallet("frank", FRANK_PEM) } /// Test wallet. Do not use on mainnet. pub fn grace() -> Wallet { - test_wallet(GRACE_PEM) + Wallet::new_test_wallet("grace", GRACE_PEM) } /// Test wallet. Do not use on mainnet. pub fn heidi() -> Wallet { - test_wallet(HEIDI_PEM) + Wallet::new_test_wallet("heidi", HEIDI_PEM) } /// Test wallet. Do not use on mainnet. pub fn ivan() -> Wallet { - test_wallet(IVAN_PEM) + Wallet::new_test_wallet("ivan", IVAN_PEM) } /// Test wallet. Do not use on mainnet. pub fn judy() -> Wallet { - test_wallet(JUDY_PEM) + Wallet::new_test_wallet("judy", JUDY_PEM) } /// Test wallet. Do not use on mainnet. pub fn mallory() -> Wallet { - test_wallet(MALLORY_PEM) + Wallet::new_test_wallet("mallory", MALLORY_PEM) } /// Test wallet. Do not use on mainnet. pub fn mike() -> Wallet { - test_wallet(MIKE_PEM) + Wallet::new_test_wallet("mike", MIKE_PEM) } /// Test wallet. Do not use on mainnet. @@ -109,7 +105,7 @@ pub fn mike() -> Wallet { /// /// Address: 0x14af28ce7d79117f689228b1af89d16e8b0c16a3d36062a2b6eeb8fbab6c0000 pub fn sophie() -> Wallet { - test_wallet(SOPHIE_PEM) + Wallet::new_test_wallet("sophie", SOPHIE_PEM) } /// Test wallet. Do not use on mainnet. @@ -118,7 +114,7 @@ pub fn sophie() -> Wallet { /// /// Address: 0x4b9ab2524a7d15416fb78d4d88249dc30272bd6ee1b8a07d4342c33a40a00001 pub fn simon() -> Wallet { - test_wallet(SIMON_PEM) + Wallet::new_test_wallet("simon", SIMON_PEM) } /// Test wallet. Do not use on mainnet. @@ -127,7 +123,7 @@ pub fn simon() -> Wallet { /// /// Address: 0x5ea3f378aaaa9f51cef76093b62e1041c90b415016dfa49760d7a846a8d90002 pub fn szonja() -> Wallet { - test_wallet(SZONJA_PEM) + Wallet::new_test_wallet("szonja", SZONJA_PEM) } /// Test wallets. Do not use on mainnet. diff --git a/sdk/core/src/utils.rs b/sdk/core/src/utils.rs index d3393c8210..b757df150b 100644 --- a/sdk/core/src/utils.rs +++ b/sdk/core/src/utils.rs @@ -1,15 +1 @@ -use base64::{Engine as _, engine::general_purpose}; - -pub fn base64_decode(to_decode: T) -> Vec -where - T: AsRef<[u8]>, -{ - general_purpose::STANDARD.decode(to_decode).unwrap() -} - -pub fn base64_encode(to_encode: T) -> String -where - T: AsRef<[u8]>, -{ - general_purpose::STANDARD.encode(to_encode) -} +pub use multiversx_chain_core::std::{base64_decode, base64_encode}; diff --git a/sdk/core/src/wallet.rs b/sdk/core/src/wallet.rs index 153efe11d2..cc3a0fd97b 100644 --- a/sdk/core/src/wallet.rs +++ b/sdk/core/src/wallet.rs @@ -1,390 +1,22 @@ -use core::str; -use std::{ - fs::{self}, - io::{self, Write}, - path::Path, -}; - -use aes::{Aes128, cipher::KeyIvInit}; -use anyhow::Result; -use bip39::Mnemonic; -use ctr::{Ctr128BE, cipher::StreamCipher}; -use hmac::{Hmac, KeyInit, Mac}; -use multiversx_chain_core::{std::Bech32Address, types::Address}; -use pbkdf2::pbkdf2; -use scrypt::{Params, scrypt}; -use serde_json::json; -use sha2::{Digest, Sha256, Sha512}; -use sha3::Keccak256; -use zeroize::Zeroize; - -use crate::{ - crypto::{ - private_key::{PRIVATE_KEY_LENGTH, PrivateKey}, - public_key::PublicKey, - }, - data::{keystore::*, transaction::Transaction}, - utils::*, -}; - -const EGLD_COIN_TYPE: u32 = 508; -const HARDENED: u32 = 0x80000000; -const CIPHER_ALGORITHM_AES_128_CTR: &str = "aes-128-ctr"; -const KDF_SCRYPT: &str = "scrypt"; - -type HmacSha512 = Hmac; -type HmacSha256 = Hmac; - -#[derive(Copy, Clone, Debug)] -pub struct Wallet { - priv_key: PrivateKey, -} - -impl Wallet { - fn seed_from_mnemonic(mnemonic: Mnemonic, password: &str) -> [u8; 64] { - let mut salt = String::with_capacity(8 + password.len()); - salt.push_str("mnemonic"); - salt.push_str(password); - - let mut seed = [0u8; 64]; - - let _ = pbkdf2::>( - mnemonic.to_string().as_bytes(), - salt.as_bytes(), - 2048, - &mut seed, - ); - - salt.zeroize(); - - seed - } - - pub fn get_private_key_from_mnemonic( - mnemonic: Mnemonic, - account: u32, - address_index: u32, - ) -> PrivateKey { - let seed = Self::seed_from_mnemonic(mnemonic, ""); - - let serialized_key_len = 32; - let hardened_child_padding: u8 = 0; - - let mut digest = - HmacSha512::new_from_slice(b"ed25519 seed").expect("HMAC can take key of any size"); - digest.update(&seed); - let intermediary: Vec = digest.finalize().into_bytes().into_iter().collect(); - let mut key = intermediary[..serialized_key_len].to_vec(); - let mut chain_code = intermediary[serialized_key_len..].to_vec(); - - for child_idx in [ - 44 | HARDENED, - EGLD_COIN_TYPE | HARDENED, - account | HARDENED, // account - HARDENED, - address_index | HARDENED, // addressIndex - ] { - let mut buff = [vec![hardened_child_padding], key.clone()].concat(); - buff.push((child_idx >> 24) as u8); - buff.push((child_idx >> 16) as u8); - buff.push((child_idx >> 8) as u8); - buff.push(child_idx as u8); - - digest = - HmacSha512::new_from_slice(&chain_code).expect("HMAC can take key of any size"); - digest.update(&buff); - let intermediary: Vec = digest.finalize().into_bytes().into_iter().collect(); - key = intermediary[..serialized_key_len].to_vec(); - chain_code = intermediary[serialized_key_len..].to_vec(); - } - - PrivateKey::from_bytes(key.as_slice()).unwrap() - } - - pub fn get_wallet_keys_mnemonic(mnemonic_str: String) -> (String, String) { - let mnemonic = Mnemonic::parse(mnemonic_str.replace('\n', "")).unwrap(); - let private_key = Self::get_private_key_from_mnemonic(mnemonic, 0u32, 0u32); - let public_key = PublicKey::from(&private_key); - - let public_key_str: &str = &public_key.to_string(); - let private_key_str: &str = &private_key.to_string(); - - (private_key_str.to_string(), public_key_str.to_string()) - } - - pub fn from_private_key(priv_key: &str) -> Result { - let priv_key = PrivateKey::from_hex_str(priv_key)?; - Ok(Self { priv_key }) - } - - pub fn from_pem_file

(file_path: P) -> Result - where - P: AsRef, - { - let contents = std::fs::read_to_string(file_path)?; - Self::from_pem_file_contents(contents) - } - - pub fn from_pem_file_contents(contents: String) -> Result { - let x = pem::parse(contents)?; - let x = x.contents()[..PRIVATE_KEY_LENGTH].to_vec(); - let priv_key_str = std::str::from_utf8(x.as_slice())?; - let pri_key = PrivateKey::from_hex_str(priv_key_str)?; - Ok(Self { priv_key: pri_key }) - } - - pub fn get_shard(&self) -> u8 { - let address = self.to_address(); - let address_bytes = address.as_bytes(); - address_bytes[address_bytes.len() - 1] % 3 - } - - pub fn get_pem_decoded_content>(file: P) -> Vec { - let pem_content = fs::read_to_string(file).unwrap(); - let lines: Vec<&str> = pem_content.split('\n').collect(); - let pem_encoded_keys = format!("{}{}{}", lines[1], lines[2], lines[3]); - base64_decode(pem_encoded_keys) - } - - pub fn get_wallet_keys_pem>(file: P) -> (String, String) { - let pem_decoded_keys = Self::get_pem_decoded_content(file); - let (private_key, public_key) = pem_decoded_keys.split_at(pem_decoded_keys.len() / 2); - let private_key_str = String::from_utf8(private_key.to_vec()).unwrap(); - let public_key_str = String::from_utf8(public_key.to_vec()).unwrap(); - - (private_key_str, public_key_str) - } - - pub fn from_keystore_secret>( - file_path: P, - insert_password: InsertPassword, - ) -> Result { - let decryption_params = match insert_password { - InsertPassword::Plaintext(password) => { - Self::validate_keystore_password(&file_path, password.to_string()).unwrap_or_else( - |e| { - panic!("Error: {:?}", e); - }, - ) - } - InsertPassword::StandardInput => { - Self::validate_keystore_password(&file_path, Self::get_keystore_password()) - .unwrap_or_else(|e| { - panic!("Error: {:?}", e); - }) - } - }; - let priv_key = PrivateKey::from_hex_str( - hex::encode(Self::decrypt_secret_key(decryption_params)).as_str(), - )?; - Ok(Self { priv_key }) - } - - pub fn get_private_key_from_keystore_secret>( - file_path: P, - password: &str, - ) -> Result { - let decyption_params = Self::validate_keystore_password(file_path, password.to_string()) - .unwrap_or_else(|e| { - panic!("Error: {:?}", e); - }); - let priv_key = PrivateKey::from_hex_str( - hex::encode(Self::decrypt_secret_key(decyption_params)).as_str(), - )?; - Ok(priv_key) - } - - #[deprecated( - since = "0.54.0", - note = "Renamed to `to_address`, type changed to multiversx_chain_core::types::Address" - )] - pub fn address(&self) -> Bech32Address { - self.to_address().to_bech32_default() - } - - pub fn to_address(&self) -> Address { - PublicKey::from(&self.priv_key).to_address() - } - - pub fn sign_tx(&self, unsign_tx: &Transaction) -> [u8; 64] { - let mut unsign_tx = unsign_tx.clone(); - unsign_tx.signature = None; - - let mut tx_bytes = json!(unsign_tx).to_string().as_bytes().to_vec(); - - let should_sign_on_tx_hash = unsign_tx.version >= 2 && unsign_tx.options & 1 > 0; - if should_sign_on_tx_hash { - let mut h = Keccak256::new(); - h.update(tx_bytes); - tx_bytes = h.finalize().to_vec(); - } - - self.priv_key.sign(tx_bytes) - } - - pub fn sign_bytes(&self, data: Vec) -> [u8; 64] { - self.priv_key.sign(data) - } - - pub fn get_keystore_password() -> String { - print!("Insert password: "); - io::stdout().flush().unwrap(); - rpassword::read_password().unwrap() - } - - pub fn validate_keystore_password>( - path: P, - password: String, - ) -> Result { - let json_body = fs::read_to_string(path).unwrap(); - let keystore: Keystore = serde_json::from_str(&json_body).unwrap(); - let ciphertext = hex::decode(&keystore.crypto.ciphertext).unwrap(); - - let cipher = &keystore.crypto.cipher; - if cipher != CIPHER_ALGORITHM_AES_128_CTR { - return Err(WalletError::InvalidCipher); - } - - let iv = hex::decode(&keystore.crypto.cipherparams.iv).unwrap(); - let salt = hex::decode(&keystore.crypto.kdfparams.salt).unwrap(); - let json_mac = hex::decode(&keystore.crypto.mac).unwrap(); - - let kdf = &keystore.crypto.kdf; - if kdf != KDF_SCRYPT { - return Err(WalletError::InvalidKdf); - } - let n = keystore.crypto.kdfparams.n as f64; - let r = keystore.crypto.kdfparams.r as u64; - let p = keystore.crypto.kdfparams.p as u64; - let _dklen = keystore.crypto.kdfparams.dklen as usize; - - let params = Params::new(n.log2() as u8, r as u32, p as u32).unwrap(); - - let mut derived_key = vec![0u8; 32]; - scrypt(password.as_bytes(), &salt, ¶ms, &mut derived_key).unwrap(); - - let derived_key_first_half = derived_key[0..16].to_vec(); - let derived_key_second_half = derived_key[16..32].to_vec(); - - let mut input_mac = HmacSha256::new_from_slice(&derived_key_second_half).unwrap(); - input_mac.update(&ciphertext); - let computed_mac = input_mac.finalize().into_bytes(); - - if computed_mac.to_vec() == json_mac { - println!("Password is correct"); - Ok(DecryptionParams { - derived_key_first_half, - iv, - data: ciphertext, - }) - } else { - println!("Password is incorrect"); - Err(WalletError::InvalidPassword) - } - } - - pub fn decrypt_secret_key(decryption_params: DecryptionParams) -> Vec { - let key: &[u8; 16] = decryption_params - .derived_key_first_half - .as_slice() - .try_into() - .unwrap(); - let iv: &[u8; 16] = decryption_params.iv.as_slice().try_into().unwrap(); - let mut cipher = Ctr128BE::::new(key.into(), iv.into()); - let mut decrypted = decryption_params.data.to_vec(); - cipher.apply_keystream(&mut decrypted); - - decrypted - } - - /// Not available in dapps, since it uses randomness to generate the keystore. - /// - /// Only available in the sc-meta standalone CLI. - #[cfg(feature = "wallet-full")] - pub fn encrypt_keystore( - data: &[u8], - hrp: &str, - address: &Address, - public_key: &str, - password: &str, - ) -> String { - use rand::Rng; - - let params = Params::new((KDF_N as f64).log2() as u8, KDF_R, KDF_P).unwrap(); - let mut rand_salt: [u8; 32] = [0u8; 32]; - rand::rng().fill_bytes(&mut rand_salt); - let salt_hex = hex::encode(rand_salt); - - let mut rand_iv: [u8; 16] = [0u8; 16]; - rand::rng().fill_bytes(&mut rand_iv); - let iv_hex = hex::encode(rand_iv); - - let mut derived_key = vec![0u8; 32]; - scrypt(password.as_bytes(), &rand_salt, ¶ms, &mut derived_key).unwrap(); - - let derived_key_first_half = derived_key[0..16].to_vec(); - let derived_key_second_half = derived_key[16..32].to_vec(); - - let decryption_params = DecryptionParams { - derived_key_first_half, - iv: rand_iv.to_vec(), - data: data.to_vec(), - }; - - let ciphertext = Self::decrypt_secret_key(decryption_params); - - let mut h = HmacSha256::new_from_slice(&derived_key_second_half).unwrap(); - h.update(&ciphertext); - let mac = h.finalize().into_bytes(); - let keystore = Keystore { - crypto: Crypto { - cipher: CIPHER_ALGORITHM_AES_128_CTR.to_string(), - cipherparams: CryptoParams { iv: iv_hex }, - ciphertext: hex::encode(&ciphertext), - kdf: KDF_SCRYPT.to_string(), - kdfparams: KdfParams { - salt: salt_hex, - n: KDF_N, - r: KDF_R, - p: KDF_P, - dklen: KDF_DKLEN as u32, - }, - mac: hex::encode(mac), - }, - id: uuid::Uuid::new_v4().to_string(), - version: KEYSTORE_VERSION, - kind: "secretKey".to_string(), - address: public_key.to_string(), - bech32: address.to_bech32(hrp).bech32, - }; - - let mut keystore_json: String = serde_json::to_string_pretty(&keystore).unwrap(); - keystore_json.push('\n'); - keystore_json - } - - pub fn generate_pem_content( - hrp: &str, - address: &Address, - private_key: &str, - public_key: &str, - ) -> String { - let concat_keys = format!("{}{}", private_key, public_key); - let concat_keys_b64 = base64_encode(concat_keys); - - // Split the base64 string into 64-character lines - let formatted_key = concat_keys_b64 - .as_bytes() - .chunks(64) - .map(|chunk| std::str::from_utf8(chunk).unwrap()) - .collect::>() - .join("\n"); - - let address_bech32 = Bech32Address::encode_address(hrp, address.clone()); - let pem_content = format!( - "-----BEGIN PRIVATE KEY for {address_bech32}-----\n{formatted_key}\n-----END PRIVATE KEY for {address_bech32}-----\n" - ); - - pem_content - } -} +mod keystore; +mod keystore_error; +mod keystore_json; +mod mnemonic; +mod private_key; +mod public_key; +mod wallet_impl; +mod wallet_pem; +mod wallet_signature; +mod wallet_source; + +pub use keystore::Keystore; +pub use keystore::KeystoreRandomness; +pub use keystore_error::KeystoreError; +pub use keystore_json::*; +pub use mnemonic::Mnemonic; +pub use private_key::{PRIVATE_KEY_LENGTH, PrivateKey, SEED_LENGTH}; +pub use public_key::{PUBLIC_KEY_LENGTH, PublicKey}; +pub use wallet_impl::Wallet; +pub use wallet_pem::WalletPem; +pub use wallet_signature::WalletSignature; +pub use wallet_source::WalletSource; diff --git a/sdk/core/src/wallet/keystore.rs b/sdk/core/src/wallet/keystore.rs new file mode 100644 index 0000000000..e7b5daaa22 --- /dev/null +++ b/sdk/core/src/wallet/keystore.rs @@ -0,0 +1,188 @@ +use std::fs; +use std::path::Path; + +use aes::{Aes128, cipher::KeyIvInit}; +use ctr::{Ctr128BE, cipher::StreamCipher}; +use hmac::{Hmac, KeyInit, Mac}; +use multiversx_chain_core::std::{Bech32Address, Bech32Hrp}; +use scrypt::{Params, scrypt}; +use sha2::Sha256; + +use super::{KeystoreError, KeystoreJson, PrivateKey, PublicKey, Wallet}; + +const KDF_N: u32 = 4096; +const KDF_R: u32 = 8; +const KDF_P: u32 = 1; +const KDF_DKLEN: usize = 32; +const KEYSTORE_VERSION: u32 = 4; +const CIPHER_ALGORITHM_AES_128_CTR: &str = "aes-128-ctr"; +const KDF_SCRYPT: &str = "scrypt"; +const KIND_SECRET_KEY: &str = "secretKey"; + +type HmacSha256 = Hmac; + +/// Groups all randomness inputs required to encrypt a keystore. +/// +/// Keeping these separate from [`Keystore::encrypt`] makes the function +/// deterministic and easy to test with fixed values. +pub struct KeystoreRandomness { + pub salt: [u8; 32], + pub iv: [u8; 16], + pub id: String, +} + +/// Keystore with all fields decoded from their hex-string representation. +pub struct Keystore { + pub version: u32, + pub kind: String, + pub address: Bech32Address, + pub cipher: String, + pub ciphertext: Vec, + pub kdf: String, + pub n: u32, + pub r: u32, + pub p: u32, + pub dklen: u32, + pub mac: Vec, + pub randomness: KeystoreRandomness, +} + +impl Keystore { + pub fn from_file>(path: P) -> anyhow::Result { + let json_str = fs::read_to_string(path)?; + let json: KeystoreJson = serde_json::from_str(&json_str)?; + Self::from_json(json) + } + + pub fn to_json_string(&self) -> String { + let mut s = serde_json::to_string_pretty(&self.to_json()).unwrap(); + s.push('\n'); + s + } + + /// Decrypts the keystore with the given password and returns a [`Wallet`]. + /// + /// Returns [`KeystoreError::InvalidPassword`] if the MAC check fails, or + /// other variants for unsupported cipher / KDF parameters. + pub fn decrypt_wallet(&self, password: &str) -> Result { + if self.cipher != CIPHER_ALGORITHM_AES_128_CTR { + return Err(KeystoreError::InvalidCipher); + } + if self.kdf != KDF_SCRYPT { + return Err(KeystoreError::InvalidKdf); + } + + let n = self.n as f64; + let params = Params::new(n.log2() as u8, self.r, self.p) + .map_err(|e| KeystoreError::Other(e.into()))?; + + let mut derived_key = [0u8; 32]; + scrypt( + password.as_bytes(), + &self.randomness.salt, + ¶ms, + &mut derived_key, + ) + .unwrap(); + + let (derived_key_first_half, derived_key_second_half) = split_derived_key(&derived_key); + + let mut input_mac = HmacSha256::new_from_slice(&derived_key_second_half).unwrap(); + input_mac.update(&self.ciphertext); + let computed_mac = input_mac.finalize().into_bytes(); + + if computed_mac.to_vec() != self.mac { + return Err(KeystoreError::InvalidPassword); + } + + let private_key_bytes = run_cipher( + derived_key_first_half, + self.randomness.iv, + self.ciphertext.clone(), + ); + + let private_key_arr: [u8; 64] = private_key_bytes + .try_into() + .map_err(|_| anyhow::anyhow!("decrypted keystore has wrong key length"))?; + let private_key = PrivateKey::from_keypair_bytes(&private_key_arr)?; + Ok(Wallet::new( + private_key, + super::WalletSource::Keystore(self.address.hrp), + )) + } + + /// Encrypts a private key into a keystore using scrypt + AES-128-CTR + HMAC-SHA256. + /// + /// The wallet address stored in the keystore is derived from `private_key` + /// and encoded with the given `hrp`. + pub fn encrypt( + private_key: &PrivateKey, + hrp: Bech32Hrp, + password: &str, + randomness: KeystoreRandomness, + ) -> Self { + let public_key = PublicKey::from(private_key); + let address = public_key.to_address().to_bech32(hrp); + let private_key_bytes = private_key.to_bytes(); + + let params = Params::new((KDF_N as f64).log2() as u8, KDF_R, KDF_P).unwrap(); + + let mut derived_key = [0u8; 32]; + scrypt( + password.as_bytes(), + &randomness.salt, + ¶ms, + &mut derived_key, + ) + .unwrap(); + + let (derived_key_first_half, derived_key_second_half) = split_derived_key(&derived_key); + + let ciphertext = run_cipher( + derived_key_first_half, + randomness.iv, + private_key_bytes.to_vec(), + ); + + let mut h = HmacSha256::new_from_slice(&derived_key_second_half).unwrap(); + h.update(&ciphertext); + let mac = h.finalize().into_bytes().to_vec(); + + Keystore { + version: KEYSTORE_VERSION, + kind: KIND_SECRET_KEY.to_string(), + address, + cipher: CIPHER_ALGORITHM_AES_128_CTR.to_string(), + ciphertext, + kdf: KDF_SCRYPT.to_string(), + n: KDF_N, + r: KDF_R, + p: KDF_P, + dklen: KDF_DKLEN as u32, + mac, + randomness, + } + } +} + +/// Applies AES-128-CTR to `data` in place and returns the result. +/// +/// AES-128-CTR is a symmetric stream cipher, so the same operation both +/// encrypts plaintext and decrypts ciphertext. +fn run_cipher(key: [u8; 16], iv: [u8; 16], mut data: Vec) -> Vec { + let mut cipher = Ctr128BE::::new((&key).into(), (&iv).into()); + cipher.apply_keystream(&mut data); + data +} + +/// Splits a 32-byte scrypt derived key into two 16-byte halves. +/// +/// The first half is used as the AES-128 cipher key; the second half is +/// used as the HMAC-SHA256 key for MAC verification. +fn split_derived_key(derived_key: &[u8; 32]) -> ([u8; 16], [u8; 16]) { + let mut first_half = [0u8; 16]; + let mut second_half = [0u8; 16]; + first_half.copy_from_slice(&derived_key[..16]); + second_half.copy_from_slice(&derived_key[16..]); + (first_half, second_half) +} diff --git a/sdk/core/src/wallet/keystore_error.rs b/sdk/core/src/wallet/keystore_error.rs new file mode 100644 index 0000000000..4af6470f75 --- /dev/null +++ b/sdk/core/src/wallet/keystore_error.rs @@ -0,0 +1,26 @@ +#[derive(Debug)] +pub enum KeystoreError { + InvalidPassword, + InvalidKdf, + InvalidCipher, + Other(anyhow::Error), +} + +impl std::fmt::Display for KeystoreError { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + match self { + KeystoreError::InvalidPassword => write!(f, "invalid password"), + KeystoreError::InvalidKdf => write!(f, "invalid KDF"), + KeystoreError::InvalidCipher => write!(f, "invalid cipher"), + KeystoreError::Other(e) => write!(f, "{e}"), + } + } +} + +impl std::error::Error for KeystoreError {} + +impl From for KeystoreError { + fn from(e: anyhow::Error) -> Self { + KeystoreError::Other(e) + } +} diff --git a/sdk/core/src/wallet/keystore_json.rs b/sdk/core/src/wallet/keystore_json.rs new file mode 100644 index 0000000000..a3aa807e60 --- /dev/null +++ b/sdk/core/src/wallet/keystore_json.rs @@ -0,0 +1,100 @@ +use serde::{Deserialize, Serialize}; + +use multiversx_chain_core::std::Bech32Address; + +use super::{Keystore, KeystoreRandomness}; + +#[derive(Debug, Serialize, Deserialize)] +pub struct CryptoParams { + pub iv: String, +} + +#[derive(Debug, Serialize, Deserialize)] +pub struct KdfParams { + pub dklen: u32, + pub salt: String, + pub n: u32, + pub r: u32, + pub p: u32, +} + +#[derive(Debug, Serialize, Deserialize)] +pub struct Crypto { + pub ciphertext: String, + pub cipherparams: CryptoParams, + pub cipher: String, + pub kdf: String, + pub kdfparams: KdfParams, + pub mac: String, +} + +#[derive(Debug, Serialize, Deserialize)] +pub struct KeystoreJson { + pub version: u32, + pub kind: String, + pub id: String, + pub address: String, + pub bech32: String, + pub crypto: Crypto, +} + +impl Keystore { + pub fn from_json(json: KeystoreJson) -> anyhow::Result { + let ciphertext = hex::decode(&json.crypto.ciphertext)?; + let iv_bytes = hex::decode(&json.crypto.cipherparams.iv)?; + let iv: [u8; 16] = iv_bytes + .as_slice() + .try_into() + .map_err(|_: std::array::TryFromSliceError| anyhow::anyhow!("iv must be 16 bytes"))?; + let salt_bytes = hex::decode(&json.crypto.kdfparams.salt)?; + let salt: [u8; 32] = salt_bytes + .as_slice() + .try_into() + .map_err(|_: std::array::TryFromSliceError| anyhow::anyhow!("salt must be 32 bytes"))?; + let mac = hex::decode(&json.crypto.mac)?; + Ok(Keystore { + version: json.version, + kind: json.kind, + address: Bech32Address::from_bech32_str(&json.bech32), + cipher: json.crypto.cipher, + ciphertext, + kdf: json.crypto.kdf, + n: json.crypto.kdfparams.n, + r: json.crypto.kdfparams.r, + p: json.crypto.kdfparams.p, + dklen: json.crypto.kdfparams.dklen, + mac, + randomness: KeystoreRandomness { + salt, + iv, + id: json.id, + }, + }) + } + + pub fn to_json(&self) -> KeystoreJson { + KeystoreJson { + version: self.version, + kind: self.kind.clone(), + id: self.randomness.id.clone(), + address: self.address.address.to_hex(), + bech32: self.address.bech32.clone(), + crypto: Crypto { + cipher: self.cipher.clone(), + cipherparams: CryptoParams { + iv: hex::encode(self.randomness.iv), + }, + ciphertext: hex::encode(&self.ciphertext), + kdf: self.kdf.clone(), + kdfparams: KdfParams { + salt: hex::encode(self.randomness.salt), + n: self.n, + r: self.r, + p: self.p, + dklen: self.dklen, + }, + mac: hex::encode(&self.mac), + }, + } + } +} diff --git a/sdk/core/src/wallet/mnemonic.rs b/sdk/core/src/wallet/mnemonic.rs new file mode 100644 index 0000000000..580b9d1498 --- /dev/null +++ b/sdk/core/src/wallet/mnemonic.rs @@ -0,0 +1,97 @@ +use std::fmt; + +use anyhow::{Context, Result}; +use hmac::{Hmac, KeyInit, Mac}; +use sha2::Sha512; + +use super::private_key::PrivateKey; + +const EGLD_COIN_TYPE: u32 = 508; +const HARDENED: u32 = 0x80000000; + +/// A BIP-39 mnemonic used to derive [`PrivateKey`]s via the MultiversX HD path. +/// +/// Wraps [`bip39::Mnemonic`] and provides MultiversX-specific key derivation. +#[derive(Clone)] +pub struct Mnemonic(bip39::Mnemonic); + +impl Mnemonic { + /// Parses a mnemonic phrase. + /// + /// All whitespace sequences (spaces, tabs, `\n`, `\r\n`, etc.) are + /// collapsed to single spaces before parsing, so file contents can be + /// passed directly without pre-processing. + pub fn parse(s: &str) -> Result { + let normalized = s.split_whitespace().collect::>().join(" "); + Ok(Mnemonic( + bip39::Mnemonic::parse(&normalized).context("invalid mnemonic phrase")?, + )) + } + + /// Derives a [`PrivateKey`] using the MultiversX HD path + /// `m/44'/508'/'/0'/'`. + pub fn to_private_key(&self, account: u32, address_index: u32) -> Result { + let seed = self.to_bip39_seed(); + self.bip32_derive(&seed, account, address_index) + } + + fn to_bip39_seed(&self) -> [u8; 64] { + self.0.to_seed_normalized("") + } + + fn bip32_derive( + &self, + seed: &[u8; 64], + account: u32, + address_index: u32, + ) -> Result { + let serialized_key_len = 32; + let hardened_child_padding: u8 = 0; + + let mut digest = Hmac::::new_from_slice(b"ed25519 seed") + .context("failed to initialise root HMAC-SHA512 digest")?; + digest.update(seed); + let intermediary: Vec = digest.finalize().into_bytes().into_iter().collect(); + let mut key = intermediary[..serialized_key_len].to_vec(); + let mut chain_code = intermediary[serialized_key_len..].to_vec(); + + for child_idx in [ + 44 | HARDENED, + EGLD_COIN_TYPE | HARDENED, + account | HARDENED, + HARDENED, + address_index | HARDENED, + ] { + let mut buff = [vec![hardened_child_padding], key.clone()].concat(); + buff.push((child_idx >> 24) as u8); + buff.push((child_idx >> 16) as u8); + buff.push((child_idx >> 8) as u8); + buff.push(child_idx as u8); + + digest = Hmac::::new_from_slice(&chain_code) + .context("failed to initialise child HMAC-SHA512 digest")?; + digest.update(&buff); + let intermediary: Vec = digest.finalize().into_bytes().into_iter().collect(); + key = intermediary[..serialized_key_len].to_vec(); + chain_code = intermediary[serialized_key_len..].to_vec(); + } + + let seed_bytes: &[u8; 32] = key + .as_slice() + .try_into() + .context("BIP32 derived key has unexpected length")?; + Ok(PrivateKey::from_seed_bytes(seed_bytes)) + } +} + +impl From for Mnemonic { + fn from(m: bip39::Mnemonic) -> Self { + Mnemonic(m) + } +} + +impl fmt::Display for Mnemonic { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + write!(f, "{}", self.0) + } +} diff --git a/sdk/core/src/wallet/private_key.rs b/sdk/core/src/wallet/private_key.rs new file mode 100644 index 0000000000..ff1b40e528 --- /dev/null +++ b/sdk/core/src/wallet/private_key.rs @@ -0,0 +1,139 @@ +use std::fmt::Display; + +use anyhow::{Result, anyhow}; +use multiversx_chain_core::std::crypto::ed25519; +use serde::{ + de::{Deserialize, Deserializer}, + ser::{Serialize, Serializer}, +}; + +use super::wallet_signature::WalletSignature; + +pub const PRIVATE_KEY_LENGTH: usize = 64; +pub const SEED_LENGTH: usize = 32; + +#[derive(Clone, PartialEq, Eq)] +pub struct PrivateKey(pub(crate) ed25519::Ed25519SigningKey); + +impl PrivateKey { + /// Constructs a [`PrivateKey`] from a 32-byte ed25519 seed. + /// + /// The corresponding public (verifying) key is derived automatically. + /// This is the canonical representation used throughout the MultiversX SDK. + pub fn from_seed_bytes(bytes: &[u8; 32]) -> PrivateKey { + PrivateKey(ed25519::Ed25519SigningKey::from_seed(bytes)) + } + + /// Constructs a [`PrivateKey`] from a 64-byte keypair `[seed || public_key]`. + /// + /// Returns an error if the embedded public key does not match the seed. + pub fn from_keypair_bytes(bytes: &[u8; 64]) -> Result { + ed25519::Ed25519SigningKey::from_keypair_bytes(bytes) + .map(PrivateKey) + .map_err(|e| anyhow!("Invalid keypair bytes: {e}")) + } + + /// Constructs a [`PrivateKey`] from a slice whose length determines the format: + /// - 32 bytes → treated as a seed (see [`from_seed_bytes`](Self::from_seed_bytes)) + /// - 64 bytes → treated as a keypair (see [`from_keypair_bytes`](Self::from_keypair_bytes)) + /// + /// Returns an error for any other length. + pub fn from_bytes(bytes: &[u8]) -> Result { + match bytes.len() { + SEED_LENGTH => { + let seed: &[u8; 32] = bytes + .try_into() + .map_err(|_| anyhow!("Invalid secret key length"))?; + Ok(PrivateKey::from_seed_bytes(seed)) + } + PRIVATE_KEY_LENGTH => { + let keypair: &[u8; 64] = bytes + .try_into() + .map_err(|_| anyhow!("Invalid secret key length"))?; + PrivateKey::from_keypair_bytes(keypair) + } + _ => Err(anyhow!("Invalid secret key length")), + } + } + + /// Decodes a hex string into a 32-byte seed and constructs a [`PrivateKey`]. + /// + /// The input must be exactly 64 hex characters (32 bytes). Returns an error + /// if the string is not valid hex or does not decode to exactly 32 bytes. + pub fn from_seed_hex_str(pk: &str) -> Result { + let bytes = hex::decode(pk)?; + let seed: [u8; 32] = bytes + .try_into() + .map_err(|_| anyhow!("Invalid seed key length"))?; + Ok(PrivateKey::from_seed_bytes(&seed)) + } + + /// Decodes a hex string into a 64-byte keypair and constructs a [`PrivateKey`]. + /// + /// The input must be exactly 128 hex characters (64 bytes). Returns an error + /// if the string is not valid hex, does not decode to exactly 64 bytes, or + /// the embedded public key does not match the seed. + pub fn from_keypair_hex_str(pk: &str) -> Result { + let bytes = hex::decode(pk)?; + let keypair: [u8; 64] = bytes + .try_into() + .map_err(|_| anyhow!("Invalid keypair key length"))?; + PrivateKey::from_keypair_bytes(&keypair) + } + + /// Decodes a hex string and constructs a [`PrivateKey`], inferring the format + /// from the decoded length (32 bytes → seed, 64 bytes → keypair). + /// + /// Prefer [`from_seed_hex_str`](Self::from_seed_hex_str) or + /// [`from_keypair_hex_str`](Self::from_keypair_hex_str) when the format is known. + pub fn from_hex_str(pk: &str) -> Result { + let bytes = hex::decode(pk)?; + PrivateKey::from_bytes(bytes.as_slice()) + } + + /// Returns the full 64-byte keypair as `[seed (32 bytes) || public_key (32 bytes)]`. + pub fn to_bytes(&self) -> [u8; PRIVATE_KEY_LENGTH] { + self.0.to_keypair_bytes() + } + + /// Returns the 32-byte seed encoded as a lowercase hex string (64 characters). + pub fn to_seed_hex(&self) -> String { + hex::encode(self.0.to_seed_bytes()) + } + + /// Signs `message` with this key and returns a [`WalletSignature`]. + pub fn sign(&self, message: impl AsRef<[u8]>) -> WalletSignature { + WalletSignature::from(self.0.sign(message.as_ref())) + } +} + +impl Display for PrivateKey { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + self.to_seed_hex().fmt(f) + } +} + +impl std::fmt::Debug for PrivateKey { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + write!(f, "PrivateKey({})", self) + } +} + +impl Serialize for PrivateKey { + fn serialize(&self, serializer: S) -> Result + where + S: Serializer, + { + serializer.serialize_str(self.to_seed_hex().as_str()) + } +} + +impl<'de> Deserialize<'de> for PrivateKey { + fn deserialize(deserializer: D) -> Result + where + D: Deserializer<'de>, + { + let s = String::deserialize(deserializer)?; + Ok(Self::from_hex_str(s.as_str()).unwrap()) + } +} diff --git a/sdk/core/src/wallet/public_key.rs b/sdk/core/src/wallet/public_key.rs new file mode 100644 index 0000000000..c382ae8aba --- /dev/null +++ b/sdk/core/src/wallet/public_key.rs @@ -0,0 +1,97 @@ +use std::fmt::Display; + +use super::PrivateKey; +use super::wallet_signature::WalletSignature; +use anyhow::Result; +use multiversx_chain_core::std::crypto::ed25519; +use multiversx_chain_core::types::Address; +use serde::{ + de::{Deserialize, Deserializer}, + ser::{Serialize, Serializer}, +}; + +pub const PUBLIC_KEY_LENGTH: usize = 32; + +#[derive(Copy, Clone)] +pub struct PublicKey(ed25519::Ed25519VerifyingKey); + +impl PublicKey { + /// Returns the raw 32-byte public key. + pub fn to_bytes(&self) -> [u8; PUBLIC_KEY_LENGTH] { + self.0.to_bytes() + } + + /// Returns a reference to the raw 32-byte public key. + pub fn as_bytes(&self) -> &[u8; PUBLIC_KEY_LENGTH] { + self.0.as_bytes() + } + + /// Derives the MultiversX [`Address`] from this public key. + /// + /// The address is the raw 32-byte public key interpreted as an address. + pub fn to_address(&self) -> Address { + (*self.0.as_bytes()).into() + } + + /// Returns the public key encoded as a lowercase hex string (64 characters). + pub fn to_hex(&self) -> String { + hex::encode(self.0.as_bytes()) + } + + /// Decodes a 64-character hex string into a [`PublicKey`]. + /// + /// Returns an error if the string is not valid hex, does not decode to + /// exactly 32 bytes, or the bytes do not represent a valid ed25519 point. + pub fn from_hex_str(pk: &str) -> Result { + let bytes = hex::decode(pk)?; + let bits: [u8; PUBLIC_KEY_LENGTH] = bytes + .try_into() + .map_err(|_| anyhow::anyhow!("invalid public key length, expected 32 bytes"))?; + ed25519::Ed25519VerifyingKey::from_bytes(&bits) + .map(PublicKey) + .ok_or_else(|| anyhow::anyhow!("invalid ed25519 public key")) + } + + /// Verifies that `signature` is a valid ed25519 signature over `message` + /// produced by the private key corresponding to this public key. + pub fn verify(&self, message: &[u8], signature: &WalletSignature) -> bool { + self.0.verify(message, signature.inner()) + } +} + +impl From<&PrivateKey> for PublicKey { + fn from(private_key: &PrivateKey) -> PublicKey { + PublicKey(private_key.0.verifying_key()) + } +} + +impl Display for PublicKey { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + self.to_hex().fmt(f) + } +} + +impl std::fmt::Debug for PublicKey { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + write!(f, "PublicKey({})", self) + } +} + +impl Serialize for PublicKey { + fn serialize(&self, serializer: S) -> Result + where + S: Serializer, + { + serializer.serialize_str(self.to_hex().as_str()) + } +} + +impl<'de> Deserialize<'de> for PublicKey { + fn deserialize(deserializer: D) -> Result + where + D: Deserializer<'de>, + { + let s = String::deserialize(deserializer)?; + Ok(Self::from_hex_str(s.as_str()).unwrap()) + } +} diff --git a/sdk/core/src/wallet/wallet_impl.rs b/sdk/core/src/wallet/wallet_impl.rs new file mode 100644 index 0000000000..96f5695972 --- /dev/null +++ b/sdk/core/src/wallet/wallet_impl.rs @@ -0,0 +1,129 @@ +use core::str; +use std::path::Path; + +use anyhow::Result; +use multiversx_chain_core::{ + std::{Bech32Address, Bech32Hrp, crypto}, + types::Address, +}; +use serde_json::json; + +use crate::{ + data::transaction::Transaction, + wallet::{Mnemonic, PrivateKey, PublicKey, WalletPem, WalletSignature, WalletSource}, +}; + +#[derive(Clone, PartialEq, Eq, Debug)] +pub struct Wallet { + pub private_key: PrivateKey, + pub address: Address, + pub source: WalletSource, +} + +impl Wallet { + pub fn new(private_key: PrivateKey, source: WalletSource) -> Self { + let address = PublicKey::from(&private_key).to_address(); + Wallet { + private_key, + address, + source, + } + } +} + +impl From for Wallet { + fn from(wallet_pem: WalletPem) -> Self { + Self::new( + wallet_pem.private_key, + WalletSource::PemFile(wallet_pem.address.hrp), + ) + } +} + +impl From for Wallet { + fn from(private_key: PrivateKey) -> Self { + Self::new(private_key, WalletSource::PrivateKey) + } +} + +impl TryFrom for Wallet { + type Error = anyhow::Error; + + /// Derives the wallet at account 0, address index 0 from the mnemonic. + fn try_from(mnemonic: Mnemonic) -> Result { + let private_key = mnemonic.to_private_key(0, 0)?; + Ok(Self::new(private_key, WalletSource::Mnemonic)) + } +} + +impl Wallet { + #[deprecated( + since = "0.67.0", + note = "Use `PrivateKey::from_hex_str(hex).map(Wallet::from)` instead" + )] + pub fn from_private_key_hex(priv_key: &str) -> Result { + let private_key = PrivateKey::from_hex_str(priv_key)?; + Ok(Self::new(private_key, WalletSource::PrivateKey)) + } + + pub fn from_pem_file

(file_path: P) -> Result + where + P: AsRef, + { + Ok(WalletPem::from_pem_file(file_path)?.into()) + } + + pub(crate) fn new_test_wallet(name: &'static str, pem: &str) -> Self { + let wallet_pem = WalletPem::from_pem_str(pem).unwrap(); + Self::new(wallet_pem.private_key, WalletSource::TestWallet(name)) + } + + #[deprecated( + since = "0.54.0", + note = "Renamed to `to_address`, type changed to multiversx_chain_core::types::Address" + )] + pub fn address(&self) -> Bech32Address { + self.to_address().to_bech32_default() + } + + pub fn to_address(&self) -> Address { + self.address.clone() + } + + pub fn private_key_hex(&self) -> String { + self.private_key.to_seed_hex() + } + + pub fn public_key(&self) -> PublicKey { + PublicKey::from(&self.private_key) + } + + pub fn public_key_hex(&self) -> String { + PublicKey::from(&self.private_key).to_hex() + } + + pub fn sign_tx(&self, unsign_tx: &Transaction) -> WalletSignature { + let mut unsign_tx = unsign_tx.clone(); + unsign_tx.signature = None; + + let mut tx_bytes = json!(unsign_tx).to_string().as_bytes().to_vec(); + + let should_sign_on_tx_hash = unsign_tx.version >= 2 && unsign_tx.options & 1 > 0; + if should_sign_on_tx_hash { + tx_bytes = crypto::keccak256(&tx_bytes).to_vec(); + } + + self.private_key.sign(tx_bytes) + } + + pub fn sign_bytes(&self, data: impl AsRef<[u8]>) -> WalletSignature { + self.private_key.sign(data) + } + + pub fn to_pem(&self, hrp: Bech32Hrp) -> WalletPem { + WalletPem { + private_key: self.private_key.clone(), + address: Bech32Address::encode_address(hrp, self.address.clone()), + } + } +} diff --git a/sdk/core/src/wallet/wallet_pem.rs b/sdk/core/src/wallet/wallet_pem.rs new file mode 100644 index 0000000000..9d1ad1bddf --- /dev/null +++ b/sdk/core/src/wallet/wallet_pem.rs @@ -0,0 +1,99 @@ +use std::path::Path; + +use anyhow::{Result, anyhow}; +use multiversx_chain_core::std::Bech32Address; + +use multiversx_chain_core::std::{base64_decode, base64_encode}; + +use super::{PrivateKey, PublicKey}; + +const PEM_BEGIN_PREFIX: &str = "-----BEGIN PRIVATE KEY for "; +const PEM_END_PREFIX: &str = "-----END PRIVATE KEY for "; +const PEM_MARKER_SUFFIX: &str = "-----"; + +/// A wallet loaded from or destined for the PEM format. +/// +/// The address field carries both the 32-byte address and the HRP, so a +/// round-trip through [`WalletPem::from_pem_str`] / [`WalletPem::to_pem_str`] +/// preserves the original human-readable part (e.g. `"erd"` or a custom one). +pub struct WalletPem { + pub private_key: PrivateKey, + pub address: Bech32Address, +} + +impl WalletPem { + /// Parses a PEM string into a `WalletPem`. + /// + /// The first line must be `-----BEGIN PRIVATE KEY for {bech32}-----`, which + /// supplies the address together with its HRP. The base64-encoded body + /// contains the concatenated private-key hex and public-key hex. + pub fn from_pem_str(pem_str: &str) -> Result { + let mut lines = pem_str.lines(); + + let header = lines.next().ok_or_else(|| anyhow!("PEM string is empty"))?; + let bech32_str = header + .strip_prefix(PEM_BEGIN_PREFIX) + .and_then(|s| s.strip_suffix(PEM_MARKER_SUFFIX)) + .ok_or_else(|| anyhow!("invalid PEM header: {header}"))?; + let address = Bech32Address::from_bech32_str(bech32_str); + + let b64_body: String = lines + .take_while(|line| !line.starts_with(PEM_END_PREFIX)) + .collect(); + + let decoded = + base64_decode(b64_body).map_err(|e| anyhow!("invalid base64 in PEM body: {e}"))?; + let private_key_bytes = &decoded[..decoded.len() / 2]; + let private_key_str = std::str::from_utf8(private_key_bytes) + .map_err(|e| anyhow!("invalid UTF-8 in private key: {e}"))?; + let private_key = PrivateKey::from_seed_hex_str(private_key_str)?; + + Ok(WalletPem { + private_key, + address, + }) + } + + /// Reads a PEM file from disk and parses it with [`WalletPem::from_pem_str`]. + pub fn from_pem_file

(file_path: P) -> Result + where + P: AsRef, + { + let contents = std::fs::read_to_string(file_path)?; + Self::from_pem_str(&contents) + } + + /// Produces a PEM string from this `WalletPem`. + /// + /// Output format: + /// ```text + /// -----BEGIN PRIVATE KEY for {bech32}----- + /// {base64(private_key_hex + public_key_hex)} + /// -----END PRIVATE KEY for {bech32}----- + /// ``` + pub fn to_pem_str(&self) -> String { + let private_key = self.private_key_hex(); + let public_key = self.public_key_hex(); + let b64 = base64_encode(format!("{private_key}{public_key}")); + + let formatted_key = b64 + .as_bytes() + .chunks(64) + .map(|chunk| std::str::from_utf8(chunk).unwrap()) + .collect::>() + .join("\n"); + + let bech32 = self.address.to_bech32_str(); + format!( + "{PEM_BEGIN_PREFIX}{bech32}{PEM_MARKER_SUFFIX}\n{formatted_key}\n{PEM_END_PREFIX}{bech32}{PEM_MARKER_SUFFIX}\n" + ) + } + + pub fn private_key_hex(&self) -> String { + self.private_key.to_seed_hex() + } + + pub fn public_key_hex(&self) -> String { + PublicKey::from(&self.private_key).to_hex() + } +} diff --git a/sdk/core/src/wallet/wallet_signature.rs b/sdk/core/src/wallet/wallet_signature.rs new file mode 100644 index 0000000000..352dc29144 --- /dev/null +++ b/sdk/core/src/wallet/wallet_signature.rs @@ -0,0 +1,78 @@ +use std::fmt; + +use anyhow::Result; +use multiversx_chain_core::std::crypto::ed25519; +use serde::{Deserialize, Deserializer, Serialize, Serializer}; + +/// An Ed25519 signature, serialized as a lowercase hex string. +#[derive(Copy, Clone, PartialEq, Eq)] +pub struct WalletSignature(ed25519::Ed25519Signature); + +impl WalletSignature { + pub fn from_bytes(bytes: [u8; 64]) -> Self { + Self(ed25519::Ed25519Signature::from_bytes(&bytes)) + } + + pub fn to_bytes(&self) -> [u8; 64] { + self.0.to_bytes() + } + + pub fn inner(&self) -> &ed25519::Ed25519Signature { + &self.0 + } + + pub fn to_hex(&self) -> String { + hex::encode(self.to_bytes()) + } + + pub fn from_hex_str(s: &str) -> Result { + let bytes = hex::decode(s)?; + let bits: [u8; 64] = bytes + .try_into() + .map_err(|_| anyhow::anyhow!("invalid signature length, expected 64 bytes"))?; + Ok(Self::from_bytes(bits)) + } +} + +impl From<[u8; 64]> for WalletSignature { + fn from(bytes: [u8; 64]) -> Self { + Self::from_bytes(bytes) + } +} + +impl From for WalletSignature { + fn from(sig: ed25519::Ed25519Signature) -> Self { + Self(sig) + } +} + +impl fmt::Display for WalletSignature { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + self.to_hex().fmt(f) + } +} + +impl fmt::Debug for WalletSignature { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + write!(f, "WalletSignature({})", self) + } +} + +impl Serialize for WalletSignature { + fn serialize(&self, serializer: S) -> std::result::Result + where + S: Serializer, + { + serializer.serialize_str(&self.to_hex()) + } +} + +impl<'de> Deserialize<'de> for WalletSignature { + fn deserialize(deserializer: D) -> std::result::Result + where + D: Deserializer<'de>, + { + let s = String::deserialize(deserializer)?; + Self::from_hex_str(&s).map_err(serde::de::Error::custom) + } +} diff --git a/sdk/core/src/wallet/wallet_source.rs b/sdk/core/src/wallet/wallet_source.rs new file mode 100644 index 0000000000..8b62d29346 --- /dev/null +++ b/sdk/core/src/wallet/wallet_source.rs @@ -0,0 +1,11 @@ +use multiversx_chain_core::std::Bech32Hrp; + +/// Optional structure that indicates how the [`Wallet`] was created, with additional metadata. +#[derive(Clone, PartialEq, Eq, Debug)] +pub enum WalletSource { + Mnemonic, + PrivateKey, + PemFile(Bech32Hrp), + TestWallet(&'static str), + Keystore(Bech32Hrp), +} diff --git a/sdk/core/tests/private_key_test.rs b/sdk/core/tests/private_key_test.rs new file mode 100644 index 0000000000..5d594a763e --- /dev/null +++ b/sdk/core/tests/private_key_test.rs @@ -0,0 +1,101 @@ +use multiversx_sdk::wallet::{PRIVATE_KEY_LENGTH, PrivateKey, SEED_LENGTH}; + +// Alice's well-known key material (consistent with wallet_pem_test.rs). +const ALICE_SEED_HEX: &str = "413f42575f7f26fad3317a778771212fdb80245850981e48b58a4f25e344e8f9"; +const ALICE_PUBLIC_KEY_HEX: &str = + "0139472eff6886771a982f3083da5d421f24c29181e63888228dc81ca60d69e1"; + +fn alice_seed_bytes() -> Vec { + hex::decode(ALICE_SEED_HEX).unwrap() +} + +fn alice_64byte_hex() -> String { + format!("{}{}", ALICE_SEED_HEX, ALICE_PUBLIC_KEY_HEX) +} + +// --------------------------------------------------------------------------- +// from_bytes — 32-byte (seed) branch +// --------------------------------------------------------------------------- + +#[test] +fn test_from_bytes_seed_length_ok() { + let seed = alice_seed_bytes(); + assert_eq!(seed.len(), SEED_LENGTH); + + let pk = PrivateKey::from_seed_bytes(seed.as_slice().try_into().unwrap()); + + // to_seed_hex() encodes only the first 32 bytes (the seed). + assert_eq!(pk.to_seed_hex(), ALICE_SEED_HEX); +} + +#[test] +fn test_from_bytes_seed_derives_correct_public_key() { + let seed = alice_seed_bytes(); + let pk = PrivateKey::from_seed_bytes(seed.as_slice().try_into().unwrap()); + + // The upper 32 bytes of the stored key must be the verifying key. + let stored = pk.to_bytes(); + let derived_pubkey_hex = hex::encode(&stored[32..]); + assert_eq!(derived_pubkey_hex, ALICE_PUBLIC_KEY_HEX); +} + +#[test] +fn test_from_bytes_seed_roundtrip() { + let seed = alice_seed_bytes(); + let pk = PrivateKey::from_seed_bytes(seed.as_slice().try_into().unwrap()); + + // Re-constructing from the returned 64-byte array must yield an equal key. + let pk2 = PrivateKey::from_keypair_bytes(&pk.to_bytes()).unwrap(); + assert_eq!(pk, pk2); +} + +// --------------------------------------------------------------------------- +// from_bytes — 64-byte (full key) branch +// --------------------------------------------------------------------------- + +#[test] +fn test_from_bytes_full_length_ok() { + let full = hex::decode(alice_64byte_hex()).unwrap(); + assert_eq!(full.len(), PRIVATE_KEY_LENGTH); + + let pk = PrivateKey::from_keypair_bytes(full.as_slice().try_into().unwrap()).unwrap(); + + // Seed portion must be preserved verbatim. + assert_eq!(pk.to_seed_hex(), ALICE_SEED_HEX); +} + +#[test] +fn test_from_bytes_full_preserves_all_64_bytes() { + let full = hex::decode(alice_64byte_hex()).unwrap(); + let pk = PrivateKey::from_keypair_bytes(full.as_slice().try_into().unwrap()).unwrap(); + + assert_eq!(pk.to_bytes().as_slice(), full.as_slice()); +} + +#[test] +fn test_from_bytes_full_roundtrip() { + let full = hex::decode(alice_64byte_hex()).unwrap(); + let pk = PrivateKey::from_keypair_bytes(full.as_slice().try_into().unwrap()).unwrap(); + let pk2 = PrivateKey::from_keypair_bytes(&pk.to_bytes()).unwrap(); + assert_eq!(pk, pk2); +} + +// --------------------------------------------------------------------------- +// from_bytes — error cases +// --------------------------------------------------------------------------- + +#[test] +fn test_from_bytes_empty_is_err() { + assert!(PrivateKey::from_bytes(&[]).is_err()); +} + +#[test] +fn test_from_bytes_wrong_length_is_err() { + // 16 bytes — neither 32 nor 64. + assert!(PrivateKey::from_bytes(&[0u8; 16]).is_err()); +} + +#[test] +fn test_from_bytes_65_bytes_is_err() { + assert!(PrivateKey::from_bytes(&[0u8; 65]).is_err()); +} diff --git a/sdk/core/tests/public_key_test.rs b/sdk/core/tests/public_key_test.rs new file mode 100644 index 0000000000..0600c4d302 --- /dev/null +++ b/sdk/core/tests/public_key_test.rs @@ -0,0 +1,70 @@ +use multiversx_sdk::wallet::PublicKey; + +// Alice's known values, consistent with wallet_pem_test.rs constants. +const ALICE_PUBLIC_KEY_HEX: &str = + "0139472eff6886771a982f3083da5d421f24c29181e63888228dc81ca60d69e1"; +const ALICE_BECH32: &str = "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th"; + +// --------------------------------------------------------------------------- +// from_hex_str +// --------------------------------------------------------------------------- + +#[test] +fn test_from_hex_str_valid() { + let pk = PublicKey::from_hex_str(ALICE_PUBLIC_KEY_HEX).unwrap(); + assert_eq!(pk.to_hex(), ALICE_PUBLIC_KEY_HEX); +} + +#[test] +fn test_from_hex_str_invalid_hex() { + assert!(PublicKey::from_hex_str("not_valid_hex!!").is_err()); +} + +#[test] +fn test_from_hex_str_too_short() { + // 8 bytes — not 32 + assert!(PublicKey::from_hex_str("0102030405060708").is_err()); +} + +#[test] +fn test_from_hex_str_too_long() { + // 64 bytes (128 hex chars) — not 32 + let long_hex = "01".repeat(64); + assert!(PublicKey::from_hex_str(&long_hex).is_err()); +} + +// --------------------------------------------------------------------------- +// to_hex +// --------------------------------------------------------------------------- + +#[test] +fn test_to_hex_matches_input() { + let pk = PublicKey::from_hex_str(ALICE_PUBLIC_KEY_HEX).unwrap(); + assert_eq!(pk.to_hex(), ALICE_PUBLIC_KEY_HEX); +} + +#[test] +fn test_to_hex_from_hex_roundtrip() { + let pk = PublicKey::from_hex_str(ALICE_PUBLIC_KEY_HEX).unwrap(); + let pk2 = PublicKey::from_hex_str(&pk.to_hex()).unwrap(); + assert_eq!(pk.to_bytes(), pk2.to_bytes()); +} + +// --------------------------------------------------------------------------- +// to_address +// --------------------------------------------------------------------------- + +#[test] +fn test_to_address_bytes_match_public_key() { + // On MultiversX the address IS the public key bytes. + let pk = PublicKey::from_hex_str(ALICE_PUBLIC_KEY_HEX).unwrap(); + let address = pk.to_address(); + assert_eq!(address.to_hex(), ALICE_PUBLIC_KEY_HEX); +} + +#[test] +fn test_to_address_bech32() { + let pk = PublicKey::from_hex_str(ALICE_PUBLIC_KEY_HEX).unwrap(); + let address = pk.to_address(); + assert_eq!(address.to_bech32_default().to_bech32_str(), ALICE_BECH32); +} diff --git a/sdk/core/tests/retrieve_tx_on_network_test.rs b/sdk/core/tests/retrieve_tx_on_network_test.rs index bac74f6d5d..ee9c45e975 100644 --- a/sdk/core/tests/retrieve_tx_on_network_test.rs +++ b/sdk/core/tests/retrieve_tx_on_network_test.rs @@ -1,11 +1,10 @@ -use multiversx_chain_core::types::ReturnCode; +use multiversx_chain_core::{std::base64_decode, types::ReturnCode}; use multiversx_sdk::{ data::transaction::{ApiTransactionResult, GetTransactionResponse}, retrieve_tx_on_network::{ extract_message_from_string_reason, find_code_and_message, parse_reason, replace_with_error_message, }, - utils::base64_decode, }; #[test] @@ -869,7 +868,7 @@ fn replace_logs_reason_sc_panic_test() { serde_json::from_str::(tx_str).unwrap(); let expected_tx: ApiTransactionResult = serde_json::from_str::(expected_tx_str).unwrap(); - replace_with_error_message(&mut tx, &String::from_utf8(base64_decode("c3RvcmFnZSBkZWNvZGUgZXJyb3IgKGtleTogcG9vbENvbnRyYWN0AAAAAAAAAe+/vSk6IGlucHV0IHRvbyBzaG9ydA==")).unwrap()); + replace_with_error_message(&mut tx, &String::from_utf8(base64_decode("c3RvcmFnZSBkZWNvZGUgZXJyb3IgKGtleTogcG9vbENvbnRyYWN0AAAAAAAAAe+/vSk6IGlucHV0IHRvbyBzaG9ydA==").unwrap()).unwrap()); assert_eq!( expected_tx.logs.unwrap().events[0].topics, tx.logs.unwrap().events[0].topics diff --git a/sdk/core/tests/wallet_keystore_test.rs b/sdk/core/tests/wallet_keystore_test.rs new file mode 100644 index 0000000000..93c6b0901b --- /dev/null +++ b/sdk/core/tests/wallet_keystore_test.rs @@ -0,0 +1,160 @@ +use multiversx_chain_core::std::Bech32Hrp; +use multiversx_sdk::{ + wallet::{Keystore, KeystoreError, KeystoreRandomness, WalletSource}, + wallet::{PrivateKey, PublicKey}, +}; + +// Well-known Alice private key used across the test suite. +const ALICE_PRIVATE_KEY_HEX: &str = + "413f42575f7f26fad3317a778771212fdb80245850981e48b58a4f25e344e8f9"; +const KEYSTORE_PASSWORD: &str = "test_password"; + +/// Fully deterministic randomness: all-zeroes salt, all-ones IV, fixed UUID. +fn fixed_randomness() -> KeystoreRandomness { + KeystoreRandomness { + salt: [0u8; 32], + iv: [1u8; 16], + id: "a1b2c3d4-e5f6-7890-abcd-ef1234567890".to_string(), + } +} + +fn alice_private_key() -> PrivateKey { + PrivateKey::from_seed_hex_str(ALICE_PRIVATE_KEY_HEX).unwrap() +} + +fn erd_hrp() -> Bech32Hrp { + Bech32Hrp::try_from("erd").unwrap() +} + +// --------------------------------------------------------------------------- +// Encrypt / decrypt +// --------------------------------------------------------------------------- + +#[test] +fn test_keystore_encrypt_decrypt_roundtrip() { + let private_key = alice_private_key(); + let keystore = Keystore::encrypt( + &private_key, + erd_hrp(), + KEYSTORE_PASSWORD, + fixed_randomness(), + ); + + let wallet = keystore.decrypt_wallet(KEYSTORE_PASSWORD).unwrap(); + + assert_eq!(wallet.private_key, private_key); + assert_eq!( + wallet.source, + WalletSource::Keystore(Bech32Hrp::try_from("erd").unwrap()) + ); + assert_eq!(wallet.address, PublicKey::from(&private_key).to_address(),); +} + +#[test] +fn test_keystore_wrong_password_rejected() { + let keystore = Keystore::encrypt( + &alice_private_key(), + erd_hrp(), + KEYSTORE_PASSWORD, + fixed_randomness(), + ); + + assert!(matches!( + keystore.decrypt_wallet("wrong_password"), + Err(KeystoreError::InvalidPassword) + )); +} + +// --------------------------------------------------------------------------- +// Serialization / deserialization +// --------------------------------------------------------------------------- + +#[test] +fn test_keystore_serialize_deserialize_roundtrip() { + let private_key = alice_private_key(); + let keystore = Keystore::encrypt( + &private_key, + erd_hrp(), + KEYSTORE_PASSWORD, + fixed_randomness(), + ); + + let json = keystore.to_json_string(); + + let keystore2: Keystore = Keystore::from_json(serde_json::from_str(&json).unwrap()).unwrap(); + let wallet = keystore2.decrypt_wallet(KEYSTORE_PASSWORD).unwrap(); + + assert_eq!(wallet.private_key, private_key); +} + +#[test] +fn test_keystore_json_snapshot() { + let keystore = Keystore::encrypt( + &alice_private_key(), + erd_hrp(), + KEYSTORE_PASSWORD, + fixed_randomness(), + ); + + let json = keystore.to_json_string(); + + assert_eq!(json, EXPECTED_KEYSTORE_JSON); +} + +#[test] +fn test_full_encrypt_serialize_deserialize_decrypt_sign() { + const MESSAGE: &[u8] = b"hello multiversx"; + + // Encrypt. + let keystore = Keystore::encrypt( + &alice_private_key(), + erd_hrp(), + KEYSTORE_PASSWORD, + fixed_randomness(), + ); + + // Serialize to JSON, then deserialize back. + let json = keystore.to_json_string(); + let keystore2 = Keystore::from_json(serde_json::from_str(&json).unwrap()).unwrap(); + + // Decrypt into a Wallet. + let wallet = keystore2.decrypt_wallet(KEYSTORE_PASSWORD).unwrap(); + assert_eq!(wallet.private_key, alice_private_key()); + + // Sign the message. + let sig = wallet.sign_bytes(MESSAGE); + + // Ed25519 is deterministic: same key + same message always gives the same signature. + assert_eq!(sig, wallet.sign_bytes(MESSAGE)); + + // Snapshot: exact signature bytes must match. + assert_eq!(sig.to_hex(), EXPECTED_SIGNATURE_HEX); +} + +// Generated by running the test suite once with fixed randomness. +const EXPECTED_KEYSTORE_JSON: &str = r#"{ + "version": 4, + "kind": "secretKey", + "id": "a1b2c3d4-e5f6-7890-abcd-ef1234567890", + "address": "0139472eff6886771a982f3083da5d421f24c29181e63888228dc81ca60d69e1", + "bech32": "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th", + "crypto": { + "ciphertext": "66f761de7f386c3cde5d8b1650c37614263880e96314b3070c45a39e44eb7b46573174ddade22c2a5f7dae73385d5a0abc5cff566e34152867c0ff560f1d5d05", + "cipherparams": { + "iv": "01010101010101010101010101010101" + }, + "cipher": "aes-128-ctr", + "kdf": "scrypt", + "kdfparams": { + "dklen": 32, + "salt": "0000000000000000000000000000000000000000000000000000000000000000", + "n": 4096, + "r": 8, + "p": 1 + }, + "mac": "4f9db1601de9013e32b2a8ca6cd941b5f5a3feb7a592c0b2586f6b8c1b2a87b9" + } +} +"#; + +const EXPECTED_SIGNATURE_HEX: &str = "c32f811c809a02d3548f190b134d5fa542b028935f4e300556e29b3164f146d54aa7e37ba97080e9f72402af67f6f6f070cbbd1b496c9779e75038a6aee54c07"; diff --git a/sdk/core/tests/wallet_pem_test.rs b/sdk/core/tests/wallet_pem_test.rs new file mode 100644 index 0000000000..f5d016f7db --- /dev/null +++ b/sdk/core/tests/wallet_pem_test.rs @@ -0,0 +1,91 @@ +use multiversx_chain_core::std::Bech32Hrp; +use multiversx_sdk::wallet::{Wallet, WalletPem, WalletSource}; + +const ALICE_PEM_PATH: &str = "tests/alice.pem"; +const ALICE_BECH32: &str = "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th"; +const ALICE_PRIVATE_KEY_HEX: &str = + "413f42575f7f26fad3317a778771212fdb80245850981e48b58a4f25e344e8f9"; +const ALICE_PUBLIC_KEY_HEX: &str = + "0139472eff6886771a982f3083da5d421f24c29181e63888228dc81ca60d69e1"; + +// --------------------------------------------------------------------------- +// WalletPem parsing +// --------------------------------------------------------------------------- + +#[test] +fn test_pem_from_file_address() { + let pem = WalletPem::from_pem_file(ALICE_PEM_PATH).unwrap(); + assert_eq!(pem.address.to_bech32_str(), ALICE_BECH32); +} + +#[test] +fn test_pem_from_file_private_key() { + let pem = WalletPem::from_pem_file(ALICE_PEM_PATH).unwrap(); + assert_eq!(pem.private_key_hex(), ALICE_PRIVATE_KEY_HEX); +} + +#[test] +fn test_pem_from_file_public_key() { + let pem = WalletPem::from_pem_file(ALICE_PEM_PATH).unwrap(); + assert_eq!(pem.public_key_hex(), ALICE_PUBLIC_KEY_HEX); +} + +#[test] +fn test_pem_from_str_parses_correctly() { + let pem_str = std::fs::read_to_string(ALICE_PEM_PATH).unwrap(); + let pem = WalletPem::from_pem_str(&pem_str).unwrap(); + assert_eq!(pem.address.to_bech32_str(), ALICE_BECH32); + assert_eq!(pem.private_key_hex(), ALICE_PRIVATE_KEY_HEX); + assert_eq!(pem.public_key_hex(), ALICE_PUBLIC_KEY_HEX); +} + +// --------------------------------------------------------------------------- +// WalletPem serialization +// --------------------------------------------------------------------------- + +#[test] +fn test_pem_str_roundtrip() { + let pem = WalletPem::from_pem_file(ALICE_PEM_PATH).unwrap(); + let serialized = pem.to_pem_str(); + let reparsed = WalletPem::from_pem_str(&serialized).unwrap(); + assert_eq!(reparsed.private_key_hex(), ALICE_PRIVATE_KEY_HEX); + assert_eq!(reparsed.address.to_bech32_str(), ALICE_BECH32); +} + +// --------------------------------------------------------------------------- +// WalletPem <-> Wallet conversion +// --------------------------------------------------------------------------- + +#[test] +fn test_wallet_from_pem_fields() { + let pem = WalletPem::from_pem_file(ALICE_PEM_PATH).unwrap(); + let wallet = Wallet::from(pem); + assert_eq!(wallet.private_key.to_seed_hex(), ALICE_PRIVATE_KEY_HEX); + assert_eq!(wallet.address.to_bech32_default().bech32, ALICE_BECH32); +} + +#[test] +fn test_wallet_from_pem_source() { + let pem = WalletPem::from_pem_file(ALICE_PEM_PATH).unwrap(); + let hrp = pem.address.hrp; + let wallet = Wallet::from(pem); + assert_eq!(wallet.source, WalletSource::PemFile(hrp)); +} + +#[test] +fn test_wallet_to_pem_roundtrip() { + let wallet = Wallet::from_pem_file(ALICE_PEM_PATH).unwrap(); + let hrp = Bech32Hrp::try_from("erd").unwrap(); + let pem = wallet.to_pem(hrp); + assert_eq!(pem.private_key_hex(), ALICE_PRIVATE_KEY_HEX); + assert_eq!(pem.address.to_bech32_str(), ALICE_BECH32); +} + +#[test] +fn test_wallet_to_pem_str_roundtrip() { + let wallet = Wallet::from_pem_file(ALICE_PEM_PATH).unwrap(); + let hrp = Bech32Hrp::try_from("erd").unwrap(); + let pem_str = wallet.to_pem(hrp).to_pem_str(); + let reparsed = Wallet::from(WalletPem::from_pem_str(&pem_str).unwrap()); + assert_eq!(reparsed.private_key.to_seed_hex(), ALICE_PRIVATE_KEY_HEX); +} diff --git a/sdk/core/tests/wallet_sign_test.rs b/sdk/core/tests/wallet_sign_test.rs new file mode 100644 index 0000000000..1cde364b2c --- /dev/null +++ b/sdk/core/tests/wallet_sign_test.rs @@ -0,0 +1,126 @@ +use multiversx_sdk::{test_wallets, wallet::WalletSignature}; + +#[test] +fn test_sign_bytes_snapshot() { + let alice = test_wallets::alice(); + let bob = test_wallets::bob(); + + // Signatures are deterministic: same key + same message always produces the same bytes. + let sig_alice = alice.sign_bytes(b"hello multiversx"); + let sig_bob = bob.sign_bytes(b"hello multiversx"); + + assert_eq!(sig_alice.to_hex(), SIG_ALICE_HELLO); + assert_eq!(sig_bob.to_hex(), SIG_BOB_HELLO); +} + +#[test] +fn test_sign_bytes_deterministic() { + let alice = test_wallets::alice(); + assert_eq!( + alice.sign_bytes(b"deterministic"), + alice.sign_bytes(b"deterministic"), + ); +} + +#[test] +fn test_sign_bytes_different_messages_differ() { + let alice = test_wallets::alice(); + assert_ne!( + alice.sign_bytes(b"message one"), + alice.sign_bytes(b"message two"), + ); +} + +#[test] +fn test_sign_bytes_different_keys_differ() { + assert_ne!( + test_wallets::alice().sign_bytes(b"same message"), + test_wallets::bob().sign_bytes(b"same message"), + ); +} + +#[test] +fn test_verify_valid_signature() { + let alice = test_wallets::alice(); + let message = b"hello multiversx"; + let sig = alice.sign_bytes(message); + assert!(alice.public_key().verify(message, &sig)); +} + +#[test] +fn test_verify_wrong_message_fails() { + let alice = test_wallets::alice(); + let sig = alice.sign_bytes(b"hello multiversx"); + assert!(!alice.public_key().verify(b"different message", &sig)); +} + +#[test] +fn test_verify_wrong_key_fails() { + let alice = test_wallets::alice(); + let bob = test_wallets::bob(); + let sig = alice.sign_bytes(b"hello multiversx"); + assert!(!bob.public_key().verify(b"hello multiversx", &sig)); +} + +#[test] +fn test_verify_snapshot_signatures() { + let alice = test_wallets::alice(); + let bob = test_wallets::bob(); + let alice_sig = WalletSignature::from_hex_str(SIG_ALICE_HELLO).unwrap(); + let bob_sig = WalletSignature::from_hex_str(SIG_BOB_HELLO).unwrap(); + assert!(alice.public_key().verify(b"hello multiversx", &alice_sig)); + assert!(bob.public_key().verify(b"hello multiversx", &bob_sig)); +} + +// Snapshots captured with fixed test-wallet keys. +const SIG_ALICE_HELLO: &str = "c32f811c809a02d3548f190b134d5fa542b028935f4e300556e29b3164f146d54aa7e37ba97080e9f72402af67f6f6f070cbbd1b496c9779e75038a6aee54c07"; +const SIG_BOB_HELLO: &str = "09e1b11a87e47bb0c1bebc71f653daabb966c583219588d4b80e396a966b91d41767af8f4704bbc50f8e8fd34cc6fb0da210329ea19437a7e07c0fc3f5cdf50e"; + +#[test] +fn test_wallet_signature_to_hex_roundtrip() { + let raw = [0xabu8; 64]; + let sig = WalletSignature::from_bytes(raw); + let hex = sig.to_hex(); + assert_eq!(hex.len(), 128); + let sig2 = WalletSignature::from_hex_str(&hex).unwrap(); + assert_eq!(sig2, sig); +} + +#[test] +fn test_wallet_signature_from_hex_str_invalid_hex() { + assert!(WalletSignature::from_hex_str("not-hex").is_err()); +} + +#[test] +fn test_wallet_signature_from_hex_str_wrong_length() { + // 63 bytes (126 hex chars) — too short + assert!(WalletSignature::from_hex_str(&"ab".repeat(63)).is_err()); + // 65 bytes (130 hex chars) — too long + assert!(WalletSignature::from_hex_str(&"ab".repeat(65)).is_err()); +} + +#[test] +fn test_wallet_signature_json_serialize_as_hex() { + let raw = [0x01u8; 64]; + let sig = WalletSignature::from_bytes(raw); + let json = serde_json::to_string(&sig).unwrap(); + // JSON value should be a quoted hex string of length 128 chars + assert_eq!(json, format!("\"{}\"", sig.to_hex())); +} + +#[test] +fn test_wallet_signature_json_deserialize_from_hex() { + let hex = "ab".repeat(64); + let json = format!("\"{}\"", hex); + let sig: WalletSignature = serde_json::from_str(&json).unwrap(); + assert_eq!(sig.to_hex(), hex); +} + +#[test] +fn test_wallet_signature_json_roundtrip() { + let raw = [0xdeu8; 64]; + let sig = WalletSignature::from_bytes(raw); + let json = serde_json::to_string(&sig).unwrap(); + let sig2: WalletSignature = serde_json::from_str(&json).unwrap(); + assert_eq!(sig, sig2); +} diff --git a/sdk/core/tests/wallet_test.rs b/sdk/core/tests/wallet_test.rs index 693cc2dce6..e51f5f4bad 100644 --- a/sdk/core/tests/wallet_test.rs +++ b/sdk/core/tests/wallet_test.rs @@ -1,38 +1,37 @@ -use bip39::Mnemonic; - use multiversx_sdk::test_wallets; -use multiversx_sdk::{crypto::public_key::PublicKey, wallet::Wallet}; +use multiversx_sdk::wallet::Mnemonic; +use multiversx_sdk::wallet::PublicKey; #[test] fn test_private_key_from_mnemonic() { - let mnemonic: Mnemonic = Mnemonic::parse_normalized("acid twice post genre topic observe valid viable gesture fortune funny dawn around blood enemy page update reduce decline van bundle zebra rookie real").unwrap(); + let mnemonic = Mnemonic::parse("acid twice post genre topic observe valid viable gesture fortune funny dawn around blood enemy page update reduce decline van bundle zebra rookie real").unwrap(); - let private_key = Wallet::get_private_key_from_mnemonic(mnemonic.clone(), 0, 0); + let private_key = mnemonic.to_private_key(0, 0).unwrap(); let public_key = PublicKey::from(&private_key); let address = public_key.to_address(); assert_eq!( "0b7966138e80b8f3bb64046f56aea4250fd7bacad6ed214165cea6767fd0bc2c", - private_key.to_string() + private_key.to_seed_hex() ); assert_eq!( "dfefe0453840e5903f2bd519de9b0ed6e9621e57e28ba0b4c1b15115091dd72f", - public_key.to_string() + public_key.to_hex() ); assert_eq!( "erd1mlh7q3fcgrjeq0et65vaaxcw6m5ky8jhu296pdxpk9g32zga6uhsemxx2a", address.to_bech32_default().bech32 ); - let private_key = Wallet::get_private_key_from_mnemonic(mnemonic, 0, 1); + let private_key = mnemonic.to_private_key(0, 1).unwrap(); let public_key = PublicKey::from(&private_key); let address = public_key.to_address(); assert_eq!( "1648ad209d6b157a289884933e3bb30f161ec7113221ec16f87c3578b05830b0", - private_key.to_string() + private_key.to_seed_hex() ); assert_eq!( "af8fef070a581873912ccbafb6a78bb9eb4e003085ac43dbbdfa3e20eb93cede", - public_key.to_string() + public_key.to_hex() ); assert_eq!( "erd147877pc2tqv88yfvewhmdfuth845uqpsskky8kaalglzp6unem0qpwh982", @@ -40,29 +39,20 @@ fn test_private_key_from_mnemonic() { ); } -#[test] -fn test_load_from_pem() { - let wallet = Wallet::from_pem_file("tests/alice.pem").unwrap(); - let address = wallet.to_address(); - assert_eq!( - "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th", - address.to_bech32_default().bech32 - ); -} #[test] fn test_get_shard() { let alice = test_wallets::alice(); // [1, 57, 71, 46, 255, 104, 134, 119, 26, 152, 47, 48, 131, 218, 93, 66, 31, 36, 194, 145, 129, 230, 56, 136, 34, 141, 200, 28, 166, 13, 105, 225] - assert_eq!(0, alice.get_shard()); + assert_eq!(1, alice.address.shard_of_3().as_u32()); let bob = test_wallets::bob(); // [128, 73, 214, 57, 229, 166, 152, 13, 28, 210, 57, 42, 188, 206, 65, 2, 156, 218, 116, 161, 86, 53, 35, 162, 2, 240, 150, 65, 204, 38, 24, 248] - assert_eq!(2, bob.get_shard()); + assert_eq!(0, bob.address.shard_of_3().as_u32()); let carol = test_wallets::carol(); // [178, 161, 21, 85, 206, 82, 30, 73, 68, 224, 154, 177, 117, 73, 216, 91, 72, 125, 205, 38, 200, 75, 80, 23, 163, 158, 49, 163, 103, 8, 137, 186] - assert_eq!(0, carol.get_shard()); + assert_eq!(2, carol.address.shard_of_3().as_u32()); let heidi = test_wallets::heidi(); // [110, 34, 65, 24, 217, 6, 138, 230, 38, 135, 138, 28, 251, 235, 203, 106, 149, 164, 113, 93, 184, 109, 27, 81, 224, 106, 4, 34, 108, 243, 15, 214] - assert_eq!(1, heidi.get_shard()); + assert_eq!(2, heidi.address.shard_of_3().as_u32()); let mike = test_wallets::mike(); // [227, 42, 254, 220, 144, 79, 225, 147, 151, 70, 173, 151, 59, 235, 56, 53, 99, 207, 99, 100, 43, 166, 105, 179, 4, 15, 155, 148, 40, 165, 237, 96] - assert_eq!(0, mike.get_shard()); + assert_eq!(0, mike.address.shard_of_3().as_u32()); } diff --git a/sdk/dapp/src/lib.rs b/sdk/dapp/src/lib.rs index 4ca9648fd7..de17f4742e 100644 --- a/sdk/dapp/src/lib.rs +++ b/sdk/dapp/src/lib.rs @@ -3,4 +3,4 @@ pub use gateway_dapp_proxy::GatewayDappProxy; pub use multiversx_sdk as core; -pub use multiversx_sdk::{data, utils, wallet}; +pub use multiversx_sdk::{data, wallet}; diff --git a/sdk/http/examples/sign_tx.rs b/sdk/http/examples/sign_tx.rs index b194680798..d69ae7f78c 100644 --- a/sdk/http/examples/sign_tx.rs +++ b/sdk/http/examples/sign_tx.rs @@ -1,26 +1,24 @@ -use multiversx_sdk::{data::transaction::Transaction, wallet::Wallet}; +use multiversx_sdk::{data::transaction::Transaction, wallet::PrivateKey, wallet::Wallet}; use multiversx_sdk_http::{DEVNET_GATEWAY, GatewayHttpProxy}; #[tokio::main] -async fn main() { - let wl = Wallet::from_private_key( +async fn main() -> anyhow::Result<()> { + let wallet = Wallet::from(PrivateKey::from_seed_hex_str( "1648ad209d6b157a289884933e3bb30f161ec7113221ec16f87c3578b05830b0", - ) - .unwrap(); - let addr = wl.to_address(); + )?); + let addr = wallet.to_address(); let blockchain = GatewayHttpProxy::new(DEVNET_GATEWAY.to_string()); - let network_config = blockchain.get_network_config().await.unwrap(); + let network_config = blockchain.get_network_config().await?; let arg = blockchain .get_default_transaction_arguments(&addr, &network_config) - .await - .unwrap(); + .await?; let mut unsign_tx = Transaction { nonce: arg.nonce, value: "0".to_string(), - receiver: addr.to_bech32(&network_config.address_hrp), - sender: addr.to_bech32(&network_config.address_hrp), + receiver: addr.to_bech32(network_config.address_hrp), + sender: addr.to_bech32(network_config.address_hrp), gas_price: arg.gas_price, gas_limit: arg.gas_limit, data: arg.data, @@ -30,10 +28,11 @@ async fn main() { options: arg.options, }; - let signature = wl.sign_tx(&unsign_tx); - unsign_tx.signature = Some(hex::encode(signature)); - let tx_hash = blockchain.send_transaction(&unsign_tx).await.unwrap(); + let signature = wallet.sign_tx(&unsign_tx); + unsign_tx.signature = Some(signature); + let tx_hash = blockchain.send_transaction(&unsign_tx).await?; assert!(!tx_hash.is_empty()); println!("tx_hash {tx_hash}"); + Ok(()) } diff --git a/sdk/http/examples/sign_txs.rs b/sdk/http/examples/sign_txs.rs index 13bf767cef..fb99c8db48 100644 --- a/sdk/http/examples/sign_txs.rs +++ b/sdk/http/examples/sign_txs.rs @@ -1,26 +1,27 @@ -use multiversx_sdk::{data::transaction::Transaction, wallet::Wallet}; +use multiversx_sdk::{ + data::transaction::Transaction, + wallet::{PrivateKey, Wallet}, +}; use multiversx_sdk_http::{DEVNET_GATEWAY, GatewayHttpProxy}; #[tokio::main] -async fn main() { - let wl = Wallet::from_private_key( +async fn main() -> anyhow::Result<()> { + let wallet = Wallet::from(PrivateKey::from_seed_hex_str( "1648ad209d6b157a289884933e3bb30f161ec7113221ec16f87c3578b05830b0", - ) - .unwrap(); - let addr = wl.to_address(); + )?); + let addr = wallet.to_address(); let blockchain = GatewayHttpProxy::new(DEVNET_GATEWAY.to_string()); - let network_config = blockchain.get_network_config().await.unwrap(); + let network_config = blockchain.get_network_config().await?; let arg = blockchain .get_default_transaction_arguments(&addr, &network_config) - .await - .unwrap(); + .await?; let mut unsign_tx = Transaction { nonce: arg.nonce, value: "1000000000000000000".to_string(), - receiver: addr.to_bech32(&network_config.address_hrp), - sender: addr.to_bech32(&network_config.address_hrp), + receiver: addr.to_bech32(network_config.address_hrp), + sender: addr.to_bech32(network_config.address_hrp), gas_price: arg.gas_price, gas_limit: arg.gas_limit, data: arg.data, @@ -32,20 +33,21 @@ async fn main() { let mut txs: Vec = vec![]; - let signature = wl.sign_tx(&unsign_tx); - unsign_tx.signature = Some(hex::encode(signature)); + let signature = wallet.sign_tx(&unsign_tx); + unsign_tx.signature = Some(signature); txs.push(unsign_tx.clone()); unsign_tx.version = 2; unsign_tx.options = 1; unsign_tx.nonce += 1; - let signature = wl.sign_tx(&unsign_tx); - unsign_tx.signature = Some(hex::encode(signature)); + let signature = wallet.sign_tx(&unsign_tx); + unsign_tx.signature = Some(signature); txs.push(unsign_tx.clone()); - let tx_hash = blockchain.send_transactions(&txs).await.unwrap(); + let tx_hash = blockchain.send_transactions(&txs).await?; assert!(!tx_hash.is_empty()); println!("tx_hashes {tx_hash:?}"); + Ok(()) } diff --git a/sdk/http/examples/tx_cost.rs b/sdk/http/examples/tx_cost.rs index dfdd81b19d..5501650f07 100644 --- a/sdk/http/examples/tx_cost.rs +++ b/sdk/http/examples/tx_cost.rs @@ -1,5 +1,6 @@ use multiversx_sdk::{ - chain_core::std::Bech32Address, data::transaction::Transaction, utils::base64_encode, + chain_core::std::{Bech32Address, base64_encode}, + data::transaction::Transaction, }; use multiversx_sdk_http::{DEVNET_GATEWAY, GatewayHttpProxy}; diff --git a/sdk/http/src/gateway_http_proxy/http_tx.rs b/sdk/http/src/gateway_http_proxy/http_tx.rs index 4f556944f4..cba874cf72 100644 --- a/sdk/http/src/gateway_http_proxy/http_tx.rs +++ b/sdk/http/src/gateway_http_proxy/http_tx.rs @@ -52,10 +52,10 @@ impl GatewayHttpProxy { network_configs: &NetworkConfig, ) -> Result { let account = self - .get_account(&address.to_bech32(&network_configs.address_hrp)) + .get_account(&address.to_bech32(network_configs.address_hrp)) .await?; - let address_bech32 = address.to_bech32(&network_configs.address_hrp); + let address_bech32 = address.to_bech32(network_configs.address_hrp); Ok(ArgCreateTransaction { nonce: account.nonce, diff --git a/tools/interactor-delegation-func-calls/src/delegation_sc_interact.rs b/tools/interactor-delegation-func-calls/src/delegation_sc_interact.rs index a810801c15..32d0feee21 100644 --- a/tools/interactor-delegation-func-calls/src/delegation_sc_interact.rs +++ b/tools/interactor-delegation-func-calls/src/delegation_sc_interact.rs @@ -10,7 +10,7 @@ use delegation_sc_interact_state::State; use multiversx_sc_snippets::{ imports::*, - sdk::{gateway::SetStateAccount, utils::base64_decode}, + sdk::{chain_core::std::base64_decode, gateway::SetStateAccount}, }; pub async fn delegation_sc_interact_cli() { @@ -197,7 +197,7 @@ impl DelegateCallsInteract { .find(|log| log.endpoint == "SCDeploy") .expect("No SCDeploy log found"); - let decode_deploy_address = base64_decode(deploy_log.topics[0].clone()); + let decode_deploy_address = base64_decode(deploy_log.topics[0].clone()).unwrap(); let deploy_address = Bech32Address::from(Address::from_slice(&decode_deploy_address)); self.state.set_delegation_address(deploy_address); diff --git a/tools/interactor-governance-func-calls/src/governance_sc_interact.rs b/tools/interactor-governance-func-calls/src/governance_sc_interact.rs index 57e81a5a0a..df33685b8e 100644 --- a/tools/interactor-governance-func-calls/src/governance_sc_interact.rs +++ b/tools/interactor-governance-func-calls/src/governance_sc_interact.rs @@ -8,7 +8,7 @@ use governance_sc_interact_state::State; use multiversx_sc_snippets::{ imports::*, - sdk::{gateway::SetStateAccount, utils::base64_decode}, + sdk::{chain_core::std::base64_decode, gateway::SetStateAccount}, }; pub async fn governance_sc_interact_cli() { diff --git a/tools/interactor-system-func-calls/src/system_sc_interact.rs b/tools/interactor-system-func-calls/src/system_sc_interact.rs index e81f1796b2..0ade6a184e 100644 --- a/tools/interactor-system-func-calls/src/system_sc_interact.rs +++ b/tools/interactor-system-func-calls/src/system_sc_interact.rs @@ -11,7 +11,7 @@ use system_sc_interact_state::State; use multiversx_sc_snippets::{ imports::*, - sdk::{data::esdt::EsdtBalance, utils::base64_decode}, + sdk::{chain_core::std::base64_decode, data::esdt::EsdtBalance}, }; pub async fn system_sc_interact_cli() { @@ -1029,7 +1029,7 @@ impl SysFuncCallsInteract { assert_eq!(expected_uris.len(), uris.len()); for (index, uri) in uris.iter().enumerate() { - let uri_string = String::from_utf8(base64_decode(uri)).unwrap(); + let uri_string = String::from_utf8(base64_decode(uri).unwrap()).unwrap(); assert_eq!(expected_uris[index], uri_string); } }