feat: update non-token contracts to SDK v0.9 by 0xNeshi · Pull Request #659 · OpenZeppelin/rust-contracts-stylus

0xNeshi · 2025-05-15T07:50:14Z

No description provided.

…er>::Error

…oken

bidzyyys

First pass

contracts/src/access/ownable.rs

bidzyyys · 2025-05-15T12:28:16Z

contracts/src/access/ownable_two_step.rs

 }

+#[public]
+#[implements(IOwnable2Step<Error = ownable::Error>, IErc165)]


Based on Solidity Ownable2Step is Ownable and with some features.
I think we should implement both IOwnable and change IOwnable2Step.
https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v5.3.0/contracts/access/Ownable2Step.sol

#659 (comment)

IMHO you should remove all the fns from IOwnable2Step trait that exist in IOwnable trait and apply #[implements(IOwnable2Step<Error = ownable::Error>, IOwnable<Error = ownable::Error>, IErc165)]

This is the same situation as for IVestingWallet:

The problem with that is that devs who inherit IVestingWallet might forget to inherit IOwnable too.

What you suggested would be the right approach if it were possible to define:

pub trait IVestingWallet: IOwnable

Until the above is possible, IOwnable2Step should include IOwnable functions

contracts/src/access/ownable_two_step.rs

contracts/src/finance/vesting_wallet.rs

bidzyyys · 2025-05-15T12:33:45Z

examples/ownable-two-step/src/lib.rs


 #[public]
-#[inherit(Erc20, Ownable2Step)]
+#[implements(IErc20<Error = Error>, IOwnable2Step<Error = Error>)]


Based on my previous comment, it should implement also IOwnable trait.

We should do that once IOwnable2Step can be defined as:

