Skip to content

Commit

Permalink
Package rename to complete repo move
Browse files Browse the repository at this point in the history
  • Loading branch information
@mdehoog
mdehoog committed Oct 21, 2024
1 parent 4ad0652 commit 76642b3
Show file tree
Hide file tree
Showing 17 changed files with 25 additions and 25 deletions.
4 changes: 2 additions & 2 deletions example/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/mdehoog/op-enclave
module github.com/base-org/op-enclave

go 1.22.6

Expand All @@ -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
)
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion op-batcher/cmd/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions op-da/cmd/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion op-da/da/config.go
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion op-da/da/service.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion op-enclave/cmd/enclave/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion op-enclave/go.mod
View file
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions op-proposer/cmd/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion op-proposer/proposer/config.go
View file
Original file line number Diff line number Diff line change
@@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions op-proposer/proposer/driver.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion op-proposer/proposer/l2_output_submitter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion op-proposer/proposer/prover.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ 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"
"github.com/ethereum/go-ethereum/common"
"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 {
Expand Down
4 changes: 2 additions & 2 deletions op-proposer/proposer/service.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions op-withdrawer/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion op-withdrawer/withdrawals/withdrawals.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion testnet/genesis.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
)

Expand Down

0 comments on commit 76642b3

Please sign in to comment.