Skip to content

Commit

Permalink
Merge pull request #117 from Supercolony-net/feature/release-1.7.0
Browse files Browse the repository at this point in the history
OpenBrush Release 1.7.0
  • Loading branch information
xgreenx authored May 24, 2022
2 parents 6a4400f + 094ae22 commit bcc475b
Show file tree
Hide file tree
Showing 71 changed files with 366 additions and 367 deletions.
9 changes: 4 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ jobs:
image: ghcr.io/supercolony-net/openbrush-contracts-ci
options: --user root
env:
node: /usr/local/bin/node
CARGO_TARGET_DIR: /usr/local/cache/target
steps:
- uses: actions/checkout@v2
Expand All @@ -21,25 +20,25 @@ jobs:
image: ghcr.io/supercolony-net/openbrush-contracts-ci
options: --user root
env:
node: /usr/local/bin/node
CARGO_TARGET_DIR: /usr/local/cache/target
steps:
- uses: actions/checkout@v2
- name: Build & Run cargo tests
run: |
RUSTFLAGS="-D warnings" cargo test --all-features --workspace -- --test-threads=10
cargo test --all-features --workspace -- --test-threads=10
integration-tests:
runs-on: ubuntu-latest
container:
image: ghcr.io/supercolony-net/openbrush-contracts-ci
options: --user root
env:
node: /usr/local/bin/node
CARGO_TARGET_DIR: /usr/local/cache/target
steps:
- uses: actions/checkout@v2
- name: Yarn install dependencies
run: yarn
run: |
yarn
yarn add ts-node
- name: Redspot Сompile
run: |
chown -R root .
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ exclude = [

[package]
name = "brush"
version = "1.6.1"
version = "1.7.0"
authors = ["Supercolony <green.baneling@supercolony.net>"]
edition = "2018"

Expand Down
14 changes: 7 additions & 7 deletions contracts/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
[package]
name = "contracts"
version = "1.6.1"
version = "1.7.0"
authors = ["Supercolony <green.baneling@supercolony.net>"]
edition = "2021"

[dependencies]
ink_primitives = { tag = "v3.0.1", git = "https://github.com/paritytech/ink", default-features = false }
ink_metadata = { tag = "v3.0.1", git = "https://github.com/paritytech/ink", default-features = false, features = ["derive"], optional = true }
ink_env = { tag = "v3.0.1", git = "https://github.com/paritytech/ink", default-features = false }
ink_storage = { tag = "v3.0.1", git = "https://github.com/paritytech/ink", default-features = false }
ink_lang = { tag = "v3.0.1", git = "https://github.com/paritytech/ink", default-features = false }
ink_prelude = { tag = "v3.0.1", git = "https://github.com/paritytech/ink", default-features = false }
ink_primitives = { version = "3.1.0", default-features = false }
ink_metadata = { version = "3.1.0", default-features = false, features = ["derive"], optional = true }
ink_env = { version = "3.1.0", default-features = false }
ink_storage = { version = "3.1.0", default-features = false }
ink_lang = { version = "3.1.0", default-features = false }
ink_prelude = { version = "3.1.0", default-features = false }

scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
scale-info = { version = "2", default-features = false, features = ["derive"], optional = true }
Expand Down
2 changes: 1 addition & 1 deletion contracts/derive/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "derive"
version = "1.6.1"
version = "1.7.0"
authors = ["Supercolony <green.baneling@supercolony.net>"]
edition = "2021"

Expand Down
2 changes: 1 addition & 1 deletion docs/docs/smart-contracts/PSP1155/psp1155.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Include `brush` as dependency in the cargo file or you can use [default `Cargo.t
After you need to enable default implementation of PSP1155 via `brush` feature.

```toml
brush = { tag = "v1.6.1", git = "https://github.com/Supercolony-net/openbrush-contracts", default-features = false, features = ["psp1155"] }
brush = { tag = "v1.7.0", git = "https://github.com/Supercolony-net/openbrush-contracts", default-features = false, features = ["psp1155"] }
```

## Step 2: Add imports and enable unstable feature
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/smart-contracts/PSP22/Extensions/capped.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Include `brush` as dependency in the cargo file or you can use [default `Cargo.t
After you need to enable default implementation of PSP22 via `brush` features.

```toml
brush = { tag = "v1.6.1", git = "https://github.com/Supercolony-net/openbrush-contracts", default-features = false, features = ["psp22"] }
brush = { tag = "v1.7.0", git = "https://github.com/Supercolony-net/openbrush-contracts", default-features = false, features = ["psp22"] }
```

## Step 2: Add imports and enable unstable feature
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/smart-contracts/PSP22/Extensions/pausable.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Include `brush` as dependency in the cargo file or you can use [default `Cargo.t
After you need to enable default implementation of PSP22 and Pausable via `brush` features.

```toml
brush = { tag = "v1.6.1", git = "https://github.com/Supercolony-net/openbrush-contracts", default-features = false, features = ["psp22", "pausable"] }
brush = { tag = "v1.7.0", git = "https://github.com/Supercolony-net/openbrush-contracts", default-features = false, features = ["psp22", "pausable"] }
```

## Step 2: Add imports and enable unstable feature
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/smart-contracts/PSP22/Extensions/wrapper.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Include `brush` as dependency in the cargo file or you can use [default `Cargo.t
After you need to enable default implementation of PSP22 via `brush` features.

```toml
brush = { tag = "v1.6.1", git = "https://github.com/Supercolony-net/openbrush-contracts", default-features = false, features = ["psp22"] }
brush = { tag = "v1.7.0", git = "https://github.com/Supercolony-net/openbrush-contracts", default-features = false, features = ["psp22"] }
```

## Step 2: Add imports and enable unstable feature
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/smart-contracts/PSP22/Utils/token-timelock.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Include `brush` as dependency in the cargo file or you can use [default `Cargo.t
After you need to enable default implementation of PSP22 via `brush` features.

```toml
brush = { tag = "v1.6.1", git = "https://github.com/Supercolony-net/openbrush-contracts", default-features = false, features = ["psp22"] }
brush = { tag = "v1.7.0", git = "https://github.com/Supercolony-net/openbrush-contracts", default-features = false, features = ["psp22"] }
```

## Step 2: Add imports and enable unstable feature
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/smart-contracts/PSP22/psp22.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Include `brush` as dependency in the cargo file or you can use [default `Cargo.t
After you need to enable default implementation of PSP22 via `brush` features.

```toml
brush = { tag = "v1.6.1", git = "https://github.com/Supercolony-net/openbrush-contracts", default-features = false, features = ["psp22"] }
brush = { tag = "v1.7.0", git = "https://github.com/Supercolony-net/openbrush-contracts", default-features = false, features = ["psp22"] }
```

## Step 2: Add imports and enable unstable feature
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/smart-contracts/PSP34/Extensions/metadata.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Include `brush` as dependency in the cargo file or you can use [default `Cargo.t
After you need to enable default implementation of PSP34 via `brush` features.

```toml
brush = { tag = "v1.6.1", git = "https://github.com/Supercolony-net/openbrush-contracts", default-features = false, features = ["psp34"] }
brush = { tag = "v1.7.0", git = "https://github.com/Supercolony-net/openbrush-contracts", default-features = false, features = ["psp34"] }
```

## Step 2: Add imports and enable unstable feature
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/smart-contracts/PSP34/psp34.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Include `brush` as dependency in the cargo file or you can use [default `Cargo.t
After you need to enable default implementation of PSP34 via `brush` features.

```toml
brush = { tag = "v1.6.1", git = "https://github.com/Supercolony-net/openbrush-contracts", default-features = false, features = ["psp34"] }
brush = { tag = "v1.7.0", git = "https://github.com/Supercolony-net/openbrush-contracts", default-features = false, features = ["psp34"] }
```

## Step 2: Add imports and enable unstable feature
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/smart-contracts/access-control.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Include `brush` as dependency in the cargo file or you can use [default `Cargo.t
After you need to enable default implementation of Access Control via `brush` features.

```toml
brush = { tag = "v1.6.1", git = "https://github.com/Supercolony-net/openbrush-contracts", default-features = false, features = ["access_control"] }
brush = { tag = "v1.7.0", git = "https://github.com/Supercolony-net/openbrush-contracts", default-features = false, features = ["access_control"] }
```

## Step 2: Add imports and enable unstable feature
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/smart-contracts/diamond.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Include `brush` as dependency in the cargo file or you can use [default `Cargo.t
After you need to enable default implementation of Diamond Standard via `brush` features.

```toml
brush = { tag = "v1.6.1", git = "https://github.com/Supercolony-net/openbrush-contracts", default-features = false, features = ["diamond"] }
brush = { tag = "v1.7.0", git = "https://github.com/Supercolony-net/openbrush-contracts", default-features = false, features = ["diamond"] }
```

## Step 2: Add imports and enable unstable feature
Expand Down
12 changes: 6 additions & 6 deletions docs/docs/smart-contracts/example/contract.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ authors = ["Supercolony <dominik.krizo@supercolony.net>"]
edition = "2021"

[dependencies]
ink_primitives = { tag = "v3.0.1", git = "https://github.com/paritytech/ink", default-features = false }
ink_metadata = { tag = "v3.0.1", git = "https://github.com/paritytech/ink", default-features = false, features = ["derive"], optional = true }
ink_env = { tag = "v3.0.1", git = "https://github.com/paritytech/ink", default-features = false }
ink_storage = { tag = "v3.0.1", git = "https://github.com/paritytech/ink", default-features = false }
ink_lang = { tag = "v3.0.1", git = "https://github.com/paritytech/ink", default-features = false }
ink_prelude = { tag = "v3.0.1", git = "https://github.com/paritytech/ink", default-features = false }
ink_primitives = { version = "3.1.0", default-features = false }
ink_metadata = { version = "3.1.0", default-features = false, features = ["derive"], optional = true }
ink_env = { version = "3.1.0", default-features = false }
ink_storage = { version = "3.1.0", default-features = false }
ink_lang = { version = "3.1.0", default-features = false }
ink_prelude = { version = "3.1.0", default-features = false }

scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
scale-info = { version = "2", default-features = false, features = ["derive"], optional = true }
Expand Down
14 changes: 7 additions & 7 deletions docs/docs/smart-contracts/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@ So you should use the same version of the ink! across your project.
```toml
[dependencies]
# Import of all ink! crates
ink_primitives = { tag = "v3.0.1", git = "https://github.com/paritytech/ink", default-features = false }
ink_metadata = { tag = "v3.0.1", git = "https://github.com/paritytech/ink", default-features = false, features = ["derive"], optional = true }
ink_env = { tag = "v3.0.1", git = "https://github.com/paritytech/ink", default-features = false }
ink_storage = { tag = "v3.0.1", git = "https://github.com/paritytech/ink", default-features = false }
ink_lang = { tag = "v3.0.1", git = "https://github.com/paritytech/ink", default-features = false }
ink_prelude = { tag = "v3.0.1", git = "https://github.com/paritytech/ink", default-features = false }
ink_primitives = { version = "3.1.0", default-features = false }
ink_metadata = { version = "3.1.0", default-features = false, features = ["derive"], optional = true }
ink_env = { version = "3.1.0", default-features = false }
ink_storage = { version = "3.1.0", default-features = false }
ink_lang = { version = "3.1.0", default-features = false }
ink_prelude = { version = "3.1.0", default-features = false }

scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
scale-info = { version = "2", default-features = false, features = ["derive"], optional = true }

# Brush dependency
brush = { tag = "v1.6.1", git = "https://github.com/Supercolony-net/openbrush-contracts", default-features = false }
brush = { tag = "v1.7.0", git = "https://github.com/Supercolony-net/openbrush-contracts", default-features = false }

[features]
default = ["std"]
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/smart-contracts/ownable.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Include `brush` as dependency in the cargo file or you can use [default `Cargo.t
After you need to enable default implementation of Ownable via `brush` features.

```toml
brush = { tag = "v1.6.1", git = "https://github.com/Supercolony-net/openbrush-contracts", default-features = false, features = ["ownable"] }
brush = { tag = "v1.7.0", git = "https://github.com/Supercolony-net/openbrush-contracts", default-features = false, features = ["ownable"] }
```

## Step 2: Add imports and enable unstable feature
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/smart-contracts/pausable.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Include `brush` as dependency in the cargo file or you can use [default `Cargo.t
After you need to enable default implementation of Pausable via `brush` features.

```toml
brush = { tag = "v1.6.1", git = "https://github.com/Supercolony-net/openbrush-contracts", default-features = false, features = ["pausable"] }
brush = { tag = "v1.7.0", git = "https://github.com/Supercolony-net/openbrush-contracts", default-features = false, features = ["pausable"] }
```

## Step 2: Add imports and enable unstable feature
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/smart-contracts/payment-splitter.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Include `brush` as dependency in the cargo file or you can use [default `Cargo.t
After you need to enable default implementation of Payment Splitter via `brush` features.

```toml
brush = { tag = "v1.6.1", git = "https://github.com/Supercolony-net/openbrush-contracts", default-features = false, features = ["payment_splitter"] }
brush = { tag = "v1.7.0", git = "https://github.com/Supercolony-net/openbrush-contracts", default-features = false, features = ["payment_splitter"] }

# payment-splitter uses dividing inside, so your version of rust can require you to disable check overflow.
[profile.dev]
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/smart-contracts/proxy.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Include `brush` as dependency in the cargo file or you can use [default `Cargo.t
After you need to enable default implementation of Proxy via `brush` features.

```toml
brush = { tag = "v1.6.1", git = "https://github.com/Supercolony-net/openbrush-contracts", default-features = false, features = ["proxy"] }
brush = { tag = "v1.7.0", git = "https://github.com/Supercolony-net/openbrush-contracts", default-features = false, features = ["proxy"] }
```

## Step 2: Add imports and enable unstable feature
Expand Down
14 changes: 7 additions & 7 deletions docs/docs/smart-contracts/reentrancy-guard.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Include `brush` as dependency in the cargo file or you can use [default `Cargo.t
After you need to enable default implementation of Reentrancy Guard via `brush` features.

```toml
brush = { tag = "v1.6.1", git = "https://github.com/Supercolony-net/openbrush-contracts", default-features = false, features = ["reentrancy_guard"] }
brush = { tag = "v1.7.0", git = "https://github.com/Supercolony-net/openbrush-contracts", default-features = false, features = ["reentrancy_guard"] }
```

### Step 2: Add imports
Expand Down Expand Up @@ -174,12 +174,12 @@ To do a cross-contract call to `MyFlipper` you need to import the `MyFlipper` co
```toml
[dependencies]
ink_primitives = { tag = "v3.0.1", git = "https://github.com/paritytech/ink", default-features = false }
ink_metadata = { tag = "v3.0.1", git = "https://github.com/paritytech/ink", default-features = false, features = ["derive"], optional = true }
ink_env = { tag = "v3.0.1", git = "https://github.com/paritytech/ink", default-features = false }
ink_storage = { tag = "v3.0.1", git = "https://github.com/paritytech/ink", default-features = false }
ink_lang = { tag = "v3.0.1", git = "https://github.com/paritytech/ink", default-features = false }
ink_prelude = { tag = "v3.0.1", git = "https://github.com/paritytech/ink", default-features = false }
ink_primitives = { version = "3.1.0", default-features = false }
ink_metadata = { version = "3.1.0", default-features = false, features = ["derive"], optional = true }
ink_env = { version = "3.1.0", default-features = false }
ink_storage = { version = "3.1.0", default-features = false }
ink_lang = { version = "3.1.0", default-features = false }
ink_prelude = { version = "3.1.0", default-features = false }

scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
scale-info = { version = "2", default-features = false, features = ["derive"], optional = true }
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/smart-contracts/timelock-controller.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Include `brush` as dependency in the cargo file or you can use [default `Cargo.t
After you need to enable default implementation of Timelock Controller via `brush` features.

```toml
brush = { tag = "v1.6.1", git = "https://github.com/Supercolony-net/openbrush-contracts", default-features = false, features = ["timelock_controller"] }
brush = { tag = "v1.7.0", git = "https://github.com/Supercolony-net/openbrush-contracts", default-features = false, features = ["timelock_controller"] }
```

## Step 2: Add imports and enable unstable feature
Expand Down
14 changes: 7 additions & 7 deletions example_project_structure/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
[package]
name = "lending_project"
version = "1.6.1"
version = "1.7.0"
authors = ["Supercolony <green.baneling@supercolony.net, dominik.krizo@supercolony.net>"]
edition = "2021"

[dependencies]
ink_primitives = { tag = "v3.0.1", git = "https://github.com/paritytech/ink", default-features = false }
ink_metadata = { tag = "v3.0.1", git = "https://github.com/paritytech/ink", default-features = false, features = ["derive"], optional = true }
ink_env = { tag = "v3.0.1", git = "https://github.com/paritytech/ink", default-features = false }
ink_storage = { tag = "v3.0.1", git = "https://github.com/paritytech/ink", default-features = false }
ink_lang = { tag = "v3.0.1", git = "https://github.com/paritytech/ink", default-features = false }
ink_prelude = { tag = "v3.0.1", git = "https://github.com/paritytech/ink", default-features = false }
ink_primitives = { version = "3.1.0", default-features = false }
ink_metadata = { version = "3.1.0", default-features = false, features = ["derive"], optional = true }
ink_env = { version = "3.1.0", default-features = false }
ink_storage = { version = "3.1.0", default-features = false }
ink_lang = { version = "3.1.0", default-features = false }
ink_prelude = { version = "3.1.0", default-features = false }

scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
scale-info = { version = "2", default-features = false, features = ["derive"], optional = true }
Expand Down
14 changes: 7 additions & 7 deletions example_project_structure/contracts/lending/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
[package]
name = "lending_contract"
version = "1.6.1"
version = "1.7.0"
authors = ["Supercolony <dominik.krizo@supercolony.net>"]
edition = "2021"

[dependencies]
ink_primitives = { tag = "v3.0.1", git = "https://github.com/paritytech/ink", default-features = false }
ink_metadata = { tag = "v3.0.1", git = "https://github.com/paritytech/ink", default-features = false, features = ["derive"], optional = true }
ink_env = { tag = "v3.0.1", git = "https://github.com/paritytech/ink", default-features = false }
ink_storage = { tag = "v3.0.1", git = "https://github.com/paritytech/ink", default-features = false }
ink_lang = { tag = "v3.0.1", git = "https://github.com/paritytech/ink", default-features = false }
ink_prelude = { tag = "v3.0.1", git = "https://github.com/paritytech/ink", default-features = false }
ink_primitives = { version = "3.1.0", default-features = false }
ink_metadata = { version = "3.1.0", default-features = false, features = ["derive"], optional = true }
ink_env = { version = "3.1.0", default-features = false }
ink_storage = { version = "3.1.0", default-features = false }
ink_lang = { version = "3.1.0", default-features = false }
ink_prelude = { version = "3.1.0", default-features = false }

scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
scale-info = { version = "2", default-features = false, features = ["derive"], optional = true }
Expand Down
Loading

0 comments on commit bcc475b

Please sign in to comment.