Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/github_actions/crate-ci/typos-1.28.4
Browse files Browse the repository at this point in the history
  • Loading branch information
bidzyyys authored Dec 27, 2024
2 parents 24bd8cd + 9192c18 commit 73dc7ef
Show file tree
Hide file tree
Showing 28 changed files with 99 additions and 881 deletions.
3 changes: 0 additions & 3 deletions .github/codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,11 @@ coverage:
default:
informational: true
# Docs and examples are not relevant to coverage.
# Motsu and e2e should be moved outside of this repo.
ignore:
- "docs"
- "examples"
- "lib/e2e"
- "lib/e2e-proc"
- "lib/motsu"
- "lib/motsu-proc"
# Make comments less noisy.
comment:
layout: "files"
Expand Down
10 changes: 2 additions & 8 deletions .github/workflows/check-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ permissions:
contents: read
on:
push:
branches: [ main, release/* ]
branches: [main, release/*]
pull_request:
branches: [ main, release/* ]
branches: [main, release/*]

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
Expand All @@ -25,12 +25,6 @@ jobs:
with:
rustflags: ""

- name: Check motsu-proc
run: cargo publish -p motsu-proc --dry-run

- name: Check motsu
run: cargo publish -p motsu --dry-run

- name: Check openzeppelin-crypto
run: cargo publish -p openzeppelin-crypto --target wasm32-unknown-unknown --dry-run

Expand Down
30 changes: 0 additions & 30 deletions .github/workflows/publish-motsu-proc.yml

This file was deleted.

30 changes: 0 additions & 30 deletions .github/workflows/publish-motsu.yml

This file was deleted.

6 changes: 1 addition & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ 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.1.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]
## [v0.2.0-alpha.2] - 2024-12-18

### Added

Expand All @@ -27,10 +27,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed (Breaking)

- Update internal functions of `Erc721` and `Erc721Consecutive` to accept a reference to `Bytes`. #437
- Stop supporting reentrancy, and borrow `self` immutably in `IErc721::_check_on_erc721_received`. #440
- Remove `&mut self` parameter from `IErc1155::_check_on_erc1155_received` and make it an associated function. #440
- Remove `storage: &mut impl TopLevelStorage` parameter from `ecdsa::recover`. #440
- Remove `TopLevelStorage` trait implementation from `VestingWallet`, `Erc1155`, `Erc20Permit`, `SafeErc20`, `Erc721Consecutive`, and `Erc721`. #440

### Fixed

Expand Down
52 changes: 26 additions & 26 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 4 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ members = [
"contracts",
"contracts-proc",
"lib/crypto",
"lib/motsu",
"lib/motsu-proc",
"lib/e2e",
"lib/e2e-proc",
"examples/erc20",
Expand All @@ -30,8 +28,6 @@ default-members = [
"contracts",
"contracts-proc",
"lib/crypto",
"lib/motsu",
"lib/motsu-proc",
"lib/e2e-proc",
"examples/erc20",
"examples/erc20-permit",
Expand Down Expand Up @@ -61,7 +57,7 @@ authors = ["OpenZeppelin"]
edition = "2021"
license = "MIT"
repository = "https://github.com/OpenZeppelin/rust-contracts-stylus"
version = "0.2.0-alpha.1"
version = "0.2.0-alpha.2"

[workspace.lints.rust]
missing_docs = "warn"
Expand Down Expand Up @@ -121,12 +117,13 @@ syn = { version = "2.0.58", features = ["full"] }
proc-macro2 = "1.0.79"
quote = "1.0.35"

# test helpers
motsu = "0.2.1"

# members
openzeppelin-stylus = { path = "contracts" }
openzeppelin-stylus-proc = { path = "contracts-proc", version = "0.1.0" }
openzeppelin-crypto = { path = "lib/crypto" }
motsu = { path = "lib/motsu" }
motsu-proc = { path = "lib/motsu-proc", version = "0.2.0" }
e2e = { path = "lib/e2e" }
e2e-proc = { path = "lib/e2e-proc" }

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

[`koba`]: https://github.com/OpenZeppelin/koba

[Unit]: ./lib/motsu/README.md
[Unit]: https://github.com/OpenZeppelin/stylus-test-helpers

[integration]: ./lib/e2e/README.md

Expand Down
Loading

0 comments on commit 73dc7ef

Please sign in to comment.