Skip to content

Commit

Permalink
🧱 update project name imports
Browse files Browse the repository at this point in the history
  • Loading branch information
cairoeth committed Mar 24, 2024
1 parent 7231d5a commit 012256d
Show file tree
Hide file tree
Showing 33 changed files with 57 additions and 90 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/cairoeth/preconfirmations-avs
module github.com/cairoeth/preconfirmations

go 1.21

Expand Down
14 changes: 3 additions & 11 deletions preconf-operator/cmd/operator/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,14 @@ package main
import (
"context"
"encoding/json"
// "errors"
// "fmt"
"log"
// "net/http"
"os"
// "os/signal"
// "syscall"
// "time"

"github.com/urfave/cli"

"github.com/cairoeth/preconfirmations-avs/preconf-operator"
"github.com/cairoeth/preconfirmations-avs/preconf-operator/core/config"
"github.com/cairoeth/preconfirmations-avs/preconf-operator/types"

// "github.com/cairoeth/preconfirmations-avs/preconf-share/jsonrpcserver"
"github.com/cairoeth/preconfirmations/preconf-operator"
"github.com/cairoeth/preconfirmations/preconf-operator/core/config"
"github.com/cairoeth/preconfirmations/preconf-operator/types"

sdkutils "github.com/Layr-Labs/eigensdk-go/utils"
)
Expand Down
4 changes: 2 additions & 2 deletions preconf-operator/core/chainio/avs_reader.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"github.com/Layr-Labs/eigensdk-go/chainio/clients/eth"
logging "github.com/Layr-Labs/eigensdk-go/logging"

erc20mock "github.com/cairoeth/preconfirmations-avs/contracts/bindings/ERC20Mock"
"github.com/cairoeth/preconfirmations-avs/preconf-operator/core/config"
erc20mock "github.com/cairoeth/preconfirmations/contracts/bindings/ERC20Mock"
"github.com/cairoeth/preconfirmations/preconf-operator/core/config"
)

type AvsReaderer interface {
Expand Down
2 changes: 1 addition & 1 deletion preconf-operator/core/chainio/avs_writer.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/Layr-Labs/eigensdk-go/chainio/txmgr"
logging "github.com/Layr-Labs/eigensdk-go/logging"

"github.com/cairoeth/preconfirmations-avs/preconf-operator/core/config"
"github.com/cairoeth/preconfirmations/preconf-operator/core/config"
)

type AvsWriterer interface {
Expand Down
6 changes: 3 additions & 3 deletions preconf-operator/core/chainio/bindings.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
gethcommon "github.com/ethereum/go-ethereum/common"

regcoord "github.com/Layr-Labs/eigensdk-go/contracts/bindings/RegistryCoordinator"
erc20mock "github.com/cairoeth/preconfirmations-avs/contracts/bindings/ERC20Mock"
preconfchallengemanager "github.com/cairoeth/preconfirmations-avs/contracts/bindings/PreconfChallengeManager"
preconfservicemanager "github.com/cairoeth/preconfirmations-avs/contracts/bindings/PreconfServiceManager"
erc20mock "github.com/cairoeth/preconfirmations/contracts/bindings/ERC20Mock"
preconfchallengemanager "github.com/cairoeth/preconfirmations/contracts/bindings/PreconfChallengeManager"
preconfservicemanager "github.com/cairoeth/preconfirmations/contracts/bindings/PreconfServiceManager"
)

