From 368acea16b1514b94f193b8ad64fa44ccad4526c Mon Sep 17 00:00:00 2001 From: Andrei Marinica Date: Mon, 23 Dec 2024 18:53:11 +0200 Subject: [PATCH 1/2] EgldOrEsdtTokenIdentifier encode as EGLD-000000 instead of EGLD --- .../wrapped/egld_or_esdt_token_identifier.rs | 12 ++-------- .../scenario/tests/token_identifier_test.rs | 24 +++++++++++++++---- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/framework/base/src/types/managed/wrapped/egld_or_esdt_token_identifier.rs b/framework/base/src/types/managed/wrapped/egld_or_esdt_token_identifier.rs index 79b9977943..03c6e9f619 100644 --- a/framework/base/src/types/managed/wrapped/egld_or_esdt_token_identifier.rs +++ b/framework/base/src/types/managed/wrapped/egld_or_esdt_token_identifier.rs @@ -243,11 +243,7 @@ impl NestedEncode for EgldOrEsdtTokenIdentifier { O: NestedEncodeOutput, H: EncodeErrorHandler, { - if self.is_egld() { - (&Self::EGLD_REPRESENTATION[..]).dep_encode_or_handle_err(dest, h) - } else { - self.buffer.dep_encode_or_handle_err(dest, h) - } + self.buffer.dep_encode_or_handle_err(dest, h) } } @@ -258,11 +254,7 @@ impl TopEncode for EgldOrEsdtTokenIdentifier { O: TopEncodeOutput, H: EncodeErrorHandler, { - if self.is_egld() { - (&Self::EGLD_REPRESENTATION[..]).top_encode_or_handle_err(output, h) - } else { - self.buffer.top_encode_or_handle_err(output, h) - } + self.buffer.top_encode_or_handle_err(output, h) } } diff --git a/framework/scenario/tests/token_identifier_test.rs b/framework/scenario/tests/token_identifier_test.rs index 56951ca430..e2927108e6 100644 --- a/framework/scenario/tests/token_identifier_test.rs +++ b/framework/scenario/tests/token_identifier_test.rs @@ -1,9 +1,11 @@ use multiversx_sc::types::{ BoxedBytes, EgldOrEsdtTokenIdentifier, EgldOrEsdtTokenPayment, EsdtTokenPayment, ManagedBuffer, - TokenIdentifier, + TokenIdentifier, EGLD_000000_TOKEN_IDENTIFIER, }; use multiversx_sc_scenario::{ - api::StaticApi, managed_egld_token_id, managed_test_util::check_managed_top_encode_decode, + api::StaticApi, + managed_egld_token_id, + managed_test_util::{check_managed_top_decode, check_managed_top_encode_decode}, managed_token_id, managed_token_id_wrapped, multiversx_sc, }; @@ -16,12 +18,12 @@ fn test_egld() { fn test_codec() { check_managed_top_encode_decode( EgldOrEsdtTokenIdentifier::::egld(), - EgldOrEsdtTokenIdentifier::::EGLD_REPRESENTATION, + EGLD_000000_TOKEN_IDENTIFIER.as_bytes(), ); let expected = BoxedBytes::from_concat(&[ - &[0, 0, 0, 4], - &EgldOrEsdtTokenIdentifier::::EGLD_REPRESENTATION[..], + &[0, 0, 0, EGLD_000000_TOKEN_IDENTIFIER.len() as u8], + EGLD_000000_TOKEN_IDENTIFIER.as_bytes(), ]); check_managed_top_encode_decode( vec![EgldOrEsdtTokenIdentifier::::egld()], @@ -29,6 +31,18 @@ fn test_codec() { ); } +#[test] +fn test_decode_egld() { + let deserialized = check_managed_top_decode::>(b"EGLD"); + assert!(deserialized.is_egld()); + + let deserialized = check_managed_top_decode::>>( + b"\x00\x00\x00\x04EGLD", + ); + assert_eq!(deserialized.len(), 1); + assert!(deserialized[0].is_egld()); +} + #[test] #[rustfmt::skip] fn test_is_valid_esdt_identifier() { From 98c26533620dd9ac87309ac24f0352beac1d5741 Mon Sep 17 00:00:00 2001 From: Andrei Marinica Date: Mon, 23 Dec 2024 21:22:24 +0200 Subject: [PATCH 2/2] EgldOrEsdtTokenIdentifier encode as EGLD-000000 instead of EGLD test fix --- .../egld-crowdfunding-claim-failed.scen.json | 4 +- ...ld-crowdfunding-claim-successful.scen.json | 4 +- .../egld-crowdfunding-fund-too-late.scen.json | 2 +- .../egld-crowdfunding-fund.scen.json | 2 +- .../egld-crowdfunding-init.scen.json | 4 +- .../scenarios/claim-egld.scen.json | 4 +- .../scenarios/claim-esdt.scen.json | 4 +- .../scenarios/claim-fees.scen.json | 4 +- .../scenarios/claim-multi-esdt.scen.json | 4 +- .../digital-cash/scenarios/forward.scen.json | 4 +- .../scenarios/fund-egld-and-esdt.scen.json | 12 +-- .../scenarios/pay-fee-and-fund-egld.scen.json | 4 +- .../scenarios/pay-fee-and-fund-esdt.scen.json | 4 +- .../scenarios/set-accounts.scen.json | 6 +- .../whitelist-blacklist-fee-tokens.scen.json | 6 +- .../scenarios/withdraw-egld.scen.json | 8 +- .../scenarios/withdraw-esdt.scen.json | 8 +- .../scenarios/withdraw-multi-esdt.scen.json | 8 +- .../recursive_caller_egld_2.scen.json | 14 ++-- .../recursive_caller_egld_x.scen.json | 2 +- ...rwarder_call_async_retrieve_egld.scen.json | 8 +- ...orwarder_call_sync_retrieve_egld.scen.json | 6 +- ...arder_call_sync_retrieve_egld_bt.scen.json | 6 +- ...transf_exec_accept_return_values.scen.json | 2 +- ...rwarder_send_esdt_multi_transfer.scen.json | 2 +- ...romises_call_async_retrieve_egld.scen.json | 8 +- .../recursive_caller_egld_1.scen.json | 6 +- .../scenarios/end_auction.scen.json | 2 +- .../scenarios/payable_all_transfers.scen.json | 78 +++++++++++++++++++ .../scenarios/payable_any_1.scen.json | 4 +- .../scenarios/payable_any_2.scen.json | 4 +- .../scenarios/payable_any_3.scen.json | 4 +- .../scenarios/payable_any_4.scen.json | 4 +- .../scenarios/payable_egld_1.scen.json | 4 +- .../scenarios/payable_egld_2.scen.json | 4 +- .../scenarios/payable_egld_3.scen.json | 4 +- .../scenarios/payable_egld_4.scen.json | 4 +- 37 files changed, 168 insertions(+), 90 deletions(-) create mode 100644 contracts/feature-tests/payable-features/scenarios/payable_all_transfers.scen.json diff --git a/contracts/examples/crowdfunding-esdt/scenarios/egld-crowdfunding-claim-failed.scen.json b/contracts/examples/crowdfunding-esdt/scenarios/egld-crowdfunding-claim-failed.scen.json index be2df15dcd..9e604c2542 100644 --- a/contracts/examples/crowdfunding-esdt/scenarios/egld-crowdfunding-claim-failed.scen.json +++ b/contracts/examples/crowdfunding-esdt/scenarios/egld-crowdfunding-claim-failed.scen.json @@ -57,7 +57,7 @@ "storage": { "str:target": "500,000,000,000", "str:deadline": "123,000", - "str:tokenIdentifier": "str:EGLD", + "str:tokenIdentifier": "str:EGLD-000000", "str:deposit|address:donor1": "250,000,000,000", "str:deposit|address:donor2": "200,000,000,000" }, @@ -131,7 +131,7 @@ "storage": { "str:target": "500,000,000,000", "str:deadline": "123,000", - "str:tokenIdentifier": "str:EGLD", + "str:tokenIdentifier": "str:EGLD-000000", "str:deposit|address:donor1": "0", "str:deposit|address:donor2": "0" }, diff --git a/contracts/examples/crowdfunding-esdt/scenarios/egld-crowdfunding-claim-successful.scen.json b/contracts/examples/crowdfunding-esdt/scenarios/egld-crowdfunding-claim-successful.scen.json index 4d911a34dc..74fc6135f4 100644 --- a/contracts/examples/crowdfunding-esdt/scenarios/egld-crowdfunding-claim-successful.scen.json +++ b/contracts/examples/crowdfunding-esdt/scenarios/egld-crowdfunding-claim-successful.scen.json @@ -57,7 +57,7 @@ "storage": { "str:target": "500,000,000,000", "str:deadline": "123,000", - "str:tokenIdentifier": "str:EGLD", + "str:tokenIdentifier": "str:EGLD-000000", "str:deposit|address:donor1": "250,000,000,000", "str:deposit|address:donor2": "250,000,000,000" }, @@ -132,7 +132,7 @@ "storage": { "str:target": "500,000,000,000", "str:deadline": "123,000", - "str:tokenIdentifier": "str:EGLD", + "str:tokenIdentifier": "str:EGLD-000000", "str:deposit|address:donor1": "250,000,000,000", "str:deposit|address:donor2": "250,000,000,000" }, diff --git a/contracts/examples/crowdfunding-esdt/scenarios/egld-crowdfunding-fund-too-late.scen.json b/contracts/examples/crowdfunding-esdt/scenarios/egld-crowdfunding-fund-too-late.scen.json index 021c8ebaa6..19d6b18ad1 100644 --- a/contracts/examples/crowdfunding-esdt/scenarios/egld-crowdfunding-fund-too-late.scen.json +++ b/contracts/examples/crowdfunding-esdt/scenarios/egld-crowdfunding-fund-too-late.scen.json @@ -50,7 +50,7 @@ "storage": { "str:target": "500,000,000,000", "str:deadline": "123,000", - "str:tokenIdentifier": "str:EGLD", + "str:tokenIdentifier": "str:EGLD-000000", "str:deposit|address:donor1": "250,000,000,000" }, "code": "mxsc:../output/crowdfunding-esdt.mxsc.json" diff --git a/contracts/examples/crowdfunding-esdt/scenarios/egld-crowdfunding-fund.scen.json b/contracts/examples/crowdfunding-esdt/scenarios/egld-crowdfunding-fund.scen.json index 207b282c5f..191ecd105e 100644 --- a/contracts/examples/crowdfunding-esdt/scenarios/egld-crowdfunding-fund.scen.json +++ b/contracts/examples/crowdfunding-esdt/scenarios/egld-crowdfunding-fund.scen.json @@ -52,7 +52,7 @@ "storage": { "str:target": "500,000,000,000", "str:deadline": "123,000", - "str:tokenIdentifier": "str:EGLD", + "str:tokenIdentifier": "str:EGLD-000000", "str:deposit|address:donor1": "250,000,000,000" }, "code": "mxsc:../output/crowdfunding-esdt.mxsc.json" diff --git a/contracts/examples/crowdfunding-esdt/scenarios/egld-crowdfunding-init.scen.json b/contracts/examples/crowdfunding-esdt/scenarios/egld-crowdfunding-init.scen.json index 4d89bcc06a..fc74620ea3 100644 --- a/contracts/examples/crowdfunding-esdt/scenarios/egld-crowdfunding-init.scen.json +++ b/contracts/examples/crowdfunding-esdt/scenarios/egld-crowdfunding-init.scen.json @@ -26,7 +26,7 @@ "arguments": [ "500,000,000,000", "123,000", - "str:EGLD" + "str:EGLD-000000" ], "gasLimit": "5,000,000", "gasPrice": "0" @@ -52,7 +52,7 @@ "storage": { "str:target": "500,000,000,000", "str:deadline": "123,000", - "str:tokenIdentifier": "str:EGLD" + "str:tokenIdentifier": "str:EGLD-000000" }, "code": "mxsc:../output/crowdfunding-esdt.mxsc.json" } diff --git a/contracts/examples/digital-cash/scenarios/claim-egld.scen.json b/contracts/examples/digital-cash/scenarios/claim-egld.scen.json index b14fefe155..bc371704d3 100644 --- a/contracts/examples/digital-cash/scenarios/claim-egld.scen.json +++ b/contracts/examples/digital-cash/scenarios/claim-egld.scen.json @@ -162,10 +162,10 @@ }, "str:fee|nested:str:EGLD": "10", "str:whitelistedFeeTokens|str:.len": "1", - "str:whitelistedFeeTokens|str:.item|u32:1": "str:EGLD", + "str:whitelistedFeeTokens|str:.item|u32:1": "str:EGLD-000000", "str:whitelistedFeeTokens|str:.index|nested:str:EGLD": "1", "str:allTimeFeeTokens|str:.len": "1", - "str:allTimeFeeTokens|str:.item|u32:1": "str:EGLD", + "str:allTimeFeeTokens|str:.item|u32:1": "str:EGLD-000000", "str:allTimeFeeTokens|str:.index|nested:str:EGLD": "1", "str:collectedFees|nested:str:EGLD": "10" }, diff --git a/contracts/examples/digital-cash/scenarios/claim-esdt.scen.json b/contracts/examples/digital-cash/scenarios/claim-esdt.scen.json index f7db9967d0..3aa808331a 100644 --- a/contracts/examples/digital-cash/scenarios/claim-esdt.scen.json +++ b/contracts/examples/digital-cash/scenarios/claim-esdt.scen.json @@ -161,10 +161,10 @@ }, "str:fee|nested:str:EGLD": "10", "str:whitelistedFeeTokens|str:.len": "1", - "str:whitelistedFeeTokens|str:.item|u32:1": "str:EGLD", + "str:whitelistedFeeTokens|str:.item|u32:1": "str:EGLD-000000", "str:whitelistedFeeTokens|str:.index|nested:str:EGLD": "1", "str:allTimeFeeTokens|str:.len": "1", - "str:allTimeFeeTokens|str:.item|u32:1": "str:EGLD", + "str:allTimeFeeTokens|str:.item|u32:1": "str:EGLD-000000", "str:allTimeFeeTokens|str:.index|nested:str:EGLD": "1", "str:collectedFees|nested:str:EGLD": "10" }, diff --git a/contracts/examples/digital-cash/scenarios/claim-fees.scen.json b/contracts/examples/digital-cash/scenarios/claim-fees.scen.json index 35fd7afa2b..74503035f0 100644 --- a/contracts/examples/digital-cash/scenarios/claim-fees.scen.json +++ b/contracts/examples/digital-cash/scenarios/claim-fees.scen.json @@ -99,10 +99,10 @@ }, "str:fee|nested:str:EGLD": "10", "str:whitelistedFeeTokens|str:.len": "1", - "str:whitelistedFeeTokens|str:.item|u32:1": "str:EGLD", + "str:whitelistedFeeTokens|str:.item|u32:1": "str:EGLD-000000", "str:whitelistedFeeTokens|str:.index|nested:str:EGLD": "1", "str:allTimeFeeTokens|str:.len": "1", - "str:allTimeFeeTokens|str:.item|u32:1": "str:EGLD", + "str:allTimeFeeTokens|str:.item|u32:1": "str:EGLD-000000", "str:allTimeFeeTokens|str:.index|nested:str:EGLD": "1" }, "code": "mxsc:../output/digital-cash.mxsc.json" diff --git a/contracts/examples/digital-cash/scenarios/claim-multi-esdt.scen.json b/contracts/examples/digital-cash/scenarios/claim-multi-esdt.scen.json index df27c31521..62b0ab3c96 100644 --- a/contracts/examples/digital-cash/scenarios/claim-multi-esdt.scen.json +++ b/contracts/examples/digital-cash/scenarios/claim-multi-esdt.scen.json @@ -159,10 +159,10 @@ }, "str:fee|nested:str:EGLD": "10", "str:whitelistedFeeTokens|str:.len": "1", - "str:whitelistedFeeTokens|str:.item|u32:1": "str:EGLD", + "str:whitelistedFeeTokens|str:.item|u32:1": "str:EGLD-000000", "str:whitelistedFeeTokens|str:.index|nested:str:EGLD": "1", "str:allTimeFeeTokens|str:.len": "1", - "str:allTimeFeeTokens|str:.item|u32:1": "str:EGLD", + "str:allTimeFeeTokens|str:.item|u32:1": "str:EGLD-000000", "str:allTimeFeeTokens|str:.index|nested:str:EGLD": "1", "str:collectedFees|nested:str:EGLD": "30" }, diff --git a/contracts/examples/digital-cash/scenarios/forward.scen.json b/contracts/examples/digital-cash/scenarios/forward.scen.json index ab5a4443d7..bcf48cb4de 100644 --- a/contracts/examples/digital-cash/scenarios/forward.scen.json +++ b/contracts/examples/digital-cash/scenarios/forward.scen.json @@ -207,10 +207,10 @@ }, "str:fee|nested:str:EGLD": "10", "str:whitelistedFeeTokens|str:.len": "1", - "str:whitelistedFeeTokens|str:.item|u32:1": "str:EGLD", + "str:whitelistedFeeTokens|str:.item|u32:1": "str:EGLD-000000", "str:whitelistedFeeTokens|str:.index|nested:str:EGLD": "1", "str:allTimeFeeTokens|str:.len": "1", - "str:allTimeFeeTokens|str:.item|u32:1": "str:EGLD", + "str:allTimeFeeTokens|str:.item|u32:1": "str:EGLD-000000", "str:allTimeFeeTokens|str:.index|nested:str:EGLD": "1", "str:collectedFees|nested:str:EGLD": "40" }, diff --git a/contracts/examples/digital-cash/scenarios/fund-egld-and-esdt.scen.json b/contracts/examples/digital-cash/scenarios/fund-egld-and-esdt.scen.json index 594a3339ed..034ed049ee 100644 --- a/contracts/examples/digital-cash/scenarios/fund-egld-and-esdt.scen.json +++ b/contracts/examples/digital-cash/scenarios/fund-egld-and-esdt.scen.json @@ -100,10 +100,10 @@ }, "str:fee|nested:str:EGLD": "10", "str:whitelistedFeeTokens|str:.len": "1", - "str:whitelistedFeeTokens|str:.item|u32:1": "str:EGLD", + "str:whitelistedFeeTokens|str:.item|u32:1": "str:EGLD-000000", "str:whitelistedFeeTokens|str:.index|nested:str:EGLD": "1", "str:allTimeFeeTokens|str:.len": "1", - "str:allTimeFeeTokens|str:.item|u32:1": "str:EGLD", + "str:allTimeFeeTokens|str:.item|u32:1": "str:EGLD-000000", "str:allTimeFeeTokens|str:.index|nested:str:EGLD": "1" }, "code": "mxsc:../output/digital-cash.mxsc.json" @@ -231,10 +231,10 @@ }, "str:fee|nested:str:EGLD": "10", "str:whitelistedFeeTokens|str:.len": "1", - "str:whitelistedFeeTokens|str:.item|u32:1": "str:EGLD", + "str:whitelistedFeeTokens|str:.item|u32:1": "str:EGLD-000000", "str:whitelistedFeeTokens|str:.index|nested:str:EGLD": "1", "str:allTimeFeeTokens|str:.len": "1", - "str:allTimeFeeTokens|str:.item|u32:1": "str:EGLD", + "str:allTimeFeeTokens|str:.item|u32:1": "str:EGLD-000000", "str:allTimeFeeTokens|str:.index|nested:str:EGLD": "1" }, "code": "mxsc:../output/digital-cash.mxsc.json" @@ -452,10 +452,10 @@ }, "str:fee|nested:str:EGLD": "10", "str:whitelistedFeeTokens|str:.len": "1", - "str:whitelistedFeeTokens|str:.item|u32:1": "str:EGLD", + "str:whitelistedFeeTokens|str:.item|u32:1": "str:EGLD-000000", "str:whitelistedFeeTokens|str:.index|nested:str:EGLD": "1", "str:allTimeFeeTokens|str:.len": "1", - "str:allTimeFeeTokens|str:.item|u32:1": "str:EGLD", + "str:allTimeFeeTokens|str:.item|u32:1": "str:EGLD-000000", "str:allTimeFeeTokens|str:.index|nested:str:EGLD": "1" }, "code": "mxsc:../output/digital-cash.mxsc.json" diff --git a/contracts/examples/digital-cash/scenarios/pay-fee-and-fund-egld.scen.json b/contracts/examples/digital-cash/scenarios/pay-fee-and-fund-egld.scen.json index 4c66d33df3..3ea5154206 100644 --- a/contracts/examples/digital-cash/scenarios/pay-fee-and-fund-egld.scen.json +++ b/contracts/examples/digital-cash/scenarios/pay-fee-and-fund-egld.scen.json @@ -78,12 +78,12 @@ "str:fee|nested:str:EGLD": "10", "str:fee|nested:str:CASHTOKEN-778899": "3", "str:whitelistedFeeTokens|str:.len": "2", - "str:whitelistedFeeTokens|str:.item|u32:1": "str:EGLD", + "str:whitelistedFeeTokens|str:.item|u32:1": "str:EGLD-000000", "str:whitelistedFeeTokens|str:.item|u32:2": "str:CASHTOKEN-778899", "str:whitelistedFeeTokens|str:.index|nested:str:EGLD": "1", "str:whitelistedFeeTokens|str:.index|nested:str:CASHTOKEN-778899": "2", "str:allTimeFeeTokens|str:.len": "3", - "str:allTimeFeeTokens|str:.item|u32:1": "str:EGLD", + "str:allTimeFeeTokens|str:.item|u32:1": "str:EGLD-000000", "str:allTimeFeeTokens|str:.item|u32:2": "str:CASHTOKEN-778899", "str:allTimeFeeTokens|str:.item|u32:3": "str:ESDT-778899", "str:allTimeFeeTokens|str:.index|nested:str:EGLD": "1", diff --git a/contracts/examples/digital-cash/scenarios/pay-fee-and-fund-esdt.scen.json b/contracts/examples/digital-cash/scenarios/pay-fee-and-fund-esdt.scen.json index 6786587fe8..45056678d6 100644 --- a/contracts/examples/digital-cash/scenarios/pay-fee-and-fund-esdt.scen.json +++ b/contracts/examples/digital-cash/scenarios/pay-fee-and-fund-esdt.scen.json @@ -100,12 +100,12 @@ "str:fee|nested:str:EGLD": "10", "str:fee|nested:str:CASHTOKEN-778899": "3", "str:whitelistedFeeTokens|str:.len": "2", - "str:whitelistedFeeTokens|str:.item|u32:1": "str:EGLD", + "str:whitelistedFeeTokens|str:.item|u32:1": "str:EGLD-000000", "str:whitelistedFeeTokens|str:.item|u32:2": "str:CASHTOKEN-778899", "str:whitelistedFeeTokens|str:.index|nested:str:EGLD": "1", "str:whitelistedFeeTokens|str:.index|nested:str:CASHTOKEN-778899": "2", "str:allTimeFeeTokens|str:.len": "3", - "str:allTimeFeeTokens|str:.item|u32:1": "str:EGLD", + "str:allTimeFeeTokens|str:.item|u32:1": "str:EGLD-000000", "str:allTimeFeeTokens|str:.item|u32:2": "str:CASHTOKEN-778899", "str:allTimeFeeTokens|str:.item|u32:3": "str:ESDT-778899", "str:allTimeFeeTokens|str:.index|nested:str:EGLD": "1", diff --git a/contracts/examples/digital-cash/scenarios/set-accounts.scen.json b/contracts/examples/digital-cash/scenarios/set-accounts.scen.json index 550268266b..790f15d812 100644 --- a/contracts/examples/digital-cash/scenarios/set-accounts.scen.json +++ b/contracts/examples/digital-cash/scenarios/set-accounts.scen.json @@ -45,7 +45,7 @@ "contractCode": "mxsc:../output/digital-cash.mxsc.json", "arguments": [ "10", - "str:EGLD" + "str:EGLD-000000" ], "gasLimit": "5,000,000", "gasPrice": "0" @@ -66,10 +66,10 @@ "storage": { "str:fee|nested:str:EGLD": "10", "str:whitelistedFeeTokens|str:.len": "1", - "str:whitelistedFeeTokens|str:.item|u32:1": "str:EGLD", + "str:whitelistedFeeTokens|str:.item|u32:1": "str:EGLD-000000", "str:whitelistedFeeTokens|str:.index|nested:str:EGLD": "1", "str:allTimeFeeTokens|str:.len": "1", - "str:allTimeFeeTokens|str:.item|u32:1": "str:EGLD", + "str:allTimeFeeTokens|str:.item|u32:1": "str:EGLD-000000", "str:allTimeFeeTokens|str:.index|nested:str:EGLD": "1" }, "code": "mxsc:../output/digital-cash.mxsc.json" diff --git a/contracts/examples/digital-cash/scenarios/whitelist-blacklist-fee-tokens.scen.json b/contracts/examples/digital-cash/scenarios/whitelist-blacklist-fee-tokens.scen.json index f88f0e0073..cbb184dd27 100644 --- a/contracts/examples/digital-cash/scenarios/whitelist-blacklist-fee-tokens.scen.json +++ b/contracts/examples/digital-cash/scenarios/whitelist-blacklist-fee-tokens.scen.json @@ -14,7 +14,7 @@ "function": "whitelistFeeToken", "arguments": [ "biguint:10", - "str:EGLD" + "str:EGLD-000000" ], "gasLimit": "500,000,000", "gasPrice": "0" @@ -128,12 +128,12 @@ "str:fee|nested:str:EGLD": "10", "str:fee|nested:str:CASHTOKEN-778899": "3", "str:whitelistedFeeTokens|str:.len": "2", - "str:whitelistedFeeTokens|str:.item|u32:1": "str:EGLD", + "str:whitelistedFeeTokens|str:.item|u32:1": "str:EGLD-000000", "str:whitelistedFeeTokens|str:.item|u32:2": "str:CASHTOKEN-778899", "str:whitelistedFeeTokens|str:.index|nested:str:EGLD": "1", "str:whitelistedFeeTokens|str:.index|nested:str:CASHTOKEN-778899": "2", "str:allTimeFeeTokens|str:.len": "3", - "str:allTimeFeeTokens|str:.item|u32:1": "str:EGLD", + "str:allTimeFeeTokens|str:.item|u32:1": "str:EGLD-000000", "str:allTimeFeeTokens|str:.item|u32:2": "str:CASHTOKEN-778899", "str:allTimeFeeTokens|str:.item|u32:3": "str:ESDT-778899", "str:allTimeFeeTokens|str:.index|nested:str:EGLD": "1", diff --git a/contracts/examples/digital-cash/scenarios/withdraw-egld.scen.json b/contracts/examples/digital-cash/scenarios/withdraw-egld.scen.json index 81b93b41fb..9b4aa7255b 100644 --- a/contracts/examples/digital-cash/scenarios/withdraw-egld.scen.json +++ b/contracts/examples/digital-cash/scenarios/withdraw-egld.scen.json @@ -87,10 +87,10 @@ }, "str:fee|nested:str:EGLD": "10", "str:whitelistedFeeTokens|str:.len": "1", - "str:whitelistedFeeTokens|str:.item|u32:1": "str:EGLD", + "str:whitelistedFeeTokens|str:.item|u32:1": "str:EGLD-000000", "str:whitelistedFeeTokens|str:.index|nested:str:EGLD": "1", "str:allTimeFeeTokens|str:.len": "1", - "str:allTimeFeeTokens|str:.item|u32:1": "str:EGLD", + "str:allTimeFeeTokens|str:.item|u32:1": "str:EGLD-000000", "str:allTimeFeeTokens|str:.index|nested:str:EGLD": "1" }, "code": "mxsc:../output/digital-cash.mxsc.json" @@ -224,10 +224,10 @@ }, "str:fee|nested:str:EGLD": "10", "str:whitelistedFeeTokens|str:.len": "1", - "str:whitelistedFeeTokens|str:.item|u32:1": "str:EGLD", + "str:whitelistedFeeTokens|str:.item|u32:1": "str:EGLD-000000", "str:whitelistedFeeTokens|str:.index|nested:str:EGLD": "1", "str:allTimeFeeTokens|str:.len": "1", - "str:allTimeFeeTokens|str:.item|u32:1": "str:EGLD", + "str:allTimeFeeTokens|str:.item|u32:1": "str:EGLD-000000", "str:allTimeFeeTokens|str:.index|nested:str:EGLD": "1" }, "code": "mxsc:../output/digital-cash.mxsc.json" diff --git a/contracts/examples/digital-cash/scenarios/withdraw-esdt.scen.json b/contracts/examples/digital-cash/scenarios/withdraw-esdt.scen.json index 2a1d2743a0..5219118034 100644 --- a/contracts/examples/digital-cash/scenarios/withdraw-esdt.scen.json +++ b/contracts/examples/digital-cash/scenarios/withdraw-esdt.scen.json @@ -87,10 +87,10 @@ }, "str:fee|nested:str:EGLD": "10", "str:whitelistedFeeTokens|str:.len": "1", - "str:whitelistedFeeTokens|str:.item|u32:1": "str:EGLD", + "str:whitelistedFeeTokens|str:.item|u32:1": "str:EGLD-000000", "str:whitelistedFeeTokens|str:.index|nested:str:EGLD": "1", "str:allTimeFeeTokens|str:.len": "1", - "str:allTimeFeeTokens|str:.item|u32:1": "str:EGLD", + "str:allTimeFeeTokens|str:.item|u32:1": "str:EGLD-000000", "str:allTimeFeeTokens|str:.index|nested:str:EGLD": "1" }, "code": "mxsc:../output/digital-cash.mxsc.json" @@ -223,10 +223,10 @@ }, "str:fee|nested:str:EGLD": "10", "str:whitelistedFeeTokens|str:.len": "1", - "str:whitelistedFeeTokens|str:.item|u32:1": "str:EGLD", + "str:whitelistedFeeTokens|str:.item|u32:1": "str:EGLD-000000", "str:whitelistedFeeTokens|str:.index|nested:str:EGLD": "1", "str:allTimeFeeTokens|str:.len": "1", - "str:allTimeFeeTokens|str:.item|u32:1": "str:EGLD", + "str:allTimeFeeTokens|str:.item|u32:1": "str:EGLD-000000", "str:allTimeFeeTokens|str:.index|nested:str:EGLD": "1" }, "code": "mxsc:../output/digital-cash.mxsc.json" diff --git a/contracts/examples/digital-cash/scenarios/withdraw-multi-esdt.scen.json b/contracts/examples/digital-cash/scenarios/withdraw-multi-esdt.scen.json index 2e0ee98a3c..879e5f287a 100644 --- a/contracts/examples/digital-cash/scenarios/withdraw-multi-esdt.scen.json +++ b/contracts/examples/digital-cash/scenarios/withdraw-multi-esdt.scen.json @@ -87,10 +87,10 @@ }, "str:fee|nested:str:EGLD": "10", "str:whitelistedFeeTokens|str:.len": "1", - "str:whitelistedFeeTokens|str:.item|u32:1": "str:EGLD", + "str:whitelistedFeeTokens|str:.item|u32:1": "str:EGLD-000000", "str:whitelistedFeeTokens|str:.index|nested:str:EGLD": "1", "str:allTimeFeeTokens|str:.len": "1", - "str:allTimeFeeTokens|str:.item|u32:1": "str:EGLD", + "str:allTimeFeeTokens|str:.item|u32:1": "str:EGLD-000000", "str:allTimeFeeTokens|str:.index|nested:str:EGLD": "1" }, "code": "mxsc:../output/digital-cash.mxsc.json" @@ -221,10 +221,10 @@ }, "str:fee|nested:str:EGLD": "10", "str:whitelistedFeeTokens|str:.len": "1", - "str:whitelistedFeeTokens|str:.item|u32:1": "str:EGLD", + "str:whitelistedFeeTokens|str:.item|u32:1": "str:EGLD-000000", "str:whitelistedFeeTokens|str:.index|nested:str:EGLD": "1", "str:allTimeFeeTokens|str:.len": "1", - "str:allTimeFeeTokens|str:.item|u32:1": "str:EGLD", + "str:allTimeFeeTokens|str:.item|u32:1": "str:EGLD-000000", "str:allTimeFeeTokens|str:.index|nested:str:EGLD": "1" }, "code": "mxsc:../output/digital-cash.mxsc.json" diff --git a/contracts/feature-tests/composability/scenarios-unsupported/recursive_caller_egld_2.scen.json b/contracts/feature-tests/composability/scenarios-unsupported/recursive_caller_egld_2.scen.json index cefb775799..6b632507c9 100644 --- a/contracts/feature-tests/composability/scenarios-unsupported/recursive_caller_egld_2.scen.json +++ b/contracts/feature-tests/composability/scenarios-unsupported/recursive_caller_egld_2.scen.json @@ -29,7 +29,7 @@ "function": "recursive_send_funds", "arguments": [ "sc:vault", - "str:EGLD", + "str:EGLD-000000", "1", "2" ], @@ -45,7 +45,7 @@ "endpoint": "str:recursive_send_funds", "topics": [ "sc:vault", - "str:EGLD", + "str:EGLD-000000", "1" ], "data": [ @@ -56,7 +56,7 @@ "address": "sc:vault", "endpoint": "str:accept_funds", "topics": [ - "str:EGLD", + "str:EGLD-000000", "str:FungibleESDT", "1", "0" @@ -68,7 +68,7 @@ "endpoint": "str:recursive_send_funds_callback", "topics": [ "sc:vault", - "str:EGLD", + "str:EGLD-000000", "1" ], "data": [ @@ -80,7 +80,7 @@ "endpoint": "str:recursive_send_funds", "topics": [ "sc:vault", - "str:EGLD", + "str:EGLD-000000", "1" ], "data": [ @@ -91,7 +91,7 @@ "address": "sc:vault", "endpoint": "str:accept_funds", "topics": [ - "str:EGLD", + "str:EGLD-000000", "str:FungibleESDT", "1", "0" @@ -103,7 +103,7 @@ "endpoint": "str:recursive_send_funds_callback", "topics": [ "sc:vault", - "str:EGLD", + "str:EGLD-000000", "1" ], "data": [ diff --git a/contracts/feature-tests/composability/scenarios-unsupported/recursive_caller_egld_x.scen.json b/contracts/feature-tests/composability/scenarios-unsupported/recursive_caller_egld_x.scen.json index 457db86a61..be6a876c84 100644 --- a/contracts/feature-tests/composability/scenarios-unsupported/recursive_caller_egld_x.scen.json +++ b/contracts/feature-tests/composability/scenarios-unsupported/recursive_caller_egld_x.scen.json @@ -29,7 +29,7 @@ "function": "recursive_send_funds", "arguments": [ "sc:vault", - "str:EGLD", + "str:EGLD-000000", "1", "5" ], diff --git a/contracts/feature-tests/composability/scenarios/forwarder_call_async_retrieve_egld.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_call_async_retrieve_egld.scen.json index ecfae9b375..2d7eb512e0 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_call_async_retrieve_egld.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_call_async_retrieve_egld.scen.json @@ -29,7 +29,7 @@ "function": "forward_async_retrieve_funds", "arguments": [ "sc:vault", - "str:EGLD", + "str:EGLD-000000", "0", "1000" ], @@ -50,7 +50,7 @@ "data": [ "str:AsyncCall", "str:retrieve_funds", - "str:EGLD", + "str:EGLD-000000", "0", "1000" ] @@ -60,7 +60,7 @@ "endpoint": "str:retrieve_funds", "topics": [ "str:retrieve_funds", - "str:EGLD", + "str:EGLD-000000", "0", "1000" ], @@ -98,7 +98,7 @@ "endpoint": "str:callBack", "topics": [ "str:retrieve_funds_callback", - "str:EGLD", + "str:EGLD-000000", "0", "1000" ], diff --git a/contracts/feature-tests/composability/scenarios/forwarder_call_sync_retrieve_egld.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_call_sync_retrieve_egld.scen.json index 898b02e3f8..d901909a2d 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_call_sync_retrieve_egld.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_call_sync_retrieve_egld.scen.json @@ -29,7 +29,7 @@ "function": "forward_sync_retrieve_funds", "arguments": [ "sc:vault", - "str:EGLD", + "str:EGLD-000000", "0", "1000" ], @@ -50,7 +50,7 @@ "data": [ "str:ExecuteOnDestContext", "str:retrieve_funds", - "str:EGLD", + "str:EGLD-000000", "0", "1000" ] @@ -60,7 +60,7 @@ "endpoint": "str:retrieve_funds", "topics": [ "str:retrieve_funds", - "str:EGLD", + "str:EGLD-000000", "0", "1000" ], diff --git a/contracts/feature-tests/composability/scenarios/forwarder_call_sync_retrieve_egld_bt.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_call_sync_retrieve_egld_bt.scen.json index 5d7d625f85..453cbb6181 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_call_sync_retrieve_egld_bt.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_call_sync_retrieve_egld_bt.scen.json @@ -29,7 +29,7 @@ "function": "forward_sync_retrieve_funds_bt", "arguments": [ "sc:vault", - "str:EGLD", + "str:EGLD-000000", "0", "1000" ], @@ -50,7 +50,7 @@ "data": [ "str:ExecuteOnDestContext", "str:retrieve_funds", - "str:EGLD", + "str:EGLD-000000", "0", "1000" ] @@ -60,7 +60,7 @@ "endpoint": "str:retrieve_funds", "topics": [ "str:retrieve_funds", - "str:EGLD", + "str:EGLD-000000", "0", "1000" ], diff --git a/contracts/feature-tests/composability/scenarios/forwarder_call_transf_exec_accept_return_values.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_call_transf_exec_accept_return_values.scen.json index c861c4c39d..7740bd7fe5 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_call_transf_exec_accept_return_values.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_call_transf_exec_accept_return_values.scen.json @@ -39,7 +39,7 @@ "*", "*", "0", - "str:EGLD" + "str:EGLD-000000" ], "status": "0", "logs": [ diff --git a/contracts/feature-tests/composability/scenarios/forwarder_send_esdt_multi_transfer.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_send_esdt_multi_transfer.scen.json index 80d7b639e2..97450f3c63 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_send_esdt_multi_transfer.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_send_esdt_multi_transfer.scen.json @@ -189,7 +189,7 @@ "function": "send_esdt_direct_multi_transfer", "arguments": [ "address:a_user", - "str:EGLD", + "str:EGLD-000000", "0", "1000" ], diff --git a/contracts/feature-tests/composability/scenarios/promises_call_async_retrieve_egld.scen.json b/contracts/feature-tests/composability/scenarios/promises_call_async_retrieve_egld.scen.json index e17b0fd7d5..17acc20fcc 100644 --- a/contracts/feature-tests/composability/scenarios/promises_call_async_retrieve_egld.scen.json +++ b/contracts/feature-tests/composability/scenarios/promises_call_async_retrieve_egld.scen.json @@ -28,7 +28,7 @@ "function": "forward_promise_retrieve_funds", "arguments": [ "sc:vault", - "str:EGLD", + "str:EGLD-000000", "0", "1000" ], @@ -49,7 +49,7 @@ "data": [ "str:AsyncCall", "str:retrieve_funds", - "str:EGLD", + "str:EGLD-000000", "0", "1000" ] @@ -59,7 +59,7 @@ "endpoint": "str:retrieve_funds", "topics": [ "str:retrieve_funds", - "str:EGLD", + "str:EGLD-000000", "0", "1000" ], @@ -97,7 +97,7 @@ "endpoint": "str:retrieve_funds_callback", "topics": [ "str:retrieve_funds_callback", - "str:EGLD", + "str:EGLD-000000", "0", "1000" ], diff --git a/contracts/feature-tests/composability/scenarios/recursive_caller_egld_1.scen.json b/contracts/feature-tests/composability/scenarios/recursive_caller_egld_1.scen.json index 418ee1162b..6be7996616 100644 --- a/contracts/feature-tests/composability/scenarios/recursive_caller_egld_1.scen.json +++ b/contracts/feature-tests/composability/scenarios/recursive_caller_egld_1.scen.json @@ -30,7 +30,7 @@ "function": "recursive_send_funds", "arguments": [ "sc:vault", - "str:EGLD", + "str:EGLD-000000", "1", "1" ], @@ -47,7 +47,7 @@ "topics": [ "str:recursive_send_funds", "sc:vault", - "str:EGLD", + "str:EGLD-000000", "1" ], "data": [ @@ -96,7 +96,7 @@ "topics": [ "str:recursive_send_funds_callback", "sc:vault", - "str:EGLD", + "str:EGLD-000000", "1" ], "data": [ diff --git a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/scenarios/end_auction.scen.json b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/scenarios/end_auction.scen.json index 95adcc52d5..7b0a00e7ef 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/scenarios/end_auction.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/scenarios/end_auction.scen.json @@ -93,7 +93,7 @@ "str:percentageCut": "10", "str:claimableFunds|str:.mapped|nested:str:EGLD": "50", "str:claimableFunds|str:.node_links|u32:1": "u32:0|u32:0", - "str:claimableFunds|str:.value|u32:1": "str:EGLD", + "str:claimableFunds|str:.value|u32:1": "str:EGLD-000000", "str:claimableFunds|str:.node_id|nested:str:EGLD": "1", "str:claimableFunds|str:.info": "u32:1|u32:1|u32:1|u32:1" }, diff --git a/contracts/feature-tests/payable-features/scenarios/payable_all_transfers.scen.json b/contracts/feature-tests/payable-features/scenarios/payable_all_transfers.scen.json new file mode 100644 index 0000000000..8a357676cd --- /dev/null +++ b/contracts/feature-tests/payable-features/scenarios/payable_all_transfers.scen.json @@ -0,0 +1,78 @@ +{ + "name": "payable", + "gasSchedule": "v3", + "steps": [ + { + "step": "setState", + "accounts": { + "sc:payable-features": { + "nonce": "0", + "balance": "0", + "code": "mxsc:../output/payable-features.mxsc.json" + }, + "address:an-account": { + "nonce": "0", + "balance": "10000", + "esdt": { + "str:TOK-123456": "1000", + "str:OTHERTOK-123456": "500", + "str:SFT-123": { + "instances": [ + { + "nonce": "5", + "balance": "20" + } + ] + } + } + } + } + }, + { + "step": "scCall", + "id": "payment-all", + "tx": { + "from": "address:an-account", + "to": "sc:payable-features", + "esdtValue": [ + { + "tokenIdentifier": "str:TOK-123456", + "value": "100" + }, + { + "tokenIdentifier": "str:OTHERTOK-123456", + "value": "400" + }, + { + "tokenIdentifier": "str:SFT-123", + "nonce": "5", + "value": "10" + }, + { + "tokenIdentifier": "str:EGLD-000000", + "nonce": "0", + "value": "120" + } + ], + "function": "payment_multiple", + "arguments": [], + "gasLimit": "50,000,000", + "gasPrice": "0" + }, + "expect": { + "out": [ + [ + "nested:str:TOK-123456|u64:0|biguint:100|", + "nested:str:OTHERTOK-123456|u64:0|biguint:400", + "nested:str:SFT-123|u64:5|biguint:10", + "nested:str:EGLD-000000|u64:0|biguint:120" + ] + ], + "status": "", + "logs": "*", + "gas": "*", + "refund": "*" + } + } + ] +} \ No newline at end of file diff --git a/contracts/feature-tests/payable-features/scenarios/payable_any_1.scen.json b/contracts/feature-tests/payable-features/scenarios/payable_any_1.scen.json index 615636c669..6c629d0999 100644 --- a/contracts/feature-tests/payable-features/scenarios/payable_any_1.scen.json +++ b/contracts/feature-tests/payable-features/scenarios/payable_any_1.scen.json @@ -34,7 +34,7 @@ "expect": { "out": [ "0", - "str:EGLD" + "str:EGLD-000000" ], "status": "", "logs": "*", @@ -57,7 +57,7 @@ "expect": { "out": [ "5", - "str:EGLD" + "str:EGLD-000000" ], "status": "", "logs": "*", diff --git a/contracts/feature-tests/payable-features/scenarios/payable_any_2.scen.json b/contracts/feature-tests/payable-features/scenarios/payable_any_2.scen.json index 8715e5b59a..ff995632f5 100644 --- a/contracts/feature-tests/payable-features/scenarios/payable_any_2.scen.json +++ b/contracts/feature-tests/payable-features/scenarios/payable_any_2.scen.json @@ -34,7 +34,7 @@ "expect": { "out": [ "0", - "str:EGLD" + "str:EGLD-000000" ], "status": "", "logs": "*", @@ -57,7 +57,7 @@ "expect": { "out": [ "5", - "str:EGLD" + "str:EGLD-000000" ], "status": "", "logs": "*", diff --git a/contracts/feature-tests/payable-features/scenarios/payable_any_3.scen.json b/contracts/feature-tests/payable-features/scenarios/payable_any_3.scen.json index 8891796a1a..3e67b8a3d5 100644 --- a/contracts/feature-tests/payable-features/scenarios/payable_any_3.scen.json +++ b/contracts/feature-tests/payable-features/scenarios/payable_any_3.scen.json @@ -34,7 +34,7 @@ "expect": { "out": [ "0", - "str:EGLD" + "str:EGLD-000000" ], "status": "", "logs": "*", @@ -57,7 +57,7 @@ "expect": { "out": [ "5", - "str:EGLD" + "str:EGLD-000000" ], "status": "", "logs": "*", diff --git a/contracts/feature-tests/payable-features/scenarios/payable_any_4.scen.json b/contracts/feature-tests/payable-features/scenarios/payable_any_4.scen.json index 2379e769ba..f8e0e777c7 100644 --- a/contracts/feature-tests/payable-features/scenarios/payable_any_4.scen.json +++ b/contracts/feature-tests/payable-features/scenarios/payable_any_4.scen.json @@ -34,7 +34,7 @@ "expect": { "out": [ "0", - "str:EGLD" + "str:EGLD-000000" ], "status": "", "logs": "*", @@ -57,7 +57,7 @@ "expect": { "out": [ "5", - "str:EGLD" + "str:EGLD-000000" ], "status": "", "logs": "*", diff --git a/contracts/feature-tests/payable-features/scenarios/payable_egld_1.scen.json b/contracts/feature-tests/payable-features/scenarios/payable_egld_1.scen.json index daa18ca3b0..04fd4b80d5 100644 --- a/contracts/feature-tests/payable-features/scenarios/payable_egld_1.scen.json +++ b/contracts/feature-tests/payable-features/scenarios/payable_egld_1.scen.json @@ -34,7 +34,7 @@ "expect": { "out": [ "0", - "str:EGLD" + "str:EGLD-000000" ], "status": "", "logs": "*", @@ -57,7 +57,7 @@ "expect": { "out": [ "5", - "str:EGLD" + "str:EGLD-000000" ], "status": "", "logs": "*", diff --git a/contracts/feature-tests/payable-features/scenarios/payable_egld_2.scen.json b/contracts/feature-tests/payable-features/scenarios/payable_egld_2.scen.json index 6936d54810..5466e66fed 100644 --- a/contracts/feature-tests/payable-features/scenarios/payable_egld_2.scen.json +++ b/contracts/feature-tests/payable-features/scenarios/payable_egld_2.scen.json @@ -34,7 +34,7 @@ "expect": { "out": [ "0", - "str:EGLD" + "str:EGLD-000000" ], "status": "", "logs": "*", @@ -57,7 +57,7 @@ "expect": { "out": [ "5", - "str:EGLD" + "str:EGLD-000000" ], "status": "", "logs": "*", diff --git a/contracts/feature-tests/payable-features/scenarios/payable_egld_3.scen.json b/contracts/feature-tests/payable-features/scenarios/payable_egld_3.scen.json index bc72384a81..e59a136610 100644 --- a/contracts/feature-tests/payable-features/scenarios/payable_egld_3.scen.json +++ b/contracts/feature-tests/payable-features/scenarios/payable_egld_3.scen.json @@ -34,7 +34,7 @@ "expect": { "out": [ "0", - "str:EGLD" + "str:EGLD-000000" ], "status": "", "logs": "*", @@ -57,7 +57,7 @@ "expect": { "out": [ "5", - "str:EGLD" + "str:EGLD-000000" ], "status": "", "logs": "*", diff --git a/contracts/feature-tests/payable-features/scenarios/payable_egld_4.scen.json b/contracts/feature-tests/payable-features/scenarios/payable_egld_4.scen.json index da92bf5a59..4bad0626b1 100644 --- a/contracts/feature-tests/payable-features/scenarios/payable_egld_4.scen.json +++ b/contracts/feature-tests/payable-features/scenarios/payable_egld_4.scen.json @@ -34,7 +34,7 @@ "expect": { "out": [ "0", - "str:EGLD" + "str:EGLD-000000" ], "status": "", "logs": "*", @@ -57,7 +57,7 @@ "expect": { "out": [ "5", - "str:EGLD" + "str:EGLD-000000" ], "status": "", "logs": "*",