Skip to content

Commit

Permalink
Merge pull request #20 from 727-Ventures/feature/ink-4-update
Browse files Browse the repository at this point in the history 
Ink! 4 update
  • Loading branch information
@Artemka374
Artemka374 authored Feb 17, 2023
2 parents 72571e9 + 0d436ad commit 9894c2f
Show file tree
Hide file tree
Showing 60 changed files with 116 additions and 116 deletions.
8 changes: 4 additions & 4 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ exclude = [

[package]
name = "openbrush"
version = "3.0.0-beta.1"
version = "3.0.0"
authors = ["Brushfam <green@727.ventures>"]
edition = "2018"

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

[dependencies]
ink = { version = "~4.0.0-rc", default-features = false}
ink = { version = "~4.0.0", 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.0.0-beta.1", path = "contracts", default-features = false }
openbrush_lang = { version = "~3.0.0-beta.1", path = "lang", default-features = false }
openbrush_contracts = { version = "~3.0.0", path = "contracts", default-features = false }
openbrush_lang = { version = "~3.0.0", path = "lang", default-features = false }

[lib]
name = "openbrush"
Expand Down
8 changes: 4 additions & 4 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.0.0-beta.1"
version = "3.0.0"
authors = ["Brushfam <green@727.ventures>"]
edition = "2021"

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

[dependencies]
ink = { version = "~4.0.0-rc", default-features = false}
ink = { version = "~4.0.0", 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.0.0-beta.1", package = "openbrush_lang", path = "../lang", default-features = false }
openbrush = { version = "~3.0.0", package = "openbrush_lang", path = "../lang", default-features = false }

pallet-assets-chain-extension = { git = "https://github.com/727-ventures/pallet-assets-chain-extension", branch = "ink-4-beta", default-features = false, features = ["ink-lang"] }
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"] }

[lib]
name = "openbrush_contracts"
Expand Down
4 changes: 2 additions & 2 deletions docs/docs/smart-contracts/example/contract.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ implementation of `Lending` and `LendingPermissioned` traits defined in the `len
```toml
[package]
name = "lending_contract"
version = "3.0.0-beta.1"
version = "3.0.0"
authors = ["Brushfam <dominik.krizo@727.ventures>"]
edition = "2021"

Expand All @@ -29,7 +29,7 @@ scale-info = { version = "2.3", default-features = false, features = ["derive"],
shares_contract = { path = "../shares", default-features = false, features = ["ink-as-dependency"] }
loan_contract = { path = "../loan", default-features = false, features = ["ink-as-dependency"] }
lending_project = { path = "../..", default-features = false }
openbrush = { version = "~3.0.0-beta.1", default-features = false, features = ["pausable", "access_control"] }
openbrush = { version = "~3.0.0", default-features = false, features = ["pausable", "access_control"] }

[lib]
name = "lending_contract"
Expand Down
12 changes: 6 additions & 6 deletions docs/docs/smart-contracts/overview.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ title: Overview

This doc contains description of how the OpenBrush library can be imported and used.

The OpenBrush is using ink! version `4.0.0-rc` at the moment.
The OpenBrush is using ink! version `4.0.0` at the moment.
You will need to use the same version of the ink! in your project.
If you use a different version of ink, you need to use a different version of OpenBrush which uses the same version of ink!.
OpenBrush had several significant changes in API, so you check the [Wizard](https://openbrush.io)
Expand All @@ -18,13 +18,13 @@ It doesn't contain [versioning](https://github.com/supercolony-net/openbrush-con
```toml
[dependencies]
# Import ink!
ink = { version = "~4.0.0-rc", default-features = false}
ink = { version = "~4.0.0", 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 }

# Brush dependency
openbrush = { git = "https://github.com/727-Ventures/openbrush-contracts", version = "~3.0.0-beta.1", default-features = false }
openbrush = { git = "https://github.com/727-Ventures/openbrush-contracts", version = "~3.0.0", default-features = false }

[features]
default = ["std"]
Expand Down Expand Up @@ -73,17 +73,17 @@ The name of the feature is the same as the name of the module. For example:

To enable `psp22`:
```toml
openbrush = { git = "https://github.com/727-Ventures/openbrush-contracts", version = "~3.0.0-beta.1", default-features = false, features = ["psp22"] }
openbrush = { git = "https://github.com/727-Ventures/openbrush-contracts", version = "~3.0.0", default-features = false, features = ["psp22"] }
```

To enable `ownable`:
```toml
openbrush = { git = "https://github.com/727-Ventures/openbrush-contracts", version = "~3.0.0-beta.1", default-features = false, features = ["ownable"] }
openbrush = { git = "https://github.com/727-Ventures/openbrush-contracts", version = "~3.0.0", default-features = false, features = ["ownable"] }
```

To enable both:
```toml
openbrush = { git = "https://github.com/727-Ventures/openbrush-contracts", version = "~3.0.0-beta.1", default-features = false, features = ["psp22, ownable"] }
openbrush = { git = "https://github.com/727-Ventures/openbrush-contracts", version = "~3.0.0", default-features = false, features = ["psp22, ownable"] }
```

After enabling the feature and importing the corresponding module, you need to embed the module
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/smart-contracts/upgradeable.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ pub struct Data {

### Disclaimer

The following information describes `Proxy` and `Diamond` patterns of upgradeable storage, which currently don't work in ink! 4 due to `DelegateCall`, but we will leave it here for the future updates of this feature (and also for the OpenBrush versions before `3.0.0-beta.1`).
The following information describes `Proxy` and `Diamond` patterns of upgradeable storage, which currently don't work in ink! 4 due to `DelegateCall`, but we will leave it here for the future updates of this feature (and also for the OpenBrush versions before `3.0.0`).

Uploading your contract on the blockchain with `contract-pallet` has two phases:
- Deploy - deploys source code to the blockchain. After deploying, the network uses the hash of the source code as an identifier for future instantiation of the contract. Now anyone can instantiate the contract by source code hash.
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.0.0-beta.1"
version = "3.0.0"
authors = ["Brushfam <green@727.ventures, dominik.krizo@727.ventures>"]
edition = "2021"

[dependencies]
ink = { version = "~4.0.0-rc", default-features = false}
ink = { version = "~4.0.0", 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
4 changes: 2 additions & 2 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.0.0-beta.1"
version = "3.0.0"
authors = ["Brushfam <dominik.krizo@727.ventures>"]
edition = "2021"

[dependencies]
ink = { version = "~4.0.0-rc", default-features = false}
ink = { version = "~4.0.0", 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
4 changes: 2 additions & 2 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.0.0-beta.1"
version = "3.0.0"
authors = ["Brushfam <dominik.krizo@727.ventures>"]
edition = "2021"

[dependencies]
ink = { version = "~4.0.0-rc", default-features = false}
ink = { version = "~4.0.0", 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
4 changes: 2 additions & 2 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.0.0-beta.1"
version = "3.0.0"
authors = ["Brushfam <dominik.krizo@727.ventures>"]
edition = "2021"

[dependencies]
ink = { version = "~4.0.0-rc", default-features = false}
ink = { version = "~4.0.0", 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
4 changes: 2 additions & 2 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.0.0-beta.1"
version = "3.0.0"
authors = ["Brushfam <dominik.krizo@727.ventures>"]
edition = "2021"

[dependencies]
ink = { version = "~4.0.0-rc", default-features = false}
ink = { version = "~4.0.0", 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
4 changes: 2 additions & 2 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.0.0-beta.1"
version = "3.0.0"
authors = ["Brushfam <green@727.ventures>"]
edition = "2021"

[dependencies]
ink = { version = "~4.0.0-rc", default-features = false}
ink = { version = "~4.0.0", 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
4 changes: 2 additions & 2 deletions examples/access_control_extensions/enumerable/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[package]
name = "my_access_control_enumerable"
version = "3.0.0-beta.1"
version = "3.0.0"
authors = ["Brushfam <nameless.endless@727.ventures>"]
edition = "2021"

[dependencies]
ink = { version = "~4.0.0-rc", default-features = false}
ink = { version = "~4.0.0", 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
2 changes: 1 addition & 1 deletion examples/alternatives/diamond/ink/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ authors = ["Brushfam <green@727.ventures>"]
edition = "2021"

[dependencies]
ink = { version = "~4.0.0-rc", default-features = false}
ink = { version = "~4.0.0", 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
4 changes: 2 additions & 2 deletions examples/alternatives/diamond/rust/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[package]
name = "rust_diamond"
version = "3.0.0-beta.1"
version = "3.0.0"
authors = ["Brushfam <dominik.krizo@727.ventures>"]
edition = "2021"

[dependencies]
ink = { version = "~4.0.0-rc", default-features = false}
ink = { version = "~4.0.0", 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
2 changes: 1 addition & 1 deletion examples/diamond/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ authors = ["Brushfam <dominik.krizo@727.ventures>"]
edition = "2021"

[dependencies]
ink = { version = "~4.0.0-rc", default-features = false}
ink = { version = "~4.0.0", 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
2 changes: 1 addition & 1 deletion examples/diamond/diamond_caller/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ authors = ["Brushfam <dominik.krizo@727.ventures>"]
edition = "2021"

[dependencies]
ink = { version = "~4.0.0-rc", default-features = false}
ink = { version = "~4.0.0", 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
2 changes: 1 addition & 1 deletion examples/diamond/psp22_facet_v1/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ authors = ["Brushfam <dominik.krizo@727.ventures>"]
edition = "2021"

[dependencies]
ink = { version = "~4.0.0-rc", default-features = false}
ink = { version = "~4.0.0", 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
2 changes: 1 addition & 1 deletion examples/diamond/psp22_facet_v2/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ authors = ["Brushfam <dominik.krizo@727.ventures>"]
edition = "2021"

[dependencies]
ink = { version = "~4.0.0-rc", default-features = false}
ink = { version = "~4.0.0", 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
2 changes: 1 addition & 1 deletion examples/diamond/psp22_metadata_facet/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ authors = ["Brushfam <dominik.krizo@727.ventures>"]
edition = "2021"

[dependencies]
ink = { version = "~4.0.0-rc", default-features = false}
ink = { version = "~4.0.0", 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
2 changes: 1 addition & 1 deletion examples/ownable/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ authors = ["Brushfam <green@727.ventures>"]
edition = "2021"

[dependencies]
ink = { version = "~4.0.0-rc", default-features = false}
ink = { version = "~4.0.0", 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
2 changes: 1 addition & 1 deletion examples/pausable/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ authors = ["Brushfam <green@727.ventures>"]
edition = "2021"

[dependencies]
ink = { version = "~4.0.0-rc", default-features = false}
ink = { version = "~4.0.0", 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
2 changes: 1 addition & 1 deletion examples/payment_splitter/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ authors = ["Brushfam <green@727.ventures>"]
edition = "2021"

[dependencies]
ink = { version = "~4.0.0-rc", default-features = false}
ink = { version = "~4.0.0", 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
4 changes: 2 additions & 2 deletions examples/proxy/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[package]
name = "my_proxy"
version = "3.0.0-beta.1"
version = "3.0.0"
authors = ["Brushfam <horacio.lex@727.ventures>"]
edition = "2021"

[dependencies]
ink = { version = "~4.0.0-rc", default-features = false}
ink = { version = "~4.0.0", 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
4 changes: 2 additions & 2 deletions examples/proxy/psp22_metadata_upgradeable/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[package]
name = "my_psp22_metadata_upgradeable"
version = "3.0.0-beta.1"
version = "3.0.0"
authors = ["Brushfam <horacio.lex@727.ventures>"]
edition = "2021"

[dependencies]
ink = { version = "~4.0.0-rc", default-features = false}
ink = { version = "~4.0.0", 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
4 changes: 2 additions & 2 deletions examples/proxy/psp22_upgradeable/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[package]
name = "my_psp22_upgradeable"
version = "3.0.0-beta.1"
version = "3.0.0"
authors = ["Brushfam <horacio.lex@727.ventures>"]
edition = "2021"

[dependencies]
ink = { version = "~4.0.0-rc", default-features = false}
ink = { version = "~4.0.0", 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
4 changes: 2 additions & 2 deletions examples/psp22/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[package]
name = "my_psp22"
version = "3.0.0-beta.1"
version = "3.0.0"
authors = ["Brushfam <green@727.ventures>"]
edition = "2021"

[dependencies]
ink = { version = "~4.0.0-rc", default-features = false}
ink = { version = "~4.0.0", 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
4 changes: 2 additions & 2 deletions examples/psp22_extensions/burnable/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[package]
name = "my_psp22_burnable"
version = "3.0.0-beta.1"
version = "3.0.0"
authors = ["Brushfam <m.konstantinovna@727.ventures>"]
edition = "2021"

[dependencies]
ink = { version = "~4.0.0-rc", default-features = false}
ink = { version = "~4.0.0", 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
2 changes: 1 addition & 1 deletion examples/psp22_extensions/capped/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ authors = ["Brushfam <dominik.krizo@727.ventures>"]
edition = "2021"

[dependencies]
ink = { version = "~4.0.0-rc", default-features = false}
ink = { version = "~4.0.0", 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
Loading

0 comments on commit 9894c2f

Please sign in to comment.