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.

Sign up for GitHub

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

Jump to bottom

Farm energy fix #920

Draft
wants to merge 69 commits into
base: feat/v3.1
Choose a base branch
from
Draft

Farm energy fix #920

wants to merge 69 commits into from

Commits on Apr 8, 2024

  1. Farm tests with original caller merge fix

    @psorinionut
    psorinionut committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    44cbbf1 View commit details
    Browse the repository at this point in the history

  2. clippy fixes

    @psorinionut
    psorinionut committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    e4cfd13 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2024

  1. Merge branch 'rc/v3.0' into farm-tests-with-original-caller-merge-fix

    @dorin-iancu
    dorin-iancu authored Apr 9, 2024
    Configuration menu
    Copy the full SHA
    80bcfba View commit details
    Browse the repository at this point in the history

  2. Github actions on rc branches

    @psorinionut
    psorinionut committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    dd4cb71 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #881 from multiversx/github-actions-rc-branches 

    Github actions on rc branches
    @psorinionut
    psorinionut authored Apr 9, 2024
    Configuration menu
    Copy the full SHA
    c2a2d27 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'rc/v3.0' into farm-tests-with-original-caller-merge-fix

    @psorinionut
    psorinionut authored Apr 9, 2024
    Configuration menu
    Copy the full SHA
    4aaa01f View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2024

  1. Router check pair refactor

    @psorinionut
    psorinionut committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    b21ea70 View commit details
    Browse the repository at this point in the history

  2. clippy fixes

    @psorinionut
    psorinionut committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    16f0d72 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2024

  1. framework update v0.48.0

    @psorinionut
    psorinionut committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    e09da89 View commit details
    Browse the repository at this point in the history

  2. add check on enable swap by user

    @psorinionut
    psorinionut committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    b01507b View commit details
    Browse the repository at this point in the history

  3. Farm staking merge fix + unit tests

    @psorinionut
    psorinionut committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    19e8ce3 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2024

  1. use FarmStakingWrapper for merge endpoint

    @psorinionut
    psorinionut committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    74c16af View commit details
    Browse the repository at this point in the history

  2. Merge pull request #875 from multiversx/farm-tests-with-original-call… 

    …er-merge-fix

Farm tests with original caller merge fix
    @psorinionut
    psorinionut authored Apr 12, 2024
    Configuration menu
    Copy the full SHA
    154b56a View commit details
    Browse the repository at this point in the history

  3. Merge branch 'rc/v3.0' into farm-staking-tests-with-merge-fix

    @psorinionut
    psorinionut authored Apr 12, 2024
    Configuration menu
    Copy the full SHA
    04ecfe4 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'rc/v3.0' into framework-upgrade-v0.48.0

    @andrei-marinica
    andrei-marinica authored Apr 12, 2024
    Configuration menu
    Copy the full SHA
    0d174b9 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #887 from multiversx/framework-upgrade-v0.48.0 

    framework update v0.48.0
    @andrei-marinica
    andrei-marinica authored Apr 12, 2024
    Configuration menu
    Copy the full SHA
    7bdcf2f View commit details
    Browse the repository at this point in the history

  6. upgrade annotation

    @andrei-marinica
    andrei-marinica committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    4463206 View commit details
    Browse the repository at this point in the history

  7. cargo fmt

    @andrei-marinica
    andrei-marinica committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    0f92c4f View commit details
    Browse the repository at this point in the history

  8. Merge pull request #889 from multiversx/upgrade-annotation 

    Upgrade annotation
    @andrei-marinica
    andrei-marinica authored Apr 12, 2024
    Configuration menu
    Copy the full SHA
    cb32307 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'rc/v3.0' into router-check-is-pair-refactor

    @psorinionut
    psorinionut authored Apr 12, 2024
    Configuration menu
    Copy the full SHA
    1f215e6 View commit details
    Browse the repository at this point in the history

  10. router fix after framework upgrade

    @psorinionut
    psorinionut committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    88ab1ca View commit details
    Browse the repository at this point in the history

  11. Merge branch 'rc/v3.0' into farm-staking-tests-with-merge-fix

    @psorinionut
    psorinionut authored Apr 12, 2024
    Configuration menu
    Copy the full SHA
    baa4c13 View commit details
    Browse the repository at this point in the history

  12. energy factory tests

    @psorinionut
    psorinionut committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    c572908 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2024

  1. remove unneeded check

    @psorinionut
    psorinionut committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    ef12603 View commit details
    Browse the repository at this point in the history

  2. total farm position through simple lock test

    @psorinionut
    psorinionut committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    6b5442e View commit details
    Browse the repository at this point in the history

  3. farm updated tests

    @psorinionut
    psorinionut committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    f9b5a0d View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2024

  1. add back the router reverse check pair logic

    @psorinionut
    psorinionut committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    ec4b550 View commit details
    Browse the repository at this point in the history

  2. code cleanup

    @psorinionut
    psorinionut committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    954d65c View commit details
    Browse the repository at this point in the history

  3. Merge pull request #886 from multiversx/router-check-is-pair-refactor 

    Router check pair refactor
    @psorinionut
    psorinionut authored Apr 16, 2024
    Configuration menu
    Copy the full SHA
    a97b9c3 View commit details
    Browse the repository at this point in the history

  4. farm staking proxy unit tests

    @psorinionut
    psorinionut committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    6c2a608 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'rc/v3.0' into farm-staking-tests-with-merge-fix

    @psorinionut
    psorinionut authored Apr 16, 2024
    Configuration menu
    Copy the full SHA
    a470bc3 View commit details
    Browse the repository at this point in the history

  6. merge logic update orig owner in a separate fn for safer future impl … 

    …(audit request)
    @psorinionut
    psorinionut committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    4544a92 View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2024

  1. Merge pull request #888 from multiversx/farm-staking-tests-with-merge… 

    …-fix
    @psorinionut
    psorinionut authored Apr 17, 2024
    Configuration menu
    Copy the full SHA
    27085fb View commit details
    Browse the repository at this point in the history

  2. Merge branch 'rc/v3.0' into v3.0-various-unit-tests

    @psorinionut
    psorinionut authored Apr 17, 2024
    Configuration menu
    Copy the full SHA
    08ef135 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2024

  1. clippy fixes

    @psorinionut
    psorinionut committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    ee10fe1 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2024

  1. Proxy-dex: farm: original caller negative test

    @CostinCarabas
    CostinCarabas committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    fe7e92d View commit details
    Browse the repository at this point in the history

  2. original caller merge fix

    @psorinionut
    psorinionut committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    e993235 View commit details
    Browse the repository at this point in the history

  3. proxy_dex: more unit tests

    @CostinCarabas
    CostinCarabas committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    031b36a View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2024

  1. farm staking additional tests

    @psorinionut
    psorinionut committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    6516b36 View commit details
    Browse the repository at this point in the history

  2. proxy_dex: more unit tests

    @CostinCarabas
    CostinCarabas committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    6eb7113 View commit details
    Browse the repository at this point in the history

  3. code coverage update

    @psorinionut
    psorinionut committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    1a1f276 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2024

  1. Merge pull request #897 from multiversx/original-caller-merge-fix 

    original caller merge fix
    @psorinionut
    psorinionut authored Apr 29, 2024
    Configuration menu
    Copy the full SHA
    01a0959 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'rc/v3.0' into v3.0-various-unit-tests

    @psorinionut
    psorinionut authored Apr 29, 2024
    Configuration menu
    Copy the full SHA
    aed790b View commit details
    Browse the repository at this point in the history

  3. Merge pull request #890 from multiversx/v3.0-various-unit-tests 

    Various DEX tests
    @psorinionut
    psorinionut authored Apr 29, 2024
    Configuration menu
    Copy the full SHA
    6101651 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'rc/v3.0' into additional-farm-staking-tests

    @psorinionut
    psorinionut authored Apr 29, 2024
    Configuration menu
    Copy the full SHA
    5587d14 View commit details
    Browse the repository at this point in the history

  5. clippy fixes

    @psorinionut
    psorinionut committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    9c04db5 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #898 from multiversx/additional-farm-staking-tests 

    farm staking additional tests
    @psorinionut
    psorinionut authored Apr 29, 2024
    Configuration menu
    Copy the full SHA
    19c6abf View commit details
    Browse the repository at this point in the history

  7. Merge branch 'rc/v3.0' into github-actions-code-coverage-update

    @psorinionut
    psorinionut authored Apr 29, 2024
    Configuration menu
    Copy the full SHA
    a222bd3 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'rc/v3.0' into proxy-dex-unit-tests

    @psorinionut
    psorinionut authored Apr 29, 2024
    Configuration menu
    Copy the full SHA
    0ef7b61 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #899 from multiversx/proxy-dex-unit-tests 

    Proxy dex unit tests
    @psorinionut
    psorinionut authored Apr 29, 2024
    Configuration menu
    Copy the full SHA
    e3c3196 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'rc/v3.0' into github-actions-code-coverage-update

    @psorinionut
    psorinionut authored Apr 29, 2024
    Configuration menu
    Copy the full SHA
    7713e19 View commit details
    Browse the repository at this point in the history

  11. force rebuild github actions

    @psorinionut
    psorinionut committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    effd81c View commit details
    Browse the repository at this point in the history

  12. Merge pull request #900 from multiversx/github-actions-code-coverage-… 

    …update

