Skip to content

Commit

Permalink
github.com/rollkit/rollkit => github.com/astriaorg/rollkit
Browse files Browse the repository at this point in the history
  • Loading branch information
@mycodecrafting
mycodecrafting committed Feb 8, 2024
1 parent ec17832 commit a248579
Show file tree
Hide file tree
Showing 67 changed files with 148 additions and 148 deletions.
6 changes: 3 additions & 3 deletions astria/execution/v1alpha2.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (

astriaGrpc "buf.build/gen/go/astria/execution-apis/grpc/go/astria/execution/v1alpha2/executionv1alpha2grpc"
astriaPb "buf.build/gen/go/astria/execution-apis/protocolbuffers/go/astria/execution/v1alpha2"
"github.com/astriaorg/rollkit/block"
"github.com/astriaorg/rollkit/store"
"github.com/astriaorg/rollkit/types"
cmbytes "github.com/cometbft/cometbft/libs/bytes"
"github.com/cometbft/cometbft/libs/log"
"github.com/rollkit/rollkit/block"
"github.com/rollkit/rollkit/store"
"github.com/rollkit/rollkit/types"
codes "google.golang.org/grpc/codes"
status "google.golang.org/grpc/status"
"google.golang.org/protobuf/encoding/protojson"
Expand Down
4 changes: 2 additions & 2 deletions astria/mempool/reaper.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"fmt"
"sync"

"github.com/astriaorg/rollkit/astria/sequencer"
"github.com/astriaorg/rollkit/mempool"
"github.com/cometbft/cometbft/libs/log"
"github.com/rollkit/rollkit/astria/sequencer"
"github.com/rollkit/rollkit/mempool"
)

type MempoolReaper struct {
Expand Down
2 changes: 1 addition & 1 deletion block/block_cache.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package block
import (
"sync"

"github.com/rollkit/rollkit/types"
"github.com/astriaorg/rollkit/types"
)

// BlockCache maintains blocks that are seen and hard confirmed
Expand Down
2 changes: 1 addition & 1 deletion block/block_cache_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/stretchr/testify/require"

"github.com/rollkit/rollkit/types"
"github.com/astriaorg/rollkit/types"
)