type AvsManagersBindings struct {
Expand Down
10 changes: 5 additions & 5 deletions preconf-operator/operator.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import (
"github.com/prometheus/client_golang/prometheus"

"github.com/Layr-Labs/incredible-squaring-avs/metrics"
"github.com/cairoeth/preconfirmations-avs/preconf-operator/core/chainio"
"github.com/cairoeth/preconfirmations-avs/preconf-operator/receiverapi"
"github.com/cairoeth/preconfirmations-avs/preconf-operator/sse"
"github.com/cairoeth/preconfirmations-avs/preconf-operator/types"
"github.com/cairoeth/preconfirmations/preconf-operator/core/chainio"
"github.com/cairoeth/preconfirmations/preconf-operator/receiverapi"
"github.com/cairoeth/preconfirmations/preconf-operator/sse"
"github.com/cairoeth/preconfirmations/preconf-operator/types"

"github.com/Layr-Labs/eigensdk-go/chainio/clients"
sdkelcontracts "github.com/Layr-Labs/eigensdk-go/chainio/clients/elcontracts"
Expand All @@ -29,7 +29,7 @@ import (
"github.com/Layr-Labs/eigensdk-go/nodeapi"
"github.com/Layr-Labs/eigensdk-go/signerv2"
sdktypes "github.com/Layr-Labs/eigensdk-go/types"
"github.com/cairoeth/preconfirmations-avs/preconf-share/preconshare"
"github.com/cairoeth/preconfirmations/preconf-share/preconshare"
"github.com/ethereum/go-ethereum/common/hexutil"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ybbus/jsonrpc/v3"
Expand Down
2 changes: 1 addition & 1 deletion preconf-operator/sse/types.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package sse

import (
"github.com/cairoeth/preconfirmations-avs/preconf-operator/types"
"github.com/cairoeth/preconfirmations/preconf-operator/types"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil"
)
Expand Down
25 changes: 0 additions & 25 deletions preconf-share/README.md

This file was deleted.

6 changes: 3 additions & 3 deletions preconf-share/cmd/node/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ import (
"time"

"github.com/VictoriaMetrics/metrics"
"github.com/cairoeth/preconfirmations-avs/preconf-share/jsonrpcserver"
"github.com/cairoeth/preconfirmations-avs/preconf-share/preconshare"
"github.com/cairoeth/preconfirmations-avs/preconf-share/simqueue"
"github.com/cairoeth/preconfirmations/preconf-share/jsonrpcserver"
"github.com/cairoeth/preconfirmations/preconf-share/preconshare"
"github.com/cairoeth/preconfirmations/preconf-share/simqueue"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/ethclient"
"github.com/flashbots/go-utils/cli"
Expand Down
6 changes: 3 additions & 3 deletions preconf-share/preconshare/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"errors"
"time"

"github.com/cairoeth/preconfirmations-avs/preconf-share/jsonrpcserver"
"github.com/cairoeth/preconfirmations-avs/preconf-share/metrics"
"github.com/cairoeth/preconfirmations-avs/preconf-share/spike"
"github.com/cairoeth/preconfirmations/preconf-share/jsonrpcserver"
"github.com/cairoeth/preconfirmations/preconf-share/metrics"
"github.com/cairoeth/preconfirmations/preconf-share/spike"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil"
"github.com/ethereum/go-ethereum/common/lru"
Expand Down
4 changes: 2 additions & 2 deletions preconf-share/preconshare/sim_queue.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"sync"
"time"

"github.com/cairoeth/preconfirmations-avs/preconf-share/metrics"
"github.com/cairoeth/preconfirmations-avs/preconf-share/simqueue"
"github.com/cairoeth/preconfirmations/preconf-share/metrics"
"github.com/cairoeth/preconfirmations/preconf-share/simqueue"
"github.com/cenkalti/backoff/v4"
"github.com/ethereum/go-ethereum/common"
"go.uber.org/zap"
Expand Down
2 changes: 1 addition & 1 deletion preconf-share/preconshare/sim_result_backend.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"sync"
"time"

"github.com/cairoeth/preconfirmations-avs/preconf-share/simqueue"
"github.com/cairoeth/preconfirmations/preconf-share/simqueue"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil"
"github.com/ybbus/jsonrpc/v3"
Expand Down
2 changes: 1 addition & 1 deletion preconf-share/simqueue/queue.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ import (
"sync/atomic"
"time"

"github.com/cairoeth/preconfirmations-avs/preconf-share/metrics"
"github.com/cairoeth/preconfirmations/preconf-share/metrics"
"github.com/cenkalti/backoff/v4"
"github.com/redis/go-redis/v9"
"go.uber.org/zap"
Expand Down
2 changes: 1 addition & 1 deletion rpc/cmd/mockbackend/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"net/http"

"github.com/cairoeth/preconfirmations-avs/rpc/testutils"
"github.com/cairoeth/preconfirmations/rpc/testutils"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions rpc/cmd/server/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"strconv"
"strings"

"github.com/cairoeth/preconfirmations-avs/rpc/database"
"github.com/cairoeth/preconfirmations-avs/rpc/server"
"github.com/cairoeth/preconfirmations/rpc/database"
"github.com/cairoeth/preconfirmations/rpc/server"
"github.com/ethereum/go-ethereum/crypto"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
Expand Down
2 changes: 1 addition & 1 deletion rpc/cmd/txdecoder/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"log"

"github.com/cairoeth/preconfirmations-avs/rpc/server"
"github.com/cairoeth/preconfirmations/rpc/server"
)

var rawTx = ""
Expand Down
2 changes: 1 addition & 1 deletion rpc/server/configuration.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package server
import (
"crypto/ecdsa"

"github.com/cairoeth/preconfirmations-avs/rpc/database"
"github.com/cairoeth/preconfirmations/rpc/database"
"go.uber.org/zap"
)

Expand Down
4 changes: 2 additions & 2 deletions rpc/server/request_handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"net/http"
"time"

"github.com/cairoeth/preconfirmations-avs/rpc/database"
"github.com/cairoeth/preconfirmations-avs/rpc/types"
"github.com/cairoeth/preconfirmations/rpc/database"
"github.com/cairoeth/preconfirmations/rpc/types"
"github.com/google/uuid"
"go.uber.org/zap"
)
Expand Down
2 changes: 1 addition & 1 deletion rpc/server/request_intercepts.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"strings"

"github.com/cairoeth/preconfirmations-avs/rpc/types"
"github.com/cairoeth/preconfirmations/rpc/types"
"go.uber.org/zap"
)

Expand Down
6 changes: 3 additions & 3 deletions rpc/server/request_processor.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ import (
"strings"
"time"

"github.com/cairoeth/preconfirmations-avs/rpc/database"
"github.com/cairoeth/preconfirmations/rpc/database"

"github.com/cairoeth/preconfirmations-avs/preconf-share/preconshare"
"github.com/cairoeth/preconfirmations-avs/rpc/types"
"github.com/cairoeth/preconfirmations/preconf-share/preconshare"
"github.com/cairoeth/preconfirmations/rpc/types"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil"
ethtypes "github.com/ethereum/go-ethereum/core/types"
Expand Down
4 changes: 2 additions & 2 deletions rpc/server/request_processor_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"time"

"github.com/alicebob/miniredis"
"github.com/cairoeth/preconfirmations-avs/rpc/testutils"
"github.com/cairoeth/preconfirmations-avs/rpc/types"
"github.com/cairoeth/preconfirmations/rpc/testutils"
"github.com/cairoeth/preconfirmations/rpc/types"
"github.com/stretchr/testify/require"
)

Expand Down
2 changes: 1 addition & 1 deletion rpc/server/request_record.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"net/http"
"sync"

"github.com/cairoeth/preconfirmations-avs/rpc/database"
"github.com/cairoeth/preconfirmations/rpc/database"
"github.com/google/uuid"
)

Expand Down
2 changes: 1 addition & 1 deletion rpc/server/request_record_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"sync"
"testing"

"github.com/cairoeth/preconfirmations-avs/rpc/database"
"github.com/cairoeth/preconfirmations/rpc/database"
"github.com/google/uuid"
"github.com/stretchr/testify/require"
)
Expand Down
2 changes: 1 addition & 1 deletion rpc/server/request_response.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"encoding/json"
"net/http"

