Code

Farm energy fix#920

Code

Draft

psorinionut wants to merge 69 commits intofeat/v3.1multiversx/mx-exchange-sc:feat/v3.1from farm-energy-fixmultiversx/mx-exchange-sc:farm-energy-fixCopy head branch name to clipboard

+6,380-1,249

Commits

Commits on Apr 8, 2024

• Farm tests with original caller merge fix

  psorinionut

  committed
  44cbbf1

  Copy full SHA for 44cbbf1

• clippy fixes

  psorinionut

  committed
  e4cfd13

  Copy full SHA for e4cfd13

Commits on Apr 9, 2024

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

  dorin-iancu

  authored
  80bcfba

  Copy full SHA for 80bcfba

• Github actions on rc branches

  psorinionut

  committed
  dd4cb71

  Copy full SHA for dd4cb71

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

  Show description for c2a2d27
  psorinionut

  authored
  c2a2d27

  Copy full SHA for c2a2d27

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

  psorinionut

  authored
  4aaa01f

  Copy full SHA for 4aaa01f

Commits on Apr 10, 2024

• Router check pair refactor

  psorinionut

  committed
  b21ea70

  Copy full SHA for b21ea70

• clippy fixes

  psorinionut

  committed
  16f0d72

  Copy full SHA for 16f0d72

Commits on Apr 11, 2024

• framework update v0.48.0

  psorinionut

  committed
  e09da89

  Copy full SHA for e09da89

• add check on enable swap by user

  psorinionut

  committed
  b01507b

  Copy full SHA for b01507b

• Farm staking merge fix + unit tests

  psorinionut

  committed
  19e8ce3

  Copy full SHA for 19e8ce3

Commits on Apr 12, 2024

• use FarmStakingWrapper for merge endpoint

  psorinionut

  committed
  74c16af

  Copy full SHA for 74c16af

• Merge pull request #875 from multiversx/farm-tests-with-original-caller-merge-fix

  Show description for 154b56a
  psorinionut

  authored
  154b56a

  Copy full SHA for 154b56a

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

  psorinionut

  authored
  04ecfe4

  Copy full SHA for 04ecfe4

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

  andrei-marinica

  authored
  0d174b9

  Copy full SHA for 0d174b9

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

  Show description for 7bdcf2f
  andrei-marinica

  authored
  7bdcf2f

  Copy full SHA for 7bdcf2f

• upgrade annotation

  andrei-marinica

  committed
  4463206

  Copy full SHA for 4463206

• cargo fmt

  andrei-marinica

  committed
  0f92c4f

  Copy full SHA for 0f92c4f

• Merge pull request #889 from multiversx/upgrade-annotation

  Show description for cb32307
  andrei-marinica

  authored
  cb32307

  Copy full SHA for cb32307

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

  psorinionut

  authored
  1f215e6

  Copy full SHA for 1f215e6

• router fix after framework upgrade

  psorinionut

  committed
  88ab1ca

  Copy full SHA for 88ab1ca

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

  psorinionut

  authored
  baa4c13

  Copy full SHA for baa4c13

• energy factory tests

  psorinionut

  committed
  c572908

  Copy full SHA for c572908

Commits on Apr 15, 2024

• remove unneeded check

  psorinionut

  committed
  ef12603

  Copy full SHA for ef12603

• total farm position through simple lock test

  psorinionut

  committed
  6b5442e

  Copy full SHA for 6b5442e

• farm updated tests

  psorinionut

  committed
  f9b5a0d

  Copy full SHA for f9b5a0d

Commits on Apr 16, 2024

• add back the router reverse check pair logic

  psorinionut

  committed
  ec4b550

  Copy full SHA for ec4b550

• code cleanup

  psorinionut

  committed
  954d65c

  Copy full SHA for 954d65c

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

  Show description for a97b9c3
  psorinionut

  authored
  a97b9c3

  Copy full SHA for a97b9c3

• farm staking proxy unit tests

  psorinionut

  committed
  6c2a608

  Copy full SHA for 6c2a608

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

  psorinionut

  authored
  a470bc3

  Copy full SHA for a470bc3

• merge logic update orig owner in a separate fn for safer future impl (audit request)

  psorinionut

  committed
  4544a92

  Copy full SHA for 4544a92

Commits on Apr 17, 2024

• Merge pull request #888 from multiversx/farm-staking-tests-with-merge-fix

  psorinionut

  authored
  27085fb

  Copy full SHA for 27085fb

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

  psorinionut

  authored
  08ef135

  Copy full SHA for 08ef135

