Skip to content

Commit

Permalink
Merge branch 'main' into ownable-2-step
Browse files Browse the repository at this point in the history
  • Loading branch information
bidzyyys authored Nov 7, 2024
2 parents b84d407 + 1f9e7ff commit 89bd99b
Show file tree
Hide file tree
Showing 34 changed files with 4,051 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @bidzyyys @qalisander
* @bidzyyys @qalisander @0xNeshi
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].0
uses: crate-ci/[email protected].2
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Added

-
- `SafeErc20` Utility. #289
- Finite Fields arithmetics. #376

### Changed

Expand Down
52 changes: 51 additions & 1 deletion Cargo.lock

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

16 changes: 12 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ members = [
"examples/basic/token",
"examples/basic/script",
"examples/ecdsa",
"benches",
"examples/ownable-two-step",
"examples/safe-erc20",
"benches",
]
default-members = [
"contracts",
Expand All @@ -33,6 +34,7 @@ default-members = [
"examples/erc721",
"examples/erc721-consecutive",
"examples/erc721-metadata",
"examples/safe-erc20",
"examples/merkle-proofs",
"examples/ownable",
"examples/ownable-two-step",
Expand Down Expand Up @@ -96,6 +98,12 @@ 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"
educe = "0.6.0"
hex-literal = "0.4.1"

# procedural macros
syn = { version = "2.0.58", features = ["full"] }
Expand All @@ -106,10 +114,10 @@ quote = "1.0.35"
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.1.0" }
motsu = { path = "lib/motsu" }
motsu-proc = { path = "lib/motsu-proc", version = ">=0.1, <0.3" }
e2e = { path = "lib/e2e" }
e2e-proc = {path = "lib/e2e-proc"}
e2e-proc = { path = "lib/e2e-proc" }

[profile.release]
codegen-units = 1
Expand Down
1 change: 1 addition & 0 deletions contracts/src/token/erc20/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ use stylus_sdk::{
use crate::utils::introspection::erc165::{Erc165, IErc165};

pub mod extensions;
pub mod utils;

sol! {
/// Emitted when `value` tokens are moved from one account (`from`) to
Expand Down
4 changes: 4 additions & 0 deletions contracts/src/token/erc20/utils/mod.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
//! Utilities for the ERC-20 standard.
pub mod safe_erc20;

pub use safe_erc20::SafeErc20;
Loading

0 comments on commit 89bd99b

Please sign in to comment.