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

rc/v3.0 #877

Merged
merged 182 commits into from
Oct 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
182 commits
Select commit Hold shift + click to select a range
5554556
Remove the SC check for XMEX unwrap endpoint
psorinionut Feb 26, 2024
6a2cd7c
Safe price with weighted LP supply
psorinionut Mar 4, 2024
2c09f85
small refactor + decoding test
psorinionut Mar 6, 2024
204dc15
Merge branch 'main' into remove-sc-check-for-xmex-unwrap
psorinionut Mar 13, 2024
7a4f5a1
Safe Price accumulated LP supply migration fix
psorinionut Mar 25, 2024
2f5e66c
Energy factory extra checks for public endpoints
psorinionut Mar 26, 2024
b72b93c
small code update
psorinionut Mar 26, 2024
d06040a
set boosted yields percentage fix
psorinionut Apr 4, 2024
df2e51d
Simple lock whitelist audit improvements
psorinionut Apr 5, 2024
5a2b1ef
test fix
psorinionut Apr 5, 2024
f4dcc04
transfer roles status backwards compatibility fix
psorinionut Apr 8, 2024
44cbbf1
Farm tests with original caller merge fix
psorinionut Apr 8, 2024
e4cfd13
clippy fixes
psorinionut Apr 8, 2024
62397cf
Merge branch 'rc/v3.0' into safe-price-with-weighted-lp-supply
psorinionut Apr 8, 2024
6e3a976
Merge pull request #850 from multiversx/safe-price-with-weighted-lp-s…
psorinionut Apr 8, 2024
ad7fa88
Merge pull request #863 from multiversx/safe-price-lp-supply-migratio…
psorinionut Apr 8, 2024
d7dc1ac
Safe Price tests clippy fixes
psorinionut Apr 8, 2024
b1dade8
Merge branch 'rc/v3.0' into simple-lock-whitelist-audit-improvements
psorinionut Apr 8, 2024
1008496
Merge pull request #878 from multiversx/safe-price-tests-clippy-fixes
psorinionut Apr 8, 2024
0605d5c
Merge branch 'rc/v3.0' into remove-sc-check-for-xmex-unwrap
psorinionut Apr 9, 2024
22bc850
Merge branch 'rc/v3.0' into energy-factory-extra-checks
psorinionut Apr 9, 2024
1e82432
Merge branch 'rc/v3.0' into set-boosted-yields-percentage-fix
psorinionut Apr 9, 2024
dd5a53c
Merge branch 'rc/v3.0' into simple-lock-whitelist-audit-improvements
psorinionut Apr 9, 2024
80bcfba
Merge branch 'rc/v3.0' into farm-tests-with-original-caller-merge-fix
dorin-iancu Apr 9, 2024
ce8b833
Github actions on rc branches
psorinionut Apr 9, 2024
5db6ed3
Merge pull request #880 from multiversx/github-actions-rc-branch
psorinionut Apr 9, 2024
a31f2b3
Merge branch 'rc/v3.0' into energy-factory-extra-checks
psorinionut Apr 9, 2024
c4c7d83
Merge pull request #864 from multiversx/energy-factory-extra-checks
psorinionut Apr 9, 2024
231795e
Merge branch 'rc/v3.0' into set-boosted-yields-percentage-fix
psorinionut Apr 9, 2024
5c98533
Merge pull request #871 from multiversx/set-boosted-yields-percentage…
psorinionut Apr 9, 2024
163fd1d
Merge branch 'rc/v3.0' into simple-lock-whitelist-audit-improvements
psorinionut Apr 9, 2024
9be39cf
Merge pull request #872 from multiversx/simple-lock-whitelist-audit-i…
psorinionut Apr 9, 2024
a55d58b
Merge branch 'rc/v3.0' into remove-sc-check-for-xmex-unwrap
psorinionut Apr 9, 2024
3fb4c2d
Merge pull request #846 from multiversx/remove-sc-check-for-xmex-unwrap
psorinionut Apr 9, 2024
4aaa01f
Merge branch 'rc/v3.0' into farm-tests-with-original-caller-merge-fix
psorinionut Apr 9, 2024
b21ea70
Router check pair refactor
psorinionut Apr 10, 2024
16f0d72
clippy fixes
psorinionut Apr 10, 2024
e09da89
framework update v0.48.0
psorinionut Apr 11, 2024
b01507b
add check on enable swap by user
psorinionut Apr 11, 2024
19e8ce3
Farm staking merge fix + unit tests
psorinionut Apr 11, 2024
74c16af
use FarmStakingWrapper for merge endpoint
psorinionut Apr 12, 2024
154b56a
Merge pull request #875 from multiversx/farm-tests-with-original-call…
psorinionut Apr 12, 2024
04ecfe4
Merge branch 'rc/v3.0' into farm-staking-tests-with-merge-fix
psorinionut Apr 12, 2024
0d174b9
Merge branch 'rc/v3.0' into framework-upgrade-v0.48.0
andrei-marinica Apr 12, 2024
7bdcf2f
Merge pull request #887 from multiversx/framework-upgrade-v0.48.0
andrei-marinica Apr 12, 2024
4463206
upgrade annotation
andrei-marinica Apr 12, 2024
0f92c4f
cargo fmt
andrei-marinica Apr 12, 2024
cb32307
Merge pull request #889 from multiversx/upgrade-annotation
andrei-marinica Apr 12, 2024
1f215e6
Merge branch 'rc/v3.0' into router-check-is-pair-refactor
psorinionut Apr 12, 2024
88ab1ca
router fix after framework upgrade
psorinionut Apr 12, 2024
baa4c13
Merge branch 'rc/v3.0' into farm-staking-tests-with-merge-fix
psorinionut Apr 12, 2024
c572908
energy factory tests
psorinionut Apr 12, 2024
ef12603
remove unneeded check
psorinionut Apr 15, 2024
6b5442e
total farm position through simple lock test
psorinionut Apr 15, 2024
f9b5a0d
farm updated tests
psorinionut Apr 15, 2024
ec4b550
add back the router reverse check pair logic
psorinionut Apr 16, 2024
954d65c
code cleanup
psorinionut Apr 16, 2024
a97b9c3
Merge pull request #886 from multiversx/router-check-is-pair-refactor
psorinionut Apr 16, 2024
6c2a608
farm staking proxy unit tests
psorinionut Apr 16, 2024
a470bc3
Merge branch 'rc/v3.0' into farm-staking-tests-with-merge-fix
psorinionut Apr 16, 2024
4544a92
merge logic update orig owner in a separate fn for safer future impl …
psorinionut Apr 16, 2024
27085fb
Merge pull request #888 from multiversx/farm-staking-tests-with-merge…
psorinionut Apr 17, 2024
08ef135
Merge branch 'rc/v3.0' into v3.0-various-unit-tests
psorinionut Apr 17, 2024
ee10fe1
clippy fixes
psorinionut Apr 18, 2024
fe7e92d
Proxy-dex: farm: original caller negative test
CostinCarabas Apr 23, 2024
e993235
original caller merge fix
psorinionut Apr 23, 2024
031b36a
proxy_dex: more unit tests
CostinCarabas Apr 23, 2024
6516b36
farm staking additional tests
psorinionut Apr 24, 2024
6eb7113
proxy_dex: more unit tests
CostinCarabas Apr 24, 2024
1a1f276
code coverage update
psorinionut Apr 24, 2024
01a0959
Merge pull request #897 from multiversx/original-caller-merge-fix
psorinionut Apr 29, 2024
aed790b
Merge branch 'rc/v3.0' into v3.0-various-unit-tests
psorinionut Apr 29, 2024
6101651
Merge pull request #890 from multiversx/v3.0-various-unit-tests
psorinionut Apr 29, 2024
5587d14
Merge branch 'rc/v3.0' into additional-farm-staking-tests
psorinionut Apr 29, 2024
9c04db5
clippy fixes
psorinionut Apr 29, 2024
19c6abf
Merge pull request #898 from multiversx/additional-farm-staking-tests
psorinionut Apr 29, 2024
a222bd3
Merge branch 'rc/v3.0' into github-actions-code-coverage-update
psorinionut Apr 29, 2024
0ef7b61
Merge branch 'rc/v3.0' into proxy-dex-unit-tests
psorinionut Apr 29, 2024
e3c3196
Merge pull request #899 from multiversx/proxy-dex-unit-tests
psorinionut Apr 29, 2024
7713e19
Merge branch 'rc/v3.0' into github-actions-code-coverage-update
psorinionut Apr 29, 2024
effd81c
force rebuild github actions
psorinionut Apr 29, 2024
297cf73
Merge pull request #900 from multiversx/github-actions-code-coverage-…
psorinionut Apr 29, 2024
1761d54
Total farm position test in proxy dex
psorinionut Apr 29, 2024
77218ba
Merge pull request #903 from multiversx/proxy-dex-total-farm-position…
psorinionut Apr 29, 2024
8e8d180
Metastaking claim total farm position fix
psorinionut May 1, 2024
db82bb5
Merge pull request #904 from multiversx/metastaking-total-farm-positi…
psorinionut May 3, 2024
067064b
Energy factory unit test audit update
psorinionut May 7, 2024
867a88d
clippy fix
psorinionut May 9, 2024
c8f3f21
farm energy fix
dorin-iancu May 13, 2024
d8a5d6f
more fixes + test
dorin-iancu May 13, 2024
4578311
fix for old users
dorin-iancu May 13, 2024
9803759
proxy dex unit tests audit update
psorinionut May 14, 2024
23f0e2d
Merge pull request #905 from multiversx/energy-factory-unit-test-audi…
psorinionut May 14, 2024
eebb627
Merge branch 'rc/v3.0' into proxy-dex-unit-tests-update
psorinionut May 14, 2024
55088f8
proxy dex unit test scenario improvement
psorinionut May 14, 2024
3f2314a
Merge branch 'rc/v3.0' into farm-energy-fix
dorin-iancu May 15, 2024
a0671e6
Merge pull request #912 from multiversx/proxy-dex-unit-tests-update
psorinionut May 15, 2024
fab29de
Merge branch 'rc/v3.0' into farm-energy-fix
psorinionut May 15, 2024
8686bea
Merge pull request #911 from multiversx/farm-energy-fix
dorin-iancu May 20, 2024
b9ed86c
Revert "farm energy fix"
psorinionut May 20, 2024
2e025b5
Merge pull request #916 from multiversx/revert-911-farm-energy-fix
psorinionut May 20, 2024
497a61f
framework upgrade 0.48.1
psorinionut May 20, 2024
4c1d701
Merge pull request #917 from multiversx/framework-upgrade-0.48.1
psorinionut May 20, 2024
9867ab2
Simple lock legacy contract
psorinionut May 21, 2024
981866b
simple lock legacy tests & fixes
psorinionut May 22, 2024
efbd326
add initial endpoints parameters
psorinionut May 22, 2024
d11cdc2
simple lock legacy check fix
psorinionut May 28, 2024
7b75780
build fix
psorinionut May 28, 2024
04eff5a
build fix
psorinionut May 28, 2024
c4d11a9
Merge pull request #921 from multiversx/simple-lock-legacy-contract
psorinionut May 29, 2024
5c3b990
Remove checks in simple lock legacy SC
psorinionut Jun 5, 2024
d56ca32
updated tests
psorinionut Jun 5, 2024
5dc34ef
clippy fix
psorinionut Jun 5, 2024
c3d54f0
Framework upgrade 0.50.4. No syntax change.
psorinionut Jun 10, 2024
a235b6d
router upgrade pair endpoint fix
psorinionut Jun 11, 2024
78fa9a1
Simple lock exit farm with penalty fix
psorinionut Jun 11, 2024
0485c83
scenario test fix
psorinionut Jun 11, 2024
c874ed6
simple-lock-legacy: add missing FarmType
claudiulataretu Jun 11, 2024
404129d
Merge branch 'rc/v3.0' into simple-lock-legacy-contract
claudiulataretu Jun 19, 2024
b279755
Merge pull request #926 from multiversx/simple-lock-legacy-contract
claudiulataretu Jun 19, 2024
07f1db2
Merge branch 'rc/v3.0' into simple-lock-legacy-remove-checks
CostinCarabas Jun 19, 2024
0f70d3a
Merge branch 'rc/v3.0' into framework-upgrade-0.50.4-no-syntax-change
CostinCarabas Jun 19, 2024
a255383
Merge pull request #923 from multiversx/simple-lock-legacy-remove-checks
CostinCarabas Jun 19, 2024
bf39603
Merge branch 'rc/v3.0' into framework-upgrade-0.50.4-no-syntax-change
CostinCarabas Jun 19, 2024
a639089
Merge pull request #924 from multiversx/framework-upgrade-0.50.4-no-s…
CostinCarabas Jun 19, 2024
81be5bb
Merge branch 'rc/v3.0' into simple-lock-exit-farm-with-penalty-fix
psorinionut Jun 20, 2024
4320a90
Merge pull request #925 from multiversx/simple-lock-exit-farm-with-pe…
psorinionut Jun 20, 2024
c2a140a
Farm Staking Proxy Legacy SC
psorinionut Jun 23, 2024
8a7325b
upgrade
dorin-iancu Jun 27, 2024
abf386a
added unit test for unstake endpoint
psorinionut Jun 27, 2024
2231e50
clippy fixes
psorinionut Jun 27, 2024
72f8304
added legacy farm v1.3 contract
psorinionut Jul 1, 2024
343f8d8
farm staking proxy legacy sc rename to v1.3
psorinionut Jul 1, 2024
68f5ff1
Merge pull request #928 from multiversx/farm-staking-proxy-legacy-sc
psorinionut Jul 3, 2024
e2de796
Merge branch 'rc/v3.0' into upgrade-0.50.5
psorinionut Jul 3, 2024
0932481
Merge pull request #929 from multiversx/upgrade-0.50.5
psorinionut Jul 3, 2024
ee45c1e
Farm staking proxy legacy SC interactions update
psorinionut Jul 3, 2024
c061a85
Merge pull request #930 from multiversx/farm-staking-proxy-legacy-far…
psorinionut Jul 3, 2024
04285fa
user total farm position split
psorinionut Jul 11, 2024
8fedc8f
clippy fix
psorinionut Jul 11, 2024
81b6253
remove comments
psorinionut Jul 12, 2024
d291936
Proxy dex legacy contract
psorinionut Jul 16, 2024
04dbeda
Factory legacy contract
psorinionut Jul 16, 2024
4e5e21c
remove setAllowExternalClaim
psorinionut Jul 17, 2024
b7fedab
legacy contracts only with signatures
psorinionut Jul 30, 2024
28030df
legacy contracts sc error text change
psorinionut Jul 30, 2024
6e1623f
factory-legacy SC audit updates
psorinionut Jul 31, 2024
75b6fa7
proxy-dex-legacy audit updates
psorinionut Jul 31, 2024
0478274
remove commented code
psorinionut Jul 31, 2024
d2ae880
Merge pull request #935 from multiversx/remove-setAllowExternalClaim-…
psorinionut Jul 31, 2024
6cd702c
Merge pull request #932 from multiversx/user-total-farm-position-split
psorinionut Jul 31, 2024
2ca12e4
farm supply for week fix. incl claimBoosted aggr
psorinionut Aug 1, 2024
f668405
farm supply on claim fix for farm with locked rew
psorinionut Aug 1, 2024
55de050
Merge pull request #939 from multiversx/farm-with-locked-rewards-farm…
psorinionut Aug 1, 2024
a907b89
add rewards aggregation in merge endpoints
psorinionut Aug 2, 2024
3464f85
remove validation checks from farm staking SC
psorinionut Aug 2, 2024
2285407
Merge pull request #940 from multiversx/add-rewards-aggr-in-merge-end…
psorinionut Aug 2, 2024
88dd12b
farm with locked rewards unit tests
psorinionut Aug 2, 2024
602b696
farm staking unit tests
psorinionut Aug 2, 2024
b147571
farm staking unbond fix + unit test
psorinionut Aug 2, 2024
a28f0a4
revert farm staking unbond changes
psorinionut Aug 2, 2024
d43a154
Merge pull request #941 from multiversx/farm-supply-for-week-fix-unit…
psorinionut Aug 2, 2024
ba5aec9
remove supply fix for merge endpoints
psorinionut Aug 2, 2024
c957df6
remove rewards aggregation from merge farm
psorinionut Aug 2, 2024
6c0d6b6
farm staking unit tests cleanup
psorinionut Aug 2, 2024
f5d2593
zero position claim farm staking farm supply fix
psorinionut Aug 2, 2024
d6a27fd
Merge pull request #933 from multiversx/proxy-dex-legacy-contract
psorinionut Aug 3, 2024
656c8d8
Merge pull request #934 from multiversx/factory-legacy-contract
psorinionut Aug 3, 2024
df928d2
Merge pull request #936 from multiversx/legacy-contracts-only-with-si…
psorinionut Aug 3, 2024
57c06a5
restore energy factory proxy in query module
psorinionut Aug 3, 2024
e4432b9
Merge pull request #937 from multiversx/legacy-contracts-audit-fixes
psorinionut Aug 3, 2024
984f596
proxy dex legacy reference fix
psorinionut Aug 3, 2024
afdccc1
github actions update
psorinionut Aug 3, 2024
57b3433
Merge pull request #938 from multiversx/farm-supply-for-week-fix
psorinionut Aug 5, 2024
a9c14b4
Merge branch 'rc/v3.0' into v3.0-legacy-contracts
psorinionut Aug 12, 2024
b05f46e
audit updates
psorinionut Aug 12, 2024
343a9ed
further audit fixes
psorinionut Aug 13, 2024
d7463a0
add INCORRECTReturnType in legacy contracts
psorinionut Aug 13, 2024
57d14d9
small fix
psorinionut Aug 14, 2024
d12403a
Merge pull request #942 from multiversx/v3.0-legacy-contracts
psorinionut Aug 14, 2024
5712bb3
upgrade to 0.52.3
mihaicalinluca Sep 4, 2024
256191f
Merge pull request #945 from multiversx/upgrade-sc-v3
dorin-iancu Sep 4, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
58 changes: 3 additions & 55 deletions .github/workflows/actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,61 +20,9 @@ permissions:
jobs:
contracts:
name: Contracts
uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@v2.3.5
uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@v3.2.0
with:
rust-toolchain: nightly-2023-12-11
vmtools-version: v1.5.24
rust-toolchain: nightly-2024-05-22
coverage-args: --ignore-filename-regex='/.cargo/git' --output ./coverage.md
secrets:
token: ${{ secrets.GITHUB_TOKEN }}