Commits on Apr 18, 2024

• clippy fixes

  psorinionut

  committed
  ee10fe1

  Copy full SHA for ee10fe1

Commits on Apr 23, 2024

• Proxy-dex: farm: original caller negative test

  CostinCarabas

  committed
  fe7e92d

  Copy full SHA for fe7e92d

• original caller merge fix

  psorinionut

  committed
  e993235

  Copy full SHA for e993235

• proxy_dex: more unit tests

  CostinCarabas

  committed
  031b36a

  Copy full SHA for 031b36a

Commits on Apr 24, 2024

• farm staking additional tests

  psorinionut

  committed
  6516b36

  Copy full SHA for 6516b36

• proxy_dex: more unit tests

  CostinCarabas

  committed
  6eb7113

  Copy full SHA for 6eb7113

• code coverage update

  psorinionut

  committed
  1a1f276

  Copy full SHA for 1a1f276

Commits on Apr 29, 2024

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

  Show description for 01a0959
  psorinionut

  authored
  01a0959

  Copy full SHA for 01a0959

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

  psorinionut

  authored
  aed790b

  Copy full SHA for aed790b

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

  Show description for 6101651
  psorinionut

  authored
  6101651

  Copy full SHA for 6101651

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

  psorinionut

  authored
  5587d14

  Copy full SHA for 5587d14

• clippy fixes

  psorinionut

  committed
  9c04db5

  Copy full SHA for 9c04db5

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

  Show description for 19c6abf
  psorinionut

  authored
  19c6abf

  Copy full SHA for 19c6abf

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

  psorinionut

  authored
  a222bd3

  Copy full SHA for a222bd3

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

  psorinionut

  authored
  0ef7b61

  Copy full SHA for 0ef7b61

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

  Show description for e3c3196
  psorinionut

  authored
  e3c3196

  Copy full SHA for e3c3196

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

  psorinionut

  authored
  7713e19

  Copy full SHA for 7713e19

• force rebuild github actions

  psorinionut

  committed
  effd81c

  Copy full SHA for effd81c

• Merge pull request #900 from multiversx/github-actions-code-coverage-update

  Show description for 297cf73
  psorinionut

  authored
  297cf73

  Copy full SHA for 297cf73

• Total farm position test in proxy dex

  psorinionut

  committed
  1761d54

  Copy full SHA for 1761d54

• Merge pull request #903 from multiversx/proxy-dex-total-farm-position-test

  Show description for 77218ba
  psorinionut

  authored
  77218ba

  Copy full SHA for 77218ba

Commits on May 1, 2024

• Metastaking claim total farm position fix

  psorinionut

  committed
  8e8d180

  Copy full SHA for 8e8d180

Commits on May 3, 2024

• Merge pull request #904 from multiversx/metastaking-total-farm-position-safe-price-fix

  Show description for db82bb5
  psorinionut

  authored
  db82bb5

  Copy full SHA for db82bb5

Commits on May 7, 2024

• Energy factory unit test audit update

  psorinionut

  committed
  067064b

  Copy full SHA for 067064b

Commits on May 9, 2024

• clippy fix

  psorinionut

  committed
  867a88d

  Copy full SHA for 867a88d

Commits on May 13, 2024

• farm energy fix

  dorin-iancu

  committed
  c8f3f21

  Copy full SHA for c8f3f21

• more fixes + test

  dorin-iancu

  committed
  d8a5d6f

  Copy full SHA for d8a5d6f

• fix for old users

  dorin-iancu

  committed
  4578311

  Copy full SHA for 4578311

Commits on May 14, 2024

• proxy dex unit tests audit update

  psorinionut

  committed
  9803759

  Copy full SHA for 9803759

• Merge pull request #905 from multiversx/energy-factory-unit-test-audit-update

  Show description for 23f0e2d
  psorinionut

  authored
  23f0e2d

  Copy full SHA for 23f0e2d

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

  psorinionut

  authored
  eebb627

  Copy full SHA for eebb627

• proxy dex unit test scenario improvement

  psorinionut

  committed
  55088f8

  Copy full SHA for 55088f8

Commits on May 15, 2024

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

  dorin-iancu

  authored
  3f2314a

  Copy full SHA for 3f2314a

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

  Show description for a0671e6
  psorinionut

  authored
  a0671e6

  Copy full SHA for a0671e6

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

  psorinionut

  authored
  fab29de

  Copy full SHA for fab29de