Skip to content

Commit 490e5a6

Browse files
committed
Merge branch 'master' into gn/custom-signature-topic
2 parents 3c788c3 + 306145c commit 490e5a6

File tree

68 files changed

+921
-824
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+921
-824
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ on:
2626
- 'FILE_HEADER'
2727

2828
env:
29-
IMAGE: paritytech/ci-unified:bullseye-1.73.0
29+
IMAGE: paritytech/ci-unified:bullseye-1.74.0
3030
CARGO_TARGET_DIR: /ci-cache/${{ github.repository }}/targets/${{ github.ref_name }}/${{ github.job }}
3131
CARGO_INCREMENTAL: 0
3232
PURELY_STD_CRATES: ink/codegen metadata engine e2e e2e/macro ink/ir
@@ -228,7 +228,7 @@ jobs:
228228
for crate in ${ALSO_WASM_CRATES}; do
229229
cargo check --verbose --no-default-features --target wasm32-unknown-unknown \
230230
--manifest-path ./crates/${crate}/Cargo.toml;
231-
done
231+
done
232232
233233
- name: Check RISCV
234234
if: ${{ matrix.type == 'RISCV' }}
@@ -238,7 +238,7 @@ jobs:
238238
for crate in ${ALSO_WASM_CRATES}; do
239239
cargo check --verbose --no-default-features --target $RISCV_TARGET -Zbuild-std="core,alloc" \
240240
--manifest-path ./crates/${crate}/Cargo.toml;
241-
done
241+
done
242242
243243
dylint:
244244
runs-on: ubuntu-latest
@@ -336,7 +336,9 @@ jobs:
336336
- name: Cache
337337
uses: Swatinem/rust-cache@v2
338338
with:
339-
cache-directories: ${{ env.CARGO_TARGET_DIR }}
339+
cache-directories: |
340+
${{ env.CARGO_TARGET_DIR }}
341+
${{ env.CARGO_TARGET_DIR }}/linting
340342
341343
- name: Rust Info
342344
uses: ./.github/rust-info
@@ -353,6 +355,7 @@ jobs:
353355
run: |
354356
cargo test --verbose --all-features --no-fail-fast --workspace --locked
355357
cargo test --verbose --all-features --no-fail-fast --workspace --doc --locked
358+
pushd linting && cargo test --verbose --all-features --no-fail-fast --workspace && popd
356359
357360
docs:
358361
runs-on: ubuntu-latest
@@ -629,7 +632,7 @@ jobs:
629632
- name: Create Issue
630633
if: ${{ failure() && steps.fuzz_test.conclusion == 'failure' }}
631634

632-
uses: actions/github-script@v6
635+
uses: actions/github-script@v7
633636
with:
634637
script: |
635638
const runId = context.runId;

.github/workflows/measurements.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
run:
1515
shell: bash
1616
container:
17-
image: paritytech/ci-unified:bullseye-1.73.0
17+
image: paritytech/ci-unified:bullseye-1.74.0
1818
steps:
1919
- name: Checkout
2020
uses: actions/checkout@v4

CHANGELOG.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2121
- Linter: `no_main` lint - [#2001](https://github.com/paritytech/ink/pull/2001)
2222
- Clean E2E configuration parsing - [#1922](https://github.com/paritytech/ink/pull/1922)
2323
- Make `set_code_hash` generic - [#1906](https://github.com/paritytech/ink/pull/1906)
24-
- Provide a `StorageVec` datastructure built on top of `Lazy` - [#1995](https://github.com/paritytech/ink/pull/1955)
24+
- Provide a `StorageVec` datastructure built on top of `Lazy` - [#1995](https://github.com/paritytech/ink/pull/1995)
2525

2626
### Changed
2727
- Messages return `TypeSpec` directly - [#1999](https://github.com/paritytech/ink/pull/1999)
2828
- Fail when decoding from storage and not all bytes consumed - [#1897](https://github.com/paritytech/ink/pull/1897)
29-
- [E2E] resolve DispatchError error details for dry-runs - [#1944](https://github.com/paritytech/ink/pull/1994)
29+
- [E2E] resolve DispatchError error details for dry-runs - [#1994](https://github.com/paritytech/ink/pull/1994)
3030
- [E2E] update to new `drink` API - [#2005](https://github.com/paritytech/ink/pull/2005)
3131
- Support multiple chain extensions - [#1958](https://github.com/paritytech/ink/pull/1958)
3232
- New example of how to use multiple chain extensions in one contract.
3333
- Affects the usage of the `#[ink::chain_extension]` macro and the definition of the chain extension.
34+
- Split up `ink_linting` to mandatory and extra libraries - [#2032](https://github.com/paritytech/ink/pull/2032)
3435

3536

3637
## Version 5.0.0-alpha
@@ -43,7 +44,7 @@ You can read more about the change in the [PR](https://github.com/paritytech/ink
4344

4445
There are also other notable changes:
4546

46-
- Rework of event definitions - [#1827](https://github.com/paritytech/ink/pull/1708).
47+
- Rework of event definitions - [#1827](https://github.com/paritytech/ink/pull/1827).
4748
- Updated upgradeable contract example illustrating `delegate_call`
4849
- Removal of unchecked arithmetic. `cargo-contract` will fail compiling the contract with raw arithmetic operations.
4950
- Introduction of an alternative off-chain E2E testing backend, drink!
@@ -64,7 +65,7 @@ You can see a more detailed log of changes below:
6465
- [Drink backend]: Abstract error and result structs - [#1844](https://github.com/paritytech/ink/pull/1844)
6566
- Added `sr25519_verify` function to `ink_env` [#1840](https://github.com/paritytech/ink/pull/1840)
6667
- Warn when primitive number is annotated as event topic - [#1837](https://github.com/paritytech/ink/pull/1837)
67-
- Events `2.0` - [#1827](https://github.com/paritytech/ink/pull/1810)
68+
- Events `2.0` - [#1827](https://github.com/paritytech/ink/pull/1827)
6869
- Add `set_block_number` to off-chain test api `Engine` - [#1806](https://github.com/paritytech/ink/pull/1806)
6970
- Stabilize `call_runtime`[#1749](https://github.com/paritytech/ink/pull/1749)
7071
- Schema generation - [#1765](https://github.com/paritytech/ink/pull/1765)
@@ -80,7 +81,7 @@ You can see a more detailed log of changes below:
8081
- E2E: improve call API, remove `build_message` + callback - [#1782](https://github.com/paritytech/ink/pull/1782)
8182

8283
### Fixed
83-
- `RootLayout::new()` is generic again to allow using `ink_metadata` in pure `PortableForm` contexts - [#1782](https://github.com/paritytech/ink/pull/1989)
84+
- `RootLayout::new()` is generic again to allow using `ink_metadata` in pure `PortableForm` contexts - [#1989](https://github.com/paritytech/ink/pull/1989)
8485

8586
## 4.3.0
8687

0 commit comments

Comments
 (0)