Skip to content

Commit

Permalink
update contracts to be compatible with cargo-contract 3
Browse files Browse the repository at this point in the history
  • Loading branch information
@coreggon11
coreggon11 committed Jul 28, 2023
1 parent b2aa40a commit a81d53f
Show file tree
Hide file tree
Showing 109 changed files with 940 additions and 924 deletions.
10 changes: 5 additions & 5 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ exclude = [

[package]
name = "openbrush"
version = "3.1.1"
version = "3.2.0"
authors = ["Brushfam <[email protected]>"]
edition = "2018"

Expand All @@ -26,12 +26,12 @@ categories = ["no-std", "embedded"]
include = ["Cargo.toml", "src/**/*.rs"]

[dependencies]
ink = { version = "4.1.0", default-features = false}
ink = { version = "4.2.1", default-features = false}
scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true }

openbrush_contracts = { version = "~3.1.1", path = "contracts", default-features = false }
openbrush_lang = { version = "~3.1.1", path = "lang", default-features = false }
openbrush_contracts = { version = "~3.2.0", path = "contracts", default-features = false }
openbrush_lang = { version = "~3.2.0", path = "lang", default-features = false }

[lib]
name = "openbrush"
Expand All @@ -41,7 +41,7 @@ crate-type = [
]

[dev-dependencies]
ink_e2e = "4.1.0"
ink_e2e = "4.2.1"

[features]
default = ["std"]
Expand Down
6 changes: 3 additions & 3 deletions contracts/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "openbrush_contracts"
version = "3.1.1"
version = "3.2.0"
authors = ["Brushfam <[email protected]>"]
edition = "2021"

Expand All @@ -15,11 +15,11 @@ categories = ["no-std", "embedded"]
include = ["Cargo.toml", "src/**/*.rs"]

[dependencies]
ink = { version = "4.1.0", default-features = false}
ink = { version = "4.2.1", default-features = false}
scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true }

openbrush = { version = "~3.1.1", package = "openbrush_lang", path = "../lang", default-features = false }
openbrush = { version = "~3.2.0", package = "openbrush_lang", path = "../lang", default-features = false }

pallet-assets-chain-extension = { git = "https://github.com/727-ventures/pallet-assets-chain-extension", branch = "polkadot-v0.9.37", default-features = false, features = ["ink-lang"] }

Expand Down
2 changes: 1 addition & 1 deletion contracts/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

#![cfg_attr(not(feature = "std"), no_std)]
#![cfg_attr(not(feature = "std"), no_std, no_main)]
#![feature(min_specialization)]

mod access;
Expand Down
4 changes: 2 additions & 2 deletions example_project_structure/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[package]
name = "lending_project"
version = "3.1.1"
version = "3.2.0"
authors = ["Brushfam <[email protected], [email protected]>"]
edition = "2021"

[dependencies]
ink = { version = "4.1.0", default-features = false}
ink = { version = "4.2.1", default-features = false}

scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true }
Expand Down
7 changes: 2 additions & 5 deletions example_project_structure/contracts/lending/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[package]
name = "lending_contract"
version = "3.1.1"
version = "3.2.0"
authors = ["Brushfam <[email protected]>"]
edition = "2021"

[dependencies]
ink = { version = "4.1.0", default-features = false}
ink = { version = "4.2.1", default-features = false}

scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true }
Expand All @@ -19,9 +19,6 @@ openbrush = { path = "../../..", default-features = false, features = ["pausable
[lib]
name = "lending_contract"
path = "lib.rs"
crate-type = [
"cdylib",
]

[features]
default = ["std"]
Expand Down
2 changes: 1 addition & 1 deletion example_project_structure/contracts/lending/lib.rs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![cfg_attr(not(feature = "std"), no_std)]
#![cfg_attr(not(feature = "std"), no_std, no_main)]
#![feature(min_specialization)]

/// This will be a simple lending contract where users can:
Expand Down
5 changes: 2 additions & 3 deletions example_project_structure/contracts/loan/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[package]
name = "loan_contract"
version = "3.1.1"
version = "3.2.0"
authors = ["Brushfam <[email protected]>"]
edition = "2021"

[dependencies]
ink = { version = "4.1.0", default-features = false}
ink = { version = "4.2.1", default-features = false}
scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true }

Expand All @@ -17,7 +17,6 @@ openbrush = { path = "../../..", default-features = false, features = ["ownable"
name = "loan_contract"
path = "lib.rs"
crate-type = [
"cdylib",
"rlib"
]

Expand Down
2 changes: 1 addition & 1 deletion example_project_structure/contracts/loan/lib.rs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![cfg_attr(not(feature = "std"), no_std)]
#![cfg_attr(not(feature = "std"), no_std, no_main)]
#![feature(min_specialization)]

/// This contract will represent the loan of a user
Expand Down
5 changes: 2 additions & 3 deletions example_project_structure/contracts/shares/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[package]
name = "shares_contract"
version = "3.1.1"
version = "3.2.0"
authors = ["Brushfam <[email protected]>"]
edition = "2021"

[dependencies]
ink = { version = "4.1.0", default-features = false}
ink = { version = "4.2.1", default-features = false}

scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true }
Expand All @@ -18,7 +18,6 @@ openbrush = { path = "../../..", default-features = false, features = ["ownable"
name = "shares_contract"
path = "lib.rs"
crate-type = [
"cdylib",
"rlib"
]

Expand Down
2 changes: 1 addition & 1 deletion example_project_structure/contracts/shares/lib.rs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![cfg_attr(not(feature = "std"), no_std)]
#![cfg_attr(not(feature = "std"), no_std, no_main)]
#![feature(min_specialization)]

/// This contract will be used to represent the shares of a user
Expand Down
7 changes: 2 additions & 5 deletions example_project_structure/contracts/stable_coin/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[package]
name = "stable_coin_contract"
version = "3.1.1"
version = "3.2.0"
authors = ["Brushfam <[email protected]>"]
edition = "2021"

[dependencies]
ink = { version = "4.1.0", default-features = false}
ink = { version = "4.2.1", default-features = false}

scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true }
Expand All @@ -17,9 +17,6 @@ openbrush = { path = "../../..", default-features = false, features = ["psp22"]
[lib]
name = "stable_coin_contract"
path = "lib.rs"
crate-type = [
"cdylib",
]

[features]
default = ["std"]
Expand Down
2 changes: 1 addition & 1 deletion example_project_structure/contracts/stable_coin/lib.rs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![cfg_attr(not(feature = "std"), no_std)]
#![cfg_attr(not(feature = "std"), no_std, no_main)]
#![feature(min_specialization)]

/// This is a simple `PSP22` which will be used as a stable coin and a collateral token in our lending contract
Expand Down
2 changes: 1 addition & 1 deletion example_project_structure/lib.rs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![cfg_attr(not(feature = "std"), no_std)]
#![cfg_attr(not(feature = "std"), no_std, no_main)]
#![feature(min_specialization)]

pub mod impls;
Expand Down
9 changes: 3 additions & 6 deletions examples/access_control/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[package]
name = "my_access_control"
version = "3.1.1"
version = "3.2.0"
authors = ["Brushfam <[email protected]>"]
edition = "2021"

[dependencies]
ink = { version = "4.1.0", default-features = false}
ink = { version = "4.2.1", default-features = false}

scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true }
Expand All @@ -14,15 +14,12 @@ scale-info = { version = "2.3", default-features = false, features = ["derive"],
openbrush = { path = "../..", default-features = false, features = ["access_control", "psp34"] }

[dev-dependencies]
ink_e2e = "4.1.0"
ink_e2e = "4.2.1"
test_helpers = { path = "../test_helpers", default-features = false }

[lib]
name = "my_access_control"
path = "lib.rs"
crate-type = [
"cdylib",
]

[features]
default = ["std"]
Expand Down
Loading

0 comments on commit a81d53f

Please sign in to comment.