Skip to content

Commit

Permalink
Merge branch 'main' into farm-position-functionality
Browse files Browse the repository at this point in the history
  • Loading branch information
psorinionut committed Sep 29, 2023
2 parents d1a9e72 + 2fd2e4c commit 75eba99
Show file tree
Hide file tree
Showing 118 changed files with 661 additions and 544 deletions.
2 changes: 1 addition & 1 deletion common/common_errors/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ edition = "2021"
[lib]
path = "src/lib.rs"
[dependencies.multiversx-sc]
version = "=0.43.2"
version = "=0.43.3"
features = ["esdt-token-payment-legacy-decode"]
2 changes: 1 addition & 1 deletion common/common_structs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ edition = "2021"
[lib]
path = "src/lib.rs"
[dependencies.multiversx-sc]
version = "=0.43.2"
version = "=0.43.3"
features = ["esdt-token-payment-legacy-decode"]

[dependencies.mergeable]
Expand Down
2 changes: 1 addition & 1 deletion common/modules/farm/config/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ path = "../../pausable"
path = "../../permissions_module"

[dependencies.multiversx-sc]
version = "=0.43.2"
version = "=0.43.3"
features = ["esdt-token-payment-legacy-decode"]
4 changes: 2 additions & 2 deletions common/modules/farm/contexts/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ path = "../../pausable"
path = "../../permissions_module"

[dependencies.multiversx-sc]
version = "=0.43.2"
version = "=0.43.3"
features = ["esdt-token-payment-legacy-decode"]

[dependencies.multiversx-sc-modules]
version = "=0.43.2"
version = "=0.43.3"
2 changes: 1 addition & 1 deletion common/modules/farm/events/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ path = "../../../common_structs"
path = "../contexts"

[dependencies.multiversx-sc]
version = "=0.43.2"
version = "=0.43.3"
features = ["esdt-token-payment-legacy-decode"]
6 changes: 3 additions & 3 deletions common/modules/farm/farm_base_impl/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ path = "../../../traits/mergeable"
path = "../../../traits/fixed-supply-token"

[dependencies.multiversx-sc]
version = "=0.43.2"
version = "=0.43.3"
features = ["esdt-token-payment-legacy-decode"]

[dependencies.multiversx-sc-modules]
version = "=0.43.2"
version = "=0.43.3"
[dev-dependencies.multiversx-sc-scenario]
version = "=0.43.2"
version = "=0.43.3"
4 changes: 2 additions & 2 deletions common/modules/farm/farm_token/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ path = "../../pausable"
path = "../../permissions_module"

[dependencies.multiversx-sc]
version = "=0.43.2"
version = "=0.43.3"
features = ["esdt-token-payment-legacy-decode"]

[dependencies.multiversx-sc-modules]
version = "=0.43.2"
version = "=0.43.3"
4 changes: 2 additions & 2 deletions common/modules/farm/farm_token_merge/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ path = "../../token_merge_helper"
path = "../farm_token"

[dependencies.multiversx-sc]
version = "=0.43.2"
version = "=0.43.3"
features = ["esdt-token-payment-legacy-decode"]

[dependencies.multiversx-sc-modules]
version = "=0.43.2"
version = "=0.43.3"
4 changes: 2 additions & 2 deletions common/modules/farm/rewards/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ path = "../../pausable"
path = "../../permissions_module"

[dependencies.multiversx-sc]
version = "=0.43.2"
version = "=0.43.3"
features = ["esdt-token-payment-legacy-decode"]

[dependencies.multiversx-sc-modules]
version = "=0.43.2"
version = "=0.43.3"
2 changes: 1 addition & 1 deletion common/modules/legacy_token_decode_module/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ edition = "2018"
[lib]
path = "src/lib.rs"
[dependencies.multiversx-sc]
version = "=0.43.2"
version = "=0.43.3"
features = ["esdt-token-payment-legacy-decode"]

[dependencies.common_structs]
Expand Down
2 changes: 1 addition & 1 deletion common/modules/locking_module/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ edition = "2021"
[lib]
path = "src/lib.rs"
[dependencies.multiversx-sc]
version = "=0.43.2"
version = "=0.43.3"
features = ["esdt-token-payment-legacy-decode"]

[dependencies.simple-lock]
Expand Down
2 changes: 1 addition & 1 deletion common/modules/math/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ edition = "2021"
[lib]
path = "src/lib.rs"
[dependencies.multiversx-sc]
version = "=0.43.2"
version = "=0.43.3"
features = ["esdt-token-payment-legacy-decode"]
2 changes: 1 addition & 1 deletion common/modules/pausable/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ path = "src/pausable.rs"
path = "../permissions_module"

[dependencies.multiversx-sc]
version = "=0.43.2"
version = "=0.43.3"
features = ["esdt-token-payment-legacy-decode"]
2 changes: 1 addition & 1 deletion common/modules/permissions_module/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ bitflags = "1.3.2"
path = "../../common_errors"

[dependencies.multiversx-sc]
version = "=0.43.2"
version = "=0.43.3"
features = ["esdt-token-payment-legacy-decode"]
2 changes: 1 addition & 1 deletion common/modules/sc_whitelist_module/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ path = "src/sc_whitelist_module.rs"
path = "../../common_errors"

[dependencies.multiversx-sc]
version = "=0.43.2"
version = "=0.43.3"
features = ["esdt-token-payment-legacy-decode"]
2 changes: 1 addition & 1 deletion common/modules/token_merge_helper/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ path = "src/lib.rs"
path = "../../common_errors"

