feat: update SafeErc20 to newer Solidity version #652

simon0x1800 · 2025-05-08T16:57:37Z

This PR updates the SafeERC20 implementation to match the latest Solidity version, adding support for new features and improving error handling. The changes include:

Addition of try_safe_transfer and try_safe_transfer_from functions that return bool instead of reverting
Implementation of force_approve function for handling tokens requiring zero-reset approval
Addition of ERC1363 support with transfer_and_call_relaxed, transfer_from_and_call_relaxed, and approve_and_call_relaxed functions
Implementation of safe_increase_allowance and safe_decrease_allowance functions
Enhanced error handling with detailed Error enum types
Added Rust-specific safety improvements and idiomatic error handling

Resolves #620

PR Checklist

Tests
Documentation
Changelog

…zero-reset strategy

…in ISafeErc20 trait

…xed method for clarity and consistency in ISafeErc20 trait

…contract implementation

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

function.

…mon0x1800/OpenZeppelin-rust-contracts-stylus into feature/620-update-safe-erc20

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

…g with calldata for improved error handling and clarity

…mon0x1800/OpenZeppelin-rust-contracts-stylus into feature/620-update-safe-erc20

…proved clarity and consistency

netlify · 2025-05-08T16:57:41Z

✅ Deploy Preview for contracts-stylus canceled.

Name	Link
🔨 Latest commit	`155e686`
🔍 Latest deploy log	https://app.netlify.com/projects/contracts-stylus/deploys/685ebef8252c200008159c6b

0xNeshi

Thanks for contributing, left some comments

contracts/src/token/erc20/mod.rs

0xNeshi · 2025-06-06T07:31:35Z

contracts/src/token/erc20/utils/safe_erc20.rs

+    /// * `to` - Account to transfer tokens to.
+    /// * `value` - Number of tokens to transfer.
+    ///
+    /// # Returns


Remove # Returns sections, we generally don't include this

Please refrain from resolving if the change request was not applied

contracts/src/token/erc20/utils/safe_erc20.rs

0xNeshi · 2025-06-06T08:00:08Z

examples/safe-erc20/src/lib.rs

