Skip to content

Commit

Permalink
Target pallet-revive instead of pallet-contracts (#1851)
Browse files Browse the repository at this point in the history
* feat(build): PVM support for riscv

* feat: use pallet-revive instead of pallet-contracts

* fix: default storage_deposit_limit

* chore: better H160 handling, remove debug prints

* chore: improvements peter/feat-revive branch (#1780)

* chore: parse h160 address when displaying events

* chore: change template for a riscv contract

* Resolve H160 trait bound issues

* Upgrade `polkavm-linker` to 0.17.1

* Use `riscv32emac-unknown-none-polkavm.json` for `rustc --target`

* Enable `--cfg substrate_runtime`

* Enable `revive` feature for contract build

* Use ink! `master` for template

* Remove `#[payable]`'s

* Apply code hygiene

* Enable linting

* Do not optimize elf on debug builds

* Create `target/` dir, if nonexistent

* Use `H160` instead of `AccountId`

* Update `Cargo.lock`

* Make `clippy` happy

* Fix `substrate-contracts-node` archive extraction

* Update changelog

* Use `macos-15` in ci

* Build for `riscv` in integration tests

* Add target

* Fix target args

---------

Co-authored-by: Peter White <[email protected]>
Co-authored-by: Alex Bean <[email protected]>
  • Loading branch information
3 people authored Dec 5, 2024
1 parent 413ccc7 commit ae6309a
Show file tree
Hide file tree
Showing 18 changed files with 443 additions and 281 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ jobs:
fail-fast: false
matrix:
# We want newer versions than 'latest' here to have current wasm-opt
os: ["ubuntu-22.04", "macos-12"]
os: ["ubuntu-22.04", "macos-15"]
runs-on: ${{ matrix.os }}
env:
RUST_BACKTRACE: full
Expand Down Expand Up @@ -163,7 +163,7 @@ jobs:
fail-fast: false
matrix:
# We want newer versions than 'latest' here to have current wasm-opt
os: ["ubuntu-22.04", "macos-12"]
os: ["ubuntu-22.04", "macos-15"]
partition: [1, 2]
runs-on: ${{ matrix.os }}
env:
Expand Down Expand Up @@ -207,7 +207,7 @@ jobs:
fail-fast: false
matrix:
# We want newer versions than 'latest' here to have current wasm-opt
os: ["ubuntu-22.04", "macos-12"]
os: ["ubuntu-22.04", "macos-15"]
partition: [1, 2]
runs-on: ${{ matrix.os }}
env:
Expand Down Expand Up @@ -252,8 +252,8 @@ jobs:
fi
curl -L -o substrate-contracts-node.tar.gz "$CONTRACTS_NODE_URL$CONTRACTS_NODE_OS.tar.gz"
tar xfzv substrate-contracts-node.tar.gz
chmod +x artifacts/substrate-contracts-node-*/substrate-contracts-node &&
mv artifacts/substrate-contracts-node-*/substrate-contracts-node /usr/local/bin
chmod +x substrate-contracts-node-*/substrate-contracts-node &&
mv substrate-contracts-node-*/substrate-contracts-node /usr/local/bin
shell: bash

- name: Run integration tests
Expand All @@ -265,7 +265,7 @@ jobs:
fail-fast: false
matrix:
# We want newer versions than 'latest' here to have current wasm-opt
os: ["ubuntu-22.04", "macos-12", "windows-2022"]
os: ["ubuntu-22.04", "macos-15", "windows-2022"]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

[Unreleased]

### Changed
- Target `pallet-revive` instead of `pallet-contracts` - [#1851](https://github.com/use-ink/cargo-contract/pull/1851)

## [5.0.1]

### Changed
Expand Down
Loading

0 comments on commit ae6309a

Please sign in to comment.