Skip to content

Commit

Permalink
chore: merge with main
Browse files Browse the repository at this point in the history
  • Loading branch information
0xNeshi committed Feb 10, 2025
2 parents ee4302d + e900b57 commit dd97483
Show file tree
Hide file tree
Showing 103 changed files with 10,193 additions and 1,845 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -127,4 +127,4 @@ jobs:
uses: actions/checkout@v4

- name: Check spelling of files in the workspace
uses: crate-ci/[email protected].4
uses: crate-ci/[email protected].5
29 changes: 23 additions & 6 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,33 @@ 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]

### Added

-

### Changed

-

### Changed (Breaking)

-

### Fixed

-


## [v0.2.0-alpha.3] - 2025-01-30

### Added

- Optimised implementation of bigintegers `Uint<_>` for finite fields. #495
- `Erc4626` "Tokenized Vault Standard". #465
- Implement `mul_div` for `U256`. #465
- Implement `AddAssignChecked` for `StorageUint`. #474
- `Erc20FlashMint` extension. #407

Expand All @@ -28,9 +51,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Add full support for reentrancy (changed `VestingWallet` signature for some functions). #407
- `Nonce::use_nonce` panics on exceeding `U256::MAX`. #467

### Fixed

-

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

Expand All @@ -55,9 +75,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Update internal functions of `Erc721` and `Erc721Consecutive` to accept a reference to `Bytes`. #437

### Fixed

-

## [v0.2.0-alpha.1] - 2024-11-15

Expand Down
58 changes: 35 additions & 23 deletions Cargo.lock

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

14 changes: 7 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ members = [
"examples/erc1155",
"examples/erc1155-metadata-uri",
"examples/erc1155-supply",
"examples/erc4626",
"examples/merkle-proofs",
"examples/ownable",
"examples/vesting-wallet",
Expand All @@ -40,6 +41,7 @@ default-members = [
"examples/erc1155",
"examples/erc1155-metadata-uri",
"examples/erc1155-supply",
"examples/erc4626",
"examples/safe-erc20",
"examples/merkle-proofs",
"examples/ownable",
Expand All @@ -50,6 +52,7 @@ default-members = [
"examples/ecdsa",
"examples/poseidon",
]
exclude = ["fuzz"]

# Explicitly set the resolver to version 2, which is the default for packages
# with edition >= 2021.
Expand All @@ -61,7 +64,7 @@ authors = ["OpenZeppelin"]
edition = "2021"
license = "MIT"
repository = "https://github.com/OpenZeppelin/rust-contracts-stylus"
version = "0.2.0-alpha.2"
version = "0.2.0-alpha.3"

[workspace.lints.rust]
missing_docs = "warn"
Expand All @@ -75,7 +78,9 @@ all = "warn"

[workspace.dependencies]
# Stylus SDK related
stylus-sdk = { version = "0.7.0", default-features = false, features = ["mini-alloc"] }
stylus-sdk = { version = "0.7.0", default-features = false, features = [
"mini-alloc",
] }

alloy = { version = "=0.7.3", features = [
"contract",
Expand All @@ -96,7 +101,6 @@ alloy-sol-macro = { version = "=0.8.14", default-features = false }
alloy-sol-macro-expander = { version = "=0.8.14", default-features = false }
alloy-sol-macro-input = { version = "=0.8.14", default-features = false }

const-hex = { version = "1.11.1", default-features = false }
eyre = "0.6.8"
keccak-const = "0.2.0"
koba = "0.3.0"
Expand All @@ -106,10 +110,6 @@ regex = "1.10.4"
tiny-keccak = { version = "2.0.2", features = ["keccak"] }
tokio = { version = "1.12.0", features = ["full"] }
futures = "0.3.30"
dashmap = "6.1.0"
crypto-bigint = { version = "0.5.5", default-features = false, features = [
"zeroize",
] }
num-traits = "0.2.14"
zeroize = { version = "1.8.1", features = ["derive"] }
proptest = "1"
Expand Down
33 changes: 29 additions & 4 deletions GUIDELINES.md
Original file line number Diff line number Diff line change
Expand Up @@ -212,19 +212,25 @@ Some other examples of automation are:

Always check your code with the linter (`clippy`), by running:

$ cargo clippy --tests --all-features
```shell
cargo clippy --tests --all-features
```

And make sure your code is formatted with, using:

$ cargo +nightly fmt
```shell
cargo +nightly fmt
```

Finally, ensure there is no trailing whitespace anywhere.

### Running tests

Make sure all tests are passing with:

$ cargo test --all-features
```shell
cargo test --all-features
```

### Running end-to-end tests

Expand All @@ -241,12 +247,31 @@ Then you will be able to run e2e tests:
./scripts/e2e-tests.sh
```

### Running fuzz tests

To run fuzz tests, you need to have [cargo-fuzz] installed.
Then from the root of the project you can use `cargo fuzz list` to view the list of all existing fuzz targets:

```shell
cargo fuzz list
```

Finally you need to run:

```shell
cargo fuzz run <fuzz target name>
```

[cargo-fuzz]: https://rust-fuzz.github.io/book/cargo-fuzz/setup.html

### Checking the docs

If you make documentation changes, you may want to check whether there are any
warnings or errors:

$ cargo doc --all-features
```shell
cargo doc --all-features
```

## Pull requests

Expand Down
Loading

0 comments on commit dd97483

Please sign in to comment.