Merge pull request #271 from gRoussac/crates_update

Update crates
casper-ecosystem · May 9, 2024 · c1e1fb9 · c1e1fb9
2 parents 7815f09 + bb475a6
commit c1e1fb9
Show file tree

Hide file tree

Showing 15 changed files with 42 additions and 36 deletions.
diff --git a/client/balance_of_session/Cargo.toml b/client/balance_of_session/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "balance_of_session"
 version = "1.5.1"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
-casper-contract = "3.0.0"
-casper-types = "3.0.0"
+casper-contract = "4.0.0"
+casper-types = "4.0.1"
 
 [[bin]]
 name = "balance_of_call"

diff --git a/client/get_approved_session/Cargo.toml b/client/get_approved_session/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "get_approved_session"
 version = "1.5.1"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
-casper-contract = "3.0.0"
-casper-types = "3.0.0"
+casper-contract = "4.0.0"
+casper-types = "4.0.1"
 
 [[bin]]
 name = "get_approved_call"

diff --git a/client/is_approved_for_all_session/Cargo.toml b/client/is_approved_for_all_session/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "is_approved_for_all_session"
 version = "1.5.1"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
-casper-contract = "3.0.0"
-casper-types = "3.0.0"
+casper-contract = "4.0.0"
+casper-types = "4.0.1"
 
 [[bin]]
 name = "is_approved_for_all_call"

diff --git a/client/mint_session/Cargo.toml b/client/mint_session/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "mint_session"
 version = "1.5.1"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
-casper-contract = "3.0.0"
-casper-types = "3.0.0"
+casper-contract = "4.0.0"
+casper-types = "4.0.1"
 
 [[bin]]
 name = "mint_call"

diff --git a/client/owner_of_session/Cargo.toml b/client/owner_of_session/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "owner_of_session"
 version = "1.5.1"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
-casper-contract = "3.0.0"
-casper-types = "3.0.0"
+casper-contract = "4.0.0"
+casper-types = "4.0.1"
 
 [[bin]]
 name = "owner_of_call"

diff --git a/client/transfer_session/Cargo.toml b/client/transfer_session/Cargo.toml
@@ -6,8 +6,8 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-casper-contract = "3.0.0"
-casper-types = "3.0.0"
+casper-contract = "4.0.0"
+casper-types = "4.0.1"
 
 [[bin]]
 name = "transfer_call"

diff --git a/client/updated_receipts/Cargo.toml b/client/updated_receipts/Cargo.toml
@@ -6,8 +6,8 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-casper-contract = "3.0.0"
-casper-types = "3.0.0"
+casper-contract = "4.0.0"
+casper-types = "4.0.1"
 
 [[bin]]
 name = "updated_receipts"

diff --git a/contract/Cargo.toml b/contract/Cargo.toml
@@ -1,16 +1,16 @@
 [package]
 name = "contract"
 version = "1.5.1"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
-casper-contract = { version = "3.0.0", default-features = false, optional = true }
-casper-types = { version = "3.0.0", default-features = false }
+casper-contract = { version = "4.0.0", default-features = false, optional = true }
+casper-types = { version = "4.0.1", default-features = false }
 serde = { version = "1.0.80", default-features = false }
 serde_json = { version = "1.0.59", default-features = false }
 serde-json-wasm = { version = "0.5.1", default-features = false }
 base16 = { version = "0.2.1", default-features = false }
-casper-event-standard = { version = "0.4.1", default-features = false }
+casper-event-standard = { version = "0.5.0", default-features = false }
 hex = { version = "0.4.3", default-features = false }
 
 [[bin]]

diff --git a/contract/src/main.rs b/contract/src/main.rs
@@ -2445,7 +2445,13 @@ fn generate_entry_points() -> EntryPoints {
     // data if needed
     let migrate = EntryPoint::new(
         ENTRY_POINT_MIGRATE,
-        vec![Parameter::new(ARG_NFT_PACKAGE_KEY, CLType::Any)],
+        vec![
+            Parameter::new(ARG_NFT_PACKAGE_KEY, CLType::String),
+            Parameter::new(ARG_EVENTS_MODE, CLType::U8),
+            Parameter::new(ARG_ACL_PACKAGE_MODE, CLType::Bool),
+            Parameter::new(ARG_PACKAGE_OPERATOR_MODE, CLType::Bool),
+            Parameter::new(ARG_OPERATOR_BURN_MODE, CLType::Bool),
+        ],
         CLType::Unit,
         EntryPointAccess::Public,
         EntryPointType::Contract,

diff --git a/rustfmt.toml b/rustfmt.toml
@@ -1,4 +1,4 @@
 wrap_comments = true
 comment_width = 100
 imports_granularity = "Crate"
-edition = "2018"
+edition = "2021"
diff --git a/test-contracts/minting_contract/Cargo.toml b/test-contracts/minting_contract/Cargo.toml
@@ -6,8 +6,8 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-casper-contract = "3.0.0"
-casper-types = "3.0.0"
+casper-contract = "4.0.0"
+casper-types = "4.0.1"
 
 [[bin]]
 name = "minting_contract"

diff --git a/tests/Cargo.toml b/tests/Cargo.toml
@@ -1,17 +1,18 @@
 [package]
 name = "tests"
 version = "1.5.1"
-edition = "2018"
-[dependencies]
-casper-engine-test-support = { version = "5.0.0", default-features = false }
+edition = "2021"
+
+[dev-dependencies]
+casper-engine-test-support = { version = "7.0.1", default-features = false }
 contract = { path = "../contract", default-features = false }
-casper-execution-engine = { version = "5.0.0", default-features = false }
-casper-types = { version = "3.0.0", default-features = false }
+casper-execution-engine = { version = "7.0.1", default-features = false }
+casper-types = { version = "4.0.1", default-features = false }
 serde = { version = "1.0.80", default-features = false }
 serde_json = { version = "1.0.59", default-features = false }
 once_cell = "1"
 blake2 = { version = "0.9.0", default-features = false }
 base16 = { version = "0.2.1", default-features = false }
 rand = "0.8.5"
 sha256 = "1.0.3"
-casper-event-standard = { version = "0.4.0", default-features = false }
+casper-event-standard = { version = "0.5.0", default-features = false }
diff --git a/tests/rust-toolchain b/tests/rust-toolchain
@@ -0,0 +1 @@
+stable
diff --git a/tests/src/acl.rs b/tests/src/acl.rs
@@ -1,5 +1,3 @@
-use core::panic;
-
 use crate::utility::{
     constants::{
         ACCOUNT_USER_1, ARG_NFT_CONTRACT_HASH, ARG_REVERSE_LOOKUP, CONTRACT_1_0_0_WASM,

diff --git a/tests/src/utility/installer_request_builder.rs b/tests/src/utility/installer_request_builder.rs
@@ -18,7 +18,7 @@ use std::collections::BTreeMap;
 
 // Modalities reexports.
 pub use contract::modalities::{
-    EventsMode, MintingMode, NFTHolderMode, NFTKind, OwnershipMode, TokenIdentifier, WhitelistMode,
+    EventsMode, MintingMode, NFTHolderMode, NFTKind, OwnershipMode, WhitelistMode,
 };
 
 use super::constants::{NFT_TEST_COLLECTION, NFT_TEST_SYMBOL};