pub trait IOwnable2Step: IOwnable { // we should remove IOwnable function definitions from this trait now }

Until then, we have this issue

Should implement both IOwnable and IOwnable2Step traits. You should remove fns from IOwnable2Step that exist in IOwnable trait IMHO.

What is there to be gained by it? It would just duplicate functions existing in IVestingWallet.
It will make sense to implement IOwnable once this is addressed

bidzyyys · 2025-05-15T12:34:15Z

examples/ownable-two-step/src/lib.rs

+        from: Address,
+        to: Address,
+        value: U256,
+    ) -> Result<bool, <Self as IErc20>::Error> {


Why not using just Error?
Applies to all examples.

It works as per your suggestion.

I was just playing around, reverted all <Self as Interface>::Error back to Self::Error - cargo stylus export-abi and cargo check --features export-abi now works 🤔

We should check if we can revert this in traits before final merge into branch v0.2

bidzyyys · 2025-05-15T12:35:01Z

examples/vesting-wallet/src/lib.rs


 #[public]
-#[inherit(VestingWallet)]
+#[implements(IVestingWallet<Error = vesting_wallet::Error>)]


Based on my previous comment, it should implement also IOwnable trait.

#659 (comment)

Like I said before

What is there to be gained by it? It would just duplicate functions existing in IVestingWallet.
It will make sense to implement IOwnable once this is addressed

bidzyyys

Almost ready 🚀

contracts/src/token/erc20/extensions/wrapper.rs

bidzyyys · 2025-05-16T08:48:17Z

examples/ownable-two-step/src/lib.rs


 #[public]
-#[inherit(Erc20, Ownable2Step)]
+#[implements(IErc20<Error = Error>, IOwnable2Step<Error = Error>)]


Should implement both IOwnable and IOwnable2Step traits. You should remove fns from IOwnable2Step that exist in IOwnable trait IMHO.

bidzyyys · 2025-05-16T08:48:48Z

examples/vesting-wallet/src/lib.rs


 #[public]
-#[inherit(VestingWallet)]
+#[implements(IVestingWallet<Error = vesting_wallet::Error>)]


Like I said before

bidzyyys

Left an approval in advance.

codecov · 2025-05-16T09:03:56Z

Codecov Report

Attention: Patch coverage is 60.00000% with 30 lines in your changes missing coverage. Please review.

Please upload report for BASE (sdk-v0.9-and-ctors@24e93b7). Learn more about missing BASE report.
Report is 1 commits behind head on sdk-v0.9-and-ctors.

✅ All tests successful. No failed tests found.

Files with missing lines	Patch %	Lines
contracts/src/finance/vesting_wallet.rs	41.6%	14 Missing ⚠️
contracts/src/access/ownable.rs	55.0%	9 Missing ⚠️
contracts/src/access/ownable_two_step.rs	68.4%	6 Missing ⚠️
...ntracts/src/token/erc721/extensions/consecutive.rs	50.0%	1 Missing ⚠️

Additional details and impacted files

Files with missing lines	Coverage Δ
contracts/src/access/control.rs	`98.6% <100.0%> (ø)`
contracts/src/token/common/erc2981.rs	`99.2% <100.0%> (ø)`
contracts/src/token/erc1155/extensions/supply.rs	`80.7% <ø> (ø)`
contracts/src/token/erc20/extensions/capped.rs	`50.0% <ø> (ø)`
contracts/src/token/erc20/extensions/erc4626.rs	`18.7% <100.0%> (ø)`
contracts/src/token/erc20/extensions/flash_mint.rs	`76.4% <100.0%> (ø)`
contracts/src/token/erc20/extensions/metadata.rs	`61.2% <100.0%> (ø)`
contracts/src/token/erc20/extensions/wrapper.rs	`92.4% <100.0%> (ø)`
contracts/src/token/erc20/mod.rs	`97.2% <100.0%> (ø)`
contracts/src/token/erc20/utils/safe_erc20.rs	`53.1% <100.0%> (ø)`
... and 8 more

qalisander

Good job!

contracts/src/token/common/erc2981.rs

examples/vesting-wallet/src/lib.rs

0xNeshi added 29 commits May 9, 2025 10:44

test: fix access-control

a33c977

test: fix erc20

47b9a56

test: fix erc20-flash-mint

bb77374

Merge branch 'sdk-v0.9-and-ctors' into sdk-v0.9-and-ctors-erc20

9913a05

chore: merge with base

a57c5be

test: erc20 rework erc165 impl

2d36b97

test: erc20 - properly implement IErc20Burnable

e93bf01

ref: permit

7bc15ca

test: wrapper

c97cd3b

test: flashmint

38c103c

ref: remove redundant publics in erc20

1c8c5ed

ref: permit domain_separator

277e975

test: fix unit tests

d095452

test: fix erc4626 e2e tests

4a62ea8

test: refactor safeerc20

dc4e0f2

ref: move constructors into public impls

cd7d1b7

fix: access-control

f4a539f

test: fix access-control unit tests

44c6c8c

docs: fix clippy warnings

f7f455c

docs: ref

ec35aed

test: add u32 to interface-id consts

f61be2c

ref: missing implements

883ee33

test: fix erc20 lib.rs

4967ef5

fix: update ownables

81594c8

ref: vesting-wallet

056f9a6

test: create cargo.lock files

ad1d0db

test: add missing ref & in flash_mint.rs

4f2a787

test: update flash_mint.rs super::Error -> <Self as IErc3156FlashLend…

28ef9d2

…er>::Error

test: fix flash-mint

8827624

0xNeshi self-assigned this May 15, 2025

0xNeshi added 2 commits May 15, 2025 09:51

Merge branch 'sdk-v0.9-and-ctors-erc20' into sdk-v0.9-and-ctors-non-t…

e4dac66

…oken

test: revert cargo.lock deletions + revert e2e-tests.sh

aaed5f3

0xNeshi changed the title ~~Sdk v0.9 and ctors non token~~ feat: update non-token contracts to SDK v0.9 May 15, 2025

bidzyyys reviewed May 15, 2025

View reviewed changes

Base automatically changed from sdk-v0.9-and-ctors-erc20 to sdk-v0.9-and-ctors May 15, 2025 18:40

0xNeshi added 4 commits May 15, 2025 20:42

chore: merge with base

33567f1

docs: clippy warnings

bf0d6a7

ref: fixes

30b1deb

fix: include ownable interface_id in vesting wallet's supports interface

2555264

0xNeshi marked this pull request as ready for review May 15, 2025 19:16

0xNeshi requested a review from qalisander as a code owner May 15, 2025 19:16

0xNeshi requested a review from bidzyyys May 15, 2025 19:16

bidzyyys reviewed May 16, 2025

View reviewed changes

bidzyyys self-requested a review May 16, 2025 08:54

bidzyyys approved these changes May 16, 2025

View reviewed changes

0xNeshi added 2 commits May 16, 2025 10:57

chore: merge

852a71e

test: minor refs

5342659

0xNeshi added 3 commits May 16, 2025 12:07

build: pass toolchain arg to check-fmt.sh

b79c64d

build: pass toolchain arg to check-fmt.sh

7981b64

build: pass toolchain arg to check-fmt.sh

3ee2757

qalisander approved these changes May 16, 2025

View reviewed changes

contracts/src/token/common/erc2981.rs Outdated Show resolved Hide resolved

examples/vesting-wallet/src/lib.rs Show resolved Hide resolved

bidzyyys and others added 2 commits May 16, 2025 16:11

Merge branch 'sdk-v0.9-and-ctors' into sdk-v0.9-and-ctors-non-token

aea3150

test: add underscore before u32

5b64a55

0xNeshi force-pushed the sdk-v0.9-and-ctors-non-token branch from a57031f to 5b64a55 Compare May 16, 2025 14:39

0xNeshi merged commit 5d84b1f into sdk-v0.9-and-ctors May 19, 2025
16 of 17 checks passed

0xNeshi deleted the sdk-v0.9-and-ctors-non-token branch May 19, 2025 09:09

Conversation

0xNeshi commented May 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bidzyyys left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

0xNeshi May 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

0xNeshi May 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

bidzyyys left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

bidzyyys left a comment

Choose a reason for hiding this comment

Uh oh!

codecov bot commented May 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

qalisander left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

0xNeshi commented May 15, 2025 •

edited

Loading

0xNeshi May 15, 2025 •

edited

Loading

0xNeshi May 16, 2025 •

edited

Loading

codecov bot commented May 16, 2025 •

edited

Loading