call value - egld/egld_direct_non_strict; egld_value deprecated

contracts/core/wegld-swap/src/wegld.rs

@@ -16,7 +16,7 @@ pub trait EgldEsdtSwap: multiversx_sc_modules::pause::PauseModule {
     fn wrap_egld(&self) -> EsdtTokenPayment<Self::Api> {
         self.require_not_paused();
 
-        let payment_amount = self.call_value().single_egld_value();
+        let payment_amount = self.call_value().egld();
         require!(*payment_amount > 0u32, "Payment must be more than 0");
 
         let wrapped_egld_token_id = self.wrapped_egld_token_id().get();

contracts/examples/crypto-bubbles/src/crypto_bubbles.rs

@@ -13,7 +13,7 @@ pub trait CryptoBubbles {
     #[payable("EGLD")]
     #[endpoint(topUp)]
     fn top_up(&self) {
-        let payment = self.call_value().single_egld_value();
+        let payment = self.call_value().egld();
         let caller = self.blockchain().get_caller();
         self.player_balance(&caller)
             .update(|balance| *balance += &*payment);
@@ -63,7 +63,7 @@ pub trait CryptoBubbles {
     #[payable("EGLD")]
     #[endpoint(joinGame)]
     fn join_game(&self, game_index: BigUint) {
-        let bet = self.call_value().single_egld_value();
+        let bet = self.call_value().egld();
         let player = self.blockchain().get_caller();
         self.top_up();
         self.add_player_to_game_state_change(&game_index, &player, &bet)

contracts/examples/crypto-kitties/kitty-auction/src/lib.rs

@@ -152,7 +152,7 @@ pub trait KittyAuction {
     #[payable("EGLD")]
     #[endpoint]
     fn bid(&self, kitty_id: u32) {
-        let payment = self.call_value().single_egld_value();
+        let payment = self.call_value().egld();
 
         require!(
             self.is_up_for_auction(kitty_id),

contracts/examples/crypto-kitties/kitty-ownership/src/lib.rs

@@ -287,7 +287,7 @@ pub trait KittyOwnership {
         require!(self.is_valid_id(matron_id), "Invalid matron id!");
         require!(self.is_valid_id(sire_id), "Invalid sire id!");
 
-        let payment = self.call_value().single_egld_value();
+        let payment = self.call_value().egld();
         let auto_birth_fee = self.birth_fee().get();
         let caller = self.blockchain().get_caller();
 

contracts/examples/crypto-zombies/src/zombie_helper.rs

@@ -19,7 +19,7 @@ pub trait ZombieHelper: storage::Storage {
     #[payable("EGLD")]
     #[endpoint]
     fn level_up(&self, zombie_id: usize) {
-        let payment_amount = self.call_value().single_egld_value();
+        let payment_amount = self.call_value().egld();
         let fee = self.level_up_fee().get();
         require!(*payment_amount == fee, "Payment must be must be 0.001 EGLD");
         self.zombies(&zombie_id)

contracts/examples/digital-cash/src/pay_fee_and_fund.rs

@@ -19,7 +19,7 @@ pub trait PayFeeAndFund: storage::StorageModule + helpers::HelpersModule {
     #[endpoint(payFeeAndFundEGLD)]
     #[payable("EGLD")]
     fn pay_fee_and_fund_egld(&self, address: ManagedAddress, valability: u64) {
-        let mut fund = self.call_value().single_egld_value().clone_value();
+        let mut fund = self.call_value().egld().clone_value();
         let fee_value = self.fee(&EgldOrEsdtTokenIdentifier::egld()).get();
         require!(fund > fee_value, "payment not covering fees");
 
@@ -43,7 +43,8 @@ pub trait PayFeeAndFund: storage::StorageModule + helpers::HelpersModule {
         );
         let deposited_fee_token = deposit_mapper.fees.value;
         let fee_amount = self.fee(&deposited_fee_token.token_identifier).get();
-        let egld_payment = self.call_value().egld_value().clone_value();
+        // TODO: switch to egld+esdt multi transfer handling
+        let egld_payment = self.call_value().egld_direct_non_strict().clone_value();
         let esdt_payment = self.call_value().all_esdt_transfers().clone_value();
 
         let num_tokens = self.get_num_token_transfers(&egld_payment, &esdt_payment);

contracts/examples/esdt-transfer-with-fee/src/esdt_transfer_with_fee.rs

@@ -47,7 +47,7 @@ pub trait EsdtTransferWithFee {
     #[endpoint]
     fn transfer(&self, address: ManagedAddress) {
         require!(
-            *self.call_value().egld_value() == 0,
+            *self.call_value().egld_direct_non_strict() == 0,
             "EGLD transfers not allowed"
         );
         let payments = self.call_value().all_esdt_transfers();

contracts/examples/fractional-nfts/src/fractional_nfts.rs

@@ -20,7 +20,7 @@ pub trait FractionalNfts: default_issue_callbacks::DefaultIssueCallbacksModule {
         token_ticker: ManagedBuffer,
         num_decimals: usize,
     ) {
-        let issue_cost = self.call_value().egld_value();
+        let issue_cost = self.call_value().egld();
         self.fractional_token().issue_and_set_all_roles(
             EsdtTokenType::SemiFungible,
             issue_cost.clone_value(),

contracts/examples/nft-minter/src/nft_module.rs

@@ -21,7 +21,7 @@ pub trait NftModule {
     fn issue_token(&self, token_name: ManagedBuffer, token_ticker: ManagedBuffer) {
         require!(self.nft_token_id().is_empty(), "Token already issued");
 
-        let payment_amount = self.call_value().egld_value();
+        let payment_amount = self.call_value().egld();
         self.send()
             .esdt_system_sc_proxy()
             .issue_non_fungible(

contracts/examples/nft-storage-prepay/src/nft_storage_prepay.rs

@@ -50,7 +50,7 @@ pub trait NftStoragePrepay {
     #[payable("EGLD")]
     #[endpoint(depositPaymentForStorage)]
     fn deposit_payment_for_storage(&self) {
-        let payment = self.call_value().egld_value();
+        let payment = self.call_value().egld();
         let caller = self.blockchain().get_caller();
         self.deposit(&caller)
             .update(|deposit| *deposit += &*payment);

contracts/examples/nft-subscription/src/lib.rs

@@ -12,10 +12,11 @@ pub trait NftSubscription:
     fn init(&self) {}
 
     #[endpoint]
+    #[payable("EGLD")]
     fn issue(&self) {
         self.token_id().issue_and_set_all_roles(
             EsdtTokenType::NonFungible,
-            self.call_value().egld_value().clone_value(),
+            self.call_value().egld().clone_value(),
             ManagedBuffer::from(b"Subscription"),
             ManagedBuffer::from(b"SUB"),
             0,

contracts/examples/ping-pong-egld/src/ping_pong.rs

@@ -69,7 +69,7 @@ pub trait PingPong {
     #[payable("EGLD")]
     #[endpoint]
     fn ping(&self, _data: IgnoreValue) {
-        let payment = self.call_value().egld_value();
+        let payment = self.call_value().egld();
 
         require!(
             *payment == self.ping_amount().get(),

contracts/examples/seed-nft-minter/src/nft_module.rs

@@ -25,7 +25,7 @@ pub trait NftModule:
     #[payable("EGLD")]
     #[endpoint(issueToken)]
     fn issue_token(&self, token_display_name: ManagedBuffer, token_ticker: ManagedBuffer) {
-        let issue_cost = self.call_value().egld_value();
+        let issue_cost = self.call_value().egld();
         self.nft_token_id().issue_and_set_all_roles(
             EsdtTokenType::NonFungible,
             issue_cost.clone_value(),

contracts/feature-tests/basic-features/src/storage_mapper_fungible_token.rs

@@ -11,7 +11,7 @@ pub trait FungibleTokenMapperFeatures:
         token_ticker: ManagedBuffer,
         initial_supply: BigUint,
     ) {
-        let payment_amount = self.call_value().egld_value();
+        let payment_amount = self.call_value().egld();
         self.fungible_token_mapper().issue(
             payment_amount.clone_value(),
             ManagedBuffer::new(),
@@ -25,7 +25,7 @@ pub trait FungibleTokenMapperFeatures:
     #[payable("EGLD")]
     #[endpoint]
     fn issue_fungible_custom_callback(&self, token_ticker: ManagedBuffer, initial_supply: BigUint) {
-        let payment = self.call_value().egld_value();
+        let payment = self.call_value().egld();
         let cb = if initial_supply > 0 {
             FungibleTokenMapperFeatures::callbacks(self).custom_issue_non_zero_supply_cb()
         } else {
@@ -74,7 +74,7 @@ pub trait FungibleTokenMapperFeatures:
     #[payable("EGLD")]
     #[endpoint]
     fn issue_and_set_all_roles_fungible(&self, token_ticker: ManagedBuffer) {
-        let payment = self.call_value().egld_value();
+        let payment = self.call_value().egld();
         self.fungible_token_mapper().issue_and_set_all_roles(
             payment.clone_value(),
             ManagedBuffer::new(),

contracts/feature-tests/basic-features/src/storage_mapper_non_fungible_token.rs

@@ -16,7 +16,7 @@ pub trait NonFungibleTokenMapperFeatures:
     #[payable("EGLD")]
     #[endpoint]
     fn issue_and_set_all_roles_meta(&self, token_ticker: ManagedBuffer) {
-        let payment = self.call_value().egld_value();
+        let payment = self.call_value().egld();
         self.non_fungible_token_mapper().issue_and_set_all_roles(
             EsdtTokenType::Meta,
             payment.clone_value(),

contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/src/lib.rs

@@ -17,7 +17,7 @@ pub trait Child {
         token_ticker: ManagedBuffer,
         initial_supply: BigUint,
     ) {
-        let issue_cost = self.call_value().single_egld_value();
+        let issue_cost = self.call_value().egld();
         self.send()
             .esdt_system_sc_proxy()
             .issue_fungible(

contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/src/lib.rs

@@ -38,7 +38,7 @@ pub trait Parent {
         token_ticker: ManagedBuffer,
         initial_supply: BigUint,
     ) {
-        let issue_cost = self.call_value().single_egld_value();
+        let issue_cost = self.call_value().egld();
         let child_contract_adress = self.child_contract_address().get();
 
         self.tx()

contracts/feature-tests/composability/forwarder-legacy/src/fwd_esdt_legacy.rs

@@ -90,7 +90,7 @@ pub trait ForwarderEsdtModule: fwd_storage_legacy::ForwarderStorageModule {
         token_ticker: ManagedBuffer,
         initial_supply: BigUint,
     ) {
-        let issue_cost = self.call_value().single_egld_value();
+        let issue_cost = self.call_value().egld();
         let caller = self.blockchain().get_caller();
 
         self.send()

contracts/feature-tests/composability/forwarder-legacy/src/fwd_nft_legacy.rs

@@ -52,7 +52,7 @@ pub trait ForwarderNftModule: fwd_storage_legacy::ForwarderStorageModule {
     #[payable("EGLD")]
     #[endpoint]
     fn nft_issue(&self, token_display_name: ManagedBuffer, token_ticker: ManagedBuffer) {
-        let issue_cost = self.call_value().single_egld_value();
+        let issue_cost = self.call_value().egld();
         let caller = self.blockchain().get_caller();
 
         self.send()

contracts/feature-tests/composability/forwarder-legacy/src/fwd_sft_legacy.rs

@@ -7,7 +7,7 @@ pub trait ForwarderSftModule: fwd_storage_legacy::ForwarderStorageModule {
     #[payable("EGLD")]
     #[endpoint]
     fn sft_issue(&self, token_display_name: ManagedBuffer, token_ticker: ManagedBuffer) {
-        let issue_cost = self.call_value().single_egld_value();
+        let issue_cost = self.call_value().egld();
         let caller = self.blockchain().get_caller();
 
         self.send()

contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw.rs

@@ -24,24 +24,13 @@ pub trait ForwarderRaw:
 
     #[callback_raw]
     fn callback_raw(&self, args: MultiValueEncoded<ManagedBuffer>) {
-        let payments = self.call_value().all_esdt_transfers();
-        if payments.is_empty() {
-            let egld_value = self.call_value().egld_value();
-            if *egld_value > 0 {
-                let _ = self.callback_payments().push(&(
-                    EgldOrEsdtTokenIdentifier::egld(),
-                    0,
-                    egld_value.clone_value(),
-                ));
-            }
-        } else {
-            for payment in payments.iter() {
-                let _ = self.callback_payments().push(&(
-                    EgldOrEsdtTokenIdentifier::esdt(payment.token_identifier.clone()),
-                    payment.token_nonce,
-                    payment.amount.clone(),
-                ));
-            }
+        let payments = self.call_value().all_transfers();
+        for payment in payments.iter() {
+            let _ = self.callback_payments().push(&(
+                payment.token_identifier.clone(),
+                payment.token_nonce,
+                payment.amount.clone(),
+            ));
         }
 
         let args_as_vec = args.into_vec_of_buffers();

contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_alt_init.rs

@@ -52,7 +52,7 @@ pub trait ForwarderRawAlterativeInit: super::forwarder_raw_common::ForwarderRawC
         endpoint_name: ManagedBuffer,
         args: MultiValueEncoded<ManagedBuffer>,
     ) {
-        let payment = self.call_value().single_egld_value();
+        let payment = self.call_value().egld();
         let half_gas = self.blockchain().get_gas_left() / 2;
 
         let result = self

contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_async.rs

@@ -91,7 +91,7 @@ pub trait ForwarderRawAsync: super::forwarder_raw_common::ForwarderRawCommon {
         endpoint_name: ManagedBuffer,
         args: MultiValueEncoded<ManagedBuffer>,
     ) {
-        let payment = self.call_value().single_egld_value();
+        let payment = self.call_value().egld();
         self.forward_contract_call(
             to,
             EgldOrEsdtTokenIdentifier::egld(),

contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_sync.rs

@@ -10,7 +10,7 @@ pub trait ForwarderRawSync: super::forwarder_raw_common::ForwarderRawCommon {
         endpoint_name: ManagedBuffer,
         args: MultiValueEncoded<ManagedBuffer>,
     ) {
-        let payment = self.call_value().single_egld_value().clone_value();
+        let payment = self.call_value().egld().clone_value();
         let half_gas = self.blockchain().get_gas_left() / 2;
         let result = self
             .tx()
@@ -33,7 +33,7 @@ pub trait ForwarderRawSync: super::forwarder_raw_common::ForwarderRawCommon {
         endpoint_name: ManagedBuffer,
         args: MultiValueEncoded<ManagedBuffer>,
     ) {
-        let payment = self.call_value().single_egld_value();
+        let payment = self.call_value().egld();
         let one_third_gas = self.blockchain().get_gas_left() / 3;
         let half_payment = &*payment / 2u32;
         let arg_buffer = args.to_arg_buffer();
@@ -71,7 +71,7 @@ pub trait ForwarderRawSync: super::forwarder_raw_common::ForwarderRawCommon {
         endpoint_name: ManagedBuffer,
         args: MultiValueEncoded<ManagedBuffer>,
     ) {
-        let payment = self.call_value().single_egld_value();
+        let payment = self.call_value().egld();
         let half_gas = self.blockchain().get_gas_left() / 2;
 
         let result = self

contracts/feature-tests/composability/forwarder/src/fwd_call_sync.rs

@@ -80,7 +80,7 @@ pub trait ForwarderSyncCallModule {
     #[endpoint]
     #[payable("EGLD")]
     fn forward_sync_accept_funds_rh_egld(&self, to: ManagedAddress) -> BigUint {
-        let payment = self.call_value().single_egld_value();
+        let payment = self.call_value().egld();
         let half_gas = self.blockchain().get_gas_left() / 2;
 
         self.tx()

contracts/feature-tests/composability/forwarder/src/fwd_esdt.rs

@@ -95,7 +95,7 @@ pub trait ForwarderEsdtModule: fwd_storage::ForwarderStorageModule {
         token_ticker: ManagedBuffer,
         initial_supply: BigUint,
     ) {
-        let issue_cost = self.call_value().single_egld_value();
+        let issue_cost = self.call_value().egld();
         let caller = self.blockchain().get_caller();
 
         self.send()

contracts/feature-tests/composability/forwarder/src/fwd_nft.rs

@@ -52,7 +52,7 @@ pub trait ForwarderNftModule: fwd_storage::ForwarderStorageModule {
     #[payable("EGLD")]
     #[endpoint]
     fn nft_issue(&self, token_display_name: ManagedBuffer, token_ticker: ManagedBuffer) {
-        let issue_cost = self.call_value().single_egld_value();
+        let issue_cost = self.call_value().egld();
         let caller = self.blockchain().get_caller();
 
         self.send()

contracts/feature-tests/composability/forwarder/src/fwd_sft.rs

@@ -7,7 +7,7 @@ pub trait ForwarderSftModule: fwd_storage::ForwarderStorageModule {
     #[payable("EGLD")]
     #[endpoint]
     fn sft_issue(&self, token_display_name: ManagedBuffer, token_ticker: ManagedBuffer) {
-        let issue_cost = self.call_value().single_egld_value();
+        let issue_cost = self.call_value().egld();
         let caller = self.blockchain().get_caller();
 
         self.send()

contracts/feature-tests/composability/local-esdt-and-nft/src/lib.rs

@@ -27,7 +27,7 @@ pub trait LocalEsdtAndEsdtNft {
         token_ticker: ManagedBuffer,
         initial_supply: BigUint,
     ) {
-        let issue_cost = self.call_value().single_egld_value();
+        let issue_cost = self.call_value().egld();
         let caller = self.blockchain().get_caller();
 
         self.send()
@@ -68,7 +68,7 @@ pub trait LocalEsdtAndEsdtNft {
     #[payable("EGLD")]
     #[endpoint(nftIssue)]
     fn nft_issue(&self, token_display_name: ManagedBuffer, token_ticker: ManagedBuffer) {
-        let issue_cost = self.call_value().single_egld_value();
+        let issue_cost = self.call_value().egld();
         let caller = self.blockchain().get_caller();
 
         self.send()
@@ -174,7 +174,7 @@ pub trait LocalEsdtAndEsdtNft {
     #[payable("EGLD")]
     #[endpoint(sftIssue)]
     fn sft_issue(&self, token_display_name: ManagedBuffer, token_ticker: ManagedBuffer) {
-        let issue_cost = self.call_value().single_egld_value();
+        let issue_cost = self.call_value().egld();
         let caller = self.blockchain().get_caller();
 
         self.send()

contracts/feature-tests/composability/proxy-test-first/src/proxy-test-first.rs

@@ -29,7 +29,7 @@ pub trait ProxyTestFirst {
     #[payable("EGLD")]
     #[endpoint(deploySecondContract)]
     fn deploy_second_contract(&self, code: ManagedBuffer) -> i32 {
-        let payment = self.call_value().single_egld_value();
+        let payment = self.call_value().egld();
 
         let (address, init_result) = self
             .tx()
@@ -49,7 +49,7 @@ pub trait ProxyTestFirst {
     #[payable("EGLD")]
     #[endpoint(upgradeSecondContract)]
     fn upgrade_second_contract(&self, code: ManagedBuffer) {
-        let payment = self.call_value().single_egld_value();
+        let payment = self.call_value().egld();
         let other_contract = self.get_other_contract();
 
         self.tx()
@@ -66,7 +66,7 @@ pub trait ProxyTestFirst {
     #[payable("EGLD")]
     #[endpoint(forwardToOtherContract)]
     fn forward_to_other_contract(&self) {
-        let payment = self.call_value().single_egld_value();
+        let payment = self.call_value().egld();
         let other_contract = self.get_other_contract();
         self.tx()
             .to(&other_contract)
@@ -79,7 +79,7 @@ pub trait ProxyTestFirst {
     #[payable("EGLD")]
     #[endpoint(forwardToOtherContractWithCallback)]
     fn forward_to_other_contract_with_callback(&self) {
-        let payment = self.call_value().single_egld_value();
+        let payment = self.call_value().egld();
         let other_contract = self.get_other_contract();
         self.tx()
             .to(&other_contract)