Skip to content

chain simulator tests with payments #2098

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

chain simulator tests with payments #2098

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
199 changes: 151 additions & 48 deletions contracts/feature-tests/composability/forwarder-interactor/src/interact.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ mod config;
mod proxy;

pub use config::Config;
use forwarder::vault_proxy;
use multiversx_sc_snippets::imports::*;
pub use proxy::Color;
use serde::{Deserialize, Serialize};
Expand All @@ -23,6 +24,8 @@ pub const FORWARDER_UPDATE_TOKEN_INTERACTOR_TRACE_PATH: &str =
"scenarios/forwarder_update_token_scenario.scen.json";
pub const FORWARDER_MODIFY_CREATOR_INTERACTOR_TRACE_PATH: &str =
"scenarios/forwarder_modify_creator_scenario.scen.json";
const VAULT_CODE: MxscPath =
MxscPath::new("../contracts/feature-tests/composability/vault/output/vault.mxsc.json");

pub async fn forwarder_cli() {
env_logger::init();
Expand All @@ -32,7 +35,7 @@ pub async fn forwarder_cli() {
let cmd = args.next().expect("at least one argument required");
let mut interact = ContractInteract::new(Config::new(), None).await;
match cmd.as_str() {
"deploy" => interact.deploy().await,
// "deploy" => interact.deploy().await,
"send_egld" => interact.send_egld().await,
"echo_arguments_sync" => interact.echo_arguments_sync().await,
"echo_arguments_sync_twice" => interact.echo_arguments_sync_twice().await,
Expand Down Expand Up @@ -87,12 +90,12 @@ pub async fn forwarder_cli() {
.await
},
"transf_exec_multi_accept_funds" => interact.transf_exec_multi_accept_funds().await,
"forward_transf_exec_reject_funds_multi_transfer" => {
interact
.forward_transf_exec_reject_funds_multi_transfer()
.await
},
"transf_exec_multi_reject_funds" => interact.transf_exec_multi_reject_funds().await,
// "forward_transf_exec_reject_funds_multi_transfer" => {
// interact
// .forward_transf_exec_reject_funds_multi_transfer()
// .await
// },
// "transf_exec_multi_reject_funds" => interact.transf_exec_multi_reject_funds().await,
"changeOwnerAddress" => interact.change_owner().await,
"deploy_contract" => interact.deploy_contract().await,
"deploy_two_contracts" => interact.deploy_two_contracts().await,
Expand Down Expand Up @@ -175,7 +178,7 @@ impl Drop for State {
}

pub struct ContractInteract {
interactor: Interactor,
pub interactor: Interactor,
pub wallet_address: Address,
contract_code: BytesValue,
pub state: State,
Expand Down Expand Up @@ -211,8 +214,8 @@ impl ContractInteract {
}
}

pub async fn deploy(&mut self) {
let new_address = self
pub async fn deploy(&mut self) -> (Bech32Address, u64) {
let (new_address, gas_used) = self
.interactor
.tx()
.from(&self.wallet_address)
Expand All @@ -221,14 +224,18 @@ impl ContractInteract {
.init()
.code(&self.contract_code)
.returns(ReturnsNewAddress)
.returns(ReturnsGasUsed)
.run()
.await;

let new_address_bech32 = bech32::encode(&new_address);
self.state.set_address(Bech32Address::from_bech32_string(
new_address_bech32.clone(),
));

println!("new address: {new_address_bech32}");

(new_address.into(), gas_used)
}

pub async fn send_egld(&mut self) {
Expand Down Expand Up @@ -916,58 +923,68 @@ impl ContractInteract {
println!("Result: {response:?}");
}

pub async fn forward_transf_exec_reject_funds_multi_transfer(&mut self) {
let to = Address::zero();
let token_payments = MultiValueVec::from(vec![MultiValue3::<
TokenIdentifier<StaticApi>,
u64,
BigUint<StaticApi>,
>::from((
TokenIdentifier::from_esdt_bytes(&b""[..]),
0u64,
BigUint::<StaticApi>::from(0u128),
))]);
// pub async fn forward_transf_exec_reject_funds_multi_transfer(&mut self) {
// let to = Address::zero();
// let token_payments = MultiValueVec::from(vec![MultiValue3::<
// TokenIdentifier<StaticApi>,
// u64,
// BigUint<StaticApi>,
// >::from((
// TokenIdentifier::from_esdt_bytes(&b""[..]),
// 0u64,
// BigUint::<StaticApi>::from(0u128),
// ))]);

let response = self
.interactor
.tx()
.from(&self.wallet_address)
.to(self.state.current_address())
.gas(80_000_000u64)
.typed(proxy::ForwarderProxy)
.forward_transf_exec_reject_funds_multi_transfer(to, token_payments)
.returns(ReturnsResultUnmanaged)
.run()
.await;
// let response = self
// .interactor
// .tx()
// .from(&self.wallet_address)
// .to(self.state.current_address())
// .gas(80_000_000u64)
// .typed(proxy::ForwarderProxy)
// .forward_transf_exec_reject_funds_multi_transfer(to, token_payments)
// .returns(ReturnsResultUnmanaged)
// .run()
// .await;

println!("Result: {response:?}");
}
// println!("Result: {response:?}");
// }

pub async fn transf_exec_multi_reject_funds(&mut self) {
let to = Address::zero();
let token_payments = MultiValueVec::from(vec![MultiValue3::<
TokenIdentifier<StaticApi>,
u64,
BigUint<StaticApi>,
>::from((
TokenIdentifier::from_esdt_bytes(&b""[..]),
0u64,
BigUint::<StaticApi>::from(0u128),
))]);
pub async fn transf_exec_multi_reject_funds(
&mut self,
to: Bech32Address,
vec_of_payments: Vec<EgldOrEsdtTokenPayment<StaticApi>>,
) -> u64 {
let vec = vec_of_payments
.iter()
.map(|e| {
MultiValue3::from((e.token_identifier.clone(), e.token_nonce, e.amount.clone()))
})
.collect::<MultiValueEncoded<
StaticApi,
MultiValue3<EgldOrEsdtTokenIdentifier<StaticApi>, u64, BigUint<StaticApi>>,
>>();

let response = self
let vec_param =
ManagedVec::<StaticApi, EgldOrEsdtTokenPayment<StaticApi>>::from(vec_of_payments);

let (response, gas_used) = self
.interactor
.tx()
.from(&self.wallet_address)
.to(self.state.current_address())
.gas(80_000_000u64)
.typed(proxy::ForwarderProxy)
.transf_exec_multi_reject_funds(to, token_payments)
.returns(ReturnsResultUnmanaged)
.transf_exec_multi_reject_funds(to, vec)
.payment(vec_param)
.returns(ExpectMessage("reject_funds"))
.returns(ReturnsGasUsed)
.run()
.await;

println!("Result: {response:?}");

gas_used
}

pub async fn change_owner(&mut self) {
Expand Down Expand Up @@ -2102,4 +2119,90 @@ impl ContractInteract {
.run()
.await;
}

pub async fn deploy_vault(&mut self) -> (Bech32Address, u64) {
let (new_address, gas_used) = self
.interactor
.tx()
.from(&self.wallet_address)
.gas(300_000_000u64)
.typed(vault_proxy::VaultProxy)
.init(OptionalValue::<ManagedBuffer<StaticApi>>::None)
.code(VAULT_CODE)
.returns(ReturnsNewAddress)
.returns(ReturnsGasUsed)
.run()
.await;
let new_address_bech32 = bech32::encode(&new_address);

println!("new vault address: {new_address_bech32}");

(new_address.into(), gas_used)
}

pub async fn forward_send_async_reject_multi_transfer(
&mut self,
to: Bech32Address,
vec_of_payments: Vec<EgldOrEsdtTokenPayment<StaticApi>>,
) {
let vec = vec_of_payments
.iter()
.map(|e| {
MultiValue3::from((e.token_identifier.clone(), e.token_nonce, e.amount.clone()))
})
.collect::<MultiValueEncoded<
StaticApi,
MultiValue3<EgldOrEsdtTokenIdentifier<StaticApi>, u64, BigUint<StaticApi>>,
>>();

let vec_param =
ManagedVec::<StaticApi, EgldOrEsdtTokenPayment<StaticApi>>::from(vec_of_payments);

let response = self
.interactor
.tx()
.from(&self.wallet_address)
.to(self.state.current_address())
.gas(80_000_000u64)
.typed(proxy::ForwarderProxy)
.send_async_reject_multi_transfer(to.into_address(), vec)
.payment(vec_param)
.returns(ReturnsHandledOrError::new().returns(ExpectMessage("reject_funds")))
.run()
.await;

println!("Result: {response:?}");
}

pub async fn issue_fungible_token_from_wallet(
&mut self,
token_display_name: &[u8],
token_ticker: &[u8],
initial_supply: u64,
) -> (String, u64) {
let egld_amount = BigUint::<StaticApi>::from(5_000_000_000_000_000_0u128);

let (response, gas_used) = self
.interactor
.tx()
.from(&self.wallet_address)
.to(ESDTSystemSCAddress)
.gas(80_000_000u64)
.typed(system_proxy::ESDTSystemSCProxy)
.issue_fungible(
egld_amount,
token_display_name,
token_ticker,
BigUint::from(initial_supply),
FungibleTokenProperties::default(),
)
.returns(ReturnsNewTokenIdentifier)
.returns(ReturnsGasUsed)
.run()
.await;

println!("Result: {response:?}");

(response, gas_used)
}
}
6 changes: 2 additions & 4 deletions contracts/feature-tests/composability/forwarder-interactor/src/proxy.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,9 +366,8 @@ where
self,
to: Arg0,
payment_args: Arg1,
) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
) -> TxTypedCall<Env, From, To, (), Gas, ()> {
self.wrapped_tx
.payment(NotPayable)
.raw_call("send_async_reject_multi_transfer")
.argument(&to)
.argument(&payment_args)
Expand Down Expand Up @@ -482,9 +481,8 @@ where
self,
to: Arg0,
payment_args: Arg1,
) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
) -> TxTypedCall<Env, From, To, (), Gas, ()> {
self.wrapped_tx
.payment(NotPayable)
.raw_call("transf_exec_multi_reject_funds")
.argument(&to)
.argument(&payment_args)
Expand Down
2 changes: 1 addition & 1 deletion contracts/feature-tests/composability/forwarder-interactor/state.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
contract_address = "erd1qqqqqqqqqqqqqpgqm6d7cp70y7ft6xe78f7np9agdm7vpce6d8sskuuxnu"
contract_address = "erd1qqqqqqqqqqqqqpgqlz32muzjtu40pp9lapy35n0cvrdxll47d8ss9ne0ta"
Loading