# TEMPORARY: Remove this job when we can upgrade to mx-sc-actions v3+
test_coverage:
name: Test Coverage
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- name: Install rust
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: nightly-2023-12-11
target: wasm32-unknown-unknown

- name: Install prerequisites
run: |
rustup component add llvm-tools-preview
dirname $(find ~/.rustup -name llvm-cov) >> $GITHUB_PATH

echo $(dirname $(find ~/.rustup -name llvm-cov))

cargo install multiversx-sc-meta --locked

- name: Run tests and generate report
env:
RUSTFLAGS: ""
run: |
sc-meta test-coverage --output ./coverage.md

- name: Upload the report
uses: actions/upload-artifact@v3
with:
name: coverage
path: coverage.md

- name: Find the comment containing the report
id: fc
uses: peter-evans/find-comment@v2
if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository
with:
issue-number: ${{ github.event.pull_request.number }}
comment-author: "github-actions[bot]"
body-includes: "Coverage Summary"

- name: Create or update the report comment
uses: peter-evans/create-or-update-comment@v2
if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository
with:
comment-id: ${{ steps.fc.outputs.comment-id }}
issue-number: ${{ github.event.pull_request.number }}
body-file: ./coverage.md
edit-mode: replace
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ permissions:

jobs:
build:
uses: multiversx/mx-sc-actions/.github/workflows/reproducible-build.yml@v2.3.5
uses: multiversx/mx-sc-actions/.github/workflows/reproducible-build.yml@v3.2.0
with:
image_tag: v6.0.0
image_tag: v7.0.0
attach_to_existing_release: true
Loading
Loading