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.

Sign up for GitHub

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: update op dependency to v1.9.5 #203

Merged
merged 2 commits into from
Dec 3, 2024
Merged

chore: update op dependency to v1.9.5 #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9ee997
chore: update op dependency to v1.10.0
samlaf Dec 2, 2024
2c97861
chore: downgrade to v1.9.5 + fix optimism tests
samlaf Dec 2, 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
39 changes: 39 additions & 0 deletions .devnet-alt-da/addresses.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"AddressManager": "0x26a942b414CBc2eBb43F9c4e68DD791B5f61b5c7",
"AnchorStateRegistry": "0x2516DAe378507FD4cbE381e04EB0dFe41308aD3e",
"AnchorStateRegistryProxy": "0x6B73DBbd13FC27bf96b2d508B6C88179D2b4c4ba",
"DataAvailabilityChallenge": "0x18A001ab37Cba856fb8352D46A96069CBA41BFb7",
"DataAvailabilityChallengeProxy": "0xc75824f5666A236720d8409461000371776c4BC3",
"DelayedWETH": "0xec557124625E001dfe2d23ddA4F48A291E8a3e3a",
"DelayedWETHProxy": "0xbff24769250E0b40fD402dcE7AC9Ec7eEb14255E",
"DisputeGameFactory": "0x8a1a5F20ADF3005022049880f799FBBF2a188cfC",
"DisputeGameFactoryProxy": "0xeCb92a686D1ab066fc4E559A305FEB75DD512377",
"FastPreimageOracle": "0xbc1b15C94465d383bB68F345bEba1F3fcD2af44B",
"FaultDisputeGame_0": "0x86a350621ED6d036E2Af9cC68865dEf4B31C13ae",
"FaultDisputeGame_254": "0x9218181FAb774F8DBD245C8a2544069F9A8C2A8a",
"FaultDisputeGame_255": "0x401deDFb8536D84096Dd617689E770cB085ADfb7",
"L1CrossDomainMessenger": "0x2CfFF1c8Df8CE2BA6CBa19699CCBa6F381734938",
"L1CrossDomainMessengerProxy": "0x3d609De69E066F85C38AC274e3EeC251EcfDeAa1",
"L1ERC721Bridge": "0x2AC24b15a2Ded48F4B51e70293589058546a11FE",
"L1ERC721BridgeProxy": "0x961a37bd2eF41Ef68932d6E1FB4113534dcACB9B",
"L1StandardBridge": "0x3857b6c6f162fDA9BD591D4CCDEF8C00093cC357",
"L1StandardBridgeProxy": "0x9D34A2610Ea283f6d9AE29f9Cad82e00c4d38507",
"Mips": "0x9848e4470F89bec8b050eCDf93F69B8660B6046C",
"OPContractsManager": "0xb32a4b81244fEd6A176f295A4787cC9cce687a5e",
"OPContractsManagerProxy": "0x5b66F1D2dC2691F9bcac54Ee8B90a9923701e553",
"OptimismMintableERC20Factory": "0x89c88ED20d4b742185185f77017182247671eE3b",
"OptimismMintableERC20FactoryProxy": "0x623C237952ea6e3cD74740a5B766F2978AEA3b54",
"OptimismPortal2": "0x8237f181A3A8C7f871174e85f499f71f2A0d5B75",
"OptimismPortalProxy": "0xA439B64360C875951478b0Cf77698038df331255",
"PermissionedDelayedWETHProxy": "0x157514fF1F55f8685083D9D83CaE4aD4E186daDa",
"PermissionedDisputeGame": "0xe5b54F119250094761d8fed8d1CF124316B47904",
"PreimageOracle": "0xc043F015EB8cA0b94D4cAde622ed7369ce4ffE4E",
"ProtocolVersions": "0xd85BdcdaE4db1FAEB8eF93331525FE68D7C8B3f0",
"ProtocolVersionsProxy": "0x856e75e9c0Da547F9753c17746D6cc139b668e5c",
"ProxyAdmin": "0xac43F7588b15fA5F2347824F0Ad0ba1BDCa5E72C",
"SuperchainConfig": "0x238213078DbD09f2D15F4c14c02300FA1b2A81BB",
"SuperchainConfigProxy": "0xDc82c0362A241Aa94d53546648EACe48C9773dAa",
"SuperchainProxyAdmin": "0xdaE97900D4B184c5D2012dcdB658c008966466DD",
"SystemConfig": "0xE3dF61CA9F27cd66880325f3C6CB789EDe857997",
"SystemConfigProxy": "0xF493e2ebb09309e2d0046a7aFc88C8eDa3c91560"
}
1 change: 1 addition & 0 deletions .devnet-alt-da/allocs-l1.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .devnet/allocs-l2-delta.json → .devnet-alt-da/allocs-l2-delta.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .devnet/allocs-l2-ecotone.json → .devnet-alt-da/allocs-l2-ecotone.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .devnet/allocs-l2-fjord.json → .devnet-alt-da/allocs-l2-fjord.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .devnet/allocs-l2-granite.json → .devnet-alt-da/allocs-l2-granite.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .devnet/allocs-l2.json → .devnet-alt-da/allocs-l2-holocene.json
View file
Open in desktop

