diff --git a/assets/faucet.wasm b/assets/faucet.wasm index acf87c9dd6b..b9c95ca3070 100644 Binary files a/assets/faucet.wasm and b/assets/faucet.wasm differ diff --git a/assets/flash_loan.wasm b/assets/flash_loan.wasm index 51f27aa002a..6558f32ab69 100644 Binary files a/assets/flash_loan.wasm and b/assets/flash_loan.wasm differ diff --git a/assets/genesis_helper.wasm b/assets/genesis_helper.wasm index 6fa1417a6c2..4649a643cca 100644 Binary files a/assets/genesis_helper.wasm and b/assets/genesis_helper.wasm differ diff --git a/assets/global_n_owned.wasm b/assets/global_n_owned.wasm index d698c752bc4..fa655ec564b 100755 Binary files a/assets/global_n_owned.wasm and b/assets/global_n_owned.wasm differ diff --git a/assets/kv_store.wasm b/assets/kv_store.wasm index f860f223ec2..aa81d2eb04a 100755 Binary files a/assets/kv_store.wasm and b/assets/kv_store.wasm differ diff --git a/assets/max_transaction.wasm b/assets/max_transaction.wasm index cbcc0d9c339..1954c49b16b 100755 Binary files a/assets/max_transaction.wasm and b/assets/max_transaction.wasm differ diff --git a/assets/metadata.wasm b/assets/metadata.wasm index 37a9c12ec96..2db263785a8 100644 Binary files a/assets/metadata.wasm and b/assets/metadata.wasm differ diff --git a/assets/radiswap.wasm b/assets/radiswap.wasm index b1da9271b09..6187c5a1b1f 100644 Binary files a/assets/radiswap.wasm and b/assets/radiswap.wasm differ diff --git a/radix-engine-common/src/math/bnum_integer.rs b/radix-engine-common/src/math/bnum_integer.rs index 37e853992b3..99a25ef8dd5 100644 --- a/radix-engine-common/src/math/bnum_integer.rs +++ b/radix-engine-common/src/math/bnum_integer.rs @@ -515,9 +515,10 @@ macro_rules! error { #[derive(Debug, Clone, PartialEq, Eq)] pub enum [] { NegativeToUnsigned, - Overflow, InvalidLength, InvalidDigit, + Empty, + Overflow, } #[cfg(not(feature = "alloc"))] diff --git a/radix-engine-common/src/math/bnum_integer/convert.rs b/radix-engine-common/src/math/bnum_integer/convert.rs index 3f72aad2538..5ddc2954b8f 100644 --- a/radix-engine-common/src/math/bnum_integer/convert.rs +++ b/radix-engine-common/src/math/bnum_integer/convert.rs @@ -58,7 +58,7 @@ impl_to_primitive! { U448, BUint::<7>, (u8, u16, u32, u64, u128, usize, i8, i16, impl_to_primitive! { U512, BUint::<8>, (u8, u16, u32, u64, u128, usize, i8, i16, i32, i64, i128, isize) } impl_to_primitive! { U768, BUint::<12>, (u8, u16, u32, u64, u128, usize, i8, i16, i32, i64, i128, isize) } -macro_rules! impl_from_builtin{ +macro_rules! impl_from_builtin { ($t:ident, $wrapped:ty, ($($o:ident),*)) => { paste! { $( @@ -73,7 +73,7 @@ macro_rules! impl_from_builtin{ }; } -macro_rules! impl_try_from_builtin{ +macro_rules! impl_try_from_builtin { ($t:ident, $wrapped:ty, ($($o:ident),*)) => { paste! { $( @@ -92,7 +92,7 @@ macro_rules! impl_try_from_builtin{ }; } -macro_rules! impl_to_builtin{ +macro_rules! impl_to_builtin { ($t:ident, $wrapped:ty, ($($o:ident),*)) => { paste! { $( @@ -219,7 +219,14 @@ macro_rules! impl_from_string { fn from_str(val: &str) -> Result { match <$wrapped>::from_str(val) { Ok(val) => Ok(Self(val)), - Err(_) => Err([]::InvalidDigit), + Err(err) => Err(match err.kind() { + core::num::IntErrorKind::Empty => []::Empty, + core::num::IntErrorKind::InvalidDigit => []::InvalidDigit, + core::num::IntErrorKind::PosOverflow => []::Overflow, + core::num::IntErrorKind::NegOverflow => []::Overflow, + core::num::IntErrorKind::Zero => unreachable!("Zero is only issued for non-zero type"), + _ => []::InvalidDigit, // Enum is non-exhaustive, sensible fallback is InvalidDigit + }) } } } diff --git a/radix-engine-common/src/math/decimal.rs b/radix-engine-common/src/math/decimal.rs index fd8a73cb758..113dc6d7ddc 100644 --- a/radix-engine-common/src/math/decimal.rs +++ b/radix-engine-common/src/math/decimal.rs @@ -740,36 +740,75 @@ impl FromStr for Decimal { type Err = ParseDecimalError; fn from_str(s: &str) -> Result { - let tens = I192::TEN; let v: Vec<&str> = s.split('.').collect(); - let mut int = match I192::from_str(v[0]) { + if v.len() > 2 { + return Err(ParseDecimalError::MoreThanOneDecimalPoint); + } + + let integer_part = match I192::from_str(v[0]) { Ok(val) => val, - Err(_) => return Err(ParseDecimalError::InvalidDigit), + Err(err) => match err { + ParseI192Error::NegativeToUnsigned => { + unreachable!("NegativeToUnsigned is only for parsing unsigned types, not I192") + } + ParseI192Error::Overflow => return Err(ParseDecimalError::Overflow), + ParseI192Error::InvalidLength => { + unreachable!("InvalidLength is only for parsing &[u8], not &str") + } + ParseI192Error::InvalidDigit => return Err(ParseDecimalError::InvalidDigit), + // We have decided to be restrictive to force people to type "0.123" instead of ".123" + // for clarity, and to align with how rust's float literal works + ParseI192Error::Empty => return Err(ParseDecimalError::EmptyIntegralPart), + }, }; - int *= tens.pow(Self::SCALE); + let mut subunits = integer_part + .checked_mul(Self::ONE.0) + .ok_or(ParseDecimalError::Overflow)?; if v.len() == 2 { let scale = if let Some(scale) = Self::SCALE.checked_sub(v[1].len() as u32) { Ok(scale) } else { - Err(Self::Err::UnsupportedDecimalPlace) + Err(Self::Err::MoreThanEighteenDecimalPlaces) }?; - let frac = match I192::from_str(v[1]) { + let fractional_part = match I192::from_str(v[1]) { Ok(val) => val, - Err(_) => return Err(ParseDecimalError::InvalidDigit), + Err(err) => match err { + ParseI192Error::NegativeToUnsigned => { + unreachable!( + "NegativeToUnsigned is only for parsing unsigned types, no I192" + ) + } + ParseI192Error::Overflow => return Err(ParseDecimalError::Overflow), + ParseI192Error::InvalidLength => { + unreachable!("InvalidLength is only for parsing &[u8], not &str") + } + ParseI192Error::InvalidDigit => return Err(ParseDecimalError::InvalidDigit), + ParseI192Error::Empty => return Err(ParseDecimalError::EmptyFractionalPart), + }, }; + + // The product of these must be less than Self::SCALE + let fractional_subunits = fractional_part + .checked_mul(I192::TEN.pow(scale)) + .expect("No overflow possible"); + // if input is -0. then from_str returns 0 and we loose '-' sign. // Therefore check for '-' in input directly - if int.is_negative() || v[0].starts_with('-') { - int -= frac * tens.pow(scale); + if integer_part.is_negative() || v[0].starts_with('-') { + subunits = subunits + .checked_sub(fractional_subunits) + .ok_or(ParseDecimalError::Overflow)?; } else { - int += frac * tens.pow(scale); + subunits = subunits + .checked_add(fractional_subunits) + .ok_or(ParseDecimalError::Overflow)?; } } - Ok(Self(int)) + Ok(Self(subunits)) } } @@ -810,12 +849,13 @@ impl fmt::Debug for Decimal { /// Represents an error when parsing Decimal from another type. #[derive(Debug, Clone, PartialEq, Eq)] pub enum ParseDecimalError { - InvalidDecimal(String), - InvalidChar(char), InvalidDigit, - UnsupportedDecimalPlace, - InvalidLength(usize), Overflow, + EmptyIntegralPart, + EmptyFractionalPart, + MoreThanEighteenDecimalPlaces, + MoreThanOneDecimalPoint, + InvalidLength(usize), } #[cfg(not(feature = "alloc"))] @@ -904,6 +944,10 @@ mod tests { Decimal::from_str("0.000000000000000001").unwrap(), Decimal(1i128.into()), ); + assert_eq!( + Decimal::from_str("0.0000000000000000001"), + Err(ParseDecimalError::MoreThanEighteenDecimalPlaces), + ); assert_eq!( Decimal::from_str("0.123456789123456789").unwrap(), Decimal(123456789123456789i128.into()), @@ -921,11 +965,31 @@ mod tests { .unwrap(), Decimal::MAX, ); + assert_eq!( + Decimal::from_str("3138550867693340381917894711603833208051.177722232017256448"), + Err(ParseDecimalError::Overflow), + ); + assert_eq!( + Decimal::from_str("3138550867693340381917894711603833208052.177722232017256447"), + Err(ParseDecimalError::Overflow), + ); assert_eq!( Decimal::from_str("-3138550867693340381917894711603833208051.177722232017256448") .unwrap(), Decimal::MIN, ); + assert_eq!( + Decimal::from_str("-3138550867693340381917894711603833208051.177722232017256449"), + Err(ParseDecimalError::Overflow), + ); + assert_eq!( + Decimal::from_str(".000000000000000231"), + Err(ParseDecimalError::EmptyIntegralPart), + ); + assert_eq!( + Decimal::from_str("231."), + Err(ParseDecimalError::EmptyFractionalPart), + ); assert_eq!(test_dec!("0"), Decimal::ZERO); assert_eq!(test_dec!("1"), Decimal::ONE); @@ -1886,7 +1950,7 @@ mod tests { // Assert assert!(matches!( decimal, - Err(ParseDecimalError::UnsupportedDecimalPlace) + Err(ParseDecimalError::MoreThanEighteenDecimalPlaces) )) } diff --git a/radix-engine-common/src/math/precise_decimal.rs b/radix-engine-common/src/math/precise_decimal.rs index bda55570749..894bfb44b71 100644 --- a/radix-engine-common/src/math/precise_decimal.rs +++ b/radix-engine-common/src/math/precise_decimal.rs @@ -778,37 +778,79 @@ impl FromStr for PreciseDecimal { type Err = ParsePreciseDecimalError; fn from_str(s: &str) -> Result { - let tens = I256::TEN; let v: Vec<&str> = s.split('.').collect(); - let mut int = match I256::from_str(v[0]) { + if v.len() > 2 { + return Err(ParsePreciseDecimalError::MoreThanOneDecimalPoint); + } + + let integer_part = match I256::from_str(v[0]) { Ok(val) => val, - Err(_) => return Err(ParsePreciseDecimalError::InvalidDigit), + Err(err) => match err { + ParseI256Error::NegativeToUnsigned => { + unreachable!("NegativeToUnsigned is only for parsing unsigned types, not I256") + } + ParseI256Error::Overflow => return Err(ParsePreciseDecimalError::Overflow), + ParseI256Error::InvalidLength => { + unreachable!("InvalidLength is only for parsing &[u8], not &str") + } + ParseI256Error::InvalidDigit => return Err(ParsePreciseDecimalError::InvalidDigit), + // We have decided to be restrictive to force people to type "0.123" instead of ".123" + // for clarity, and to align with how rust's float literal works + ParseI256Error::Empty => return Err(ParsePreciseDecimalError::EmptyIntegralPart), + }, }; - int *= tens.pow(Self::SCALE); + let mut subunits = integer_part + .checked_mul(Self::ONE.0) + .ok_or(ParsePreciseDecimalError::Overflow)?; if v.len() == 2 { let scale = if let Some(scale) = Self::SCALE.checked_sub(v[1].len() as u32) { Ok(scale) } else { - Err(Self::Err::UnsupportedDecimalPlace) + Err(Self::Err::MoreThanThirtySixDecimalPlaces) }?; - let frac = match I256::from_str(v[1]) { + let fractional_part = match I256::from_str(v[1]) { Ok(val) => val, - Err(_) => return Err(ParsePreciseDecimalError::InvalidDigit), + Err(err) => match err { + ParseI256Error::NegativeToUnsigned => { + unreachable!( + "NegativeToUnsigned is only for parsing unsigned types, not I256" + ) + } + ParseI256Error::Overflow => return Err(ParsePreciseDecimalError::Overflow), + ParseI256Error::InvalidLength => { + unreachable!("InvalidLength is only for parsing &[u8], not &str") + } + ParseI256Error::InvalidDigit => { + return Err(ParsePreciseDecimalError::InvalidDigit) + } + ParseI256Error::Empty => { + return Err(ParsePreciseDecimalError::EmptyFractionalPart) + } + }, }; + // The product of these must be less than Self::SCALE + let fractional_subunits = fractional_part + .checked_mul(I256::TEN.pow(scale)) + .expect("No overflow possible"); + // if input is -0. then from_str returns 0 and we loose '-' sign. // Therefore check for '-' in input directly - if int.is_negative() || v[0].starts_with('-') { - int -= frac * tens.pow(scale); + if integer_part.is_negative() || v[0].starts_with('-') { + subunits = subunits + .checked_sub(fractional_subunits) + .ok_or(ParsePreciseDecimalError::Overflow)?; } else { - int += frac * tens.pow(scale); + subunits = subunits + .checked_add(fractional_subunits) + .ok_or(ParsePreciseDecimalError::Overflow)?; } } - Ok(Self(int)) + Ok(Self(subunits)) } } @@ -849,12 +891,13 @@ impl fmt::Debug for PreciseDecimal { /// Represents an error when parsing PreciseDecimal from another type. #[derive(Debug, Clone, PartialEq, Eq)] pub enum ParsePreciseDecimalError { - InvalidDecimal(String), - InvalidChar(char), InvalidDigit, - UnsupportedDecimalPlace, - InvalidLength(usize), Overflow, + EmptyIntegralPart, + EmptyFractionalPart, + MoreThanThirtySixDecimalPlaces, + MoreThanOneDecimalPoint, + InvalidLength(usize), } #[cfg(not(feature = "alloc"))] @@ -983,6 +1026,10 @@ mod tests { PreciseDecimal::from_str("0.000000000000000001").unwrap(), PreciseDecimal(I256::from(10).pow(18)), ); + assert_eq!( + PreciseDecimal::from_str("0.0000000000000000000000000000000000001"), + Err(ParsePreciseDecimalError::MoreThanThirtySixDecimalPlaces), + ); assert_eq!( PreciseDecimal::from_str("0.123456789123456789").unwrap(), PreciseDecimal(I256::from(123456789123456789i128) * I256::from(10i8).pow(18)), @@ -1004,6 +1051,16 @@ mod tests { .unwrap(), PreciseDecimal::MAX, ); + assert_eq!( + PreciseDecimal::from_str( + "57896044618658097711785492504343953926634.992332820282019728792003956564819968" + ), + Err(ParsePreciseDecimalError::Overflow), + ); + assert_eq!( + PreciseDecimal::from_str("157896044618658097711785492504343953926634"), + Err(ParsePreciseDecimalError::Overflow), + ); assert_eq!( PreciseDecimal::from_str( "-57896044618658097711785492504343953926634.992332820282019728792003956564819968" @@ -1011,6 +1068,20 @@ mod tests { .unwrap(), PreciseDecimal::MIN, ); + assert_eq!( + PreciseDecimal::from_str( + "-57896044618658097711785492504343953926634.992332820282019728792003956564819969" + ), + Err(ParsePreciseDecimalError::Overflow), + ); + assert_eq!( + PreciseDecimal::from_str(".000000000000000231"), + Err(ParsePreciseDecimalError::EmptyIntegralPart), + ); + assert_eq!( + PreciseDecimal::from_str("231."), + Err(ParsePreciseDecimalError::EmptyFractionalPart), + ); assert_eq!(test_pdec!("0"), PreciseDecimal::ZERO); assert_eq!(test_pdec!("1"), PreciseDecimal::ONE); @@ -2076,7 +2147,7 @@ mod tests { // Assert assert!(matches!( decimal, - Err(ParsePreciseDecimalError::UnsupportedDecimalPlace) + Err(ParsePreciseDecimalError::MoreThanThirtySixDecimalPlaces) )) } diff --git a/radix-engine-macros/src/decimal.rs b/radix-engine-macros/src/decimal.rs index 6dc6603bd1a..dec1679c6c1 100644 --- a/radix-engine-macros/src/decimal.rs +++ b/radix-engine-macros/src/decimal.rs @@ -1,11 +1,10 @@ use paste::paste; use proc_macro::TokenStream; use quote::quote; -use radix_engine_common::prelude::CheckedNeg; +use radix_engine_common::prelude::*; use syn::{parse, spanned::Spanned, Error, Expr, Lit, Result, UnOp}; extern crate radix_engine_common; -use radix_engine_common::math::{Decimal, PreciseDecimal}; macro_rules! get_decimal { ($type:ident) => { @@ -14,13 +13,32 @@ macro_rules! get_decimal { match expr { Expr::Lit(lit) => match &lit.lit { Lit::Str(lit_str) => $type::try_from(lit_str.value()) - .map_err(|err| Error::new(lit_str.span(), format!("Parsing failed due to {:?}", err))), - Lit::Int(lit_int) => $type::try_from(lit_int.base10_digits()) - .map_err(|err| Error::new(lit_int.span(), format!("Parsing failed due to {:?}", err))), - Lit::Bool(lit_bool) => Ok($type::from(lit_bool.value)), + .map_err(|err| Error::new(lit_str.span(), [< $type:snake:lower _error_reason >](err).to_string())), + Lit::Int(lit_int) => { + if lit_int.suffix() != "" { + Err(Error::new( + lit_int.span(), + format!("No suffix is allowed. Remove the {}.", lit_int.suffix()), + )) + } else { + $type::try_from(lit_int.base10_digits()) + .map_err(|err| Error::new(lit_int.span(), [< $type:snake:lower _error_reason >](err).to_string())) + } + } + Lit::Float(lit_float) => { + if lit_float.suffix() != "" { + Err(Error::new( + lit_float.span(), + format!("No suffix is allowed. Remove the {}.", lit_float.suffix()), + )) + } else { + $type::try_from(lit_float.base10_digits()) + .map_err(|err| Error::new(lit_float.span(), [< $type:snake:lower _error_reason >](err).to_string())) + } + } other_lit => Err(Error::new( other_lit.span(), - "Not supported literal. This macro only supports string, integer and bool literal expressions.", + "This macro only supports string, integer and float literals.", )), }, Expr::Unary(unary) => match unary.op { @@ -28,7 +46,7 @@ macro_rules! get_decimal { let res = [< get_ $type:snake:lower _from_expr >](unary.expr.as_ref()); match res { Ok(val) => { - let val = val.checked_neg().ok_or(Error::new(unary_neg.span, "Parsing failed due to Overflow"))?; + let val = val.checked_neg().ok_or(Error::new(unary_neg.span, "Parsing failed due to overflow."))?; Ok(val) }, Err(err) => Err(Error::new(unary_neg.span, err)), @@ -36,12 +54,12 @@ macro_rules! get_decimal { } other_unary => Err(Error::new( other_unary.span(), - "Not supported unary operator. This macro only supports '-' unary operator.", + "This macro only supports string, integer and float literals.", )), }, other_expr => Err(Error::new( other_expr.span(), - "Not supported expression. This macro only supports string, integer and bool literal expressions.", + "This macro only supports string, integer and float literals.", )), } } @@ -49,6 +67,53 @@ macro_rules! get_decimal { } }; } + +fn decimal_error_reason(error: ParseDecimalError) -> &'static str { + match error { + ParseDecimalError::InvalidDigit => "There is an invalid character.", + ParseDecimalError::Overflow => "The number is too large to fit in a decimal.", + ParseDecimalError::EmptyIntegralPart => { + "If there is a decimal point, the number must include at least one digit before it. Use a 0 if necessary." + }, + ParseDecimalError::EmptyFractionalPart => { + "If there is a decimal point, the number must include at least one digit after it." + } + ParseDecimalError::MoreThanEighteenDecimalPlaces => { + "A decimal cannot have more than eighteen decimal places." + } + ParseDecimalError::MoreThanOneDecimalPoint => { + "A decimal cannot have more than one decimal point." + } + ParseDecimalError::InvalidLength(_) => { + unreachable!("Not a possible error from the from_str function") + } + } +} + +fn precise_decimal_error_reason(error: ParsePreciseDecimalError) -> &'static str { + match error { + ParsePreciseDecimalError::InvalidDigit => "There is an invalid character", + ParsePreciseDecimalError::Overflow => { + "The number being too large to fit in a precise decimal" + } + ParsePreciseDecimalError::EmptyIntegralPart => { + "If there is a decimal point, the number must include at least one digit before it. Use a 0 if necessary." + } + ParsePreciseDecimalError::EmptyFractionalPart => { + "If there is a decimal point, the number must include at least one digit after it." + } + ParsePreciseDecimalError::MoreThanThirtySixDecimalPlaces => { + "A precise decimal cannot have more than thirty-six decimal places." + } + ParsePreciseDecimalError::MoreThanOneDecimalPoint => { + "A precise decimal cannot have more than one decimal point." + } + ParsePreciseDecimalError::InvalidLength(_) => { + unreachable!("Not a possible error from the from_str function") + } + } +} + get_decimal!(Decimal); get_decimal!(PreciseDecimal); diff --git a/radix-engine-tests/assets/cost_flash_loan.csv b/radix-engine-tests/assets/cost_flash_loan.csv index f808532ac0b..660271a1a81 100644 --- a/radix-engine-tests/assets/cost_flash_loan.csv +++ b/radix-engine-tests/assets/cost_flash_loan.csv @@ -1,11 +1,11 @@ -Total Cost (XRD) , 0.62796092592, 100.0% -- Execution Cost (XRD) , 0.4675297, 74.5% +Total Cost (XRD) , 0.62812212592, 100.0% +- Execution Cost (XRD) , 0.4676909, 74.5% - Finalization Cost (XRD) , 0.0322574, 5.1% - Tipping Cost (XRD) , 0, 0.0% - Storage Cost (XRD) , 0.12817382592, 20.4% - Tipping Cost (XRD) , 0, 0.0% - Royalty Cost (XRD) , 0, 0.0% -Execution Cost Breakdown , 9350594, 100.0% +Execution Cost Breakdown , 9353818, 100.0% - AfterInvoke , 1884, 0.0% - AllocateNodeId , 5141, 0.1% - BeforeInvoke , 7694, 0.1% @@ -20,13 +20,13 @@ Execution Cost Breakdown , - OpenSubstate::GlobalFungibleResourceManager , 259797, 2.8% - OpenSubstate::GlobalGenericComponent , 47692, 0.5% - OpenSubstate::GlobalNonFungibleResourceManager , 632452, 6.8% -- OpenSubstate::GlobalPackage , 3397563, 36.3% +- OpenSubstate::GlobalPackage , 3398653, 36.3% - OpenSubstate::InternalFungibleVault , 290575, 3.1% - OpenSubstate::InternalGenericComponent , 211658, 2.3% - PinNode , 636, 0.0% -- PrepareWasmCode , 964444, 10.3% +- PrepareWasmCode , 965508, 10.3% - QueryActor , 10500, 0.1% -- ReadSubstate , 1322045, 14.1% +- ReadSubstate , 1323109, 14.1% - RunNativeCode::AuthZone_pop , 33696, 0.4% - RunNativeCode::AuthZone_push , 47700, 0.5% - RunNativeCode::Worktop_drain , 11224, 0.1% @@ -54,8 +54,8 @@ Execution Cost Breakdown , - RunNativeCode::try_deposit_batch_or_abort , 121257, 1.3% - RunNativeCode::unlock_amount_FungibleVault , 46544, 0.5% - RunNativeCode::withdraw , 57851, 0.6% -- RunWasmCode::BasicFlashLoan_repay_loan , 74634, 0.8% -- RunWasmCode::BasicFlashLoan_take_loan , 68685, 0.7% +- RunWasmCode::BasicFlashLoan_repay_loan , 74637, 0.8% +- RunWasmCode::BasicFlashLoan_take_loan , 68688, 0.7% - ValidateTxPayload , 18800, 0.2% - VerifyTxSignatures , 14000, 0.1% - WriteSubstate , 33968, 0.4% diff --git a/radix-engine-tests/assets/cost_mint_large_size_nfts_from_manifest.csv b/radix-engine-tests/assets/cost_mint_large_size_nfts_from_manifest.csv index ec5e3a05066..aca6518fdc8 100644 --- a/radix-engine-tests/assets/cost_mint_large_size_nfts_from_manifest.csv +++ b/radix-engine-tests/assets/cost_mint_large_size_nfts_from_manifest.csv @@ -1,11 +1,11 @@ -Total Cost (XRD) , 207.47896963518, 100.0% -- Execution Cost (XRD) , 2.5892222, 1.2% +Total Cost (XRD) , 207.47905608518, 100.0% +- Execution Cost (XRD) , 2.58930865, 1.2% - Finalization Cost (XRD) , 2.47943445, 1.2% - Tipping Cost (XRD) , 0, 0.0% - Storage Cost (XRD) , 202.41031298518, 97.6% - Tipping Cost (XRD) , 0, 0.0% - Royalty Cost (XRD) , 0, 0.0% -Execution Cost Breakdown , 51784444, 100.0% +Execution Cost Breakdown , 51786173, 100.0% - AfterInvoke , 4752, 0.0% - AllocateNodeId , 2231, 0.0% - BeforeInvoke , 2093962, 4.0% @@ -20,15 +20,15 @@ Execution Cost Breakdown , - OpenSubstate::GlobalFungibleResourceManager , 121872, 0.2% - OpenSubstate::GlobalGenericComponent , 43690, 0.1% - OpenSubstate::GlobalNonFungibleResourceManager , 14330, 0.0% -- OpenSubstate::GlobalPackage , 2965171, 5.7% +- OpenSubstate::GlobalPackage , 2965764, 5.7% - OpenSubstate::InternalFungibleVault , 90202, 0.2% - OpenSubstate::InternalGenericComponent , 59014, 0.1% - OpenSubstate::InternalKeyValueStore , 40536, 0.1% - OpenSubstate::InternalNonFungibleVault , 133804, 0.3% - PinNode , 240, 0.0% -- PrepareWasmCode , 351598, 0.7% +- PrepareWasmCode , 352162, 0.7% - QueryActor , 2000, 0.0% -- ReadSubstate , 630926, 1.2% +- ReadSubstate , 631490, 1.2% - RunNativeCode::Worktop_drain , 11224, 0.0% - RunNativeCode::Worktop_drop , 17918, 0.0% - RunNativeCode::Worktop_put , 29033, 0.1% @@ -42,7 +42,7 @@ Execution Cost Breakdown , - RunNativeCode::lock_fee , 45243, 0.1% - RunNativeCode::put_NonFungibleVault , 35354, 0.1% - RunNativeCode::try_deposit_batch_or_abort , 121257, 0.2% -- RunWasmCode::Faucet_lock_fee , 24132, 0.0% +- RunWasmCode::Faucet_lock_fee , 24140, 0.0% - SetSubstate , 35917, 0.1% - ValidateTxPayload , 41840720, 80.8% - VerifyTxSignatures , 7000, 0.0% diff --git a/radix-engine-tests/assets/cost_mint_small_size_nfts_from_manifest.csv b/radix-engine-tests/assets/cost_mint_small_size_nfts_from_manifest.csv index bfb9863ba8f..2360b78ed63 100644 --- a/radix-engine-tests/assets/cost_mint_small_size_nfts_from_manifest.csv +++ b/radix-engine-tests/assets/cost_mint_small_size_nfts_from_manifest.csv @@ -1,11 +1,11 @@ -Total Cost (XRD) , 6.54699700536, 100.0% -- Execution Cost (XRD) , 0.2976836, 4.5% +Total Cost (XRD) , 6.54708345536, 100.0% +- Execution Cost (XRD) , 0.29777005, 4.5% - Finalization Cost (XRD) , 2.4964143, 38.1% - Tipping Cost (XRD) , 0, 0.0% - Storage Cost (XRD) , 3.75289910536, 57.3% - Tipping Cost (XRD) , 0, 0.0% - Royalty Cost (XRD) , 0, 0.0% -Execution Cost Breakdown , 5953672, 100.0% +Execution Cost Breakdown , 5955401, 100.0% - AfterInvoke , 4806, 0.1% - AllocateNodeId , 2231, 0.0% - BeforeInvoke , 10522, 0.2% @@ -20,15 +20,15 @@ Execution Cost Breakdown , - OpenSubstate::GlobalFungibleResourceManager , 121872, 2.0% - OpenSubstate::GlobalGenericComponent , 43690, 0.7% - OpenSubstate::GlobalNonFungibleResourceManager , 14330, 0.2% -- OpenSubstate::GlobalPackage , 2965171, 49.8% +- OpenSubstate::GlobalPackage , 2965764, 49.8% - OpenSubstate::InternalFungibleVault , 90202, 1.5% - OpenSubstate::InternalGenericComponent , 59122, 1.0% - OpenSubstate::InternalKeyValueStore , 40536, 0.7% - OpenSubstate::InternalNonFungibleVault , 135427, 2.3% - PinNode , 240, 0.0% -- PrepareWasmCode , 351598, 5.9% +- PrepareWasmCode , 352162, 5.9% - QueryActor , 2000, 0.0% -- ReadSubstate , 632087, 10.6% +- ReadSubstate , 632651, 10.6% - RunNativeCode::Worktop_drain , 11224, 0.2% - RunNativeCode::Worktop_drop , 17918, 0.3% - RunNativeCode::Worktop_put , 29033, 0.5% @@ -42,7 +42,7 @@ Execution Cost Breakdown , - RunNativeCode::lock_fee , 45243, 0.8% - RunNativeCode::put_NonFungibleVault , 35354, 0.6% - RunNativeCode::try_deposit_batch_or_abort , 121257, 2.0% -- RunWasmCode::Faucet_lock_fee , 24132, 0.4% +- RunWasmCode::Faucet_lock_fee , 24140, 0.4% - SetSubstate , 36370, 0.6% - ValidateTxPayload , 171920, 2.9% - VerifyTxSignatures , 7000, 0.1% diff --git a/radix-engine-tests/assets/cost_publish_large_package.csv b/radix-engine-tests/assets/cost_publish_large_package.csv index eedec3c9bd1..5ecd03e79f7 100644 --- a/radix-engine-tests/assets/cost_publish_large_package.csv +++ b/radix-engine-tests/assets/cost_publish_large_package.csv @@ -1,11 +1,11 @@ -Total Cost (XRD) , 304.85392360219, 100.0% -- Execution Cost (XRD) , 4.94841595, 1.6% +Total Cost (XRD) , 304.85401005219, 100.0% +- Execution Cost (XRD) , 4.9485024, 1.6% - Finalization Cost (XRD) , 0.07669735, 0.0% - Tipping Cost (XRD) , 0, 0.0% - Storage Cost (XRD) , 299.82881030219, 98.4% - Tipping Cost (XRD) , 0, 0.0% - Royalty Cost (XRD) , 0, 0.0% -Execution Cost Breakdown , 98968319, 100.0% +Execution Cost Breakdown , 98970048, 100.0% - AfterInvoke , 326, 0.0% - AllocateNodeId , 1552, 0.0% - BeforeInvoke , 2096226, 2.1% @@ -18,14 +18,14 @@ Execution Cost Breakdown , - MoveModule , 1960, 0.0% - OpenSubstate::GlobalFungibleResourceManager , 126616, 0.1% - OpenSubstate::GlobalGenericComponent , 43690, 0.0% -- OpenSubstate::GlobalPackage , 2517043, 2.5% +- OpenSubstate::GlobalPackage , 2517636, 2.5% - OpenSubstate::InternalFungibleVault , 91807, 0.1% - OpenSubstate::InternalGenericComponent , 18072, 0.0% - OpenSubstate::InternalKeyValueStore , 40536, 0.0% - PinNode , 156, 0.0% -- PrepareWasmCode , 351598, 0.4% +- PrepareWasmCode , 352162, 0.4% - QueryActor , 1500, 0.0% -- ReadSubstate , 467449, 0.5% +- ReadSubstate , 468013, 0.5% - RunNativeCode::Worktop_drop , 17918, 0.0% - RunNativeCode::create , 24592, 0.0% - RunNativeCode::create_empty_vault_FungibleResourceManager , 35570, 0.0% @@ -33,7 +33,7 @@ Execution Cost Breakdown , - RunNativeCode::get_amount_FungibleVault , 14451, 0.0% - RunNativeCode::lock_fee , 45243, 0.0% - RunNativeCode::publish_wasm_advanced , 46852012, 47.3% -- RunWasmCode::Faucet_lock_fee , 24132, 0.0% +- RunWasmCode::Faucet_lock_fee , 24140, 0.0% - SetSubstate , 403, 0.0% - ValidateTxPayload , 41911240, 42.3% - VerifyTxSignatures , 7000, 0.0% diff --git a/radix-engine-tests/assets/cost_radiswap.csv b/radix-engine-tests/assets/cost_radiswap.csv index 2148cc0ffae..db6f1f756c7 100644 --- a/radix-engine-tests/assets/cost_radiswap.csv +++ b/radix-engine-tests/assets/cost_radiswap.csv @@ -1,11 +1,11 @@ -Total Cost (XRD) , 0.57327492273, 100.0% -- Execution Cost (XRD) , 0.36733995, 64.1% +Total Cost (XRD) , 0.57335252273, 100.0% +- Execution Cost (XRD) , 0.36741755, 64.1% - Finalization Cost (XRD) , 0.0427613, 7.5% - Tipping Cost (XRD) , 0, 0.0% - Storage Cost (XRD) , 0.16317367273, 28.5% - Tipping Cost (XRD) , 0, 0.0% - Royalty Cost (XRD) , 0, 0.0% -Execution Cost Breakdown , 7346799, 100.0% +Execution Cost Breakdown , 7348351, 100.0% - AfterInvoke , 1444, 0.0% - AllocateNodeId , 3395, 0.0% - BeforeInvoke , 3714, 0.1% @@ -18,14 +18,14 @@ Execution Cost Breakdown , - OpenSubstate::GlobalAccount , 656205, 8.9% - OpenSubstate::GlobalFungibleResourceManager , 425889, 5.8% - OpenSubstate::GlobalGenericComponent , 44192, 0.6% -- OpenSubstate::GlobalPackage , 2669770, 36.3% -- OpenSubstate::GlobalTwoResourcePool , 657608, 9.0% +- OpenSubstate::GlobalPackage , 2670303, 36.3% +- OpenSubstate::GlobalTwoResourcePool , 657608, 8.9% - OpenSubstate::InternalFungibleVault , 355473, 4.8% - OpenSubstate::InternalGenericComponent , 125641, 1.7% - PinNode , 408, 0.0% -- PrepareWasmCode , 502826, 6.8% +- PrepareWasmCode , 503334, 6.8% - QueryActor , 4500, 0.1% -- ReadSubstate , 742202, 10.1% +- ReadSubstate , 742710, 10.1% - RunNativeCode::Worktop_drain , 11224, 0.2% - RunNativeCode::Worktop_drop , 17918, 0.2% - RunNativeCode::Worktop_put , 58066, 0.8% @@ -43,7 +43,7 @@ Execution Cost Breakdown , - RunNativeCode::take_advanced_FungibleVault , 44567, 0.6% - RunNativeCode::try_deposit_batch_or_abort , 121257, 1.7% - RunNativeCode::withdraw , 57851, 0.8% -- RunWasmCode::Radiswap_swap , 94262, 1.3% +- RunWasmCode::Radiswap_swap , 94265, 1.3% - ValidateTxPayload , 13120, 0.2% - VerifyTxSignatures , 14000, 0.2% - WriteSubstate , 19286, 0.3% diff --git a/radix-engine-tests/tests/decimal.rs b/radix-engine-tests/tests/decimal.rs index 7720c9e14be..938c8b760a4 100644 --- a/radix-engine-tests/tests/decimal.rs +++ b/radix-engine-tests/tests/decimal.rs @@ -18,11 +18,11 @@ fn test_dec_macro() { const X2: Decimal = dec!(-111); assert_eq!(X2, Decimal::try_from(-111).unwrap()); - const X3: Decimal = dec!(129u128); - assert_eq!(X3, Decimal::try_from(129u128).unwrap()); + const X3: Decimal = dec!(129); + assert_eq!(X3, Decimal::try_from(129).unwrap()); - const X4: Decimal = dec!(-1_000_000_i64); - assert_eq!(X4, Decimal::try_from(-1_000_000_i64).unwrap()); + const X4: Decimal = dec!(-1_000_000); + assert_eq!(X4, Decimal::try_from(-1_000_000).unwrap()); static X5: Decimal = dec!(1); assert_eq!(X5, Decimal::ONE); @@ -38,6 +38,21 @@ fn test_dec_macro() { static X9: Decimal = dec!("0.01"); assert_eq!(X9, Decimal::ONE_HUNDREDTH); + + const X10: Decimal = dec!(1.1); + assert_eq!(X10, Decimal::try_from("1.1").unwrap()); + + const X11: Decimal = dec!(1.12313214124); + assert_eq!(X11, Decimal::try_from("1.12313214124").unwrap()); + + const X12: Decimal = dec!("3138550867693340381917894711603833208051.177722232017256447"); + assert_eq!(X12, Decimal::MAX); + + const X13: Decimal = dec!("-3138550867693340381917894711603833208051.177722232017256448"); + assert_eq!(X13, Decimal::MIN); + + const X14: Decimal = dec!("0.000000000000000048"); + assert_eq!(X14, Decimal(I192::from(48))); } #[test] @@ -59,10 +74,10 @@ fn test_pdec_macro() { const X2: PreciseDecimal = pdec!(-111); assert_eq!(X2, PreciseDecimal::try_from(-111).unwrap()); - const X3: PreciseDecimal = pdec!(129u128); + const X3: PreciseDecimal = pdec!(129); assert_eq!(X3, PreciseDecimal::try_from(129u128).unwrap()); - const X4: PreciseDecimal = pdec!(-1_000_000_i64); + const X4: PreciseDecimal = pdec!(-1_000_000); assert_eq!(X4, PreciseDecimal::try_from(-1_000_000_i64).unwrap()); static X5: PreciseDecimal = pdec!(1); @@ -79,4 +94,18 @@ fn test_pdec_macro() { static X9: PreciseDecimal = pdec!("0.01"); assert_eq!(X9, PreciseDecimal::ONE_HUNDREDTH); + + const X10: PreciseDecimal = pdec!(21.1); + assert_eq!(X10, PreciseDecimal::try_from("21.1").unwrap()); + + const X11: PreciseDecimal = pdec!(0.12313214124); + assert_eq!(X11, PreciseDecimal::try_from("0.12313214124").unwrap()); + + const X12: PreciseDecimal = + pdec!("57896044618658097711785492504343953926634.992332820282019728792003956564819967"); + assert_eq!(X12, PreciseDecimal::MAX); + + const X13: PreciseDecimal = + pdec!("-57896044618658097711785492504343953926634.992332820282019728792003956564819968"); + assert_eq!(X13, PreciseDecimal::MIN); } diff --git a/transaction-scenarios/generated-examples/global_n_owned/001--global_n_owned_emitting_events-db41095f97022cf2e312d3a7d33bc486a21ce176cb0b81d3c0636fef0ead8aa3.blob b/transaction-scenarios/generated-examples/global_n_owned/001--global_n_owned_emitting_events-8f03801b99371af496eecddf3b52eebd00ff42776644de7d877889dbfb60d245.blob similarity index 99% rename from transaction-scenarios/generated-examples/global_n_owned/001--global_n_owned_emitting_events-db41095f97022cf2e312d3a7d33bc486a21ce176cb0b81d3c0636fef0ead8aa3.blob rename to transaction-scenarios/generated-examples/global_n_owned/001--global_n_owned_emitting_events-8f03801b99371af496eecddf3b52eebd00ff42776644de7d877889dbfb60d245.blob index d698c752bc4..fa655ec564b 100644 Binary files a/transaction-scenarios/generated-examples/global_n_owned/001--global_n_owned_emitting_events-db41095f97022cf2e312d3a7d33bc486a21ce176cb0b81d3c0636fef0ead8aa3.blob and b/transaction-scenarios/generated-examples/global_n_owned/001--global_n_owned_emitting_events-8f03801b99371af496eecddf3b52eebd00ff42776644de7d877889dbfb60d245.blob differ diff --git a/transaction-scenarios/generated-examples/global_n_owned/001--global_n_owned_emitting_events.rtm b/transaction-scenarios/generated-examples/global_n_owned/001--global_n_owned_emitting_events.rtm index 0b2c7dbc84f..7e3d153995e 100644 --- a/transaction-scenarios/generated-examples/global_n_owned/001--global_n_owned_emitting_events.rtm +++ b/transaction-scenarios/generated-examples/global_n_owned/001--global_n_owned_emitting_events.rtm @@ -346,7 +346,7 @@ PUBLISH_PACKAGE_ADVANCED ) ) ) - Blob("db41095f97022cf2e312d3a7d33bc486a21ce176cb0b81d3c0636fef0ead8aa3") + Blob("8f03801b99371af496eecddf3b52eebd00ff42776644de7d877889dbfb60d245") Map() Enum<1u8>( AddressReservation("package_address_reservation") diff --git a/transaction-scenarios/generated-examples/kv_store_with_remote_type/001--kv-store-with-remote-type-fad43b935cb3d720f1416151cc42ff1ba5baf3d5a1958bf727006ce655ff8ea8.blob b/transaction-scenarios/generated-examples/kv_store_with_remote_type/001--kv-store-with-remote-type-d7adc8e0dbf214357b45e5dbb2576c04adcadcf52e7012c9a73fbc5fada95247.blob similarity index 99% rename from transaction-scenarios/generated-examples/kv_store_with_remote_type/001--kv-store-with-remote-type-fad43b935cb3d720f1416151cc42ff1ba5baf3d5a1958bf727006ce655ff8ea8.blob rename to transaction-scenarios/generated-examples/kv_store_with_remote_type/001--kv-store-with-remote-type-d7adc8e0dbf214357b45e5dbb2576c04adcadcf52e7012c9a73fbc5fada95247.blob index f860f223ec2..aa81d2eb04a 100644 Binary files a/transaction-scenarios/generated-examples/kv_store_with_remote_type/001--kv-store-with-remote-type-fad43b935cb3d720f1416151cc42ff1ba5baf3d5a1958bf727006ce655ff8ea8.blob and b/transaction-scenarios/generated-examples/kv_store_with_remote_type/001--kv-store-with-remote-type-d7adc8e0dbf214357b45e5dbb2576c04adcadcf52e7012c9a73fbc5fada95247.blob differ diff --git a/transaction-scenarios/generated-examples/kv_store_with_remote_type/001--kv-store-with-remote-type.rtm b/transaction-scenarios/generated-examples/kv_store_with_remote_type/001--kv-store-with-remote-type.rtm index 61d955aff43..d3c1f6e84ba 100644 --- a/transaction-scenarios/generated-examples/kv_store_with_remote_type/001--kv-store-with-remote-type.rtm +++ b/transaction-scenarios/generated-examples/kv_store_with_remote_type/001--kv-store-with-remote-type.rtm @@ -148,7 +148,7 @@ PUBLISH_PACKAGE_ADVANCED ) ) ) - Blob("fad43b935cb3d720f1416151cc42ff1ba5baf3d5a1958bf727006ce655ff8ea8") + Blob("d7adc8e0dbf214357b45e5dbb2576c04adcadcf52e7012c9a73fbc5fada95247") Map() Enum<1u8>( AddressReservation("package_address_reservation") diff --git a/transaction-scenarios/generated-examples/max_transaction/001--max_transaction-publish-package-e06f34ca02af4aafab5d06108c015fc43f94260137b5134e56684c5d6a8d47f6.blob b/transaction-scenarios/generated-examples/max_transaction/001--max_transaction-publish-package-a8961f1d96f2c923408e8625c93f4ae5890c3862bd44ca63a03214a15f928bf0.blob similarity index 99% rename from transaction-scenarios/generated-examples/max_transaction/001--max_transaction-publish-package-e06f34ca02af4aafab5d06108c015fc43f94260137b5134e56684c5d6a8d47f6.blob rename to transaction-scenarios/generated-examples/max_transaction/001--max_transaction-publish-package-a8961f1d96f2c923408e8625c93f4ae5890c3862bd44ca63a03214a15f928bf0.blob index cbcc0d9c339..1954c49b16b 100644 Binary files a/transaction-scenarios/generated-examples/max_transaction/001--max_transaction-publish-package-e06f34ca02af4aafab5d06108c015fc43f94260137b5134e56684c5d6a8d47f6.blob and b/transaction-scenarios/generated-examples/max_transaction/001--max_transaction-publish-package-a8961f1d96f2c923408e8625c93f4ae5890c3862bd44ca63a03214a15f928bf0.blob differ diff --git a/transaction-scenarios/generated-examples/max_transaction/001--max_transaction-publish-package.rtm b/transaction-scenarios/generated-examples/max_transaction/001--max_transaction-publish-package.rtm index a18f163c5a2..972add8ed80 100644 --- a/transaction-scenarios/generated-examples/max_transaction/001--max_transaction-publish-package.rtm +++ b/transaction-scenarios/generated-examples/max_transaction/001--max_transaction-publish-package.rtm @@ -211,7 +211,7 @@ PUBLISH_PACKAGE_ADVANCED ) ) ) - Blob("e06f34ca02af4aafab5d06108c015fc43f94260137b5134e56684c5d6a8d47f6") + Blob("a8961f1d96f2c923408e8625c93f4ae5890c3862bd44ca63a03214a15f928bf0") Map() Enum<1u8>( AddressReservation("package_address_reservation") diff --git a/transaction-scenarios/generated-examples/max_transaction/002--max_transaction-with-large-events.rtm b/transaction-scenarios/generated-examples/max_transaction/002--max_transaction-with-large-events.rtm index 8180e97ef61..25394317a22 100644 --- a/transaction-scenarios/generated-examples/max_transaction/002--max_transaction-with-large-events.rtm +++ b/transaction-scenarios/generated-examples/max_transaction/002--max_transaction-with-large-events.rtm @@ -4,7 +4,7 @@ CALL_METHOD Decimal("5000") ; CALL_FUNCTION - Address("package_sim1phdj32uaa6zjfn8uh6h5epm6syvty8hdvf7p7ver4myqnmxtxs3xx2") + Address("package_sim1phr6jj0e8yldqush40lyxlsy4uqyltxly0x5y2ghy8ugr9nldkfaja") "MaxTransaction" "max_events" 255u32 diff --git a/transaction-scenarios/generated-examples/max_transaction/003--max_transaction-with-large-state-updates.rtm b/transaction-scenarios/generated-examples/max_transaction/003--max_transaction-with-large-state-updates.rtm index 40665adf02f..c6772280d77 100644 --- a/transaction-scenarios/generated-examples/max_transaction/003--max_transaction-with-large-state-updates.rtm +++ b/transaction-scenarios/generated-examples/max_transaction/003--max_transaction-with-large-state-updates.rtm @@ -4,7 +4,7 @@ CALL_METHOD Decimal("5000") ; CALL_METHOD - Address("component_sim1cqyspzwxtz5sy5ncvpjalumlq378svdfu0acrcxmaq8lts7649xej6") + Address("component_sim1cq97km8l03g9fmf6kc42dtmgjgm3l4u50y9wl9tv5hmzypjnvfcx2v") "max_state_updates" 21u32 ; diff --git a/transaction-scenarios/generated-examples/metadata/001--metadata-create-package-with-metadata-63cec0a11885ddb316115aa3d1d1d41e08e5ee0a1d9710cc2fa6b30486e7cd4b.blob b/transaction-scenarios/generated-examples/metadata/001--metadata-create-package-with-metadata-38e22f0cc569bce97b325509d965db19d00f496f2527cc5de39abfa9b2613ed3.blob similarity index 99% rename from transaction-scenarios/generated-examples/metadata/001--metadata-create-package-with-metadata-63cec0a11885ddb316115aa3d1d1d41e08e5ee0a1d9710cc2fa6b30486e7cd4b.blob rename to transaction-scenarios/generated-examples/metadata/001--metadata-create-package-with-metadata-38e22f0cc569bce97b325509d965db19d00f496f2527cc5de39abfa9b2613ed3.blob index 37a9c12ec96..2db263785a8 100644 Binary files a/transaction-scenarios/generated-examples/metadata/001--metadata-create-package-with-metadata-63cec0a11885ddb316115aa3d1d1d41e08e5ee0a1d9710cc2fa6b30486e7cd4b.blob and b/transaction-scenarios/generated-examples/metadata/001--metadata-create-package-with-metadata-38e22f0cc569bce97b325509d965db19d00f496f2527cc5de39abfa9b2613ed3.blob differ diff --git a/transaction-scenarios/generated-examples/metadata/001--metadata-create-package-with-metadata.rtm b/transaction-scenarios/generated-examples/metadata/001--metadata-create-package-with-metadata.rtm index da1524bdb79..6be09299f28 100644 --- a/transaction-scenarios/generated-examples/metadata/001--metadata-create-package-with-metadata.rtm +++ b/transaction-scenarios/generated-examples/metadata/001--metadata-create-package-with-metadata.rtm @@ -475,7 +475,7 @@ PUBLISH_PACKAGE_ADVANCED ) ) ) - Blob("63cec0a11885ddb316115aa3d1d1d41e08e5ee0a1d9710cc2fa6b30486e7cd4b") + Blob("38e22f0cc569bce97b325509d965db19d00f496f2527cc5de39abfa9b2613ed3") Map( "address" => Tuple( Enum<1u8>( diff --git a/transaction-scenarios/generated-examples/metadata/002--metadata-create-component-with-metadata.rtm b/transaction-scenarios/generated-examples/metadata/002--metadata-create-component-with-metadata.rtm index f9f61bbe5ab..ba8f98bf850 100644 --- a/transaction-scenarios/generated-examples/metadata/002--metadata-create-component-with-metadata.rtm +++ b/transaction-scenarios/generated-examples/metadata/002--metadata-create-component-with-metadata.rtm @@ -4,7 +4,7 @@ CALL_METHOD Decimal("5000") ; ALLOCATE_GLOBAL_ADDRESS - Address("package_sim1pkgacxu8legg42uh73e3jsmjzerna3qrvua2hshyezt2knvlzqk2wj") + Address("package_sim1phvravcrk8zgjz9ecfjed0cdkmqympwqzar8wmm05qnltqrl5rqx7c") "MetadataTest" AddressReservation("metadata_component_address_reservation") NamedAddress("metadata_component_address") @@ -14,7 +14,7 @@ CALL_METHOD "free" ; CALL_FUNCTION - Address("package_sim1pkgacxu8legg42uh73e3jsmjzerna3qrvua2hshyezt2knvlzqk2wj") + Address("package_sim1phvravcrk8zgjz9ecfjed0cdkmqympwqzar8wmm05qnltqrl5rqx7c") "MetadataTest" "new_with_address" AddressReservation("metadata_component_address_reservation") diff --git a/transaction-scenarios/generated-examples/radiswap/003--radiswap-publish-and-create-pools-70fca0bc6630134acc829b3a527e09e4d33765e4b6fe42fe465038dbd0217508.blob b/transaction-scenarios/generated-examples/non_fungible_resource_with_remote_type/001--non-fungible-resource-with-remote-type-registration-8e6815d5a4b836e30b4ae8becf7bd423ee0bfc99f64090a598f716e4a637a162.blob similarity index 63% rename from transaction-scenarios/generated-examples/radiswap/003--radiswap-publish-and-create-pools-70fca0bc6630134acc829b3a527e09e4d33765e4b6fe42fe465038dbd0217508.blob rename to transaction-scenarios/generated-examples/non_fungible_resource_with_remote_type/001--non-fungible-resource-with-remote-type-registration-8e6815d5a4b836e30b4ae8becf7bd423ee0bfc99f64090a598f716e4a637a162.blob index b1da9271b09..6187c5a1b1f 100644 Binary files a/transaction-scenarios/generated-examples/radiswap/003--radiswap-publish-and-create-pools-70fca0bc6630134acc829b3a527e09e4d33765e4b6fe42fe465038dbd0217508.blob and b/transaction-scenarios/generated-examples/non_fungible_resource_with_remote_type/001--non-fungible-resource-with-remote-type-registration-8e6815d5a4b836e30b4ae8becf7bd423ee0bfc99f64090a598f716e4a637a162.blob differ diff --git a/transaction-scenarios/generated-examples/non_fungible_resource_with_remote_type/001--non-fungible-resource-with-remote-type-registration.rtm b/transaction-scenarios/generated-examples/non_fungible_resource_with_remote_type/001--non-fungible-resource-with-remote-type-registration.rtm index 130bb7e7fac..cc5751d02fc 100644 --- a/transaction-scenarios/generated-examples/non_fungible_resource_with_remote_type/001--non-fungible-resource-with-remote-type-registration.rtm +++ b/transaction-scenarios/generated-examples/non_fungible_resource_with_remote_type/001--non-fungible-resource-with-remote-type-registration.rtm @@ -498,7 +498,7 @@ PUBLISH_PACKAGE_ADVANCED ) ) ) - Blob("70fca0bc6630134acc829b3a527e09e4d33765e4b6fe42fe465038dbd0217508") + Blob("8e6815d5a4b836e30b4ae8becf7bd423ee0bfc99f64090a598f716e4a637a162") Map( "name" => Tuple( Enum<1u8>( diff --git a/transaction-scenarios/generated-examples/non_fungible_resource_with_remote_type/002--non-fungible-resource-with-remote-type.rtm b/transaction-scenarios/generated-examples/non_fungible_resource_with_remote_type/002--non-fungible-resource-with-remote-type.rtm index 0bc8a6c6b33..d171a987d54 100644 --- a/transaction-scenarios/generated-examples/non_fungible_resource_with_remote_type/002--non-fungible-resource-with-remote-type.rtm +++ b/transaction-scenarios/generated-examples/non_fungible_resource_with_remote_type/002--non-fungible-resource-with-remote-type.rtm @@ -9,7 +9,7 @@ CREATE_NON_FUNGIBLE_RESOURCE_WITH_INITIAL_SUPPLY true Enum<1u8>( Tuple( - Address("package_sim1p4c2r34uxxa8ukdywmaknetxssfrsphyrplwukgh82wlr0pyv9szm8"), + Address("package_sim1ph8m5jh2834c4r0t6lpwhw93ljg3gjdy3q53zf5wzkxgzu7vu4kx9p"), "Radiswap", "RemoveLiquidityEvent" ), diff --git a/transaction-scenarios/generated-examples/non_fungible_resource_with_remote_type/001--non-fungible-resource-with-remote-type-registration-70fca0bc6630134acc829b3a527e09e4d33765e4b6fe42fe465038dbd0217508.blob b/transaction-scenarios/generated-examples/radiswap/003--radiswap-publish-and-create-pools-8e6815d5a4b836e30b4ae8becf7bd423ee0bfc99f64090a598f716e4a637a162.blob similarity index 63% rename from transaction-scenarios/generated-examples/non_fungible_resource_with_remote_type/001--non-fungible-resource-with-remote-type-registration-70fca0bc6630134acc829b3a527e09e4d33765e4b6fe42fe465038dbd0217508.blob rename to transaction-scenarios/generated-examples/radiswap/003--radiswap-publish-and-create-pools-8e6815d5a4b836e30b4ae8becf7bd423ee0bfc99f64090a598f716e4a637a162.blob index b1da9271b09..6187c5a1b1f 100644 Binary files a/transaction-scenarios/generated-examples/non_fungible_resource_with_remote_type/001--non-fungible-resource-with-remote-type-registration-70fca0bc6630134acc829b3a527e09e4d33765e4b6fe42fe465038dbd0217508.blob and b/transaction-scenarios/generated-examples/radiswap/003--radiswap-publish-and-create-pools-8e6815d5a4b836e30b4ae8becf7bd423ee0bfc99f64090a598f716e4a637a162.blob differ diff --git a/transaction-scenarios/generated-examples/radiswap/003--radiswap-publish-and-create-pools.rtm b/transaction-scenarios/generated-examples/radiswap/003--radiswap-publish-and-create-pools.rtm index 265e092608c..4b2cace831f 100644 --- a/transaction-scenarios/generated-examples/radiswap/003--radiswap-publish-and-create-pools.rtm +++ b/transaction-scenarios/generated-examples/radiswap/003--radiswap-publish-and-create-pools.rtm @@ -514,7 +514,7 @@ PUBLISH_PACKAGE_ADVANCED ) ) ) - Blob("70fca0bc6630134acc829b3a527e09e4d33765e4b6fe42fe465038dbd0217508") + Blob("8e6815d5a4b836e30b4ae8becf7bd423ee0bfc99f64090a598f716e4a637a162") Map( "name" => Tuple( Enum<1u8>( diff --git a/transaction-scenarios/generated-examples/radiswap/004--radiswap-add-liquidity.rtm b/transaction-scenarios/generated-examples/radiswap/004--radiswap-add-liquidity.rtm index c0f4a6d11c7..ec80ad7a6f6 100644 --- a/transaction-scenarios/generated-examples/radiswap/004--radiswap-add-liquidity.rtm +++ b/transaction-scenarios/generated-examples/radiswap/004--radiswap-add-liquidity.rtm @@ -34,7 +34,7 @@ TAKE_ALL_FROM_WORKTOP Bucket("pool_1_resource_2") ; CALL_METHOD - Address("component_sim1czl6f4wcyv3dwd34nrcr2cd39x8krfl745krmkxcaa67rs4fgna962") + Address("component_sim1cp50jhvtwesghjnzfmtwvww56dczhgmuehnvkzjpyzxk2w8hwrfd85") "add_liquidity" Bucket("pool_1_resource_1") Bucket("pool_1_resource_2") @@ -48,7 +48,7 @@ TAKE_ALL_FROM_WORKTOP Bucket("pool_2_resource_2") ; CALL_METHOD - Address("component_sim1crm9fecpkqa2xq3vyvaxnjtncxqr05h78u8kxlc5e8ka9234xj08tn") + Address("component_sim1cpawfjjaxc9v5jlug9scu2tky534udlrj65d47nq8s7sj2jv93hhfh") "add_liquidity" Bucket("pool_2_resource_1") Bucket("pool_2_resource_2") diff --git a/transaction-scenarios/generated-examples/radiswap/005--radiswap-distribute-tokens.rtm b/transaction-scenarios/generated-examples/radiswap/005--radiswap-distribute-tokens.rtm index 3447d182368..2ee6c1cbe2c 100644 --- a/transaction-scenarios/generated-examples/radiswap/005--radiswap-distribute-tokens.rtm +++ b/transaction-scenarios/generated-examples/radiswap/005--radiswap-distribute-tokens.rtm @@ -40,13 +40,13 @@ CALL_METHOD CALL_METHOD Address("account_sim168qgdkgfqxpnswu38wy6fy5v0q0um52zd0umuely5t9xrf88t3unc0") "withdraw" - Address("resource_sim1thnzdvm43l9chdmj7ma6smse6uh0vrlm2pfhth678vnn43kwelzs0w") + Address("resource_sim1t5cale6dpqa6dwrytfaclg2nd64n0y9ktu6rnkku7cmk2rrl5rscus") Decimal("333") ; CALL_METHOD Address("account_sim168qgdkgfqxpnswu38wy6fy5v0q0um52zd0umuely5t9xrf88t3unc0") "withdraw" - Address("resource_sim1tkhnevmz0hen4syfzlexs9gktfqgh8xf7h74wxj0vq5fc06xackyud") + Address("resource_sim1thek23fvvp4wgwhlh8vx38sgxtr4xsncurpjhj0jqvf0vhexv8n7kv") Decimal("333") ; CALL_METHOD @@ -82,13 +82,13 @@ CALL_METHOD CALL_METHOD Address("account_sim168qgdkgfqxpnswu38wy6fy5v0q0um52zd0umuely5t9xrf88t3unc0") "withdraw" - Address("resource_sim1thnzdvm43l9chdmj7ma6smse6uh0vrlm2pfhth678vnn43kwelzs0w") + Address("resource_sim1t5cale6dpqa6dwrytfaclg2nd64n0y9ktu6rnkku7cmk2rrl5rscus") Decimal("333") ; CALL_METHOD Address("account_sim168qgdkgfqxpnswu38wy6fy5v0q0um52zd0umuely5t9xrf88t3unc0") "withdraw" - Address("resource_sim1tkhnevmz0hen4syfzlexs9gktfqgh8xf7h74wxj0vq5fc06xackyud") + Address("resource_sim1thek23fvvp4wgwhlh8vx38sgxtr4xsncurpjhj0jqvf0vhexv8n7kv") Decimal("333") ; CALL_METHOD @@ -124,13 +124,13 @@ CALL_METHOD CALL_METHOD Address("account_sim168qgdkgfqxpnswu38wy6fy5v0q0um52zd0umuely5t9xrf88t3unc0") "withdraw" - Address("resource_sim1thnzdvm43l9chdmj7ma6smse6uh0vrlm2pfhth678vnn43kwelzs0w") + Address("resource_sim1t5cale6dpqa6dwrytfaclg2nd64n0y9ktu6rnkku7cmk2rrl5rscus") Decimal("333") ; CALL_METHOD Address("account_sim168qgdkgfqxpnswu38wy6fy5v0q0um52zd0umuely5t9xrf88t3unc0") "withdraw" - Address("resource_sim1tkhnevmz0hen4syfzlexs9gktfqgh8xf7h74wxj0vq5fc06xackyud") + Address("resource_sim1thek23fvvp4wgwhlh8vx38sgxtr4xsncurpjhj0jqvf0vhexv8n7kv") Decimal("333") ; CALL_METHOD diff --git a/transaction-scenarios/generated-examples/radiswap/006--radiswap-swap-tokens.rtm b/transaction-scenarios/generated-examples/radiswap/006--radiswap-swap-tokens.rtm index 61de957a9c1..3ac4a1d137d 100644 --- a/transaction-scenarios/generated-examples/radiswap/006--radiswap-swap-tokens.rtm +++ b/transaction-scenarios/generated-examples/radiswap/006--radiswap-swap-tokens.rtm @@ -14,7 +14,7 @@ TAKE_ALL_FROM_WORKTOP Bucket("input") ; CALL_METHOD - Address("component_sim1czl6f4wcyv3dwd34nrcr2cd39x8krfl745krmkxcaa67rs4fgna962") + Address("component_sim1cp50jhvtwesghjnzfmtwvww56dczhgmuehnvkzjpyzxk2w8hwrfd85") "swap" Bucket("input") ; diff --git a/transaction-scenarios/generated-examples/radiswap/007--radiswap-remove-tokens.rtm b/transaction-scenarios/generated-examples/radiswap/007--radiswap-remove-tokens.rtm index 4b3d7898fdd..2b01774981d 100644 --- a/transaction-scenarios/generated-examples/radiswap/007--radiswap-remove-tokens.rtm +++ b/transaction-scenarios/generated-examples/radiswap/007--radiswap-remove-tokens.rtm @@ -6,15 +6,15 @@ CALL_METHOD CALL_METHOD Address("account_sim168j3paqgngj74yzaljq4n422rtsmupaec3wnqq5425fd85cnd8xmdz") "withdraw" - Address("resource_sim1thnzdvm43l9chdmj7ma6smse6uh0vrlm2pfhth678vnn43kwelzs0w") + Address("resource_sim1t5cale6dpqa6dwrytfaclg2nd64n0y9ktu6rnkku7cmk2rrl5rscus") Decimal("100") ; TAKE_ALL_FROM_WORKTOP - Address("resource_sim1thnzdvm43l9chdmj7ma6smse6uh0vrlm2pfhth678vnn43kwelzs0w") + Address("resource_sim1t5cale6dpqa6dwrytfaclg2nd64n0y9ktu6rnkku7cmk2rrl5rscus") Bucket("pool_units") ; CALL_METHOD - Address("component_sim1czl6f4wcyv3dwd34nrcr2cd39x8krfl745krmkxcaa67rs4fgna962") + Address("component_sim1cp50jhvtwesghjnzfmtwvww56dczhgmuehnvkzjpyzxk2w8hwrfd85") "remove_liquidity" Bucket("pool_units") ; diff --git a/transaction-scenarios/generated-examples/radiswap/008--radiswap-set-two-way-linking.rtm b/transaction-scenarios/generated-examples/radiswap/008--radiswap-set-two-way-linking.rtm index de3ea43b57a..a6bff476450 100644 --- a/transaction-scenarios/generated-examples/radiswap/008--radiswap-set-two-way-linking.rtm +++ b/transaction-scenarios/generated-examples/radiswap/008--radiswap-set-two-way-linking.rtm @@ -16,45 +16,45 @@ SET_METADATA "claimed_entities" Enum<136u8>( Array
( - Address("component_sim1czl6f4wcyv3dwd34nrcr2cd39x8krfl745krmkxcaa67rs4fgna962"), - Address("pool_sim1c45qmem32g3ydvhdjtarkg2t2v7my4fqpunj6yyufm6w6385sy7cm6"), - Address("resource_sim1thnzdvm43l9chdmj7ma6smse6uh0vrlm2pfhth678vnn43kwelzs0w"), - Address("component_sim1crm9fecpkqa2xq3vyvaxnjtncxqr05h78u8kxlc5e8ka9234xj08tn"), - Address("pool_sim1c55spkpxn2gcetkm9n7r2ew6u99m0u83tc8u77ef9treq493vhv9ep"), - Address("resource_sim1tkhnevmz0hen4syfzlexs9gktfqgh8xf7h74wxj0vq5fc06xackyud") + Address("component_sim1cp50jhvtwesghjnzfmtwvww56dczhgmuehnvkzjpyzxk2w8hwrfd85"), + Address("pool_sim1cktvef6jr67kk6audy8jsdwlmqyuwzy64tmvu7gd028sa3v962d7lr"), + Address("resource_sim1t5cale6dpqa6dwrytfaclg2nd64n0y9ktu6rnkku7cmk2rrl5rscus"), + Address("component_sim1cpawfjjaxc9v5jlug9scu2tky534udlrj65d47nq8s7sj2jv93hhfh"), + Address("pool_sim1ckpw5w3zkfnd4l50lm7zuu5k53h8zwta6gpljvj7efdp0pxpte0xe6"), + Address("resource_sim1thek23fvvp4wgwhlh8vx38sgxtr4xsncurpjhj0jqvf0vhexv8n7kv") ) ) ; SET_METADATA - Address("component_sim1czl6f4wcyv3dwd34nrcr2cd39x8krfl745krmkxcaa67rs4fgna962") + Address("component_sim1cp50jhvtwesghjnzfmtwvww56dczhgmuehnvkzjpyzxk2w8hwrfd85") "dapp_definition" Enum<8u8>( Address("account_sim129uea6ms5wjstpze559am5ddw293cr2nxeqrha4ae4536dlw5x8whd") ) ; SET_METADATA - Address("component_sim1crm9fecpkqa2xq3vyvaxnjtncxqr05h78u8kxlc5e8ka9234xj08tn") + Address("component_sim1cpawfjjaxc9v5jlug9scu2tky534udlrj65d47nq8s7sj2jv93hhfh") "dapp_definition" Enum<8u8>( Address("account_sim129uea6ms5wjstpze559am5ddw293cr2nxeqrha4ae4536dlw5x8whd") ) ; SET_METADATA - Address("pool_sim1c45qmem32g3ydvhdjtarkg2t2v7my4fqpunj6yyufm6w6385sy7cm6") + Address("pool_sim1cktvef6jr67kk6audy8jsdwlmqyuwzy64tmvu7gd028sa3v962d7lr") "dapp_definition" Enum<8u8>( Address("account_sim129uea6ms5wjstpze559am5ddw293cr2nxeqrha4ae4536dlw5x8whd") ) ; SET_METADATA - Address("pool_sim1c55spkpxn2gcetkm9n7r2ew6u99m0u83tc8u77ef9treq493vhv9ep") + Address("pool_sim1ckpw5w3zkfnd4l50lm7zuu5k53h8zwta6gpljvj7efdp0pxpte0xe6") "dapp_definition" Enum<8u8>( Address("account_sim129uea6ms5wjstpze559am5ddw293cr2nxeqrha4ae4536dlw5x8whd") ) ; SET_METADATA - Address("resource_sim1thnzdvm43l9chdmj7ma6smse6uh0vrlm2pfhth678vnn43kwelzs0w") + Address("resource_sim1t5cale6dpqa6dwrytfaclg2nd64n0y9ktu6rnkku7cmk2rrl5rscus") "dapp_definitions" Enum<136u8>( Array
( @@ -63,7 +63,7 @@ SET_METADATA ) ; SET_METADATA - Address("resource_sim1tkhnevmz0hen4syfzlexs9gktfqgh8xf7h74wxj0vq5fc06xackyud") + Address("resource_sim1thek23fvvp4wgwhlh8vx38sgxtr4xsncurpjhj0jqvf0vhexv8n7kv") "dapp_definitions" Enum<136u8>( Array
( @@ -72,21 +72,21 @@ SET_METADATA ) ; SET_METADATA - Address("component_sim1czl6f4wcyv3dwd34nrcr2cd39x8krfl745krmkxcaa67rs4fgna962") + Address("component_sim1cp50jhvtwesghjnzfmtwvww56dczhgmuehnvkzjpyzxk2w8hwrfd85") "name" Enum<0u8>( "Radiswap 1 - XRD/BTC: Component" ) ; SET_METADATA - Address("component_sim1czl6f4wcyv3dwd34nrcr2cd39x8krfl745krmkxcaa67rs4fgna962") + Address("component_sim1cp50jhvtwesghjnzfmtwvww56dczhgmuehnvkzjpyzxk2w8hwrfd85") "description" Enum<0u8>( "[EXAMPLE] A Radiswap component between test tokens \"XRD\" and \"BTC\"" ) ; SET_METADATA - Address("component_sim1czl6f4wcyv3dwd34nrcr2cd39x8krfl745krmkxcaa67rs4fgna962") + Address("component_sim1cp50jhvtwesghjnzfmtwvww56dczhgmuehnvkzjpyzxk2w8hwrfd85") "tags" Enum<128u8>( Array( @@ -98,28 +98,28 @@ SET_METADATA ) ; SET_METADATA - Address("component_sim1czl6f4wcyv3dwd34nrcr2cd39x8krfl745krmkxcaa67rs4fgna962") + Address("component_sim1cp50jhvtwesghjnzfmtwvww56dczhgmuehnvkzjpyzxk2w8hwrfd85") "info_url" Enum<13u8>( "https://radiswap.radixdlt.com/" ) ; SET_METADATA - Address("pool_sim1c45qmem32g3ydvhdjtarkg2t2v7my4fqpunj6yyufm6w6385sy7cm6") + Address("pool_sim1cktvef6jr67kk6audy8jsdwlmqyuwzy64tmvu7gd028sa3v962d7lr") "name" Enum<0u8>( "Radiswap 1 - XRD/BTC: Pool" ) ; SET_METADATA - Address("pool_sim1c45qmem32g3ydvhdjtarkg2t2v7my4fqpunj6yyufm6w6385sy7cm6") + Address("pool_sim1cktvef6jr67kk6audy8jsdwlmqyuwzy64tmvu7gd028sa3v962d7lr") "description" Enum<0u8>( "[EXAMPLE] The underyling pool between test tokens \"XRD\" and \"BTC\"" ) ; SET_METADATA - Address("pool_sim1c45qmem32g3ydvhdjtarkg2t2v7my4fqpunj6yyufm6w6385sy7cm6") + Address("pool_sim1cktvef6jr67kk6audy8jsdwlmqyuwzy64tmvu7gd028sa3v962d7lr") "tags" Enum<128u8>( Array( @@ -131,28 +131,28 @@ SET_METADATA ) ; SET_METADATA - Address("pool_sim1c45qmem32g3ydvhdjtarkg2t2v7my4fqpunj6yyufm6w6385sy7cm6") + Address("pool_sim1cktvef6jr67kk6audy8jsdwlmqyuwzy64tmvu7gd028sa3v962d7lr") "info_url" Enum<13u8>( "https://radiswap.radixdlt.com/" ) ; SET_METADATA - Address("resource_sim1thnzdvm43l9chdmj7ma6smse6uh0vrlm2pfhth678vnn43kwelzs0w") + Address("resource_sim1t5cale6dpqa6dwrytfaclg2nd64n0y9ktu6rnkku7cmk2rrl5rscus") "name" Enum<0u8>( "Radiswap 1 - XRD/BTC: Pool Units" ) ; SET_METADATA - Address("resource_sim1thnzdvm43l9chdmj7ma6smse6uh0vrlm2pfhth678vnn43kwelzs0w") + Address("resource_sim1t5cale6dpqa6dwrytfaclg2nd64n0y9ktu6rnkku7cmk2rrl5rscus") "description" Enum<0u8>( "[EXAMPLE] The pool units resource for the underlying pool between test tokens \"XRD\" and \"BTC\"" ) ; SET_METADATA - Address("resource_sim1thnzdvm43l9chdmj7ma6smse6uh0vrlm2pfhth678vnn43kwelzs0w") + Address("resource_sim1t5cale6dpqa6dwrytfaclg2nd64n0y9ktu6rnkku7cmk2rrl5rscus") "tags" Enum<128u8>( Array( @@ -164,28 +164,28 @@ SET_METADATA ) ; SET_METADATA - Address("resource_sim1thnzdvm43l9chdmj7ma6smse6uh0vrlm2pfhth678vnn43kwelzs0w") + Address("resource_sim1t5cale6dpqa6dwrytfaclg2nd64n0y9ktu6rnkku7cmk2rrl5rscus") "info_url" Enum<13u8>( "https://radiswap.radixdlt.com/" ) ; SET_METADATA - Address("component_sim1crm9fecpkqa2xq3vyvaxnjtncxqr05h78u8kxlc5e8ka9234xj08tn") + Address("component_sim1cpawfjjaxc9v5jlug9scu2tky534udlrj65d47nq8s7sj2jv93hhfh") "name" Enum<0u8>( "Radiswap 2 - ETH/ETC: Component" ) ; SET_METADATA - Address("component_sim1crm9fecpkqa2xq3vyvaxnjtncxqr05h78u8kxlc5e8ka9234xj08tn") + Address("component_sim1cpawfjjaxc9v5jlug9scu2tky534udlrj65d47nq8s7sj2jv93hhfh") "description" Enum<0u8>( "[EXAMPLE] A Radiswap dApp between test tokens \"ETH\" and \"ETC\"" ) ; SET_METADATA - Address("component_sim1crm9fecpkqa2xq3vyvaxnjtncxqr05h78u8kxlc5e8ka9234xj08tn") + Address("component_sim1cpawfjjaxc9v5jlug9scu2tky534udlrj65d47nq8s7sj2jv93hhfh") "tags" Enum<128u8>( Array( @@ -197,28 +197,28 @@ SET_METADATA ) ; SET_METADATA - Address("component_sim1crm9fecpkqa2xq3vyvaxnjtncxqr05h78u8kxlc5e8ka9234xj08tn") + Address("component_sim1cpawfjjaxc9v5jlug9scu2tky534udlrj65d47nq8s7sj2jv93hhfh") "info_url" Enum<13u8>( "https://radiswap.radixdlt.com/" ) ; SET_METADATA - Address("pool_sim1c55spkpxn2gcetkm9n7r2ew6u99m0u83tc8u77ef9treq493vhv9ep") + Address("pool_sim1ckpw5w3zkfnd4l50lm7zuu5k53h8zwta6gpljvj7efdp0pxpte0xe6") "name" Enum<0u8>( "Radiswap 2 - ETH/ETC: Pool" ) ; SET_METADATA - Address("pool_sim1c55spkpxn2gcetkm9n7r2ew6u99m0u83tc8u77ef9treq493vhv9ep") + Address("pool_sim1ckpw5w3zkfnd4l50lm7zuu5k53h8zwta6gpljvj7efdp0pxpte0xe6") "description" Enum<0u8>( "[EXAMPLE] The underyling pool between test tokens \"ETH\" and \"ETC\"" ) ; SET_METADATA - Address("pool_sim1c55spkpxn2gcetkm9n7r2ew6u99m0u83tc8u77ef9treq493vhv9ep") + Address("pool_sim1ckpw5w3zkfnd4l50lm7zuu5k53h8zwta6gpljvj7efdp0pxpte0xe6") "tags" Enum<128u8>( Array( @@ -230,28 +230,28 @@ SET_METADATA ) ; SET_METADATA - Address("pool_sim1c55spkpxn2gcetkm9n7r2ew6u99m0u83tc8u77ef9treq493vhv9ep") + Address("pool_sim1ckpw5w3zkfnd4l50lm7zuu5k53h8zwta6gpljvj7efdp0pxpte0xe6") "info_url" Enum<13u8>( "https://radiswap.radixdlt.com/" ) ; SET_METADATA - Address("resource_sim1tkhnevmz0hen4syfzlexs9gktfqgh8xf7h74wxj0vq5fc06xackyud") + Address("resource_sim1thek23fvvp4wgwhlh8vx38sgxtr4xsncurpjhj0jqvf0vhexv8n7kv") "name" Enum<0u8>( "Radiswap 2 - ETH/ETC: Pool Units" ) ; SET_METADATA - Address("resource_sim1tkhnevmz0hen4syfzlexs9gktfqgh8xf7h74wxj0vq5fc06xackyud") + Address("resource_sim1thek23fvvp4wgwhlh8vx38sgxtr4xsncurpjhj0jqvf0vhexv8n7kv") "description" Enum<0u8>( "[EXAMPLE] The pool units resource for the underlying pool between test tokens \"ETH\" and \"ETC\"" ) ; SET_METADATA - Address("resource_sim1tkhnevmz0hen4syfzlexs9gktfqgh8xf7h74wxj0vq5fc06xackyud") + Address("resource_sim1thek23fvvp4wgwhlh8vx38sgxtr4xsncurpjhj0jqvf0vhexv8n7kv") "tags" Enum<128u8>( Array( @@ -263,7 +263,7 @@ SET_METADATA ) ; SET_METADATA - Address("resource_sim1tkhnevmz0hen4syfzlexs9gktfqgh8xf7h74wxj0vq5fc06xackyud") + Address("resource_sim1thek23fvvp4wgwhlh8vx38sgxtr4xsncurpjhj0jqvf0vhexv8n7kv") "info_url" Enum<13u8>( "https://radiswap.radixdlt.com/"