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

chore: add new solady version to import erc20 and add permit2 #78

Closed
Closed
Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
a16cca5
chore: add new solady version and import it for erc20
0xDiscotech Oct 2, 2024
0938dd8
fix: undo forge std changes
0xDiscotech Oct 3, 2024
62235f7
Merge branch 'sc/superchain-erc20-redesign' into chore/erc20-new-sola…
0xDiscotech Oct 3, 2024
68dc9db
chore: re run pre pr script
0xDiscotech Oct 3, 2024
bd87a99
Merge branch 'sc/superchain-erc20-redesign' into chore/erc20-new-sola…
0xDiscotech Oct 4, 2024
9fb4bc6
Merge branch 'sc-feat/crosschain-erc20' into chore/erc20-new-solady-v…
0xDiscotech Oct 4, 2024
905ee60
Merge branch 'sc-feat/crosschain-erc20' into chore/erc20-new-solady-v…
0xDiscotech Oct 9, 2024
bdcd7f1
chore: run pre-pr and update vendor interface
0xDiscotech Oct 9, 2024
70e3570
feat: add permit2 on optimism superchain erc20
0xDiscotech Oct 9, 2024
8aaca99
Merge branch 'sc-feat/crosschain-erc20' into chore/erc20-new-solady-v…
0xDiscotech Oct 9, 2024
1fc614a
feat: add permit2
0xDiscotech Oct 9, 2024
553462d
chore: run pre-pr script
0xDiscotech Oct 9, 2024
a5d0e30
MT Cannon: add mips movf/movt tests (#12392)
GrapeBaBa Oct 11, 2024
0466b62
deployOpChain using OPCM (#12291)
maurelian Oct 11, 2024
0f4b1e3
feat(contracts-bedrock): remove old forge-std code (#12378)
jsvisa Oct 11, 2024
f259ee0
doc: add more security review info (#12429)
mds1 Oct 11, 2024
7bc9fd5
Merge branch 'sc-feat/crosschain-erc20' into chore/erc20-new-solady-v…
0xDiscotech Oct 11, 2024
39f5caf
chore: run pre-pr
0xDiscotech Oct 11, 2024
86c37b9
op-deployer: Fee Recipients and Gas Params added to intent (#12404)
blmalone Oct 11, 2024
1495f6d
feat(ci): add semgrep to contracts checks (#12395)
smartcontracts Oct 11, 2024
5c1e198
[batcher] derive.ChannelOut factory (#12344)
mdehoog Oct 11, 2024
bb2c99c
MTCannon: improve consistency & add EmptyThreadStack test (#12389)
joohhnnn Oct 11, 2024
1222534
op-service: Add optional headers to the signer client (#12407)
trianglesphere Oct 11, 2024
1f91054
fix: L1 blobs fetcher interface implementation assertion (#12403)
threewebcode Oct 11, 2024
9d9dc32
cannon: Add more load / store tests (#12432)
mbaxter Oct 11, 2024
14b437b
op-challenger: Set op-program log level based on the challenger level…
ajsutton Oct 14, 2024
33628f5
dependabot(gomod): bump github.com/urfave/cli/v2 from 2.27.4 to 2.27.…
dependabot[bot] Oct 14, 2024
1ac85ca
[batcher] Cleanup batcher channel inclusion block logic (#12363)
mdehoog Oct 14, 2024
d41e588
op-challenger: Support running multiple prestates the same game type …
ajsutton Oct 14, 2024
e7085e5
dependabot(gomod): bump github.com/minio/minio-go/v7 (#12446)
dependabot[bot] Oct 14, 2024
6f41bac
proofs-tools: Update challenger to include new vm runner options. (#1…
ajsutton Oct 15, 2024
ed4a80c
ci: Port some CI jobs to self-hosted runners (#12199)
mslipper Oct 15, 2024
f0d7738
Rename channel receiver (#12453)
mdehoog Oct 15, 2024
6ae28f5
op-node/rollup/derive: Add Holocene Channel Stage (#12334)
sebastianst Oct 15, 2024
34e8e69
op-e2e: Parallelize CGT tests (#12464)
mslipper Oct 15, 2024
c8edbe2
test: Remove exceptions for unlabelled fdg contracts (#12462)
maurelian Oct 15, 2024
cb2066b
feat: introduce SuperchainERC20 redesign + ICrosschainERC20 (#12321)
agusduha Oct 15, 2024
222e10c
Merge branch 'develop' into chore/erc20-new-solady-version
0xDiscotech Oct 15, 2024
c19f54d
chore: run pre-pr
0xDiscotech Oct 15, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,6 @@
[submodule "packages/contracts-bedrock/lib/openzeppelin-contracts-v5"]
path = packages/contracts-bedrock/lib/openzeppelin-contracts-v5
url = https://github.com/OpenZeppelin/openzeppelin-contracts
[submodule "packages/contracts-bedrock/lib/solady-v0.0.245"]
path = packages/contracts-bedrock/lib/solady-v0.0.245
url = https://github.com/vectorized/solady
1 change: 1 addition & 0 deletions packages/contracts-bedrock/foundry.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ remappings = [
'@rari-capital/solmate/=lib/solmate',
'@lib-keccak/=lib/lib-keccak/contracts/lib',
'@solady/=lib/solady/src',
'@solady-v0.0.245/=lib/solady-v0.0.245/src',
'forge-std/=lib/forge-std/src',
'ds-test/=lib/forge-std/lib/ds-test/src',
'safe-contracts/=lib/safe-contracts/contracts',
Expand Down
1 change: 1 addition & 0 deletions packages/contracts-bedrock/lib/solady-v0.0.245
Submodule solady-v0.0.245 added at e0ef35
6 changes: 3 additions & 3 deletions packages/contracts-bedrock/semver-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@
"sourceCodeHash": "0xfea53344596d735eff3be945ed1300dc75a6f8b7b2c02c0043af5b0036f5f239"
},
"src/L2/OptimismSuperchainERC20.sol": {
"initCodeHash": "0xc6452d9aef6d76bdc789f3cddac6862658a481c619e6a2e7a74f6d61147f927b",
"sourceCodeHash": "0x4463e49c98ceb3327bd768579341d1e0863c8c3925d4b533fbc0f7951306261f"
"initCodeHash": "0x9d88c802312f68a4271c6b10673ff50941b0bfad805bbb2ea1a7d6aca459b557",
"sourceCodeHash": "0xb9165f6ef40da96d7fd7a3ae68268be1653b8be6491d886fcf1696ed50a9e44f"
},
"src/L2/OptimismSuperchainERC20Beacon.sol": {
"initCodeHash": "0x99ce8095b23c124850d866cbc144fee6cee05dbc6bb5d83acadfe00b90cf42c7",
Expand All @@ -133,7 +133,7 @@
},
"src/L2/SuperchainERC20.sol": {
"initCodeHash": "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
"sourceCodeHash": "0x9bc2e208774eb923894dbe391a5038a6189d7d36c202f4bf3e2c4dd332b0adf0"
"sourceCodeHash": "0xedaff59c16191469b7a4103ceb24913d98ac6c74902e6033e77f83de32819c03"
},
"src/L2/SuperchainERC20Bridge.sol": {
"initCodeHash": "0xea7eb314f96cd2520a58012ff7cc376c82c5a95612187ff6bb96ace4f095ebc4",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -580,6 +580,11 @@
"name": "OnlySuperchainERC20Bridge",
"type": "error"
},
{
"inputs": [],
"name": "Permit2AllowanceIsFixedAtInfinity",
"type": "error"
},
{
"inputs": [],
"name": "PermitExpired",
Expand Down
4 changes: 2 additions & 2 deletions packages/contracts-bedrock/src/L2/OptimismSuperchainERC20.sol
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ contract OptimismSuperchainERC20 is SuperchainERC20, Initializable, ERC165, IOpt
}

/// @notice Semantic version.
/// @custom:semver 1.0.0-beta.6
string public constant override version = "1.0.0-beta.6";
/// @custom:semver 1.0.0-beta.7
string public constant override version = "1.0.0-beta.7";

/// @notice Constructs the OptimismSuperchainERC20 contract.
constructor() {
Expand Down
6 changes: 3 additions & 3 deletions packages/contracts-bedrock/src/L2/SuperchainERC20.sol
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pragma solidity 0.8.25;
import { ISuperchainERC20Extension } from "src/L2/interfaces/ISuperchainERC20.sol";
import { ISemver } from "src/universal/interfaces/ISemver.sol";
import { Predeploys } from "src/libraries/Predeploys.sol";
import { ERC20 } from "@solady/tokens/ERC20.sol";
import { ERC20 } from "@solady-v0.0.245/tokens/ERC20.sol";

/// @title SuperchainERC20
/// @notice SuperchainERC20 is a standard extension of the base ERC20 token contract that unifies ERC20 token
Expand All @@ -18,9 +18,9 @@ abstract contract SuperchainERC20 is ERC20, ISuperchainERC20Extension, ISemver {
}

/// @notice Semantic version.
/// @custom:semver 1.0.0-beta.1
/// @custom:semver 1.0.0-beta.2
function version() external pure virtual returns (string memory) {
return "1.0.0-beta.1";
return "1.0.0-beta.2";
}

/// @notice Allows the SuperchainERC20Bridge to mint tokens.
Expand Down