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

Feat/tx with sc call #153

merged 61 commits into from
Jan 22, 2024

Conversation

CostinCarabas
Copy link
Contributor

No description provided.

@CostinCarabas CostinCarabas marked this pull request as draft October 17, 2023 12:13
} else {
valid_dest_addresses_list.push(eth_tx.to);
valid_payments_list.push(EsdtTokenPayment::new(eth_tx.token_id, 0, eth_tx.amount));
}
}

let payments_after_wrapping = self.wrap_tokens(valid_payments_list);
Copy link
Collaborator

@dragos-rebegea dragos-rebegea Oct 24, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should first try to wrap tokens first, no matter if its a SC-call or not and only then to make a deposit on bridge proxy.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

agreed

dragos-rebegea and others added 3 commits December 27, 2023 12:49
…urn-or-locking

# Conflicts:
#	bridged-tokens-wrapper/Cargo.toml
#	bridged-tokens-wrapper/meta/Cargo.toml
#	bridged-tokens-wrapper/wasm/Cargo.lock
#	bridged-tokens-wrapper/wasm/Cargo.toml
#	common/eth-address/Cargo.toml
#	common/fee-estimator-module/Cargo.toml
#	common/max-bridged-amount-module/Cargo.toml
#	common/token-module/Cargo.toml
#	common/transaction/Cargo.toml
#	common/tx-batch-module/Cargo.toml
#	esdt-safe/Cargo.toml
#	esdt-safe/meta/Cargo.toml
#	esdt-safe/wasm/Cargo.toml
#	esdt-safe/wasm/src/lib.rs
#	multi-transfer-esdt/Cargo.toml
#	multi-transfer-esdt/meta/Cargo.toml
#	multi-transfer-esdt/wasm/Cargo.lock
#	multi-transfer-esdt/wasm/Cargo.toml
#	multi-transfer-esdt/wasm/src/lib.rs
#	multisig/Cargo.toml
#	multisig/meta/Cargo.toml
#	multisig/wasm/Cargo.lock
#	multisig/wasm/Cargo.toml
#	multisig/wasm/src/lib.rs
@CostinCarabas CostinCarabas marked this pull request as ready for review December 27, 2023 11:14
dragos-rebegea
dragos-rebegea previously approved these changes Dec 27, 2023
@sasurobert sasurobert merged commit 1596483 into feat/v3 Jan 22, 2024
7 checks passed
Copy link

Contract comparison - from 8c1438e to bae95ea

Path                                                                                             size                  has-allocator                     has-format
mx-bridge-eth-sc-rs
- bridged-tokens-wrapper/bridged-tokens-wrapper.wasm 8826 ➡️ 8777 🟢 No No
- esdt-safe/esdt-safe.wasm 19744 ➡️ 21412 🔴 No No
- multi-transfer-esdt/multi-transfer-esdt.wasm 14262 ➡️ 18626 🔴 No No
- multisig/multisig.wasm 27982 ➡️ 30550 🔴 No No
- bridge-proxy/bridge-proxy.wasm N/A ➡️ 12801 ⚠️ N/A ➡️ No ⚠️ N/A ➡️ No ⚠️

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants