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

Feat/v3.1 #845

Draft
wants to merge 91 commits into
base: rc/v3.0
Choose a base branch
from
Draft

Feat/v3.1 #845

wants to merge 91 commits into from

Commits on Feb 12, 2024

  1. allow setting first week epoch in farm

    @dorin-iancu
    dorin-iancu committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    c8632cb View commit details
    Browse the repository at this point in the history

  2. fix

    @dorin-iancu
    dorin-iancu committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    d902eb3 View commit details
    Browse the repository at this point in the history

  3. fix mandos

    @dorin-iancu
    dorin-iancu committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    abad7ad View commit details
    Browse the repository at this point in the history

  4. changes

    @dorin-iancu
    dorin-iancu committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    39d6bda View commit details
    Browse the repository at this point in the history

  5. setup in farm staking

    @dorin-iancu
    dorin-iancu committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    4a818dc View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2024

  1. Merge branch 'feat/v3.1' into farm-set-start-week

    @psorinionut
    psorinionut authored Feb 22, 2024
    Configuration menu
    Copy the full SHA
    2ed5386 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #835 from multiversx/farm-set-start-week 

    allow setting first week epoch in farm
    @psorinionut
    psorinionut authored Feb 22, 2024
    Configuration menu
    Copy the full SHA
    834166d View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2024

  1. Merge branch 'main' into feat/v3.1

    @dorin-iancu
    dorin-iancu committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    c98d1e6 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #851 from multiversx/merge-with-main-feat-v3.1 

    Merge with main feat v3.1
    @dorin-iancu
    dorin-iancu authored Mar 8, 2024
    Configuration menu
    Copy the full SHA
    b4910e7 View commit details
    Browse the repository at this point in the history

  3. accumulate boosted rewards

    @dorin-iancu
    dorin-iancu committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    c8fd624 View commit details
    Browse the repository at this point in the history

  4. fix mandos

    @dorin-iancu
    dorin-iancu committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    06b77a8 View commit details
    Browse the repository at this point in the history

  5. more mandos fix

    @dorin-iancu
    dorin-iancu committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    cda01d3 View commit details
    Browse the repository at this point in the history

  6. allow user to claim unlocked rewards

    @dorin-iancu
    dorin-iancu committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    d128565 View commit details
    Browse the repository at this point in the history

  7. fix + test

    @dorin-iancu
    dorin-iancu committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    bf91c5f View commit details
    Browse the repository at this point in the history

  8. impl

    @dorin-iancu
    dorin-iancu committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    22d4c08 View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2024

  1. call energy factory

    @dorin-iancu
    dorin-iancu committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    7b03403 View commit details
    Browse the repository at this point in the history

  2. fix tests

    @dorin-iancu
    dorin-iancu committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    dfa420d View commit details
    Browse the repository at this point in the history

  3. unbond test

    @dorin-iancu
    dorin-iancu committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    4bab210 View commit details
    Browse the repository at this point in the history

  4. fix token type

    @dorin-iancu
    dorin-iancu committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    d2fb8c8 View commit details
    Browse the repository at this point in the history

  5. fix wrong call

    @dorin-iancu
    dorin-iancu committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    fd67813 View commit details
    Browse the repository at this point in the history

  6. revert fix

    @dorin-iancu
    dorin-iancu committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    8521631 View commit details
    Browse the repository at this point in the history

  7. simple lock improvements

    @dorin-iancu
    dorin-iancu committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    b24d8c7 View commit details
    Browse the repository at this point in the history

  8. test

    @dorin-iancu
    dorin-iancu committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    3187b46 View commit details
    Browse the repository at this point in the history

  9. remove import

    @dorin-iancu
    dorin-iancu committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    c284e4d View commit details
    Browse the repository at this point in the history

  10. alias

    @dorin-iancu
    dorin-iancu committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    08ade1b View commit details
    Browse the repository at this point in the history

  11. claim developer rewards

    @dorin-iancu
    dorin-iancu committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    0cbd734 View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2024

  1. small fixes pair

    @dorin-iancu
    dorin-iancu committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    96176e4 View commit details
    Browse the repository at this point in the history

  2. more pair fixes

    @dorin-iancu
    dorin-iancu committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    637ae26 View commit details
    Browse the repository at this point in the history

  3. copy-paste proxy dex SC

    @dorin-iancu
    dorin-iancu committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    feab837 View commit details
    Browse the repository at this point in the history

  4. group code into modules

    @dorin-iancu
    dorin-iancu committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    43bc868 View commit details
    Browse the repository at this point in the history

  5. attempted fix

    @dorin-iancu
    dorin-iancu committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    e0d9ad5 View commit details
    Browse the repository at this point in the history

  6. temp commit

    @dorin-iancu
    dorin-iancu committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    b550a2d View commit details
    Browse the repository at this point in the history

  7. fixes

    @dorin-iancu
    dorin-iancu committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    7d7c32b View commit details
    Browse the repository at this point in the history

  8. fix

    @dorin-iancu
    dorin-iancu committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    ef30aaa View commit details
    Browse the repository at this point in the history

  9. create pair

    @dorin-iancu
    dorin-iancu committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    af8a8d1 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2024

  1. opt

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

  2. revert change

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

  3. rename file

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

  4. create pair user + foundation

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

  5. remove liq created pair

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

  6. fixes

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

  7. fix existing tests

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

  8. use common code

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

  9. temp commit

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

  10. update scs to latest framework version

    @mihaicalinluca
    mihaicalinluca committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    bfba5a3 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2024

  1. Merge pull request #860 from multiversx/sc-update 

    update scs to latest framework version
    @dorin-iancu
    dorin-iancu authored Mar 14, 2024
    Configuration menu
    Copy the full SHA
    16b28b4 View commit details
    Browse the repository at this point in the history

  2. cargo.lock

    @dorin-iancu
    dorin-iancu committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    d05f9b7 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'proxy-dex-xmex' of https://github.com/multiversx/mx-exc… 

    …hange-sc into proxy-dex-xmex
    @dorin-iancu
    dorin-iancu committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    e6f901e View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2024

  1. fix read from storage

    @dorin-iancu
    dorin-iancu committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    df204af View commit details
    Browse the repository at this point in the history

  2. Merge pull request #852 from multiversx/farm-accumulate-boosted-rewards 

    accumulate boosted rewards
    @dorin-iancu
    dorin-iancu authored Mar 15, 2024
    Configuration menu
    Copy the full SHA
    a6c8d4d View commit details
    Browse the repository at this point in the history

  3. fixes + test

    @dorin-iancu
    dorin-iancu committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    1ecf790 View commit details
    Browse the repository at this point in the history

  4. build

    @dorin-iancu
    dorin-iancu committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    9830099 View commit details
    Browse the repository at this point in the history

  5. users creates pair from router directly

    @dorin-iancu
    dorin-iancu committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    c63da86 View commit details
    Browse the repository at this point in the history

  6. resolve conflicts

    @dorin-iancu
    dorin-iancu committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    aeb9186 View commit details
    Browse the repository at this point in the history

  7. opt arg to forced arg

    @dorin-iancu
    dorin-iancu committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    8c3ef99 View commit details
    Browse the repository at this point in the history

  8. fix proxy tests

    @dorin-iancu
    dorin-iancu committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    6ff3754 View commit details
    Browse the repository at this point in the history

  9. use add initial liq endpoint

    @dorin-iancu
    dorin-iancu committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    d5c8394 View commit details
    Browse the repository at this point in the history

  10. common code

    @dorin-iancu
    dorin-iancu committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    f7940f4 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2024

  1. Merge branch 'farm-locked-get-unlocked-rewards' into simple-lock-impr… 

    …ovements
    @dorin-iancu
    dorin-iancu committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    0643cdf View commit details
    Browse the repository at this point in the history

  2. Merge branch 'simple-lock-improvements' into router-claim-developer-r… 

    …ewards
    @dorin-iancu
    dorin-iancu committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    7775e73 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'router-claim-developer-rewards' into new-proxy-dex-sc

    @dorin-iancu
    dorin-iancu committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    4b70df2 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'new-proxy-dex-sc' into reorganize-code

    @dorin-iancu
    dorin-iancu committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    d1c14ea View commit details
    Browse the repository at this point in the history

  5. merge

    @dorin-iancu
    dorin-iancu committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    71d5305 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2024

  1. fix decode attr

    @dorin-iancu
    dorin-iancu committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    c2fe406 View commit details
    Browse the repository at this point in the history

  2. remove annotation

    @dorin-iancu
    dorin-iancu committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    6f2a4b1 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2024

  1. Merge pull request #853 from multiversx/farm-locked-get-unlocked-rewards 

    allow user to claim unlocked rewards + allow cancel unbond farm_staking
    @dorin-iancu
    dorin-iancu authored Mar 20, 2024
    Configuration menu
    Copy the full SHA
    6f2985f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feat/v3.1' into simple-lock-improvements

    @dorin-iancu
    dorin-iancu authored Mar 20, 2024
    Configuration menu
    Copy the full SHA
    5581432 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #855 from multiversx/simple-lock-improvements 

    simple lock improvements
    @dorin-iancu
    dorin-iancu authored Mar 20, 2024
    Configuration menu
    Copy the full SHA
    c3daf89 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'feat/v3.1' into router-claim-developer-rewards

    @dorin-iancu
    dorin-iancu authored Mar 20, 2024
    Configuration menu
    Copy the full SHA
    c602b4d View commit details
    Browse the repository at this point in the history

  5. fix test

    @dorin-iancu
    dorin-iancu committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    1d6b276 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'router-claim-developer-rewards' of https://github.com/m… 

    …ultiversx/mx-exchange-sc into router-claim-developer-rewards
    @dorin-iancu
    dorin-iancu committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    d4dbfac View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2024

  1. Merge pull request #856 from multiversx/router-claim-developer-rewards 

    claim developer rewards router
    @dorin-iancu
    dorin-iancu authored Mar 21, 2024
    Configuration menu
    Copy the full SHA
    eea8f43 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feat/v3.1' into new-proxy-dex-sc

    @dorin-iancu
    dorin-iancu authored Mar 21, 2024
    Configuration menu
    Copy the full SHA
    e924ff4 View commit details
    Browse the repository at this point in the history

  3. proxy-dex-xmex: Fix compiling issues

    @CostinCarabas
    CostinCarabas committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    275d198 View commit details
    Browse the repository at this point in the history

  4. proxy-dex-xmex: Fix tests

    @CostinCarabas
    CostinCarabas committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    a962cd4 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2024

  1. Merge pull request #857 from multiversx/new-proxy-dex-sc 

    copy-paste proxy dex SC
    @dorin-iancu
    dorin-iancu authored Mar 25, 2024
    Configuration menu
    Copy the full SHA
    28e2dbc View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2024

  1. Merge branch 'feat/v3.1' into reorganize-code

    @dorin-iancu
    dorin-iancu committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    3b88b9a View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2024

  1. Merge pull request #858 from multiversx/reorganize-code 

    group code into modules
    @dorin-iancu
    dorin-iancu authored Mar 27, 2024
    Configuration menu
    Copy the full SHA
    ea72bf7 View commit details
    Browse the repository at this point in the history

  2. conflicts

    @dorin-iancu
    dorin-iancu committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    5df3b56 View commit details
    Browse the repository at this point in the history

  3. annotation

    @dorin-iancu
    dorin-iancu committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    1e3233f View commit details
    Browse the repository at this point in the history

  4. more conflicts

    @dorin-iancu
    dorin-iancu committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    3021f80 View commit details
    Browse the repository at this point in the history

  5. evil clippy

    @dorin-iancu
    dorin-iancu committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    516d7f4 View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2024

  1. Merge pull request #859 from multiversx/proxy-dex-xmex 

    Proxy dex for xMEX
    @dorin-iancu
    dorin-iancu authored Apr 1, 2024
    Configuration menu
    Copy the full SHA
    68d9cf9 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feat/v3.1' into farm-staking-decode-old-attr

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

Commits on Apr 9, 2024

  1. Merge pull request #861 from multiversx/farm-staking-decode-old-attr 

    fix decode old attributes farm staking
    @dorin-iancu
    dorin-iancu authored Apr 9, 2024
    Configuration menu
    Copy the full SHA
    9270d91 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'rc/v3.0' into feat/v3.1

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

Commits on Apr 10, 2024

  1. upgrade contract scenario test fix

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

  2. revert pair perfect swap change

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

Commits on May 20, 2024

  1. framework upgrade 0.48.1

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

  2. pair tests fixes

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

  3. Merge pull request #919 from multiversx/feat-v3.1-branch-framework-up… 

    …grade

Feat v3.1 branch framework upgrade 0.48.1
    @psorinionut
    psorinionut authored May 20, 2024
    Configuration menu
    Copy the full SHA
    bae1441 View commit details
    Browse the repository at this point in the history