Skip to content

Commit

Permalink
Merge branch 'OpenZeppelin:main' into ConsistentDocs
Browse files Browse the repository at this point in the history
  • Loading branch information
DarkLord017 authored Jan 15, 2025
2 parents 19c5277 + e005e5b commit 96bbc2e
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/check-wasm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
rustflags: ""

- name: Install cargo-stylus
run: cargo install [email protected].7
run: cargo install [email protected].8

- name: Run wasm check
run: ./scripts/check-wasm.sh
2 changes: 1 addition & 1 deletion .github/workflows/e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
rustflags: ""

- name: Install cargo-stylus
run: cargo install [email protected].7
run: cargo install [email protected].8

- name: Install solc
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gas-bench.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
rustflags: ""

- name: Install cargo-stylus
run: cargo install [email protected].7
run: cargo install [email protected].8

- name: Install wasm-opt
run: cargo install [email protected]
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed (Breaking)

- Bump cargo-stylus to v0.5.7. #484
- Bump cargo-stylus to v0.5.8. #493
- Constants `TYPE_HASH`, `FIELDS`, `SALT` and `TYPED_DATA_PREFIX`, and type `DomainSeparatorTuple` are no longer exported from `utils::cryptography::eip712`. #478
- Bump Stylus SDK to v0.7.0. #433
- Bump `alloy` dependencies to v0.8.14. #433
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2021 OpenZeppelin
Copyright (c) 2021-2025 Zeppelin Group Ltd

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion scripts/nitro-testnode.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ then
git clone --recurse-submodules https://github.com/OffchainLabs/nitro-testnode.git
cd ./nitro-testnode || exit
git pull origin release --recurse-submodules
git checkout d4244cd5c2cb56ca3d11c23478ef9642f8ebf472 || exit
git checkout af851769d52cab38bc3733dbd0a4db6120fa7864 || exit

./test-node.bash --no-run --init || exit
fi
Expand Down

0 comments on commit 96bbc2e

Please sign in to comment.