"github.com/cairoeth/preconfirmations-avs/rpc/types"
"github.com/cairoeth/preconfirmations/rpc/types"
"go.uber.org/zap"
)

Expand Down
2 changes: 1 addition & 1 deletion rpc/server/request_sendrawtx.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"strings"

"github.com/cairoeth/preconfirmations-avs/rpc/types"
"github.com/cairoeth/preconfirmations/rpc/types"
"github.com/ethereum/go-ethereum/common/hexutil"

ethtypes "github.com/ethereum/go-ethereum/core/types"
Expand Down
8 changes: 4 additions & 4 deletions rpc/server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ import (
"syscall"
"time"

"github.com/cairoeth/preconfirmations-avs/rpc/adapters/webfile"
"github.com/cairoeth/preconfirmations-avs/rpc/application"
"github.com/cairoeth/preconfirmations-avs/rpc/database"
"github.com/cairoeth/preconfirmations/rpc/adapters/webfile"
"github.com/cairoeth/preconfirmations/rpc/application"
"github.com/cairoeth/preconfirmations/rpc/database"

"github.com/alicebob/miniredis"
"github.com/cairoeth/preconfirmations-avs/rpc/types"
"github.com/cairoeth/preconfirmations/rpc/types"
"github.com/pkg/errors"
"go.uber.org/zap"
)
Expand Down
2 changes: 1 addition & 1 deletion rpc/server/url_params.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strconv"
"strings"