[dependencies.multiversx-sc]
version = "=0.43.2"
version = "=0.43.3"
features = ["esdt-token-payment-legacy-decode"]
2 changes: 1 addition & 1 deletion common/modules/token_send/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ path = "../../common_structs"
path = "../../common_errors"

[dependencies.multiversx-sc]
version = "=0.43.2"
version = "=0.43.3"
features = ["esdt-token-payment-legacy-decode"]
2 changes: 1 addition & 1 deletion common/modules/utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ edition = "2021"
[lib]
path = "src/lib.rs"
[dependencies.multiversx-sc]
version = "=0.43.2"
version = "=0.43.3"
features = ["esdt-token-payment-legacy-decode"]

[dependencies.common_structs]
Expand Down
2 changes: 1 addition & 1 deletion common/traits/fixed-supply-token/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ edition = "2021"
[lib]
path = "src/lib.rs"
[dependencies.multiversx-sc]
version = "=0.43.2"
version = "=0.43.3"
2 changes: 1 addition & 1 deletion common/traits/mergeable/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ edition = "2021"
[lib]
path = "src/lib.rs"
[dependencies.multiversx-sc]
version = "=0.43.2"
version = "=0.43.3"
features = ["esdt-token-payment-legacy-decode"]
2 changes: 1 addition & 1 deletion common/traits/unwrappable/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ edition = "2021"
[lib]
path = "src/lib.rs"
[dependencies.multiversx-sc]
version = "=0.43.2"
version = "=0.43.3"
features = ["esdt-token-payment-legacy-decode"]
6 changes: 3 additions & 3 deletions dex/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ version = "0.0.0"
edition = "2021"
publish = false
[dependencies.multiversx-sc]
version = "=0.43.2"
version = "=0.43.3"
features = ["esdt-token-payment-legacy-decode"]

[dev-dependencies]
num-bigint = "0.4.2"

[dev-dependencies.multiversx-sc-modules]
version = "=0.43.2"
version = "=0.43.3"

[dev-dependencies.multiversx-sc-scenario]
version = "=0.43.2"
version = "=0.43.3"

[dev-dependencies.config]
path = "../common/modules/farm/config"
Expand Down
6 changes: 3 additions & 3 deletions dex/farm-with-locked-rewards/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -74,17 +74,17 @@ path = "../../locked-asset/energy-factory"
path = "../../energy-integration/common-modules/energy-query"

[dependencies.multiversx-sc]
version = "=0.43.2"
version = "=0.43.3"
features = ["esdt-token-payment-legacy-decode"]

[dependencies.multiversx-sc-modules]
version = "=0.43.2"
version = "=0.43.3"

[dev-dependencies]
num-bigint = "0.4.2"

[dev-dependencies.multiversx-sc-scenario]
version = "=0.43.2"
version = "=0.43.3"

[dev-dependencies.simple-lock]
path = "../../locked-asset/simple-lock"
15 changes: 8 additions & 7 deletions dex/farm-with-locked-rewards/wasm/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dex/farm-with-locked-rewards/wasm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ default-features = false
path = ".."

[dependencies.multiversx-sc-wasm-adapter]
version = "=0.43.2"
version = "=0.43.3"
6 changes: 3 additions & 3 deletions dex/farm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,11 @@ path = "../../energy-integration/common-modules/weekly-rewards-splitting"
path = "../../energy-integration/common-modules/energy-query"

[dependencies.multiversx-sc]
version = "=0.43.2"
version = "=0.43.3"
features = ["esdt-token-payment-legacy-decode"]

[dependencies.multiversx-sc-modules]
version = "=0.43.2"
version = "=0.43.3"

[dev-dependencies]
num-bigint = "0.4.2"
Expand All @@ -81,7 +81,7 @@ num-bigint = "0.4.2"
path = "../../energy-integration/energy-update"

[dev-dependencies.multiversx-sc-scenario]
version = "=0.43.2"
version = "=0.43.3"

[dev-dependencies.energy-factory-mock]
path = "../../energy-integration/energy-factory-mock"
Expand Down
20 changes: 10 additions & 10 deletions dex/farm/wasm/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dex/farm/wasm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ default-features = false
path = ".."

[dependencies.multiversx-sc-wasm-adapter]
version = "=0.43.2"
version = "=0.43.3"
4 changes: 2 additions & 2 deletions dex/fuzz/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ num-bigint = "0.4.2"
rand = "0.8.4"

[dependencies.multiversx-sc]
version = "=0.43.2"
version = "=0.43.3"
features = ["esdt-token-payment-legacy-decode"]

[dependencies.multiversx-sc-scenario]
version = "=0.43.2"
version = "=0.43.3"

[dependencies.pausable]
path = "../../common/modules/pausable"
Expand Down
4 changes: 2 additions & 2 deletions dex/governance/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ publish = false
[lib]
path = "src/lib.rs"
[dependencies.multiversx-sc]
version = "=0.43.2"
version = "=0.43.3"
features = ["esdt-token-payment-legacy-decode"]

[dev-dependencies]
num-bigint = "0.4.2"

[dev-dependencies.multiversx-sc-scenario]
version = "=0.43.2"
version = "=0.43.3"

[dev-dependencies.pair-mock]
path = "../pair-mock"
Loading

0 comments on commit 75eba99

Please sign in to comment.