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

Merge Feat/v3.1 #258

Draft
wants to merge 185 commits into
base: main
Choose a base branch
from
Draft

Merge Feat/v3.1 #258

wants to merge 185 commits into from

Conversation

CostinCarabas
Copy link
Contributor

No description provided.

evelinemolnar and others added 30 commits September 11, 2024 12:19
* set sc config based on endpoints needed and generated new proxies

* last updates

* .

* fixed proxy error

* proxy sc-config
* first-commit

* first-commit

* quick renane

* first-commit

* 99%

* small-fix

* .

* .

* .

* .

* white-box

* multi-contract

* .

* .

* change upgrade to init

* refactor - moved some tests in multitransafer blackbox

* forgot to include a proxy file

* fix case

* last-updates

* .

* .

* remove-duplicate-code

* clippy fixes

* fix proxy after merge

* fix clippy

* fix clippy

---------

Co-authored-by: evelinemolnar <[email protected]>
Co-authored-by: Molnar Noemi Eveline <[email protected]>
…v3intov3.5-03.10.24

# Conflicts:
#	bridge-proxy/src/bridge_proxy_contract_proxy.rs
#	common/token-module/src/lib.rs
#	esdt-safe/sc-config.toml
#	esdt-safe/src/lib.rs
#	esdt-safe/wasm/src/lib.rs
#	multi-transfer-esdt/src/bridge_proxy_contract_proxy.rs
#	multisig/src/esdt_safe_proxy.rs
#	multisig/src/multisig_proxy.rs
#	multisig/wasm/src/lib.rs
# Conflicts:
#	bridge-proxy/sc-config.toml
#	bridge-proxy/src/esdt_safe_proxy.rs
#	bridged-tokens-wrapper/src/esdt_safe_proxy.rs
#	multi-transfer-esdt/src/esdt_safe_proxy.rs
#	multi-transfer-esdt/tests/multi_transfer_blackbox_test.rs
#	multisig/src/esdt_safe_proxy.rs
…v3intov3.5-03.10.24

# Conflicts:
#	bridge-proxy/src/esdt_safe_proxy.rs
#	esdt-safe/src/lib.rs
Merge latest version of v3 into v3.5 04.10.24
CostinCarabas and others added 30 commits December 9, 2024 09:27
…fter-refund

bridge-proxy: Clear storages after refund
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.

5 participants