"github.com/cairoeth/preconfirmations-avs/rpc/types"
"github.com/cairoeth/preconfirmations/rpc/types"
"github.com/ethereum/go-ethereum/common"
"github.com/pkg/errors"
)
Expand Down
2 changes: 1 addition & 1 deletion rpc/server/url_params_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"net/url"
"testing"

"github.com/cairoeth/preconfirmations-avs/rpc/types"
"github.com/cairoeth/preconfirmations/rpc/types"
"github.com/ethereum/go-ethereum/common"
"github.com/stretchr/testify/require"
)
Expand Down
2 changes: 1 addition & 1 deletion rpc/server/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"os"
"strings"

"github.com/cairoeth/preconfirmations-avs/rpc/types"
"github.com/cairoeth/preconfirmations/rpc/types"
"github.com/ethereum/go-ethereum/common"
ethtypes "github.com/ethereum/go-ethereum/core/types"
"github.com/pkg/errors"
Expand Down
8 changes: 4 additions & 4 deletions rpc/tests/e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ import (
"strings"
"testing"

"github.com/cairoeth/preconfirmations-avs/rpc/database"
"github.com/cairoeth/preconfirmations/rpc/database"

"github.com/alicebob/miniredis"
"github.com/cairoeth/preconfirmations-avs/rpc/server"
"github.com/cairoeth/preconfirmations-avs/rpc/testutils"
"github.com/cairoeth/preconfirmations-avs/rpc/types"
"github.com/cairoeth/preconfirmations/rpc/server"
"github.com/cairoeth/preconfirmations/rpc/testutils"
"github.com/cairoeth/preconfirmations/rpc/types"
"github.com/ethereum/go-ethereum/crypto"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down
2 changes: 1 addition & 1 deletion rpc/testutils/mock_rpcbackend.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"net/http"
"time"

"github.com/cairoeth/preconfirmations-avs/rpc/types"
"github.com/cairoeth/preconfirmations/rpc/types"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion rpc/testutils/mock_txapibackend.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"net/http"
"strings"

"github.com/cairoeth/preconfirmations-avs/rpc/types"
"github.com/cairoeth/preconfirmations/rpc/types"
)

var MockTxApiStatusForHash map[string]types.PrivateTxStatus = make(map[string]types.PrivateTxStatus)
Expand Down
2 changes: 1 addition & 1 deletion rpc/testutils/rpctesthelpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (

"github.com/pkg/errors"

"github.com/cairoeth/preconfirmations-avs/rpc/types"
"github.com/cairoeth/preconfirmations/rpc/types"
)

var RpcEndpointUrl string // set by tests
Expand Down

0 comments on commit 012256d

Please sign in to comment.