func TestBlockCache(t *testing.T) {
Expand Down
12 changes: 6 additions & 6 deletions block/ss_manager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ import (
ds "github.com/ipfs/go-datastore"
"github.com/libp2p/go-libp2p/core/crypto"

"github.com/rollkit/rollkit/config"
"github.com/rollkit/rollkit/mempool"
"github.com/rollkit/rollkit/state"
"github.com/rollkit/rollkit/store"
"github.com/rollkit/rollkit/third_party/log"
"github.com/rollkit/rollkit/types"
"github.com/astriaorg/rollkit/config"
"github.com/astriaorg/rollkit/mempool"
"github.com/astriaorg/rollkit/state"
"github.com/astriaorg/rollkit/store"
"github.com/astriaorg/rollkit/third_party/log"
"github.com/astriaorg/rollkit/types"
)

// Manager is responsible for aggregating transactions into blocks.
Expand Down
6 changes: 3 additions & 3 deletions da/da.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (

"github.com/gogo/protobuf/proto"

"github.com/astriaorg/rollkit/third_party/log"
"github.com/astriaorg/rollkit/types"
pb "github.com/astriaorg/rollkit/types/pb/rollkit"
goDA "github.com/rollkit/go-da"
"github.com/rollkit/rollkit/third_party/log"
"github.com/rollkit/rollkit/types"
pb "github.com/rollkit/rollkit/types/pb/rollkit"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion da/da_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ import (

"google.golang.org/grpc/credentials/insecure"

"github.com/astriaorg/rollkit/types"
"github.com/rollkit/go-da"
"github.com/rollkit/go-da/proxy"
goDATest "github.com/rollkit/go-da/test"
"github.com/rollkit/rollkit/types"
)

const mockDaBlockTime = 100 * time.Millisecond
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/rollkit/rollkit
module github.com/astriaorg/rollkit

go 1.21.1

Expand Down
2 changes: 1 addition & 1 deletion mempool/clist_mempool.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/cometbft/cometbft/proxy"
"github.com/cometbft/cometbft/types"

"github.com/rollkit/rollkit/mempool/clist"
"github.com/astriaorg/rollkit/mempool/clist"
)

// CListMempool is an ordered in-memory pool for transactions before they are
Expand Down
26 changes: 13 additions & 13 deletions node/full.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,19 @@ import (
rpcclient "github.com/cometbft/cometbft/rpc/client"
cmtypes "github.com/cometbft/cometbft/types"

"github.com/rollkit/rollkit/astria/execution"
astriamempool "github.com/rollkit/rollkit/astria/mempool"
"github.com/rollkit/rollkit/astria/sequencer"
"github.com/rollkit/rollkit/block"
"github.com/rollkit/rollkit/config"
"github.com/rollkit/rollkit/mempool"
"github.com/rollkit/rollkit/state"
"github.com/rollkit/rollkit/state/indexer"
blockidxkv "github.com/rollkit/rollkit/state/indexer/block/kv"
"github.com/rollkit/rollkit/state/txindex"
"github.com/rollkit/rollkit/state/txindex/kv"
"github.com/rollkit/rollkit/store"
"github.com/rollkit/rollkit/types"
"github.com/astriaorg/rollkit/astria/execution"
astriamempool "github.com/astriaorg/rollkit/astria/mempool"
"github.com/astriaorg/rollkit/astria/sequencer"
"github.com/astriaorg/rollkit/block"
"github.com/astriaorg/rollkit/config"
"github.com/astriaorg/rollkit/mempool"
"github.com/astriaorg/rollkit/state"
"github.com/astriaorg/rollkit/state/indexer"
blockidxkv "github.com/astriaorg/rollkit/state/indexer/block/kv"
"github.com/astriaorg/rollkit/state/txindex"
"github.com/astriaorg/rollkit/state/txindex/kv"
"github.com/astriaorg/rollkit/store"
"github.com/astriaorg/rollkit/types"
)

// prefixes used in KV store to separate main node data from DALC data
Expand Down
8 changes: 4 additions & 4 deletions node/full_client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ import (
cmtypes "github.com/cometbft/cometbft/types"
"github.com/cometbft/cometbft/version"

rconfig "github.com/rollkit/rollkit/config"
"github.com/rollkit/rollkit/mempool"
"github.com/rollkit/rollkit/types"
abciconv "github.com/rollkit/rollkit/types/abci"
rconfig "github.com/astriaorg/rollkit/config"
"github.com/astriaorg/rollkit/mempool"
"github.com/astriaorg/rollkit/types"
abciconv "github.com/astriaorg/rollkit/types/abci"
)

const (
Expand Down
10 changes: 5 additions & 5 deletions node/full_client_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ import (
"github.com/libp2p/go-libp2p/core/crypto"
"github.com/libp2p/go-libp2p/core/peer"

"github.com/rollkit/rollkit/config"
test "github.com/rollkit/rollkit/test/log"
"github.com/rollkit/rollkit/test/mocks"
"github.com/rollkit/rollkit/types"
abciconv "github.com/rollkit/rollkit/types/abci"
"github.com/astriaorg/rollkit/config"
test "github.com/astriaorg/rollkit/test/log"
"github.com/astriaorg/rollkit/test/mocks"
"github.com/astriaorg/rollkit/types"
abciconv "github.com/astriaorg/rollkit/types/abci"
)

var expectedInfo = &abci.ResponseInfo{
Expand Down
8 changes: 4 additions & 4 deletions node/full_node_integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ import (
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"

"github.com/rollkit/rollkit/config"
test "github.com/rollkit/rollkit/test/log"
"github.com/rollkit/rollkit/test/mocks"
"github.com/rollkit/rollkit/types"
"github.com/astriaorg/rollkit/config"
test "github.com/astriaorg/rollkit/test/log"
"github.com/astriaorg/rollkit/test/mocks"
"github.com/astriaorg/rollkit/types"

testutils "github.com/celestiaorg/utils/test"
)
Expand Down
10 changes: 5 additions & 5 deletions node/full_node_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ import (

testutils "github.com/celestiaorg/utils/test"

"github.com/rollkit/rollkit/block"
"github.com/rollkit/rollkit/da"
"github.com/rollkit/rollkit/mempool"
"github.com/rollkit/rollkit/test/mocks"
"github.com/rollkit/rollkit/types"
"github.com/astriaorg/rollkit/block"
"github.com/astriaorg/rollkit/da"
"github.com/astriaorg/rollkit/mempool"
"github.com/astriaorg/rollkit/test/mocks"
"github.com/astriaorg/rollkit/types"
)

// simply check that node is starting and stopping without panicking
Expand Down
2 changes: 1 addition & 1 deletion node/node.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
rpcclient "github.com/cometbft/cometbft/rpc/client"
cmtypes "github.com/cometbft/cometbft/types"

"github.com/rollkit/rollkit/config"
"github.com/astriaorg/rollkit/config"
)

// Node is the interface for a rollup node
Expand Down
6 changes: 3 additions & 3 deletions node/node_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/rollkit/rollkit/config"
test "github.com/rollkit/rollkit/test/log"
"github.com/rollkit/rollkit/types"
"github.com/astriaorg/rollkit/config"
test "github.com/astriaorg/rollkit/test/log"
"github.com/astriaorg/rollkit/types"
)

var MockServerAddr = ":7980"
Expand Down
8 changes: 4 additions & 4 deletions node/setup.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
cmcfg "github.com/cometbft/cometbft/config"
proxy "github.com/cometbft/cometbft/proxy"

"github.com/rollkit/rollkit/block"
"github.com/rollkit/rollkit/mempool"
"github.com/rollkit/rollkit/p2p"
"github.com/rollkit/rollkit/state"
"github.com/astriaorg/rollkit/block"
"github.com/astriaorg/rollkit/mempool"
"github.com/astriaorg/rollkit/p2p"
"github.com/astriaorg/rollkit/state"
)

