Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: bump Stylus SDK to v0.7.0-beta.1 and alloy to v0.8.13 #433

Draft
wants to merge 30 commits into
base: main
Choose a base branch
from

Conversation

bidzyyys
Copy link
Collaborator

@bidzyyys bidzyyys commented Dec 4, 2024

Resolves #424

PR Checklist

  • Tests
  • Documentation
  • Changelog

@bidzyyys
Copy link
Collaborator Author

bidzyyys commented Dec 4, 2024

Blocked by OpenZeppelin/koba#14

@bidzyyys bidzyyys self-assigned this Dec 4, 2024
Copy link

netlify bot commented Dec 4, 2024

Deploy Preview for contracts-stylus canceled.

Name Link
🔨 Latest commit dafd146
🔍 Latest deploy log https://app.netlify.com/sites/contracts-stylus/deploys/6769b3758dda380008272c4c

Copy link

codecov bot commented Dec 4, 2024

Codecov Report

Attention: Patch coverage is 0% with 78 lines in your changes missing coverage. Please review.

Project coverage is 88.5%. Comparing base (9192c18) to head (dafd146).

Files with missing lines Patch % Lines
contracts/src/token/erc1155/mod.rs 0.0% 54 Missing ⚠️
contracts/src/token/erc721/mod.rs 0.0% 19 Missing ⚠️
contracts/src/finance/vesting_wallet.rs 0.0% 5 Missing ⚠️
Additional details and impacted files
Files with missing lines Coverage Δ
contracts/src/access/control.rs 98.1% <ø> (-0.5%) ⬇️
contracts/src/access/ownable.rs 93.0% <ø> (-1.1%) ⬇️
contracts/src/access/ownable_two_step.rs 98.4% <ø> (-0.8%) ⬇️
...racts/src/token/erc1155/extensions/metadata_uri.rs 75.8% <ø> (-2.8%) ⬇️
contracts/src/token/erc20/extensions/capped.rs 76.9% <ø> (-6.5%) ⬇️
contracts/src/token/erc20/extensions/metadata.rs 21.0% <ø> (-1.2%) ⬇️
contracts/src/token/erc20/extensions/permit.rs 0.0% <ø> (ø)
contracts/src/token/erc20/mod.rs 94.0% <ø> (-0.3%) ⬇️
contracts/src/token/erc20/utils/safe_erc20.rs 16.9% <ø> (-0.2%) ⬇️
...ntracts/src/token/erc721/extensions/consecutive.rs 98.0% <ø> (-0.2%) ⬇️
... and 10 more

... and 1 file with indirect coverage changes

@bidzyyys
Copy link
Collaborator Author

bidzyyys commented Dec 5, 2024

Unexpected change in Storage due to this commit in SDK -> OffchainLabs/stylus-sdk-rs@bc05111

@bidzyyys bidzyyys mentioned this pull request Dec 5, 2024
@@ -30,36 +33,11 @@ pub type Wallet = FillProvider<
Ethereum,
>;

/// Convenience type alias that represents an alloy provider.
pub type Provider = FillProvider<
Copy link
Member

@qalisander qalisander Dec 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bidzyyys I haven't found any place where this Provider was used. Just dropped it

///
/// May panic if unable to load the `RPC_URL` environment variable.
#[must_use]
pub fn provider() -> Provider {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And this function also wasn't used

Cargo.toml Outdated
@@ -136,3 +136,12 @@ incremental = false

[profile.dev]
panic = "abort"

# TODO#q: remove this once the fix is released
Copy link
Member

@qalisander qalisander Dec 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove this patch after stylus-sdk release

@bidzyyys
Copy link
Collaborator Author

bidzyyys commented Dec 6, 2024

@qalisander sth went wrong with your changes, see last E2E tests errors.

@qalisander
Copy link
Member

I see. But those errors are related to vesting_wallet::block_timestamp function and alloy.
External call works

@qalisander qalisander self-assigned this Dec 7, 2024
…eta.1

# Conflicts:
#	contracts/src/token/erc20/extensions/permit.rs
#	contracts/src/utils/math/storage.rs
#	lib/e2e/src/lib.rs
@@ -179,6 +177,61 @@ impl MethodError for Error {
}
}

sol_interface! {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved it back into the main file after all :D

…eta.1

# Conflicts:
#	Cargo.toml
#	contracts/src/utils/math/storage.rs
…eta.1

# Conflicts:
#	contracts/src/access/control.rs
#	contracts/src/finance/vesting_wallet.rs
#	contracts/src/token/erc1155/mod.rs
#	contracts/src/token/erc1155/receiver.rs
#	contracts/src/token/erc20/extensions/capped.rs
#	contracts/src/token/erc20/extensions/metadata.rs
#	contracts/src/token/erc721/extensions/enumerable.rs
#	contracts/src/token/erc721/mod.rs
#	contracts/src/utils/metadata.rs
#	contracts/src/utils/pausable.rs
…eta.1

# Conflicts:
#	Cargo.lock
#	contracts/src/finance/vesting_wallet.rs
#	contracts/src/token/erc1155/mod.rs
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Build]: Bump Stylus SDK to v0.7.0-beta.1 and alloy to v0.8.13
3 participants