Skip to content

Commit b8ac8f7

Browse files
mergify[bot]mergify[bot]
authored
Merge branch 'develop' into feat/op-node-metrics
2 parents a57c1ea + aa7294c commit b8ac8f7

63 files changed

Lines changed: 3880 additions & 371 deletions

Some content is hidden

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

‎.changeset/curly-spoons-invent.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+
Enable hardhat style buildinfo

‎.changeset/friendly-grapes-watch.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+
Make the Portal upgradeable

‎.changeset/gold-clocks-grin.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@eth-optimism/indexer': patch
3+
---
4+
5+
Fix a couple semgrep issues

‎.changeset/hot-crews-lie.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 `OptimismPortal.isOutputFinalized`

‎.changeset/mean-pumas-smoke.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@eth-optimism/indexer': patch
3+
---
4+
5+
Deduplicate some l2geth and geth utils

‎.changeset/quiet-avocados-wait.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@eth-optimism/indexer': patch
3+
---
4+
5+
Use op-bindings package for address manager

‎.changeset/rare-ears-share.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 mainnet

‎.changeset/serious-suits-reflect.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+
Optimize buildinfo support, only build through hardhat interface

‎indexer/Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ RUN apk add --no-cache make gcc musl-dev linux-headers git jq bash
44

55
COPY ./indexer /go/indexer
66
COPY ./l2geth /go/l2geth
7+
COPY ./op-bindings /go/op-bindings
78

89
COPY ./indexer/docker.go.work /go/go.work
910

‎indexer/Makefile‎

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ LDFLAGSSTRING +=-X main.GitDate=$(GITDATE)
77
LDFLAGSSTRING +=-X main.GitVersion=$(GITVERSION)
88
LDFLAGS := -ldflags "$(LDFLAGSSTRING)"
99

10-
L1BRIDGE_ABI_ARTIFACT = ../../packages/contracts/artifacts/contracts/L1/messaging/L1StandardBridge.sol/L1StandardBridge.json
11-
L2BRIDGE_ABI_ARTIFACT = ../../packages/contracts/artifacts/contracts/L2/messaging/L2StandardBridge.sol/L2StandardBridge.json
10+
L1BRIDGE_ABI_ARTIFACT = ../packages/contracts/artifacts/contracts/L1/messaging/L1StandardBridge.sol/L1StandardBridge.json
11+
L2BRIDGE_ABI_ARTIFACT = ../packages/contracts/artifacts/contracts/L2/messaging/L2StandardBridge.sol/L2StandardBridge.json
1212

1313
ERC20_ABI_ARTIFACT = ./contracts/ERC20.sol/ERC20.json
1414

15-
SCC_ABI_ARTIFACT = ../../packages/contracts/artifacts/contracts/L1/rollup/StateCommitmentChain.sol/StateCommitmentChain.json
15+
SCC_ABI_ARTIFACT = ../packages/contracts/artifacts/contracts/L1/rollup/StateCommitmentChain.sol/StateCommitmentChain.json
1616

1717
indexer:
1818
env GO111MODULE=on go build -v $(LDFLAGS) ./cmd/indexer
@@ -26,7 +26,7 @@ test:
2626
lint:
2727
golangci-lint run ./...
2828

29-
bindings: bindings-l1bridge bindings-l2bridge bindings-l1erc20 bindings-l2erc20 bindings-scc bindings-address-manager
29+
bindings: bindings-l1bridge bindings-l2bridge bindings-l1erc20 bindings-l2erc20 bindings-scc
3030

3131
bindings-l1bridge:
3232
$(eval temp := $(shell mktemp))
@@ -52,7 +52,7 @@ bindings-l2bridge:
5252

5353
cat $(L2BRIDGE_ABI_ARTIFACT) \
5454
| jq .abi \
55-
| ../../l2geth/build/bin/abigen --pkg l2bridge \
55+
| abigen --pkg l2bridge \
5656
--abi - \
5757
--out bindings/l2bridge/l2_standard_bridge.go \
5858
--type L2StandardBridge \
@@ -84,7 +84,7 @@ bindings-l2erc20:
8484

8585
cat $(ERC20_ABI_ARTIFACT) \
8686
| jq .abi \
87-
| ../../l2geth/build/bin/abigen --pkg l2erc20 \
87+
| abigen --pkg l2erc20 \
8888
--abi - \
8989
--out bindings/l2erc20/l2erc20.go \
9090
--type L2ERC20 \
@@ -108,20 +108,6 @@ bindings-scc:
108108

109109
rm $(temp)
110110

111-
bindings-address-manager:
112-
$(eval temp := $(shell mktemp))
113-
114-
cat $(ADDRESS_MANAGER_ABI_ARTIFACT) \
115-
| jq -r .bytecode > $(temp)
116-
117-
cat $(ADDRESS_MANAGER_ABI_ARTIFACT) \
118-
| jq .abi \
119-
| abigen --pkg address_manager \
120-
--abi - \
121-
--out ./bindings/address_manager/address_manager.go \
122-
--type AddressManager \
123-
--bin $(temp)
124-
125111
.PHONY: \
126112
indexer \
127113
bindings \
@@ -130,7 +116,6 @@ bindings-address-manager:
130116
bindings-l1erc20 \
131117
bindings-l2erc20 \
132118
bindings-scc \
133-
bindings-address-manager
134119
clean \
135120
test \
136121
lint

0 commit comments

Comments
 (0)