code coverage update
    @psorinionut
    psorinionut authored Apr 29, 2024
    Configuration menu
    Copy the full SHA
    297cf73 View commit details
    Browse the repository at this point in the history

  13. Total farm position test in proxy dex

    @psorinionut
    psorinionut committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    1761d54 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #903 from multiversx/proxy-dex-total-farm-position… 

    …-test

Total farm position test in proxy dex
    @psorinionut
    psorinionut authored Apr 29, 2024
    Configuration menu
    Copy the full SHA
    77218ba View commit details
    Browse the repository at this point in the history

Commits on May 1, 2024

  1. Metastaking claim total farm position fix

    @psorinionut
    psorinionut committed May 1, 2024
    Configuration menu
    Copy the full SHA
    8e8d180 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2024

  1. Merge pull request #904 from multiversx/metastaking-total-farm-positi… 

    …on-safe-price-fix

Metastaking claim total farm position fix
    @psorinionut
    psorinionut authored May 3, 2024
    Configuration menu
    Copy the full SHA
    db82bb5 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2024

  1. Energy factory unit test audit update

    @psorinionut
    psorinionut committed May 7, 2024
    Configuration menu
    Copy the full SHA
    067064b View commit details
    Browse the repository at this point in the history

Commits on May 9, 2024

  1. clippy fix

    @psorinionut
    psorinionut committed May 9, 2024
    Configuration menu
    Copy the full SHA
    867a88d View commit details
    Browse the repository at this point in the history

Commits on May 13, 2024

  1. farm energy fix

    @dorin-iancu
    dorin-iancu committed May 13, 2024
    Configuration menu
    Copy the full SHA
    c8f3f21 View commit details
    Browse the repository at this point in the history

  2. more fixes + test

    @dorin-iancu
    dorin-iancu committed May 13, 2024
    Configuration menu
    Copy the full SHA
    d8a5d6f View commit details
    Browse the repository at this point in the history

  3. fix for old users

    @dorin-iancu
    dorin-iancu committed May 13, 2024
    Configuration menu
    Copy the full SHA
    4578311 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2024

  1. proxy dex unit tests audit update

    @psorinionut
    psorinionut committed May 14, 2024
    Configuration menu
    Copy the full SHA
    9803759 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #905 from multiversx/energy-factory-unit-test-audi… 

    …t-update

Energy factory unit test audit update
    @psorinionut
    psorinionut authored May 14, 2024
    Configuration menu
    Copy the full SHA
    23f0e2d View commit details
    Browse the repository at this point in the history

  3. Merge branch 'rc/v3.0' into proxy-dex-unit-tests-update

    @psorinionut
    psorinionut authored May 14, 2024
    Configuration menu
    Copy the full SHA
    eebb627 View commit details
    Browse the repository at this point in the history

  4. proxy dex unit test scenario improvement

    @psorinionut
    psorinionut committed May 14, 2024
    Configuration menu
    Copy the full SHA
    55088f8 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2024

  1. Merge branch 'rc/v3.0' into farm-energy-fix

    @dorin-iancu
    dorin-iancu authored May 15, 2024
    Configuration menu
    Copy the full SHA
    3f2314a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #912 from multiversx/proxy-dex-unit-tests-update 

    Proxy dex unit tests audit update
    @psorinionut
    psorinionut authored May 15, 2024
    Configuration menu
    Copy the full SHA
    a0671e6 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'rc/v3.0' into farm-energy-fix

    @psorinionut
    psorinionut authored May 15, 2024
    Configuration menu
    Copy the full SHA
    fab29de View commit details
    Browse the repository at this point in the history