const readHeaderTimeout = 10 * time.Second
Expand Down
4 changes: 2 additions & 2 deletions p2p/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import (

tmcrypto "github.com/tendermint/tendermint/crypto"

"github.com/rollkit/rollkit/config"
"github.com/rollkit/rollkit/third_party/log"
"github.com/astriaorg/rollkit/config"
"github.com/astriaorg/rollkit/third_party/log"
)

// TODO(tzdybal): refactor to configuration parameters
Expand Down
4 changes: 2 additions & 2 deletions p2p/client_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/rollkit/rollkit/config"
test "github.com/rollkit/rollkit/test/log"
"github.com/astriaorg/rollkit/config"
test "github.com/astriaorg/rollkit/test/log"
)

func TestClientStartup(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion p2p/gossip.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/libp2p/go-libp2p/core/host"
"github.com/libp2p/go-libp2p/core/peer"

"github.com/rollkit/rollkit/third_party/log"
"github.com/astriaorg/rollkit/third_party/log"
)

// GossipMessage represents message gossiped via P2P network (e.g. transaction, Block etc).
Expand Down
4 changes: 2 additions & 2 deletions p2p/utils_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import (
"github.com/multiformats/go-multiaddr"
"github.com/stretchr/testify/require"

"github.com/rollkit/rollkit/config"
"github.com/rollkit/rollkit/third_party/log"
"github.com/astriaorg/rollkit/config"
"github.com/astriaorg/rollkit/third_party/log"
)

type testNet []*Client
Expand Down
2 changes: 1 addition & 1 deletion proto/rollkit/rollkit.proto
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
syntax = "proto3";
package rollkit;
option go_package = "github.com/rollkit/rollkit/types/pb/rollkit";
option go_package = "github.com/astriaorg/rollkit/types/pb/rollkit";
import "tendermint/types/validator.proto";

// Version captures the consensus rules for processing a block in the blockchain,
Expand Down
2 changes: 1 addition & 1 deletion proto/rollkit/state.proto
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
syntax = "proto3";
package rollkit;
option go_package = "github.com/rollkit/rollkit/types/pb/rollkit";
option go_package = "github.com/astriaorg/rollkit/types/pb/rollkit";

import "gogoproto/gogo.proto";
import "google/protobuf/timestamp.proto";
Expand Down
2 changes: 1 addition & 1 deletion rpc/json/handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"github.com/gorilla/rpc/v2"
"github.com/gorilla/rpc/v2/json2"