Large diffs are not rendered by default.

36 changes: 0 additions & 36 deletions .devnet/addresses.json
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion .devnet/allocs-l1.json
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,5 @@
"go.testFlags": [
"-test.parallel",
"4",
// Comment the following 2 lines to run unit tests.
"-deploy-config",
"../.devnet/devnetL1.json"
]
}
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ test:
go test ./... -parallel 4

e2e-test:
INTEGRATION=true go test -timeout 1m ./e2e -parallel 4 -deploy-config ../.devnet/devnetL1.json
INTEGRATION=true go test -timeout 1m ./e2e -parallel 4
Copy link
Collaborator

Choose a reason for hiding this comment

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

nice


holesky-test:
TESTNET=true go test -timeout 50m ./e2e -parallel 4 -deploy-config ../.devnet/devnetL1.json
TESTNET=true go test -timeout 50m ./e2e -parallel 4

.PHONY: lint
lint:
Expand Down Expand Up @@ -67,7 +67,7 @@ op-devnet-allocs:
@./scripts/op-devnet-allocs.sh

benchmark:
go test -benchmem -run=^$ -bench . ./e2e -test.parallel 4 -deploy-config ../.devnet/devnetL1.json
go test -benchmem -run=^$ -bench . ./e2e -test.parallel 4

.PHONY: \
clean \
Expand Down
7 changes: 4 additions & 3 deletions e2e/optimism_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,12 @@ func NewL2AltDA(t actions.Testing, daHost string, altDA bool) *L2AltDA {
ChannelTimeout: 120,
L1BlockTime: 12,
UseAltDA: true,
AllocType: config.AllocTypeAltDA,
}

log := testlog.Logger(t, log.LvlDebug)

