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

Framework upgrade 0.50.4. No syntax change. #924

Merged
merged 5 commits into from
Jun 19, 2024
Merged

Framework upgrade 0.50.4. No syntax change. #924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c3d54f0
Framework upgrade 0.50.4. No syntax change.
psorinionut Jun 10, 2024
a235b6d
router upgrade pair endpoint fix
psorinionut Jun 11, 2024
0485c83
scenario test fix
psorinionut Jun 11, 2024
0f70d3a
Merge branch 'rc/v3.0' into framework-upgrade-0.50.4-no-syntax-change
CostinCarabas Jun 19, 2024
bf39603
Merge branch 'rc/v3.0' into framework-upgrade-0.50.4-no-syntax-change
CostinCarabas Jun 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
429 changes: 327 additions & 102 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion common/common_errors/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ edition = "2021"
path = "src/lib.rs"

[dependencies.multiversx-sc]
version = "=0.48.1"
version = "=0.50.4"
features = ["esdt-token-payment-legacy-decode"]
2 changes: 1 addition & 1 deletion common/common_structs/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ edition = "2021"
path = "src/lib.rs"

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

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

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

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

[dependencies.multiversx-sc-modules]
version = "=0.48.1"
version = "=0.50.4"
2 changes: 1 addition & 1 deletion common/modules/farm/events/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ path = "../../../common_structs"
path = "../contexts"

[dependencies.multiversx-sc]
version = "=0.48.1"
version = "=0.50.4"
features = ["esdt-token-payment-legacy-decode"]
6 changes: 3 additions & 3 deletions common/modules/farm/farm_base_impl/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@ path = "../../../traits/mergeable"
path = "../../../traits/fixed-supply-token"

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

[dependencies.multiversx-sc-modules]
version = "=0.48.1"
version = "=0.50.4"

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

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

[dependencies.multiversx-sc-modules]
version = "=0.48.1"
version = "=0.50.4"
4 changes: 2 additions & 2 deletions common/modules/farm/farm_token_merge/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ path = "../../token_merge_helper"
path = "../farm_token"

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

[dependencies.multiversx-sc-modules]
version = "=0.48.1"
version = "=0.50.4"

[workspace]
members = ["."]
4 changes: 2 additions & 2 deletions common/modules/farm/rewards/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ path = "../../pausable"
path = "../../permissions_module"

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

[dependencies.multiversx-sc-modules]
version = "=0.48.1"
version = "=0.50.4"
2 changes: 1 addition & 1 deletion common/modules/legacy_token_decode_module/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ edition = "2018"
path = "src/lib.rs"

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

[dependencies.common_structs]
Expand Down
2 changes: 1 addition & 1 deletion common/modules/locking_module/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ edition = "2021"
path = "src/lib.rs"

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

[dependencies.simple-lock]
Expand Down
2 changes: 1 addition & 1 deletion common/modules/locking_module/src/lock_with_energy_module.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ pub trait LockWithEnergyModule {
.execute_on_dest_context()
}

