Skip to content
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.

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

Feat/tx with sc call #153

Merged
merged 61 commits into from
Jan 22, 2024
Merged
Changes from 1 commit
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
96a8b26
Add data and gasLimit
CostinCarabas Jul 10, 2023
9516111
Add bridge proxy to execute SC calls from Eth
CostinCarabas Jul 11, 2023
e373415
MultiTransfer: deposit funds and tx from Eth
CostinCarabas Jul 11, 2023
b345340
Framework update
CostinCarabas Jul 11, 2023
e924486
Bridge-proxy & Multi-Transfer
CostinCarabas Jul 12, 2023
76a97e6
Tests fix
CostinCarabas Aug 9, 2023
e70cd37
Test fix
CostinCarabas Aug 9, 2023
492ee3a
Fix tests
CostinCarabas Aug 9, 2023
f29acbf
Fix tests
CostinCarabas Aug 10, 2023
32224fc
Test fix
CostinCarabas Aug 10, 2023
3a42445
Tests fix
CostinCarabas Aug 11, 2023
07fb466
Framework upgrade 0.42
CostinCarabas Aug 11, 2023
864bcf0
bridge-proxy: Add tests
CostinCarabas Aug 13, 2023
b22ab53
Rename mandos -> scenarios
CostinCarabas Aug 13, 2023
b8e9086
Refactor bridge-proxy deposit test
CostinCarabas Aug 14, 2023
4c8596a
Add MultiTransferEsdt rust test
CostinCarabas Aug 14, 2023
deccdcd
Merge pull request #146 from multiversx/enable-tx-to-SC
CostinCarabas Aug 16, 2023
fbddf00
Merge pull request #149 from multiversx/add-tests-for-tx-with-SC
CostinCarabas Aug 16, 2023
2bc968b
fix MultiTransferEsdt init arguments
dragos-rebegea Oct 16, 2023
55142c7
remove MultiTransferEsdt init arguments
dragos-rebegea Oct 16, 2023
7231845
Merge pull request #152 from multiversx/fix-init-arguments
dragos-rebegea Oct 16, 2023
196565e
Merge pull request #150 from multiversx/bridge-proxy-tests
CostinCarabas Oct 17, 2023
743facd
add mintBurn or locking functionality
dragos-rebegea Oct 25, 2023
fc41c0d
fix proxytrait and always wrap tokens
dragos-rebegea Oct 26, 2023
1414d36
Merge branch 'feat/tx-with-SC-call' into mintBurn-or-locking
CostinCarabas Oct 27, 2023
dc4f12d
Fix compiling issues
CostinCarabas Oct 27, 2023
f85a3db
Fix clippy
CostinCarabas Oct 27, 2023
c6079b6
Fix dependencies
CostinCarabas Oct 27, 2023
ea878b3
Add blackbox test for Multi Transfer SC
CostinCarabas Oct 30, 2023
f90ac87
Add check storage for test
CostinCarabas Oct 30, 2023
23260b3
Fix compilation issues
CostinCarabas Nov 9, 2023
13c9034
add accumulated burned tokens
dragos-rebegea Nov 27, 2023
3228628
Framework upgrade 0.45.1
CostinCarabas Dec 5, 2023
da8fcec
Fixed after reviews
CostinCarabas Dec 20, 2023
b10b80c
add snippets for tx-with-SC-call
dragos-rebegea Dec 27, 2023
41522c5
Merge remote-tracking branch 'origin/main' into feat/tx-with-SC-call
dragos-rebegea Dec 27, 2023
3557b6e
Merge remote-tracking branch 'origin/feat/tx-with-SC-call' into mintB…
dragos-rebegea Dec 27, 2023
6c43b9d
Fixes after review
CostinCarabas Dec 27, 2023
dbf6668
Framework upgrade bridge-proxy to 0.45.2
CostinCarabas Dec 27, 2023
b249789
Merge branch 'feat/tx-with-SC-call' into mintBurn-or-locking
CostinCarabas Dec 27, 2023
3743ad0
Merge remote-tracking branch 'origin/mintBurn-or-locking' into mintBu…
CostinCarabas Dec 27, 2023
a93762f
Comiling fixes
CostinCarabas Dec 27, 2023
a9b512c
Actions: checks trigger also on feat branches
CostinCarabas Dec 27, 2023
531c35b
Merge pull request #158 from multiversx/actions-trigger-on-feat-branches
dragos-rebegea Dec 27, 2023
d1767c5
Multi transfer: Batch Transfer blackbox test
CostinCarabas Dec 29, 2023
1185594
Fix go tests - replace mandos -> scenarios
CostinCarabas Dec 29, 2023
37772a6
Fix mandos tests
CostinCarabas Dec 29, 2023
a40c1c0
Update price-aggregator to 0.45.2
CostinCarabas Jan 3, 2024
b9958ac
price-aggregator scenarios:Submit correctly prices
CostinCarabas Jan 4, 2024
455aaeb
Fix tests
CostinCarabas Jan 5, 2024
40d7189
Update Rust toolchain
CostinCarabas Jan 5, 2024
b7717ae
Rebranding elrond -> MultiversX
CostinCarabas Jan 5, 2024
d6d2ff2
Framework upgrade 0.46
CostinCarabas Jan 5, 2024
fb20be9
esdt-safe: tests: ix roles
CostinCarabas Jan 5, 2024
ba6292b
Bridge-proxy: Add option for args + tests
CostinCarabas Jan 9, 2024
8c54750
Bridge-proxy: transform args to ManagedVec
CostinCarabas Jan 10, 2024
a6c8ae1
Update common/token-module/src/lib.rs
CostinCarabas Jan 12, 2024
58546e3
Multi-transfer: Add new test
CostinCarabas Jan 12, 2024
40dc6ea
Framework upgrade 0.46.1
CostinCarabas Jan 19, 2024
12ea6db
Test fix
CostinCarabas Jan 19, 2024
bae95ea
Merge pull request #154 from multiversx/mintBurn-or-locking
sasurobert Jan 22, 2024
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
Prev Previous commit
Next Next commit
Fix clippy
CostinCarabas committed Oct 27, 2023
commit f85a3db83ecfba57a72dae028a0b5c216cd0b425
2 changes: 1 addition & 1 deletion common/token-module/src/lib.rs
Original file line number Diff line number Diff line change
@@ -94,7 +94,7 @@ pub trait TokenModule: fee_estimator_module::FeeEstimatorModule {
fn get_token(&self, token_id: &TokenIdentifier, amount: &BigUint) {
let caller = self.blockchain().get_caller();
require!(caller == self.multi_transfer_contract_address().get(), "Only MultiTransfer can get tokens");
if self.whitelisted_token_mint_burn(token_id).get() == true {
if self.whitelisted_token_mint_burn(token_id).get() {
self.mint_esdt_token(token_id, amount);
}

8 changes: 4 additions & 4 deletions esdt-safe/src/lib.rs
Original file line number Diff line number Diff line change
@@ -84,10 +84,10 @@ pub trait EsdtSafe:
// local burn role might be removed while tx is executed
// tokens will remain locked forever in that case
// otherwise, the whole batch would fail
if self.whitelisted_token_mint_burn(&tx.token_identifier).get() == true {
if self.is_local_role_set(&tx.token_identifier, &EsdtLocalRole::Burn) {
self.burn_esdt_token(&tx.token_identifier, &tx.amount);
}
if self.whitelisted_token_mint_burn(&tx.token_identifier).get()
&& self.is_local_role_set(&tx.token_identifier, &EsdtLocalRole::Burn)
{
self.burn_esdt_token(&tx.token_identifier, &tx.amount);
}
}
TransactionStatus::Rejected => {