-#[entrypoint]
-#[storage]
-struct SafeErc20Example {
-    #[borrow]
+#[derive(Clone)]
+pub struct SafeErc20Example {


After fixing merge conflicts, make sure to use the new code (you'll see it after merging)

examples/safe-erc20/tests/abi/mod.rs

0xNeshi · 2025-06-06T08:01:10Z

examples/safe-erc20/tests/abi/mod.rs

@@ -23,3 +23,57 @@ sol!(
        event Approval(address indexed owner, address indexed spender, uint256 value);


Expand the sol! definition with the new functions

0xNeshi · 2025-06-06T08:02:04Z

contracts/src/lib.rs

@@ -51,4 +51,4 @@ extern crate alloc;
 pub mod access;
 pub mod finance;
 pub mod token;
-pub mod utils;
+pub mod utils;


format all code with cargo +nightly fmt --all

0xNeshi · 2025-06-18T05:13:24Z

Hey @simon0x1800 , just checking in, have you had time to review the change requests?

simon0x1800 · 2025-06-18T05:48:45Z

@0xNeshi sorry, I'll was a bit occupied with another project. Thanks for reviewing the pr. I'll apply the changes asap.

…mon0x1800/rust-contracts-stylus into feature/620-update-safe-erc20

simon0x1800 · 2025-06-19T09:14:28Z

@0xNeshi can you check now?

0xNeshi

Looks better.
For future reference, please address all of the change requests from previous code reviews before requesting a new review.
Thanks!

0xNeshi · 2025-06-27T08:38:29Z

contracts/src/token/erc20/mod.rs

-#[public]
-#[implements(IErc20<Error = Error>)]
-impl Erc20 {}
-
-#[public]


revert this

0xNeshi · 2025-06-27T08:38:58Z

contracts/src/token/erc20/utils/safe_erc20.rs

        #[derive(Debug)]
-        #[allow(missing_docs)]
        error SafeErc20FailedOperation(address token);


why remove this?

0xNeshi · 2025-06-27T08:39:55Z

contracts/src/token/erc20/utils/safe_erc20.rs

-#[public]
-#[implements(ISafeErc20<Error = Error>)]
-impl SafeErc20 {}


why remove this?

0xNeshi · 2025-06-27T08:40:27Z

contracts/src/token/erc20/utils/safe_erc20.rs

+    /// * `to` - Account to transfer tokens to.
+    /// * `value` - Number of tokens to transfer.
+    ///
+    /// # Returns


Please refrain from resolving if the change request was not applied

0xNeshi · 2025-06-27T08:47:23Z

examples/safe-erc20/src/lib.rs

-#[entrypoint]
-#[storage]
-struct SafeErc20Example {
+use alloy_primitives::{Address, U256};
+use openzeppelin_stylus::token::erc20::utils::safe_erc20::SafeErc20;
+use stylus_sdk::prelude::*;
+
+#[derive(Clone)]
+pub struct SafeErc20Example {
    safe_erc20: SafeErc20,
 }

-#[public]
-#[implements(ISafeErc20<Error = safe_erc20::Error>)]
+#[inherit(SafeErc20)]
 impl SafeErc20Example {}

-#[public]
-impl ISafeErc20 for SafeErc20Example {
-    type Error = safe_erc20::Error;
+#[external]
+impl SafeErc20Example {
+    pub fn transfer_and_call(


Please revert this and use the new inheritance model

0xNeshi · 2025-06-27T08:48:59Z

examples/safe-erc20/src/lib.rs

        &mut self,
        token: Address,
        to: Address,
        value: U256,
-    ) -> Result<(), Self::Error> {
-        self.safe_erc20.safe_transfer(token, to, value)
+        data: Vec<u8>,


data should be stylus_sdk::abi::Bytes

0xNeshi · 2025-06-27T08:49:23Z

examples/safe-erc20/tests/abi/mod.rs

+
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct SafeErc20;
+
+impl SafeErc20 {
+    pub fn new(address: Address, wallet: &Wallet) -> Self {
+        Self
+    }
+}


Why is this necessary?

simon0x1800 and others added 17 commits May 2, 2025 14:05

feat: SafeErc20.rs match the solidity version

7888698

refactor: Update force_approve method in ISafeErc20 trait to include …

06565ee

…zero-reset strategy

feat: Update SafeErc20 to match the new Solidity version of the Contract

c193733

refactor: Simplify force_approve method and improve code readability …

8d99290

…in ISafeErc20 trait

refactor: Rename 'to' parameter to 'spender' in approve_and_call_rela…

2457829

…xed method for clarity and consistency in ISafeErc20 trait

refactor: Remove SafeErc20 trait and related tests to streamline the …

84bd984

…contract implementation

Update contracts/src/token/erc20/utils/safe_erc20.rs

b96f2e5

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

Update contracts/src/token/erc20/utils/safe_erc20.rs

b81ad53

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

Update contracts/src/token/erc20/utils/safe_erc20.rs

6765b4d

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

refactor: Update safe_erc20.rs to improve method calls and code clarity

342d74c

function.

Merge branch 'feature/620-update-safe-erc20' of https://github.com/si…

174b634

…mon0x1800/OpenZeppelin-rust-contracts-stylus into feature/620-update-safe-erc20

Update contracts/src/token/erc20/utils/safe_erc20.rs

10840e1

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

Update contracts/src/token/erc20/utils/safe_erc20.rs

46ea88f

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

refactor: Enhance SafeErc20 method calls by replacing RawCall encodin…

e88951a

…g with calldata for improved error handling and clarity

Merge branch 'feature/620-update-safe-erc20' of https://github.com/si…

d19173a

…mon0x1800/OpenZeppelin-rust-contracts-stylus into feature/620-update-safe-erc20

refactor: Update SafeErc20 method calls to use data conversion for im…

49f9b00

…proved clarity and consistency

feat: Update SafeERC20 to match latest Solidity version

aa2a535

simon0x1800 requested review from bidzyyys, qalisander and 0xNeshi as code owners May 8, 2025 16:57

simon0x1800 mentioned this pull request May 8, 2025

[Feature]: Update SafeErc20 to match the new Solidity version of the Contract #620

Open

1 task

bidzyyys changed the title ~~Feature/620 update safe erc20~~ feat: update SafeErc20 to newer Solidity version May 27, 2025

0xNeshi reviewed Jun 6, 2025

View reviewed changes

simon0x1800 added 3 commits June 19, 2025 05:09

Merge branch 'main' into feature/620-update-safe-erc20

b918696

review implementation

bbcff79

Merge branch 'feature/620-update-safe-erc20' of https://github.com/si…

6ae9cc3

…mon0x1800/rust-contracts-stylus into feature/620-update-safe-erc20

0xNeshi reviewed Jun 27, 2025

View reviewed changes

Merge branch 'main' into feature/620-update-safe-erc20

155e686

		@@ -23,3 +23,57 @@ sol!(
		event Approval(address indexed owner, address indexed spender, uint256 value);

feat: update SafeErc20 to newer Solidity version #652

Are you sure you want to change the base?

feat: update SafeErc20 to newer Solidity version #652

Conversation

simon0x1800 commented May 8, 2025

PR Checklist

Uh oh!

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

Uh oh!

✅ Deploy Preview for contracts-stylus canceled.

Uh oh!

0xNeshi 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!

0xNeshi Jun 27, 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!

Uh oh!

Uh oh!

Uh oh!

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!

0xNeshi commented Jun 18, 2025

Uh oh!

simon0x1800 commented Jun 18, 2025

Uh oh!

simon0x1800 commented Jun 19, 2025

Uh oh!

0xNeshi left a comment • 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 Jun 27, 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!

Uh oh!

netlify bot commented May 8, 2025 •

edited

Loading

0xNeshi Jun 27, 2025 •

edited

Loading

0xNeshi left a comment •

edited

Loading

0xNeshi Jun 27, 2025 •

edited

Loading