chore: Rename all the things connect v2 (skip-mev#684)

neutron-org · Aug 20, 2024 · faf530f · faf530f
1 parent ec6cf12
commit faf530f
Show file tree

Hide file tree

Showing 463 changed files with 1,471 additions and 1,463 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -18,7 +18,8 @@ linters:
     - durationcheck
     - goconst
     - gocritic
-    - gofumpt
+      # re-enable this once golangci-lint has a new release
+      # - gofumpt
     - gosec
     - gosimple
     - govet
@@ -85,4 +86,4 @@ linters-settings:
   nolintlint:
     allow-unused: false
     require-explanation: false
-    require-specific: false
+    require-specific: false
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -15,15 +15,15 @@ builds:
     binary: 'connect'
     id: 'connect'
     ldflags:
-      - "-X github.com/skip-mev/slinky/cmd/build.Build={{.Version}}"
+      - "-X github.com/skip-mev/connect/v2/cmd/build.Build={{.Version}}"
   - main: 'cmd/connect/main.go'
     goos:
     - 'linux'
     - 'darwin'
     binary: 'slinky'
     id: 'slinky'
     ldflags:
-      - "-X github.com/skip-mev/slinky/cmd/build.Build={{.Version}}"
+      - "-X github.com/skip-mev/connect/v2/cmd/build.Build={{.Version}}"
 archives:
   - format: tar.gz
     wrap_in_directory: true

diff --git a/Makefile b/Makefile
@@ -7,7 +7,7 @@ export COMETBFT_VERSION := $(shell go list -m github.com/cometbft/cometbft | sed
 BIN_DIR ?= $(shell go env GOPATH)/bin
 BUILD_DIR ?= $(CURDIR)/build
 PROJECT_NAME = $(shell git remote get-url origin | xargs basename -s .git)
-HTTPS_GIT := https://github.com/skip-mev/slinky.git
+HTTPS_GIT := https://github.com/skip-mev/connect.git
 DOCKER := $(shell which docker)
 DOCKER_COMPOSE := $(shell which docker-compose)
 HOMEDIR ?= $(CURDIR)/tests/.connectd
@@ -28,7 +28,7 @@ SCRIPT_DIR := $(CURDIR)/scripts
 DEV_COMPOSE ?= $(CURDIR)/contrib/compose/docker-compose-dev.yml
 
 LEVANT_VAR_FILE:=$(shell mktemp -d)/levant.yaml
-NOMAD_FILE_SLINKY:=contrib/nomad/slinky.nomad
+NOMAD_FILE_CONNECT:=contrib/nomad/connect.nomad
 
 TAG := $(shell git describe --tags --always --dirty)
 
@@ -45,7 +45,7 @@ export USE_OSMOSIS_MARKETS ?= $(USE_OSMOSIS_MARKETS)
 export USE_POLYMARKET_MARKETS ?= $(USE_POLYMARKET_MARKETS)
 export SCRIPT_DIR := $(SCRIPT_DIR)
 
-BUILD_TAGS := -X github.com/skip-mev/slinky/cmd/build.Build=$(TAG)
+BUILD_TAGS := -X github.com/skip-mev/connect/v2/cmd/build.Build=$(TAG)
 
 ###############################################################################
 ###                               build                                     ###
@@ -55,7 +55,7 @@ build: tidy
 	go build -ldflags="$(BUILD_TAGS)" \
 	 -o ./build/ ./...
 	go build -ldflags="$(BUILD_TAGS)" \
-	 -o ./build/slinky ./cmd/connect
+     -o ./build/slinky ./cmd/connect
 
 run-oracle-client: build
 	@./build/client --host localhost --port 8080
@@ -298,7 +298,7 @@ gen-mocks:
 format:
 	@find . -name '*.go' -type f -not -path "*.git*" -not -path "*/mocks/*" -not -name '*.pb.go' -not -name '*.pulsar.go' -not -name '*.gw.go' | xargs go run mvdan.cc/gofumpt -w .
 	@find . -name '*.go' -type f -not -path "*.git*" -not -path "*/mocks/*" -not -name '*.pb.go' -not -name '*.pulsar.go' -not -name '*.gw.go' | xargs go run github.com/client9/misspell/cmd/misspell -w
-	@find . -name '*.go' -type f -not -path "*.git*" -not -path "/*mocks/*" -not -name '*.pb.go' -not -name '*.pulsar.go' -not -name '*.gw.go' | xargs go run golang.org/x/tools/cmd/goimports -w -local github.com/skip-mev/slinky
+	@find . -name '*.go' -type f -not -path "*.git*" -not -path "/*mocks/*" -not -name '*.pb.go' -not -name '*.pulsar.go' -not -name '*.gw.go' | xargs go run golang.org/x/tools/cmd/goimports -w -local github.com/skip-mev/connect/v2
 
 .PHONY: format
 
@@ -310,7 +310,7 @@ deploy-dev:
 	@touch ${LEVANT_VAR_FILE}
 	@yq e -i '.sidecar_image |= "${SIDECAR_IMAGE}"' ${LEVANT_VAR_FILE}
 	@yq e -i '.chain_image |= "${CHAIN_IMAGE}"' ${LEVANT_VAR_FILE}
-	@levant deploy -force -force-count -var-file=${LEVANT_VAR_FILE} ${NOMAD_FILE_SLINKY}
+	@levant deploy -force -force-count -var-file=${LEVANT_VAR_FILE} ${NOMAD_FILE_CONNECT}
 
 .PHONY: deploy-dev
 

diff --git a/README.md b/README.md
@@ -4,10 +4,10 @@
 <!-- markdownlint-disable MD041 -->
 
 [![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#wip)
-[![GoDoc](https://img.shields.io/badge/godoc-reference-blue?style=flat-square&logo=go)](https://godoc.org/github.com/skip-mev/slinky)
-[![Go Report Card](https://goreportcard.com/badge/github.com/skip-mev/slinky?style=flat-square)](https://goreportcard.com/report/github.com/skip-mev/slinky)
-[![Version](https://img.shields.io/github/tag/skip-mev/slinky.svg?style=flat-square)](https://github.com/skip-mev/slinky/releases/latest)
-[![Lines Of Code](https://img.shields.io/tokei/lines/github/skip-mev/slinky?style=flat-square)](https://github.com/skip-mev/slinky)
+[![GoDoc](https://img.shields.io/badge/godoc-reference-blue?style=flat-square&logo=go)](https://godoc.org/github.com/skip-mev/connect/v2)
+[![Go Report Card](https://goreportcard.com/badge/github.com/skip-mev/connect/v2?style=flat-square)](https://goreportcard.com/report/github.com/skip-mev/connect/v2)
+[![Version](https://img.shields.io/github/tag/skip-mev/slinky.svg?style=flat-square)](https://github.com/skip-mev/connect/v2/releases/latest)
+[![Lines Of Code](https://img.shields.io/tokei/lines/github/skip-mev/slinky?style=flat-square)](https://github.com/skip-mev/connect/v2)
 
 A general purpose price oracle leveraging ABCI++. Please visit our [docs](https://docs.skip.build/connect/introduction) page for more information!
 
@@ -21,7 +21,7 @@ many of the highest-performance decentralized applications today. If you would l
 ## Install
 
 ```shell
-$ go install github.com/skip-mev/slinky
+$ go install github.com/skip-mev/connect/v2
 ```
 
 ## Overview

diff --git a/abci/preblock/oracle/preblock.go b/abci/preblock/oracle/preblock.go
@@ -11,14 +11,14 @@ import (
 	cometabci "github.com/cometbft/cometbft/abci/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	abciaggregator "github.com/skip-mev/slinky/abci/strategies/aggregator"
-	"github.com/skip-mev/slinky/abci/strategies/codec"
-	"github.com/skip-mev/slinky/abci/strategies/currencypair"
-	slinkyabcitypes "github.com/skip-mev/slinky/abci/types"
-	"github.com/skip-mev/slinky/abci/ve"
-	"github.com/skip-mev/slinky/aggregator"
-	slinkytypes "github.com/skip-mev/slinky/pkg/types"
-	servicemetrics "github.com/skip-mev/slinky/service/metrics"
+	abciaggregator "github.com/skip-mev/connect/v2/abci/strategies/aggregator"
+	"github.com/skip-mev/connect/v2/abci/strategies/codec"
+	"github.com/skip-mev/connect/v2/abci/strategies/currencypair"
+	slinkyabcitypes "github.com/skip-mev/connect/v2/abci/types"
+	"github.com/skip-mev/connect/v2/abci/ve"
+	"github.com/skip-mev/connect/v2/aggregator"
+	slinkytypes "github.com/skip-mev/connect/v2/pkg/types"
+	servicemetrics "github.com/skip-mev/connect/v2/service/metrics"
 )
 
 // PreBlockHandler is responsible for aggregating oracle data from each

diff --git a/abci/preblock/oracle/preblock_test.go b/abci/preblock/oracle/preblock_test.go
@@ -17,23 +17,23 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
-	preblock "github.com/skip-mev/slinky/abci/preblock/oracle"
-	compression "github.com/skip-mev/slinky/abci/strategies/codec"
-	codecmock "github.com/skip-mev/slinky/abci/strategies/codec/mocks"
-	"github.com/skip-mev/slinky/abci/strategies/currencypair"
-	currencypairmock "github.com/skip-mev/slinky/abci/strategies/currencypair/mocks"
-	"github.com/skip-mev/slinky/abci/testutils"
-	"github.com/skip-mev/slinky/abci/types"
-	slinkyabcimocks "github.com/skip-mev/slinky/abci/types/mocks"
-	vetypes "github.com/skip-mev/slinky/abci/ve/types"
-	"github.com/skip-mev/slinky/aggregator"
-	"github.com/skip-mev/slinky/pkg/math/voteweighted"
-	voteweightedmocks "github.com/skip-mev/slinky/pkg/math/voteweighted/mocks"
-	slinkytypes "github.com/skip-mev/slinky/pkg/types"
-	servicemetrics "github.com/skip-mev/slinky/service/metrics"
-	metricmock "github.com/skip-mev/slinky/service/metrics/mocks"
-	"github.com/skip-mev/slinky/x/oracle/keeper"
-	oracletypes "github.com/skip-mev/slinky/x/oracle/types"
+	preblock "github.com/skip-mev/connect/v2/abci/preblock/oracle"
+	compression "github.com/skip-mev/connect/v2/abci/strategies/codec"
+	codecmock "github.com/skip-mev/connect/v2/abci/strategies/codec/mocks"
+	"github.com/skip-mev/connect/v2/abci/strategies/currencypair"
+	currencypairmock "github.com/skip-mev/connect/v2/abci/strategies/currencypair/mocks"
+	"github.com/skip-mev/connect/v2/abci/testutils"
+	"github.com/skip-mev/connect/v2/abci/types"
+	slinkyabcimocks "github.com/skip-mev/connect/v2/abci/types/mocks"
+	vetypes "github.com/skip-mev/connect/v2/abci/ve/types"
+	"github.com/skip-mev/connect/v2/aggregator"
+	"github.com/skip-mev/connect/v2/pkg/math/voteweighted"
+	voteweightedmocks "github.com/skip-mev/connect/v2/pkg/math/voteweighted/mocks"
+	slinkytypes "github.com/skip-mev/connect/v2/pkg/types"
+	servicemetrics "github.com/skip-mev/connect/v2/service/metrics"
+	metricmock "github.com/skip-mev/connect/v2/service/metrics/mocks"
+	"github.com/skip-mev/connect/v2/x/oracle/keeper"
+	oracletypes "github.com/skip-mev/connect/v2/x/oracle/types"
 )
 
 var maxUint256, _ = new(big.Int).SetString("115792089237316195423570985008687907853269984665640564039457584007913129639935", 10)

diff --git a/abci/preblock/oracle/utils.go b/abci/preblock/oracle/utils.go
@@ -7,8 +7,8 @@ import (
 	cometproto "github.com/cometbft/cometbft/proto/tendermint/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	slinkytypes "github.com/skip-mev/slinky/pkg/types"
-	servicemetrics "github.com/skip-mev/slinky/service/metrics"
+	slinkytypes "github.com/skip-mev/connect/v2/pkg/types"
+	servicemetrics "github.com/skip-mev/connect/v2/service/metrics"
 )
 
 // recordPrice records all the given prices per ticker, and reports them as a float64.

diff --git a/abci/preblock/sla/interfaces.go b/abci/preblock/sla/interfaces.go
@@ -6,8 +6,8 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
-	slinkytypes "github.com/skip-mev/slinky/pkg/types"
-	slakeeper "github.com/skip-mev/slinky/x/sla/keeper"
+	slinkytypes "github.com/skip-mev/connect/v2/pkg/types"
+	slakeeper "github.com/skip-mev/connect/v2/x/sla/keeper"
 )
 
 // Keeper defines the interface that must be fulfilled by the SLA keeper.

diff --git a/abci/preblock/sla/mocks/mock_oracle_keeper.go b/abci/preblock/sla/mocks/mock_oracle_keeper.go
diff --git a/abci/preblock/sla/mocks/mock_sla_keeper.go b/abci/preblock/sla/mocks/mock_sla_keeper.go
diff --git a/abci/preblock/sla/preblock.go b/abci/preblock/sla/preblock.go
@@ -6,12 +6,12 @@ import (
 	cometabci "github.com/cometbft/cometbft/abci/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	voteaggregator "github.com/skip-mev/slinky/abci/strategies/aggregator"
-	compression "github.com/skip-mev/slinky/abci/strategies/codec"
-	"github.com/skip-mev/slinky/abci/strategies/currencypair"
-	"github.com/skip-mev/slinky/abci/ve"
-	slakeeper "github.com/skip-mev/slinky/x/sla/keeper"
-	slatypes "github.com/skip-mev/slinky/x/sla/types"
+	voteaggregator "github.com/skip-mev/connect/v2/abci/strategies/aggregator"
+	compression "github.com/skip-mev/connect/v2/abci/strategies/codec"
+	"github.com/skip-mev/connect/v2/abci/strategies/currencypair"
+	"github.com/skip-mev/connect/v2/abci/ve"
+	slakeeper "github.com/skip-mev/connect/v2/x/sla/keeper"
+	slatypes "github.com/skip-mev/connect/v2/x/sla/types"
 )
 
 // PreBlockHandler is responsible for aggregating information about

diff --git a/abci/preblock/sla/preblock_test.go b/abci/preblock/sla/preblock_test.go
@@ -18,17 +18,17 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/skip-mev/slinky/abci/preblock/sla"
-	"github.com/skip-mev/slinky/abci/preblock/sla/mocks"
-	voteaggregator "github.com/skip-mev/slinky/abci/strategies/aggregator"
-	compression "github.com/skip-mev/slinky/abci/strategies/codec"
-	currencypairmocks "github.com/skip-mev/slinky/abci/strategies/currencypair/mocks"
-	"github.com/skip-mev/slinky/abci/testutils"
-	oraclevetypes "github.com/skip-mev/slinky/abci/ve/types"
-	slinkytypes "github.com/skip-mev/slinky/pkg/types"
-	slakeeper "github.com/skip-mev/slinky/x/sla/keeper"
-	slatypes "github.com/skip-mev/slinky/x/sla/types"
-	slamocks "github.com/skip-mev/slinky/x/sla/types/mocks"
+	"github.com/skip-mev/connect/v2/abci/preblock/sla"
+	"github.com/skip-mev/connect/v2/abci/preblock/sla/mocks"
+	voteaggregator "github.com/skip-mev/connect/v2/abci/strategies/aggregator"
+	compression "github.com/skip-mev/connect/v2/abci/strategies/codec"
+	currencypairmocks "github.com/skip-mev/connect/v2/abci/strategies/currencypair/mocks"
+	"github.com/skip-mev/connect/v2/abci/testutils"
+	oraclevetypes "github.com/skip-mev/connect/v2/abci/ve/types"
+	slinkytypes "github.com/skip-mev/connect/v2/pkg/types"
+	slakeeper "github.com/skip-mev/connect/v2/x/sla/keeper"
+	slatypes "github.com/skip-mev/connect/v2/x/sla/types"
+	slamocks "github.com/skip-mev/connect/v2/x/sla/types/mocks"
 )
 
 var oneHundred = big.NewInt(100)

diff --git a/abci/preblock/sla/utils.go b/abci/preblock/sla/utils.go
@@ -3,9 +3,9 @@ package sla
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/skip-mev/slinky/abci/strategies/currencypair"
-	slinkytypes "github.com/skip-mev/slinky/pkg/types"
-	slatypes "github.com/skip-mev/slinky/x/sla/types"
+	"github.com/skip-mev/connect/v2/abci/strategies/currencypair"
+	slinkytypes "github.com/skip-mev/connect/v2/pkg/types"
+	slatypes "github.com/skip-mev/connect/v2/x/sla/types"
 )
 
 // getStatuses returns the price feed status updates for each currency pair.

diff --git a/abci/proposals/proposals.go b/abci/proposals/proposals.go
@@ -9,11 +9,11 @@ import (
 	cometabci "github.com/cometbft/cometbft/abci/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/skip-mev/slinky/abci/strategies/codec"
-	"github.com/skip-mev/slinky/abci/strategies/currencypair"
-	slinkyabci "github.com/skip-mev/slinky/abci/types"
-	"github.com/skip-mev/slinky/abci/ve"
-	servicemetrics "github.com/skip-mev/slinky/service/metrics"
+	"github.com/skip-mev/connect/v2/abci/strategies/codec"
+	"github.com/skip-mev/connect/v2/abci/strategies/currencypair"
+	slinkyabci "github.com/skip-mev/connect/v2/abci/types"
+	"github.com/skip-mev/connect/v2/abci/ve"
+	servicemetrics "github.com/skip-mev/connect/v2/service/metrics"
 )
 
 // ProposalHandler is responsible primarily for:

diff --git a/abci/proposals/proposals_test.go b/abci/proposals/proposals_test.go
@@ -15,16 +15,16 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/skip-mev/slinky/abci/proposals"
-	"github.com/skip-mev/slinky/abci/strategies/codec"
-	codecmocks "github.com/skip-mev/slinky/abci/strategies/codec/mocks"
-	"github.com/skip-mev/slinky/abci/strategies/currencypair"
-	currencypairmocks "github.com/skip-mev/slinky/abci/strategies/currencypair/mocks"
-	"github.com/skip-mev/slinky/abci/testutils"
-	"github.com/skip-mev/slinky/abci/types"
-	"github.com/skip-mev/slinky/abci/ve"
-	servicemetrics "github.com/skip-mev/slinky/service/metrics"
-	servicemetricsmocks "github.com/skip-mev/slinky/service/metrics/mocks"
+	"github.com/skip-mev/connect/v2/abci/proposals"
+	"github.com/skip-mev/connect/v2/abci/strategies/codec"
+	codecmocks "github.com/skip-mev/connect/v2/abci/strategies/codec/mocks"
+	"github.com/skip-mev/connect/v2/abci/strategies/currencypair"
+	currencypairmocks "github.com/skip-mev/connect/v2/abci/strategies/currencypair/mocks"
+	"github.com/skip-mev/connect/v2/abci/testutils"
+	"github.com/skip-mev/connect/v2/abci/types"
+	"github.com/skip-mev/connect/v2/abci/ve"
+	servicemetrics "github.com/skip-mev/connect/v2/service/metrics"
+	servicemetricsmocks "github.com/skip-mev/connect/v2/service/metrics/mocks"
 )
 
 var (

diff --git a/abci/proposals/validate.go b/abci/proposals/validate.go
@@ -5,9 +5,9 @@ import (
 	cometproto "github.com/cometbft/cometbft/proto/tendermint/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/skip-mev/slinky/abci/strategies/codec"
-	"github.com/skip-mev/slinky/abci/strategies/currencypair"
-	"github.com/skip-mev/slinky/abci/ve"
+	"github.com/skip-mev/connect/v2/abci/strategies/codec"
+	"github.com/skip-mev/connect/v2/abci/strategies/currencypair"
+	"github.com/skip-mev/connect/v2/abci/ve"
 )
 
 // ValidateExtendedCommitInfo validates the extended commit info for a block. It first

diff --git a/abci/strategies/aggregator/mocks/mock_price_applier.go b/abci/strategies/aggregator/mocks/mock_price_applier.go
diff --git a/abci/strategies/aggregator/mocks/mock_vote_aggregator.go b/abci/strategies/aggregator/mocks/mock_vote_aggregator.go
diff --git a/abci/strategies/aggregator/price_applier.go b/abci/strategies/aggregator/price_applier.go
@@ -8,11 +8,11 @@ import (
 	cometabci "github.com/cometbft/cometbft/abci/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/skip-mev/slinky/abci/strategies/codec"
-	slinkyabcitypes "github.com/skip-mev/slinky/abci/types"
-	oracletypes "github.com/skip-mev/slinky/x/oracle/types"
+	"github.com/skip-mev/connect/v2/abci/strategies/codec"
+	slinkyabcitypes "github.com/skip-mev/connect/v2/abci/types"
+	oracletypes "github.com/skip-mev/connect/v2/x/oracle/types"
 
-	slinkytypes "github.com/skip-mev/slinky/pkg/types"
+	slinkytypes "github.com/skip-mev/connect/v2/pkg/types"
 )
 
 // PriceApplier is an interface used in `ExtendVote` and `PreBlock` to apply the prices