fn get_locking_sc_proxy_instance(&self) -> energy_factory::Proxy<Self::Api> {
fn get_locking_sc_proxy_instance(&self) -> energy_factory::ProxyTo<Self::Api> {
let locking_sc_address = self.locking_sc_address().get();
self.locking_sc_proxy_obj(locking_sc_address)
}
Expand Down
4 changes: 2 additions & 2 deletions common/modules/locking_module/src/locking_module.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,13 @@ pub trait LockingModule {
.execute_on_dest_context()
}

fn get_locking_sc_proxy_instance(&self) -> simple_lock::Proxy<Self::Api> {
fn get_locking_sc_proxy_instance(&self) -> simple_lock::ProxyTo<Self::Api> {
let locking_sc_address = self.locking_sc_address().get();
self.locking_sc_proxy_obj(locking_sc_address)
}

#[proxy]
fn locking_sc_proxy_obj(&self, sc_address: ManagedAddress) -> simple_lock::Proxy<Self::Api>;
fn locking_sc_proxy_obj(&self, sc_address: ManagedAddress) -> simple_lock::ProxyTo<Self::Api>;

#[view(getLockingScAddress)]
#[storage_mapper("lockingScAddress")]
Expand Down
2 changes: 1 addition & 1 deletion common/modules/math/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ edition = "2021"
path = "src/lib.rs"

[dependencies.multiversx-sc]
version = "=0.48.1"
version = "=0.50.4"
features = ["esdt-token-payment-legacy-decode"]
2 changes: 1 addition & 1 deletion common/modules/pausable/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ path = "src/pausable.rs"
path = "../permissions_module"

[dependencies.multiversx-sc]
version = "=0.48.1"
version = "=0.50.4"
features = ["esdt-token-payment-legacy-decode"]
2 changes: 1 addition & 1 deletion common/modules/permissions_module/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ bitflags = "2.4.1"
path = "../../common_errors"

[dependencies.multiversx-sc]
version = "=0.48.1"
version = "=0.50.4"
features = ["esdt-token-payment-legacy-decode"]
20 changes: 14 additions & 6 deletions common/modules/permissions_module/src/permissions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use bitflags::bitflags;
use multiversx_sc::{
abi::TypeAbi,
abi::{TypeAbi, TypeAbiFrom},
codec::{DecodeError, TopDecode, TopEncode},
};
bitflags! {
Expand Down Expand Up @@ -32,8 +32,16 @@ impl TopDecode for Permissions {
}
}

impl TypeAbi for Permissions {
fn type_name() -> multiversx_sc::abi::TypeName {
core::any::type_name::<u32>().into()
}
}
impl TypeAbiFrom<Self> for Permissions {}

impl TypeAbi for Permissions {
type Unmanaged = Self;

fn type_name() -> multiversx_sc::abi::TypeName {
core::any::type_name::<u32>().into()
}

fn type_name_rust() -> multiversx_sc::abi::TypeName {
core::any::type_name::<u32>().into()
}
}
2 changes: 1 addition & 1 deletion common/modules/permissions_module/src/permissions_module.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#![no_std]

mod permissions;
pub mod permissions;

use common_errors::ERROR_PERMISSION_DENIED;

Expand Down
2 changes: 1 addition & 1 deletion common/modules/sc_whitelist_module/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ path = "src/sc_whitelist_module.rs"
path = "../../common_errors"

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

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

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

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

[dependencies.common_structs]
Expand Down
2 changes: 1 addition & 1 deletion common/traits/fixed-supply-token/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ edition = "2021"
path = "src/lib.rs"

[dependencies.multiversx-sc]
version = "=0.48.1"
version = "=0.50.4"
2 changes: 1 addition & 1 deletion common/traits/mergeable/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ edition = "2021"
path = "src/lib.rs"

[dependencies.multiversx-sc]
version = "=0.48.1"
version = "=0.50.4"
features = ["esdt-token-payment-legacy-decode"]
2 changes: 1 addition & 1 deletion common/traits/unwrappable/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ edition = "2021"
path = "src/lib.rs"

[dependencies.multiversx-sc]
version = "=0.48.1"
version = "=0.50.4"
features = ["esdt-token-payment-legacy-decode"]
6 changes: 3 additions & 3 deletions dex/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ edition = "2021"
publish = false

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

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

[dev-dependencies.multiversx-sc-modules]
version = "=0.48.1"
version = "=0.50.4"

[dev-dependencies.multiversx-sc-scenario]
version = "=0.48.1"
version = "=0.50.4"

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

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

[dependencies.multiversx-sc-modules]
version = "=0.48.1"
version = "=0.50.4"

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

[dev-dependencies.multiversx-sc-scenario]
version = "=0.48.1"
version = "=0.50.4"

[dev-dependencies.simple-lock]
path = "../../locked-asset/simple-lock"
2 changes: 1 addition & 1 deletion dex/farm-with-locked-rewards/meta/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ publish = false
path = ".."

[dependencies.multiversx-sc-meta]
version = "0.48.1"
version = "0.50.4"
default-features = false
Loading
Loading