Skip to content

Commit bcc807b

Browse files
mergify[bot]mergify[bot]
authored
Merge branch 'develop' into sc/cache-sol-compilers
2 parents cb2e67c + 604dd31 commit bcc807b

110 files changed

Lines changed: 8827 additions & 334 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.changeset/cyan-months-kneel.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@eth-optimism/contracts': patch
3+
---
4+
5+
Use hardhat-deploy-config for deployments

‎.changeset/gentle-pants-drop.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@eth-optimism/contracts-bedrock': patch
3+
---
4+
5+
Fix style for L2 contracts to match L1 contracts

‎.changeset/gentle-shrimps-hug.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@eth-optimism/contracts-periphery': patch
3+
---
4+
5+
ERC721 bridge from Eth Mainnet to Optimism

‎.changeset/giant-cobras-heal.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@eth-optimism/hardhat-deploy-config': minor
3+
---
4+
5+
Initial release of hardhat-deploy-config

‎.changeset/smart-worms-matter.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@eth-optimism/contracts-bedrock': patch
3+
---
4+
5+
Add proxy contract

‎.changeset/sour-hornets-vanish.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@eth-optimism/contracts-periphery': patch
3+
---
4+
5+
Deploy Drippie to kovan and OP kovan

‎.circleci/config.yml‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,9 @@ jobs:
406406
working_directory: packages/contracts-bedrock
407407
- run:
408408
name: gas snapshot
409-
command: forge snapshot && git diff --exit-code
409+
command: |
410+
forge --version
411+
forge snapshot --check
410412
working_directory: packages/contracts-bedrock
411413
- run:
412414
name: check go bindings
@@ -504,8 +506,7 @@ jobs:
504506
type: string
505507
default: develop
506508
environment:
507-
# Scan changed files in PRs, block on new issues only (existing issues ignored)
508-
SEMGREP_BASELINE_REF: << parameters.diff_branch >>
509+
TEMPORARY_BASELINE_REF: << parameters.diff_branch >>
509510
SEMGREP_REPO_URL: << pipeline.project.git_url >>
510511
SEMGREP_BRANCH: << pipeline.git.branch >>
511512
SEMGREP_COMMIT: << pipeline.git.revision >>
@@ -518,6 +519,16 @@ jobs:
518519
resource_class: xlarge
519520
steps:
520521
- checkout
522+
- unless:
523+
condition:
524+
equal: [ "develop", << pipeline.git.branch >>]
525+
steps:
526+
- run:
527+
# Scan changed files in PRs, block on new issues only (existing issues ignored)
528+
# Do a full scan when scanning develop, otherwise do an incremental scan.
529+
name: "Conditionally set BASELINE env var"
530+
command: |
531+
echo 'export SEMGREP_BASELINE_REF=${TEMPORARY_BASELINE_REF}' >> $BASH_ENV
521532
- run:
522533
name: "Set environment variables" # for PR comments and in-app hyperlinks to findings
523534
command: |

‎Makefile‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ build-go: submodules op-node op-proposer op-batcher
88
.PHONY: build-go
99

1010
build-ts: submodules
11+
if [ -n "$$NVM_DIR" ]; then \
12+
. $$NVM_DIR/nvm.sh && nvm use; \
13+
fi
14+
yarn install
1115
yarn build
1216
.PHONY: build-ts
1317

@@ -47,6 +51,10 @@ clean:
4751
rm -rf ./bin
4852
.PHONY: clean
4953

54+
nuke: clean devnet-clean
55+
git clean -Xdf
56+
.PHONY: nuke
57+
5058
devnet-up:
5159
@bash ./ops-bedrock/devnet-up.sh
5260
.PHONY: devnet-up
@@ -59,9 +67,8 @@ devnet-clean:
5967
rm -rf ./packages/contracts-bedrock/deployments/devnetL1
6068
rm -rf ./.devnet
6169
cd ./ops-bedrock && docker-compose down
62-
docker image ls 'ops-bedrock*' --format='{{.Repository}}' | xargs docker rmi
63-
docker volume ls --filter name=ops-bedrock --format='{{.Name}}' | xargs docker volume rm
64-
70+
docker image ls 'ops-bedrock*' --format='{{.Repository}}' | xargs -r docker rmi
71+
docker volume ls --filter name=ops-bedrock --format='{{.Name}}' | xargs -r docker volume rm
6572
.PHONY: devnet-clean
6673

6774
test-unit:
@@ -82,7 +89,3 @@ semgrep:
8289
$(eval DEV_REF := $(shell git rev-parse develop))
8390
SEMGREP_REPO_NAME=ethereum-optimism/optimism semgrep ci --baseline-commit=$(DEV_REF)
8491
.PHONY: semgrep
85-
86-
devnet-genesis:
87-
bash ./ops-bedrock/devnet-genesis.sh
88-
.PHONY: devnet-genesis

‎integration-tests/contracts/FakeL2StandardERC721.sol‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
// SPDX-License-Identifier: MIT
2+
pragma solidity ^0.8.9;
3+
4+
import { ERC721 } from "@openzeppelin/contracts/token/ERC721/ERC721.sol";
5+
6+
contract FakeL2StandardERC721 is ERC721 {
7+
8+
address public immutable l1Token;
9+
address public immutable l2Bridge;
10+
11+
constructor(address _l1Token, address _l2Bridge) ERC721("FakeERC721", "FAKE") {
12+
l1Token = _l1Token;
13+
l2Bridge = _l2Bridge;
14+
}
15+
16+
function mint(address to, uint256 tokenId) public {
17+
_mint(to, tokenId);
18+
}
19+
20+
// Burn will be called by the L2 Bridge to burn the NFT we are bridging to L1
21+
function burn(address, uint256) external {}
22+
}

‎integration-tests/package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@
2929
},
3030
"devDependencies": {
3131
"@babel/eslint-parser": "^7.5.4",
32-
"@eth-optimism/contracts": "0.5.27",
32+
"@eth-optimism/contracts": "^0.5.26",
33+
"@eth-optimism/contracts-periphery": "^0.1.1",
3334
"@eth-optimism/core-utils": "0.8.6",
3435
"@eth-optimism/sdk": "1.1.8",
3536
"@ethersproject/abstract-provider": "^5.6.1",

0 commit comments

Comments
 (0)