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

Update crates #271

Merged
merged 4 commits into from
May 9, 2024
Merged

Update crates #271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fe6d2f6
update crates
gRoussac Apr 18, 2024
8d79853
Merge branch 'dev' of github.com:casper-ecosystem/cep-78-enhanced-nft…
gRoussac Apr 18, 2024
0ae3fb7
stabel in tests
gRoussac Apr 18, 2024
bb475a6
clippy
gRoussac Apr 18, 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
6 changes: 3 additions & 3 deletions client/balance_of_session/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
6 changes: 3 additions & 3 deletions client/get_approved_session/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
6 changes: 3 additions & 3 deletions client/is_approved_for_all_session/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
6 changes: 3 additions & 3 deletions client/mint_session/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
6 changes: 3 additions & 3 deletions client/owner_of_session/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 2 additions & 2 deletions client/transfer_session/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions client/updated_receipts/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions contract/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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]]
Expand Down
8 changes: 7 additions & 1 deletion contract/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion rustfmt.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
wrap_comments = true
comment_width = 100
imports_granularity = "Crate"
edition = "2018"
edition = "2021"
4 changes: 2 additions & 2 deletions test-contracts/minting_contract/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
13 changes: 7 additions & 6 deletions tests/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 }
1 change: 1 addition & 0 deletions tests/rust-toolchain
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
stable
2 changes: 0 additions & 2 deletions tests/src/acl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion tests/src/utility/installer_request_builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down
Loading