diff --git a/example/main.go b/example/main.go index 2f54100..25e5b20 100644 --- a/example/main.go +++ b/example/main.go @@ -9,6 +9,8 @@ import ( "os" "time" + "github.com/base-org/op-enclave/bindings" + "github.com/base-org/op-enclave/op-withdrawer/withdrawals" bindings2 "github.com/ethereum-optimism/optimism/op-e2e/bindings" "github.com/ethereum-optimism/optimism/op-node/rollup/derive" "github.com/ethereum-optimism/optimism/op-service/predeploys" @@ -19,8 +21,6 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/ethclient" "github.com/ethereum/go-ethereum/ethclient/gethclient" - "github.com/mdehoog/op-enclave/bindings" - "github.com/mdehoog/op-enclave/op-withdrawer/withdrawals" ) const pollInterval = 250 * time.Millisecond diff --git a/go.mod b/go.mod index 3830d82..ee4ce36 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/mdehoog/op-enclave +module github.com/base-org/op-enclave go 1.22.6 @@ -7,7 +7,7 @@ require ( github.com/ethereum-optimism/optimism v1.9.3 github.com/ethereum/go-ethereum v1.14.11 github.com/hashicorp/go-multierror v1.1.1 - github.com/mdehoog/op-enclave/op-enclave v0.0.0 + github.com/base-org/op-enclave/op-enclave v0.0.0 github.com/prometheus/client_golang v1.20.4 github.com/urfave/cli/v2 v2.27.4 ) @@ -111,7 +111,7 @@ require ( rsc.io/tmplfunc v0.0.3 // indirect ) -replace github.com/mdehoog/op-enclave/op-enclave => ./op-enclave +replace github.com/base-org/op-enclave/op-enclave => ./op-enclave replace github.com/ethereum/go-ethereum => github.com/mdehoog/op-geth v0.0.0-20241003075401-d8f4cde5a852 diff --git a/op-batcher/cmd/main.go b/op-batcher/cmd/main.go index 9354077..d4a6595 100644 --- a/op-batcher/cmd/main.go +++ b/op-batcher/cmd/main.go @@ -4,8 +4,8 @@ import ( "context" "os" + "github.com/base-org/op-enclave/op-batcher/batcher" "github.com/ethereum-optimism/optimism/op-batcher/flags" - "github.com/mdehoog/op-enclave/op-batcher/batcher" "github.com/urfave/cli/v2" opservice "github.com/ethereum-optimism/optimism/op-service" diff --git a/op-da/cmd/main.go b/op-da/cmd/main.go index 98d201d..79e40b1 100644 --- a/op-da/cmd/main.go +++ b/op-da/cmd/main.go @@ -4,9 +4,9 @@ import ( "context" "os" + "github.com/base-org/op-enclave/op-da/da" + "github.com/base-org/op-enclave/op-da/flags" "github.com/ethereum-optimism/optimism/op-service/ctxinterrupt" - "github.com/mdehoog/op-enclave/op-da/da" - "github.com/mdehoog/op-enclave/op-da/flags" "github.com/urfave/cli/v2" diff --git a/op-da/da/config.go b/op-da/da/config.go index 2013746..ec75daf 100644 --- a/op-da/da/config.go +++ b/op-da/da/config.go @@ -1,7 +1,7 @@ package da import ( - "github.com/mdehoog/op-enclave/op-da/flags" + "github.com/base-org/op-enclave/op-da/flags" "github.com/urfave/cli/v2" oplog "github.com/ethereum-optimism/optimism/op-service/log" diff --git a/op-da/da/service.go b/op-da/da/service.go index cfa98f4..1f1e6f2 100644 --- a/op-da/da/service.go +++ b/op-da/da/service.go @@ -7,12 +7,12 @@ import ( "os" "sync/atomic" + "github.com/base-org/op-enclave/op-da/flags" altda "github.com/ethereum-optimism/optimism/op-alt-da" opservice "github.com/ethereum-optimism/optimism/op-service" "github.com/ethereum-optimism/optimism/op-service/cliapp" oplog "github.com/ethereum-optimism/optimism/op-service/log" "github.com/ethereum/go-ethereum/log" - "github.com/mdehoog/op-enclave/op-da/flags" "github.com/urfave/cli/v2" ) diff --git a/op-enclave/cmd/enclave/main.go b/op-enclave/cmd/enclave/main.go index c4eca9c..69455ad 100644 --- a/op-enclave/cmd/enclave/main.go +++ b/op-enclave/cmd/enclave/main.go @@ -3,10 +3,10 @@ package main import ( "net/http" + enclave2 "github.com/base-org/op-enclave/op-enclave/enclave" oplog "github.com/ethereum-optimism/optimism/op-service/log" "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/rpc" - enclave2 "github.com/mdehoog/op-enclave/op-enclave/enclave" "github.com/mdlayher/vsock" ) diff --git a/op-enclave/go.mod b/op-enclave/go.mod index 18542b7..b315729 100644 --- a/op-enclave/go.mod +++ b/op-enclave/go.mod @@ -1,4 +1,4 @@ -module github.com/mdehoog/op-enclave/op-enclave +module github.com/base-org/op-enclave/op-enclave go 1.22.6 diff --git a/op-proposer/cmd/main.go b/op-proposer/cmd/main.go index f4d33f0..d03a466 100644 --- a/op-proposer/cmd/main.go +++ b/op-proposer/cmd/main.go @@ -4,13 +4,13 @@ import ( "context" "os" + "github.com/base-org/op-enclave/op-proposer/flags" + "github.com/base-org/op-enclave/op-proposer/proposer" opservice "github.com/ethereum-optimism/optimism/op-service" "github.com/ethereum-optimism/optimism/op-service/cliapp" "github.com/ethereum-optimism/optimism/op-service/ctxinterrupt" oplog "github.com/ethereum-optimism/optimism/op-service/log" "github.com/ethereum/go-ethereum/log" - "github.com/mdehoog/op-enclave/op-proposer/flags" - "github.com/mdehoog/op-enclave/op-proposer/proposer" "github.com/urfave/cli/v2" ) diff --git a/op-proposer/proposer/config.go b/op-proposer/proposer/config.go index e6f08e9..bbe31bc 100644 --- a/op-proposer/proposer/config.go +++ b/op-proposer/proposer/config.go @@ -1,8 +1,8 @@ package proposer import ( + "github.com/base-org/op-enclave/op-proposer/flags" "github.com/ethereum-optimism/optimism/op-proposer/proposer" - "github.com/mdehoog/op-enclave/op-proposer/flags" "github.com/urfave/cli/v2" ) diff --git a/op-proposer/proposer/driver.go b/op-proposer/proposer/driver.go index 4fc69a2..18f5cce 100644 --- a/op-proposer/proposer/driver.go +++ b/op-proposer/proposer/driver.go @@ -8,6 +8,8 @@ import ( "sync" "time" + "github.com/base-org/op-enclave/bindings" + "github.com/base-org/op-enclave/op-enclave/enclave" "github.com/ethereum-optimism/optimism/op-proposer/metrics" "github.com/ethereum-optimism/optimism/op-service/eth" "github.com/ethereum-optimism/optimism/op-service/txmgr" @@ -16,8 +18,6 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/log" - "github.com/mdehoog/op-enclave/bindings" - "github.com/mdehoog/op-enclave/op-enclave/enclave" ) var ( diff --git a/op-proposer/proposer/l2_output_submitter.go b/op-proposer/proposer/l2_output_submitter.go index a2a3346..639305a 100644 --- a/op-proposer/proposer/l2_output_submitter.go +++ b/op-proposer/proposer/l2_output_submitter.go @@ -4,11 +4,11 @@ import ( "context" "fmt" + thisflags "github.com/base-org/op-enclave/op-proposer/flags" "github.com/ethereum-optimism/optimism/op-proposer/flags" opservice "github.com/ethereum-optimism/optimism/op-service" "github.com/ethereum-optimism/optimism/op-service/cliapp" oplog "github.com/ethereum-optimism/optimism/op-service/log" - thisflags "github.com/mdehoog/op-enclave/op-proposer/flags" "github.com/urfave/cli/v2" ) diff --git a/op-proposer/proposer/prover.go b/op-proposer/proposer/prover.go index a7b8b5c..564d872 100644 --- a/op-proposer/proposer/prover.go +++ b/op-proposer/proposer/prover.go @@ -4,6 +4,7 @@ import ( "context" "fmt" + "github.com/base-org/op-enclave/op-enclave/enclave" "github.com/ethereum-optimism/optimism/op-node/rollup/derive" "github.com/ethereum-optimism/optimism/op-service/eth" "github.com/ethereum-optimism/optimism/op-service/predeploys" @@ -11,7 +12,6 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/core/types" "github.com/hashicorp/go-multierror" - "github.com/mdehoog/op-enclave/op-enclave/enclave" ) type Prover struct { diff --git a/op-proposer/proposer/service.go b/op-proposer/proposer/service.go index f045e10..b041403 100644 --- a/op-proposer/proposer/service.go +++ b/op-proposer/proposer/service.go @@ -8,6 +8,8 @@ import ( "sync/atomic" "time" + "github.com/base-org/op-enclave/op-enclave/enclave" + "github.com/base-org/op-enclave/op-proposer/metrics" "github.com/ethereum-optimism/optimism/op-proposer/proposer/rpc" opservice "github.com/ethereum-optimism/optimism/op-service" "github.com/ethereum-optimism/optimism/op-service/cliapp" @@ -21,8 +23,6 @@ import ( "github.com/ethereum/go-ethereum/ethclient" "github.com/ethereum/go-ethereum/log" gethrpc "github.com/ethereum/go-ethereum/rpc" - "github.com/mdehoog/op-enclave/op-enclave/enclave" - "github.com/mdehoog/op-enclave/op-proposer/metrics" ) var ErrAlreadyStopped = errors.New("already stopped") diff --git a/op-withdrawer/main.go b/op-withdrawer/main.go index 9929d13..7dedbee 100644 --- a/op-withdrawer/main.go +++ b/op-withdrawer/main.go @@ -7,6 +7,8 @@ import ( "os" "time" + "github.com/base-org/op-enclave/bindings" + "github.com/base-org/op-enclave/op-withdrawer/withdrawals" "github.com/ethereum-optimism/optimism/op-node/rollup/derive" "github.com/ethereum-optimism/optimism/op-service/ctxinterrupt" oplog "github.com/ethereum-optimism/optimism/op-service/log" @@ -17,8 +19,6 @@ import ( "github.com/ethereum/go-ethereum/ethclient" "github.com/ethereum/go-ethereum/ethclient/gethclient" "github.com/ethereum/go-ethereum/log" - "github.com/mdehoog/op-enclave/bindings" - "github.com/mdehoog/op-enclave/op-withdrawer/withdrawals" "github.com/urfave/cli/v2" ) diff --git a/op-withdrawer/withdrawals/withdrawals.go b/op-withdrawer/withdrawals/withdrawals.go index 1a91a64..11acd6f 100644 --- a/op-withdrawer/withdrawals/withdrawals.go +++ b/op-withdrawer/withdrawals/withdrawals.go @@ -7,13 +7,13 @@ import ( "math/big" "time" + "github.com/base-org/op-enclave/bindings" "github.com/ethereum-optimism/optimism/op-node/withdrawals" "github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/ethclient/gethclient" - "github.com/mdehoog/op-enclave/bindings" ) type ProofClient interface { diff --git a/testnet/genesis.go b/testnet/genesis.go index 68252d3..ae321b2 100644 --- a/testnet/genesis.go +++ b/testnet/genesis.go @@ -13,6 +13,7 @@ import ( "path/filepath" "time" + "github.com/base-org/op-enclave/bindings" altda "github.com/ethereum-optimism/optimism/op-alt-da" "github.com/ethereum-optimism/optimism/op-chain-ops/deployer/opcm" "github.com/ethereum-optimism/optimism/op-chain-ops/deployer/state" @@ -29,7 +30,6 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/ethclient" "github.com/ethereum/go-ethereum/log" - "github.com/mdehoog/op-enclave/bindings" "github.com/urfave/cli/v2" )