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

Migrate from base-org/ to base/ #41

Merged
merged 1 commit into from
Feb 11, 2025
Merged

Migrate from base-org/ to base/ #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ The `s3` backend will also work with (for example) Google Cloud Storage buckets

### Data Validity
Currently, the archiver and api do not validate the beacon node's data. Therefore, it's important to either trust the
Beacon node, or validate the data in the client. There is an open [issue](https://github.com/base-org/blob-archiver/issues/4)
Beacon node, or validate the data in the client. There is an open [issue](https://github.com/base/blob-archiver/issues/4)
to add data validation to the archiver and api.

### Development
Expand Down
2 changes: 1 addition & 1 deletion api/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
GITCOMMIT ?= $(shell git rev-parse HEAD)
LDFLAGS := -ldflags "-X github.com/base-org/blob-archiver/api/version.GitCommit=$(GITCOMMIT)"
LDFLAGS := -ldflags "-X github.com/base/blob-archiver/api/version.GitCommit=$(GITCOMMIT)"

blob-api:
env GO111MODULE=on GOOS=$(TARGETOS) GOARCH=$(TARGETARCH) go build -v $(LDFLAGS) -o ./bin/blob-api ./cmd/main.go
Expand Down
10 changes: 5 additions & 5 deletions api/cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (
"fmt"
"os"

"github.com/base-org/blob-archiver/api/flags"
"github.com/base-org/blob-archiver/api/metrics"
"github.com/base-org/blob-archiver/api/service"
"github.com/base-org/blob-archiver/common/beacon"
"github.com/base-org/blob-archiver/common/storage"
"github.com/base/blob-archiver/api/flags"
"github.com/base/blob-archiver/api/metrics"
"github.com/base/blob-archiver/api/service"
"github.com/base/blob-archiver/common/beacon"
"github.com/base/blob-archiver/common/storage"
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"
Expand Down
2 changes: 1 addition & 1 deletion api/flags/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package flags
import (
"fmt"

common "github.com/base-org/blob-archiver/common/flags"
common "github.com/base/blob-archiver/common/flags"
oplog "github.com/ethereum-optimism/optimism/op-service/log"
opmetrics "github.com/ethereum-optimism/optimism/op-service/metrics"
"github.com/urfave/cli/v2"
Expand Down
2 changes: 1 addition & 1 deletion api/flags/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package flags

import (
common "github.com/base-org/blob-archiver/common/flags"
common "github.com/base/blob-archiver/common/flags"
opservice "github.com/ethereum-optimism/optimism/op-service"
oplog "github.com/ethereum-optimism/optimism/op-service/log"
opmetrics "github.com/ethereum-optimism/optimism/op-service/metrics"
Expand Down
6 changes: 3 additions & 3 deletions api/service/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (
client "github.com/attestantio/go-eth2-client"
"github.com/attestantio/go-eth2-client/api"
"github.com/attestantio/go-eth2-client/spec/deneb"
m "github.com/base-org/blob-archiver/api/metrics"
"github.com/base-org/blob-archiver/api/version"
"github.com/base-org/blob-archiver/common/storage"
m "github.com/base/blob-archiver/api/metrics"
"github.com/base/blob-archiver/api/version"
"github.com/base/blob-archiver/common/storage"
opmetrics "github.com/ethereum-optimism/optimism/op-service/metrics"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil"
Expand Down
8 changes: 4 additions & 4 deletions api/service/api_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ import (
v1 "github.com/attestantio/go-eth2-client/api/v1"
"github.com/attestantio/go-eth2-client/spec/deneb"
"github.com/attestantio/go-eth2-client/spec/phase0"
"github.com/base-org/blob-archiver/api/metrics"
"github.com/base-org/blob-archiver/common/beacon/beacontest"
"github.com/base-org/blob-archiver/common/blobtest"
"github.com/base-org/blob-archiver/common/storage"
"github.com/base/blob-archiver/api/metrics"
"github.com/base/blob-archiver/common/beacon/beacontest"
"github.com/base/blob-archiver/common/blobtest"
"github.com/base/blob-archiver/common/storage"
"github.com/ethereum-optimism/optimism/op-service/eth"
"github.com/ethereum-optimism/optimism/op-service/testlog"
"github.com/ethereum/go-ethereum/common"
Expand Down
2 changes: 1 addition & 1 deletion api/service/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"fmt"
"sync/atomic"

"github.com/base-org/blob-archiver/api/flags"
"github.com/base/blob-archiver/api/flags"
"github.com/ethereum-optimism/optimism/op-service/httputil"
opmetrics "github.com/ethereum-optimism/optimism/op-service/metrics"
"github.com/ethereum/go-ethereum/log"
Expand Down
10 changes: 5 additions & 5 deletions archiver/cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (
"fmt"
"os"

"github.com/base-org/blob-archiver/archiver/flags"
"github.com/base-org/blob-archiver/archiver/metrics"
"github.com/base-org/blob-archiver/archiver/service"
"github.com/base-org/blob-archiver/common/beacon"
"github.com/base-org/blob-archiver/common/storage"
"github.com/base/blob-archiver/archiver/flags"
"github.com/base/blob-archiver/archiver/metrics"
"github.com/base/blob-archiver/archiver/service"
"github.com/base/blob-archiver/common/beacon"
"github.com/base/blob-archiver/common/storage"
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"
Expand Down
2 changes: 1 addition & 1 deletion archiver/flags/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"strings"
"time"

common "github.com/base-org/blob-archiver/common/flags"
common "github.com/base/blob-archiver/common/flags"
oplog "github.com/ethereum-optimism/optimism/op-service/log"
opmetrics "github.com/ethereum-optimism/optimism/op-service/metrics"
geth "github.com/ethereum/go-ethereum/common"
Expand Down
2 changes: 1 addition & 1 deletion archiver/flags/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package flags

import (
common "github.com/base-org/blob-archiver/common/flags"
common "github.com/base/blob-archiver/common/flags"
opservice "github.com/ethereum-optimism/optimism/op-service"
oplog "github.com/ethereum-optimism/optimism/op-service/log"
opmetrics "github.com/ethereum-optimism/optimism/op-service/metrics"
Expand Down
2 changes: 1 addition & 1 deletion archiver/service/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strconv"
"time"

m "github.com/base-org/blob-archiver/archiver/metrics"
m "github.com/base/blob-archiver/archiver/metrics"
opmetrics "github.com/ethereum-optimism/optimism/op-service/metrics"
"github.com/ethereum/go-ethereum/log"
"github.com/go-chi/chi/v5"
Expand Down
6 changes: 3 additions & 3 deletions archiver/service/api_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"testing"
"time"

"github.com/base-org/blob-archiver/archiver/flags"
"github.com/base-org/blob-archiver/archiver/metrics"
"github.com/base-org/blob-archiver/common/storage/storagetest"
"github.com/base/blob-archiver/archiver/flags"
"github.com/base/blob-archiver/archiver/metrics"
"github.com/base/blob-archiver/common/storage/storagetest"
"github.com/ethereum-optimism/optimism/op-service/testlog"
"github.com/ethereum/go-ethereum/log"
"github.com/stretchr/testify/require"
Expand Down
8 changes: 4 additions & 4 deletions archiver/service/archiver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
client "github.com/attestantio/go-eth2-client"
"github.com/attestantio/go-eth2-client/api"
v1 "github.com/attestantio/go-eth2-client/api/v1"
"github.com/base-org/blob-archiver/archiver/flags"
"github.com/base-org/blob-archiver/archiver/metrics"
"github.com/base-org/blob-archiver/common/storage"
"github.com/base/blob-archiver/archiver/flags"
"github.com/base/blob-archiver/archiver/metrics"
"github.com/base/blob-archiver/common/storage"
"github.com/ethereum-optimism/optimism/op-service/retry"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/log"
Expand Down Expand Up @@ -83,7 +83,7 @@ func (a *Archiver) Stop(ctx context.Context) error {
// and a boolean indicating whether the blobs already existed in S3 and any errors that occur.
// If the blobs are already stored, it will not overwrite the data. Currently, the archiver does not
// perform any validation of the blobs, it assumes a trusted beacon node. See:
// https://github.com/base-org/blob-archiver/issues/4.
// https://github.com/base/blob-archiver/issues/4.
func (a *Archiver) persistBlobsForBlockToS3(ctx context.Context, blockIdentifier string, overwrite bool) (*v1.BeaconBlockHeader, bool, error) {
currentHeader, err := a.beaconClient.BeaconBlockHeader(ctx, &api.BeaconBlockHeaderOpts{
Block: blockIdentifier,
Expand Down
12 changes: 6 additions & 6 deletions archiver/service/archiver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ import (
"testing"
"time"

"github.com/base-org/blob-archiver/archiver/flags"
"github.com/base-org/blob-archiver/archiver/metrics"
"github.com/base-org/blob-archiver/common/beacon/beacontest"
"github.com/base-org/blob-archiver/common/blobtest"
"github.com/base-org/blob-archiver/common/storage"
"github.com/base-org/blob-archiver/common/storage/storagetest"
"github.com/base/blob-archiver/archiver/flags"
"github.com/base/blob-archiver/archiver/metrics"
"github.com/base/blob-archiver/common/beacon/beacontest"
"github.com/base/blob-archiver/common/blobtest"
"github.com/base/blob-archiver/common/storage"
"github.com/base/blob-archiver/common/storage/storagetest"
"github.com/ethereum-optimism/optimism/op-service/testlog"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/log"
Expand Down
4 changes: 2 additions & 2 deletions archiver/service/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"fmt"
"sync/atomic"

"github.com/base-org/blob-archiver/archiver/flags"
"github.com/base-org/blob-archiver/archiver/metrics"
"github.com/base/blob-archiver/archiver/flags"
"github.com/base/blob-archiver/archiver/metrics"
"github.com/ethereum-optimism/optimism/op-service/httputil"
opmetrics "github.com/ethereum-optimism/optimism/op-service/metrics"
"github.com/ethereum/go-ethereum/log"
Expand Down
2 changes: 1 addition & 1 deletion common/beacon/beacontest/stub.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
v1 "github.com/attestantio/go-eth2-client/api/v1"
"github.com/attestantio/go-eth2-client/spec/deneb"
"github.com/attestantio/go-eth2-client/spec/phase0"
"github.com/base-org/blob-archiver/common/blobtest"
"github.com/base/blob-archiver/common/blobtest"
"github.com/ethereum/go-ethereum/common"
)

Expand Down
2 changes: 1 addition & 1 deletion common/beacon/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

client "github.com/attestantio/go-eth2-client"
"github.com/attestantio/go-eth2-client/http"
"github.com/base-org/blob-archiver/common/flags"
"github.com/base/blob-archiver/common/flags"
"github.com/rs/zerolog"
)

Expand Down
2 changes: 1 addition & 1 deletion common/storage/s3.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"path"
"strconv"

"github.com/base-org/blob-archiver/common/flags"
"github.com/base/blob-archiver/common/flags"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/log"
"github.com/minio/minio-go/v7"
Expand Down
2 changes: 1 addition & 1 deletion common/storage/s3_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"os"
"testing"

"github.com/base-org/blob-archiver/common/flags"
"github.com/base/blob-archiver/common/flags"
"github.com/ethereum-optimism/optimism/op-service/testlog"
"github.com/ethereum/go-ethereum/log"
"github.com/minio/minio-go/v7"
Expand Down
2 changes: 1 addition & 1 deletion common/storage/storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

v1 "github.com/attestantio/go-eth2-client/api/v1"
"github.com/attestantio/go-eth2-client/spec/deneb"
"github.com/base-org/blob-archiver/common/flags"
"github.com/base/blob-archiver/common/flags"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/log"
)
Expand Down
2 changes: 1 addition & 1 deletion common/storage/storage_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/attestantio/go-eth2-client/api"
"github.com/attestantio/go-eth2-client/spec/deneb"
"github.com/base-org/blob-archiver/common/blobtest"
"github.com/base/blob-archiver/common/blobtest"
"github.com/stretchr/testify/require"
)

Expand Down
2 changes: 1 addition & 1 deletion common/storage/storagetest/stub.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"testing"

"github.com/base-org/blob-archiver/common/storage"
"github.com/base/blob-archiver/common/storage"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/log"
"github.com/stretchr/testify/require"
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/base-org/blob-archiver
module github.com/base/blob-archiver

go 1.21.6

Expand Down
6 changes: 3 additions & 3 deletions validator/cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"fmt"
"os"

"github.com/base-org/blob-archiver/common/beacon"
"github.com/base-org/blob-archiver/validator/flags"
"github.com/base-org/blob-archiver/validator/service"
"github.com/base/blob-archiver/common/beacon"
"github.com/base/blob-archiver/validator/flags"
"github.com/base/blob-archiver/validator/service"
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"
Expand Down
2 changes: 1 addition & 1 deletion validator/flags/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"time"

common "github.com/base-org/blob-archiver/common/flags"
common "github.com/base/blob-archiver/common/flags"
oplog "github.com/ethereum-optimism/optimism/op-service/log"
"github.com/urfave/cli/v2"
)
Expand Down
2 changes: 1 addition & 1 deletion validator/service/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"net/http"

"github.com/attestantio/go-eth2-client/api"
"github.com/base-org/blob-archiver/common/storage"
"github.com/base/blob-archiver/common/storage"
)

type Format string
Expand Down
4 changes: 2 additions & 2 deletions validator/service/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"github.com/attestantio/go-eth2-client/api"
v1 "github.com/attestantio/go-eth2-client/api/v1"
"github.com/attestantio/go-eth2-client/spec/phase0"
"github.com/base-org/blob-archiver/common/storage"
"github.com/base-org/blob-archiver/validator/flags"
"github.com/base/blob-archiver/common/storage"
"github.com/base/blob-archiver/validator/flags"
"github.com/ethereum-optimism/optimism/op-service/retry"
"github.com/ethereum/go-ethereum/log"
)
Expand Down
8 changes: 4 additions & 4 deletions validator/service/service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import (

"github.com/attestantio/go-eth2-client/spec/deneb"
"github.com/attestantio/go-eth2-client/spec/phase0"
"github.com/base-org/blob-archiver/common/beacon/beacontest"
"github.com/base-org/blob-archiver/common/blobtest"
"github.com/base-org/blob-archiver/common/storage"
"github.com/base-org/blob-archiver/validator/flags"
"github.com/base/blob-archiver/common/beacon/beacontest"
"github.com/base/blob-archiver/common/blobtest"
"github.com/base/blob-archiver/common/storage"
"github.com/base/blob-archiver/validator/flags"
"github.com/ethereum-optimism/optimism/op-service/testlog"
"github.com/ethereum/go-ethereum/log"
"github.com/stretchr/testify/require"
Expand Down
Loading