"github.com/rollkit/rollkit/third_party/log"
"github.com/astriaorg/rollkit/third_party/log"
)

type handler struct {
Expand Down
8 changes: 4 additions & 4 deletions rpc/json/helpers_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ import (
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"

"github.com/rollkit/rollkit/config"
"github.com/rollkit/rollkit/node"
"github.com/rollkit/rollkit/test/mocks"
"github.com/rollkit/rollkit/types"
"github.com/astriaorg/rollkit/config"
"github.com/astriaorg/rollkit/node"
"github.com/astriaorg/rollkit/test/mocks"
"github.com/astriaorg/rollkit/types"
)

func prepareProposalResponse(_ context.Context, req *abci.RequestPrepareProposal) (*abci.ResponsePrepareProposal, error) {
Expand Down
2 changes: 1 addition & 1 deletion rpc/json/service.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/gorilla/rpc/v2"
"github.com/gorilla/rpc/v2/json2"

"github.com/rollkit/rollkit/third_party/log"
"github.com/astriaorg/rollkit/third_party/log"
)

// GetHTTPHandler returns handler configured to serve Tendermint-compatible RPC.
Expand Down
2 changes: 1 addition & 1 deletion rpc/json/service_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
coretypes "github.com/cometbft/cometbft/rpc/core/types"
"github.com/stretchr/testify/mock"

"github.com/rollkit/rollkit/test/mocks"
"github.com/astriaorg/rollkit/test/mocks"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down
2 changes: 1 addition & 1 deletion rpc/json/ws.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"github.com/gorilla/websocket"

"github.com/rollkit/rollkit/third_party/log"
"github.com/astriaorg/rollkit/third_party/log"
)

type wsConn struct {
Expand Down
4 changes: 2 additions & 2 deletions rpc/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (
"github.com/rs/cors"
"golang.org/x/net/netutil"

"github.com/rollkit/rollkit/node"
"github.com/rollkit/rollkit/rpc/json"
"github.com/astriaorg/rollkit/node"
"github.com/astriaorg/rollkit/rpc/json"
)

// Server handles HTTP and JSON-RPC requests, exposing Tendermint-compatible API.
Expand Down
8 changes: 4 additions & 4 deletions state/executor.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ import (
"github.com/cometbft/cometbft/proxy"
cmtypes "github.com/cometbft/cometbft/types"

"github.com/rollkit/rollkit/mempool"
"github.com/rollkit/rollkit/third_party/log"
"github.com/rollkit/rollkit/types"
abciconv "github.com/rollkit/rollkit/types/abci"
"github.com/astriaorg/rollkit/mempool"
"github.com/astriaorg/rollkit/third_party/log"
"github.com/astriaorg/rollkit/types"
abciconv "github.com/astriaorg/rollkit/types/abci"
)

// ErrEmptyValSetGenerated is returned when applying the validator changes would result in empty set.
Expand Down
6 changes: 3 additions & 3 deletions state/executor_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import (
"github.com/cometbft/cometbft/proxy"
cmtypes "github.com/cometbft/cometbft/types"

"github.com/rollkit/rollkit/mempool"
"github.com/rollkit/rollkit/test/mocks"
"github.com/rollkit/rollkit/types"
"github.com/astriaorg/rollkit/mempool"
"github.com/astriaorg/rollkit/test/mocks"
"github.com/astriaorg/rollkit/types"
)

func prepareProposalResponse(_ context.Context, req *abci.RequestPrepareProposal) (*abci.ResponsePrepareProposal, error) {
Expand Down
6 changes: 3 additions & 3 deletions state/indexer/block/kv/kv.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ import (
"github.com/cometbft/cometbft/libs/pubsub/query/syntax"
"github.com/cometbft/cometbft/types"

"github.com/rollkit/rollkit/state"
"github.com/rollkit/rollkit/state/indexer"
"github.com/rollkit/rollkit/store"
"github.com/astriaorg/rollkit/state"
"github.com/astriaorg/rollkit/state/indexer"
"github.com/astriaorg/rollkit/store"
)

var _ indexer.BlockIndexer = (*BlockerIndexer)(nil)
Expand Down
Loading

0 comments on commit a248579

Please sign in to comment.