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 125 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
125 commits
Select commit Hold shift + click to select a range
b88edf9
update sc-config for proxies (#206)
evelinemolnar Sep 11, 2024
4bdab8a
Feat 3.5 implementation (#196)
dragos-rebegea Sep 12, 2024
619ada2
Merge branch 'feat/v3' into 'feat/v3.5'
cosmatudor Sep 12, 2024
75151d3
fixes after merge part 1
cosmatudor Sep 12, 2024
dc40cae
fixes after merge part 2
evelinemolnar Sep 12, 2024
8c4eefd
removed set mint and set total balances
evelinemolnar Sep 12, 2024
f6f1155
Merge pull request #210 from multiversx/merge-v3-to-v3.5-12.09.2024-v2
iulianpascalau Sep 13, 2024
e40780a
Refactor sc-proxies to common
CostinCarabas Oct 2, 2024
72d804b
Fix compilation issues
CostinCarabas Oct 2, 2024
3453c86
Merge remote-tracking branch 'refs/remotes/origin/feat/v3' into merge…
evelinemolnar Oct 3, 2024
2c6f546
still needs work
evelinemolnar Oct 3, 2024
3692d70
fixes-2
evelinemolnar Oct 3, 2024
4eb3fda
Merge branch 'refs/heads/feat/v3' into mergev3intov3.5-03.10.24
evelinemolnar Oct 3, 2024
ef124b3
update-merge
evelinemolnar Oct 3, 2024
95ebc7b
fixes
evelinemolnar Oct 4, 2024
9c0fdde
Merge remote-tracking branch 'refs/remotes/origin/feat/v3' into merge…
evelinemolnar Oct 4, 2024
945b8c9
fixes after last merge
evelinemolnar Oct 4, 2024
b87e1c5
clippy-fixes
evelinemolnar Oct 4, 2024
5c3c0ac
fix test
evelinemolnar Oct 4, 2024
6b9cb20
Merge pull request #217 from multiversx/mergev3intov3.5-03.10.24
dragos-rebegea Oct 7, 2024
f2784da
edst-safe refactor
evelinemolnar Oct 7, 2024
3a00a35
small-update
evelinemolnar Oct 7, 2024
80875d0
Merge remote-tracking branch 'origin/feat/v3.5' into sc-proxies-refactor
CostinCarabas Oct 7, 2024
d8ae039
Fixes after merge
CostinCarabas Oct 7, 2024
d81bdcb
some changes
evelinemolnar Oct 9, 2024
f9d4f2c
Merge pull request #215 from multiversx/sc-proxies-refactor
CostinCarabas Oct 10, 2024
7de4af3
Mock contracts: create wrapper and safe
CostinCarabas Oct 10, 2024
94f5a94
Add more mock contracts
CostinCarabas Oct 10, 2024
4b3ac6a
mock contracts compilation
CostinCarabas Oct 10, 2024
ef00917
Update gitignore
CostinCarabas Oct 10, 2024
af658a9
Framework upgrade
CostinCarabas Oct 10, 2024
d98f790
Remove "workspace" from mock-contracts
CostinCarabas Oct 11, 2024
1e7e3fa
bridge-proxy: use mock-contracts for blackbox
CostinCarabas Oct 11, 2024
eb2ac05
Fix compilation issues
CostinCarabas Oct 11, 2024
3bc6706
Merge pull request #223 from multiversx/bridge-proxy-unit-tests
CostinCarabas Oct 11, 2024
16339c5
mock-contracts: add init parameters
CostinCarabas Oct 11, 2024
6bbbd4d
Remove unnecessary files
CostinCarabas Oct 11, 2024
a3f10fb
Allow deprecated whitebox tests
CostinCarabas Oct 11, 2024
3b74c72
bridge-proxy: blackbox remove commented code
CostinCarabas Oct 11, 2024
817a813
bridge-proxy: Add unit tests
CostinCarabas Oct 11, 2024
04ad36c
Add blackbox tests for multisig and bridge-proxy
CostinCarabas Oct 14, 2024
a6589be
Framework upgrade 0.53.2
CostinCarabas Oct 17, 2024
843f9ff
Update proxies
CostinCarabas Oct 17, 2024
e550526
Fix multi-transfer-esdt-proxy
CostinCarabas Oct 17, 2024
4bfa1b5
Merge pull request #234 from multiversx/framework-upgrade-0.53.2
CostinCarabas Oct 17, 2024
e8847b0
Remove comments
CostinCarabas Oct 18, 2024
15e99bc
Merge branch 'feat/v3.5' into create-mock-contracts
CostinCarabas Oct 18, 2024
bc8d614
Remove unused comments
CostinCarabas Oct 18, 2024
21545a2
Merge remote-tracking branch 'origin/feat/v3' into merge-v3-into-v3.5…
evelinemolnar Oct 18, 2024
d6f4c7e
fixes-after-merge
evelinemolnar Oct 18, 2024
ff3cdb2
esdt-safe-fixes
evelinemolnar Oct 18, 2024
6a0d1cc
Merge pull request #236 from multiversx/merge-v3-into-v3.5-18.10.2024
evelinemolnar Oct 21, 2024
3eb0390
Merge branch 'feat/v3.5' into create-mock-contracts
CostinCarabas Oct 21, 2024
5c1acb8
Fix test
CostinCarabas Oct 21, 2024
eb7fa9d
Merge pull request #222 from multiversx/create-mock-contracts
dragos-rebegea Oct 21, 2024
ab153b1
Merge branch 'feat/v3.5' into refactor-scstorage
evelinemolnar Oct 22, 2024
27db8e8
refactor after merge
evelinemolnar Oct 24, 2024
13ce3a3
small-fix
evelinemolnar Oct 24, 2024
bb43e3f
clippy-fix
evelinemolnar Oct 24, 2024
b4a8f68
esdt-safe: fix mandos scenarios
CostinCarabas Oct 25, 2024
7de1c32
multi-transfer: Fix mandos scenarios
CostinCarabas Oct 25, 2024
e63daec
multisig: scenarios fix
CostinCarabas Oct 25, 2024
75b8400
Fix mandos scenarios
CostinCarabas Oct 25, 2024
3cf0374
moved some unit tests
evelinemolnar Oct 25, 2024
1af605b
small-fix-esdt-safe
evelinemolnar Oct 25, 2024
d85a1b1
small test adjustment
evelinemolnar Oct 25, 2024
cfda29f
revert a line
evelinemolnar Oct 25, 2024
3d70a33
remove duplicated and unused code
evelinemolnar Oct 25, 2024
494e650
cleaner-code + typo
evelinemolnar Oct 25, 2024
6f11d59
fix from v3
evelinemolnar Oct 27, 2024
d688b47
increase esdt-safe code coverage to +80%
evelinemolnar Oct 29, 2024
bff1985
clippy fix...
evelinemolnar Oct 29, 2024
4b9b859
Merge branch 'feat/v3.5' into merge-v3-to-v3.5-29.10.2024
dragos-rebegea Oct 29, 2024
b24f35a
Merge branch 'feat/v3.5' into bridge-proxy-more-unit-tests
CostinCarabas Oct 30, 2024
f43acbe
upgrade test
evelinemolnar Oct 30, 2024
be4c206
fix tests
evelinemolnar Oct 30, 2024
7b7974a
Merge pull request #244 from multiversx/merge-v3-to-v3.5-29.10.2024
evelinemolnar Oct 30, 2024
fed22da
Merge branch 'feat/v3.5' into refactor-scstorage
evelinemolnar Oct 30, 2024
92c7abd
fix test after merge with v3.5
evelinemolnar Oct 30, 2024
8a04dbf
Merge branch 'refactor-scstorage' into multi-transfer-unit-tests
evelinemolnar Oct 30, 2024
c660c3a
delete empty lines
evelinemolnar Oct 30, 2024
1ed5fdd
new test case
evelinemolnar Oct 30, 2024
58517e7
Merge remote-tracking branch 'refs/remotes/origin/bridge-proxy-more-u…
evelinemolnar Oct 30, 2024
3c5b4de
merge and more unit tests
evelinemolnar Oct 30, 2024
2d285a8
Merge branch 'feat/v3.5' into bridge-proxy-more-unit-tests
CostinCarabas Oct 30, 2024
0280749
more tests
evelinemolnar Oct 31, 2024
5595b1a
Merge branch 'feat/v3' into merge-v3-into-v3.5n1.11v1
evelinemolnar Nov 4, 2024
4177749
mock-proxies
evelinemolnar Nov 4, 2024
697dde1
Merge pull request #248 from multiversx/merge-v3-into-v3.5n1.11v1
dragos-rebegea Nov 4, 2024
c9eb08a
Merge branch 'feat/v3.5' into refactor-scstorage
dragos-rebegea Nov 4, 2024
577f97a
Merge branch 'feat/v3.5' into bridge-proxy-more-unit-tests
dragos-rebegea Nov 4, 2024
19fbf7e
add mock multitransfer and fix test
evelinemolnar Nov 4, 2024
34639d5
Merge pull request #219 from multiversx/refactor-scstorage
dragos-rebegea Nov 4, 2024
f80e2d9
Merge branch 'feat/v3.5' into multi-transfer-unit-tests
evelinemolnar Nov 4, 2024
a1d8ef6
Merge pull request #247 from multiversx/multi-transfer-unit-tests
evelinemolnar Nov 4, 2024
81f5311
Merge branch 'feat/v3.5' into bridge-proxy-more-unit-tests
dragos-rebegea Nov 4, 2024
4f8db64
fix after merge
evelinemolnar Nov 4, 2024
b406a83
Merge branch 'feat/v3.5' into multisig-unit-tests
evelinemolnar Nov 4, 2024
56c04ff
Merge branch 'bridge-proxy-more-unit-tests' into multisig-unit-tests
evelinemolnar Nov 4, 2024
22a2cd4
more unit tests
evelinemolnar Nov 4, 2024
8630423
add setup unit tests
evelinemolnar Nov 5, 2024
3298ce7
2 lines coverage
evelinemolnar Nov 5, 2024
7b2595c
remove comm
evelinemolnar Nov 5, 2024
e2f2cc7
clippy fix
evelinemolnar Nov 5, 2024
5160b17
change mock esdt safe signature function
evelinemolnar Nov 5, 2024
cb4c3a7
fix check account
evelinemolnar Nov 7, 2024
6fc1722
solved todo's
evelinemolnar Nov 7, 2024
416e610
remove comments & unachievable tests
evelinemolnar Nov 8, 2024
4bb7379
Merge pull request #226 from multiversx/bridge-proxy-more-unit-tests
evelinemolnar Nov 8, 2024
64fb7b9
Merge branch 'feat/v3.5' into multisig-unit-tests
evelinemolnar Nov 8, 2024
47cae92
Merge branch 'feat/v3' into mergev3intov3.5_11.11
evelinemolnar Nov 11, 2024
ceaaa21
add more checks for storages and balances
evelinemolnar Nov 12, 2024
ee15680
self review refactor
evelinemolnar Nov 12, 2024
0ec529d
clippy...
evelinemolnar Nov 12, 2024
919fc98
Merge pull request #253 from multiversx/mergev3intov3.5_11.11
dragos-rebegea Nov 13, 2024
f3bc71e
Merge branch 'feat/v3.5' into multisig-unit-tests
evelinemolnar Nov 13, 2024
de97869
refactor managed address
evelinemolnar Nov 13, 2024
ed91e16
esdt-safe: Remove create_transaction with sc_call
CostinCarabas Dec 3, 2024
dbee365
Merge remote-tracking branch 'origin/main' into feat/v3.1
CostinCarabas Dec 3, 2024
c198c69
Merge pull request #260 from multiversx/merge-main-to-v3.1
CostinCarabas Dec 3, 2024
ea7ea9b
Merge pull request #259 from multiversx/remove-sc-call-create-transac…
CostinCarabas Dec 3, 2024
31805a0
Merge branch 'feat/v3.1' into multisig-unit-tests
CostinCarabas Dec 10, 2024
e3fed00
Merge pull request #249 from multiversx/multisig-unit-tests
CostinCarabas Dec 10, 2024
060b253
- added new endpoint in test caller
iulianpascalau Dec 12, 2024
7eb68ea
Merge pull request #264 from multiversx/new-endpoint-in-test-caller
iulianpascalau Dec 13, 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
42 changes: 37 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,44 @@
# Generated by Cargo
# will have compiled files and executables
/target/
**/target/**

# Remove Cargo.lock from the framework, but not from the wasm contracts.
# In contracts it helps with tracing builds.
# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
# The root Cargo.lock is kept for dependabot.
contracts/**/Cargo.lock
!contracts/**/wasm*/Cargo.lock
contracts/**/output*/
data/**/Cargo.lock
framework/**/Cargo.lock
sdk/**/Cargo.lock
tools/**/Cargo.lock
vm/**/Cargo.lock



# Coverage outputs
*.profraw
*.profdata
*.coverage
coverage.md

# These are backup files generated by rustfmt
**/*.rs.bk

# Local testnet files
**/deploy-testnet.interaction.json
# Editors config
.vscode
.zed
.idea

tags

# MultiversX IDE
**/node_modules
**/output/**
**/testnet/**
**/mxpy.data-storage.json
**/testnet/
**/deploy-child-sc-spam.json
**/*.interaction.json

# Python scripts
**/__pycache__/**
Loading
Loading