config.DeployConfig.DACommitmentType = altda.GenericCommitmentString
// config.DeployConfig.DACommitmentType = altda.GenericCommitmentString
dp := e2eutils.MakeDeployParams(t, p)
dp.DeployConfig.DAChallengeProxy = common.Address{0x42}
sd := e2eutils.Setup(t, dp, defaultAlloc)
Expand All @@ -63,7 +64,7 @@ func NewL2AltDA(t actions.Testing, daHost string, altDA bool) *L2AltDA {
l1Client := miner.EthClient()

jwtPath := e2eutils.WriteDefaultJWT(t)
engine := actions.NewL2Engine(t, log, sd.L2Cfg, sd.RollupCfg.Genesis.L1, jwtPath)
engine := actions.NewL2Engine(t, log, sd.L2Cfg, jwtPath)
engCl := engine.EngineClient(t, sd.RollupCfg)

var storage *altda.DAClient
Expand All @@ -90,7 +91,7 @@ func NewL2AltDA(t actions.Testing, daHost string, altDA bool) *L2AltDA {
enabled := sd.RollupCfg.AltDAEnabled()
require.True(t, enabled)

sequencer := actions.NewL2Sequencer(t, log, l1F, nil, daMgr, engCl, sd.RollupCfg, 0, nil)
sequencer := actions.NewL2Sequencer(t, log, l1F, miner.BlobStore(), daMgr, engCl, sd.RollupCfg, 0, nil)
miner.ActL1SetFeeRecipient(common.Address{'A'})
sequencer.ActL2PipelineFull(t)

Expand Down
53 changes: 25 additions & 28 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
module github.com/Layr-Labs/eigenda-proxy

go 1.22
go 1.22.0

toolchain go1.22.0
toolchain go1.22.7

require (
github.com/Layr-Labs/eigenda v0.8.5-rc.0.0.20241101212705-fa8776ae648c
github.com/avast/retry-go/v4 v4.6.0
github.com/consensys/gnark-crypto v0.12.1
github.com/ethereum-optimism/optimism v1.9.4-0.20240927020138-a9c7f349d10b
github.com/ethereum-optimism/optimism v1.9.5
github.com/ethereum/go-ethereum v1.14.11
github.com/go-redis/redis/v8 v8.11.5
github.com/golang/mock v1.2.0
github.com/gorilla/mux v1.8.0
github.com/joho/godotenv v1.5.1
github.com/minio/minio-go/v7 v7.0.77
github.com/prometheus/client_golang v1.20.4
github.com/minio/minio-go/v7 v7.0.80
github.com/prometheus/client_golang v1.20.5
github.com/stretchr/testify v1.9.0
github.com/testcontainers/testcontainers-go/modules/minio v0.33.0
github.com/testcontainers/testcontainers-go/modules/redis v0.33.0
github.com/urfave/cli/v2 v2.27.4
golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa
github.com/urfave/cli/v2 v2.27.5
golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c
google.golang.org/grpc v1.64.1
)

Expand Down Expand Up @@ -74,7 +74,7 @@ require (
github.com/containerd/platforms v0.2.1 // indirect
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
github.com/cpuguy83/dockercfg v0.3.1 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
github.com/crate-crypto/go-ipa v0.0.0-20240223125850-b1e8a79f509c // indirect
github.com/crate-crypto/go-kzg-4844 v1.0.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
Expand All @@ -93,15 +93,15 @@ require (
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/elastic/gosigar v0.14.3 // indirect
github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3 // indirect
github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20240910145426-b3905c89e8ac // indirect
github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20241119111730-bee358f6d6e6 // indirect
github.com/ethereum/c-kzg-4844 v1.0.0 // indirect
github.com/ethereum/go-verkle v0.1.1-0.20240829091221-dffa7562dbe9 // indirect
github.com/fatih/color v1.16.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/ferranbt/fastssz v0.1.2 // indirect
github.com/flynn/noise v1.1.0 // indirect
github.com/francoispqt/gojay v1.2.13 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/fsnotify/fsnotify v1.8.0 // indirect
github.com/fxamacker/cbor/v2 v2.5.0 // indirect
github.com/gammazero/deque v0.2.0 // indirect
github.com/gammazero/workerpool v1.1.3 // indirect
Expand All @@ -118,11 +118,10 @@ require (
github.com/gofrs/flock v0.8.1 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
github.com/golang-jwt/jwt/v4 v4.5.1 // indirect
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gopacket v1.1.19 // indirect
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
github.com/google/pprof v0.0.0-20241009165004-a3522334989c // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gorilla/websocket v1.5.3 // indirect
github.com/graph-gophers/graphql-go v1.3.0 // indirect
Expand All @@ -147,12 +146,11 @@ require (
github.com/influxdata/line-protocol v0.0.0-20210311194329-9aa0e372d097 // indirect
github.com/ipfs/go-cid v0.4.1 // indirect
github.com/ipfs/go-datastore v0.6.0 // indirect
github.com/ipfs/go-ds-leveldb v0.5.0 // indirect
github.com/ipfs/go-log/v2 v2.5.1 // indirect
github.com/jackpal/go-nat-pmp v1.0.2 // indirect
github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect
github.com/jbenet/goprocess v0.1.4 // indirect
github.com/klauspost/compress v1.17.9 // indirect
github.com/klauspost/compress v1.17.11 // indirect
github.com/klauspost/cpuid/v2 v2.2.8 // indirect
github.com/koron/go-ssdp v0.0.4 // indirect
github.com/kr/pretty v0.3.1 // indirect
Expand Down Expand Up @@ -194,8 +192,8 @@ require (
github.com/mr-tron/base58 v1.2.0 // indirect
github.com/multiformats/go-base32 v0.1.0 // indirect
github.com/multiformats/go-base36 v0.2.0 // indirect
github.com/multiformats/go-multiaddr v0.13.0 // indirect
github.com/multiformats/go-multiaddr-dns v0.3.1 // indirect
github.com/multiformats/go-multiaddr v0.14.0 // indirect
github.com/multiformats/go-multiaddr-dns v0.4.0 // indirect
github.com/multiformats/go-multiaddr-fmt v0.1.0 // indirect
github.com/multiformats/go-multibase v0.2.0 // indirect
github.com/multiformats/go-multicodec v0.9.0 // indirect
Expand All @@ -205,7 +203,6 @@ require (
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/olekukonko/tablewriter v0.0.5 // indirect
github.com/onsi/ginkgo/v2 v2.20.0 // indirect
github.com/onsi/gomega v1.34.1 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0 // indirect
github.com/opencontainers/runtime-spec v1.2.0 // indirect
Expand Down Expand Up @@ -275,15 +272,15 @@ require (
go.uber.org/mock v0.4.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/crypto v0.27.0 // indirect
golang.org/x/mod v0.20.0 // indirect
golang.org/x/net v0.28.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.25.0 // indirect
golang.org/x/term v0.24.0 // indirect
golang.org/x/text v0.18.0 // indirect
golang.org/x/time v0.6.0 // indirect
golang.org/x/tools v0.24.0 // indirect
golang.org/x/crypto v0.28.0 // indirect
golang.org/x/mod v0.21.0 // indirect
golang.org/x/net v0.30.0 // indirect
golang.org/x/sync v0.9.0 // indirect
golang.org/x/sys v0.26.0 // indirect
golang.org/x/term v0.25.0 // indirect
golang.org/x/text v0.19.0 // indirect
golang.org/x/time v0.7.0 // indirect
golang.org/x/tools v0.26.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
Expand All @@ -294,4 +291,4 @@ require (
)

// We inherit this from OP by forking their Alt-DA server.
replace github.com/ethereum/go-ethereum => github.com/ethereum-optimism/op-geth v1.101408.0-rc.4.0.20240827042333-110c433a2469
replace github.com/ethereum/go-ethereum => github.com/ethereum-optimism/op-geth v1.101411.2
Loading
Loading