Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ builds:
binary: 'slinky'
id: 'slinky'
ldflags:
- "-X github.com/skip-mev/slinky/cmd/build.Build={{.Version}}"
- "-X github.com/dydxprotocol/slinky/cmd/build.Build={{.Version}}"
archives:
- format: tar.gz
wrap_in_directory: true
Expand Down
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export COMETBFT_VERSION := $(shell go list -m github.com/cometbft/cometbft | sed
BIN_DIR ?= $(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/dydxprotocol/slinky.git
DOCKER := $(shell which docker)
DOCKER_COMPOSE := $(shell which docker-compose)
HOMEDIR ?= $(CURDIR)/tests/.slinkyd
Expand Down Expand Up @@ -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/dydxprotocol/slinky/cmd/build.Build=$(TAG)

###############################################################################
### build ###
Expand Down Expand Up @@ -85,8 +85,8 @@ install: tidy

docker-build:
@echo "Building E2E Docker image..."
@DOCKER_BUILDKIT=1 $(DOCKER) build -t skip-mev/slinky-e2e -f contrib/images/slinky.e2e.Dockerfile .
@DOCKER_BUILDKIT=1 $(DOCKER) build -t skip-mev/slinky-e2e-oracle -f contrib/images/slinky.sidecar.dev.Dockerfile .
@DOCKER_BUILDKIT=1 $(DOCKER) build -t dydxprotocol/slinky-e2e -f contrib/images/slinky.e2e.Dockerfile .
@DOCKER_BUILDKIT=1 $(DOCKER) build -t dydxprotocol/slinky-e2e-oracle -f contrib/images/slinky.sidecar.dev.Dockerfile .

.PHONY: docker-build

Expand Down Expand Up @@ -294,7 +294,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/dydxprotocol/slinky

.PHONY: format

Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/dydxprotocol/slinky)
[![Go Report Card](https://goreportcard.com/badge/github.com/dydxprotocol/slinky?style=flat-square)](https://goreportcard.com/report/github.com/dydxprotocol/slinky)
[![Version](https://img.shields.io/github/tag/dydxprotocol/slinky.svg?style=flat-square)](https://github.com/dydxprotocol/slinky/releases/latest)
[![Lines Of Code](https://img.shields.io/tokei/lines/github/dydxprotocol/slinky?style=flat-square)](https://github.com/dydxprotocol/slinky)

A general purpose price oracle leveraging ABCI++. Please visit our [docs](https://docs.skip.build/connect/introduction) page for more information!

Expand All @@ -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/dydxprotocol/slinky
```

## Overview
Expand Down
16 changes: 8 additions & 8 deletions abci/preblock/oracle/preblock.go
Original file line number Diff line number Diff line change
Expand Up @@ -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/dydxprotocol/slinky/abci/strategies/aggregator"
"github.com/dydxprotocol/slinky/abci/strategies/codec"
"github.com/dydxprotocol/slinky/abci/strategies/currencypair"
slinkyabcitypes "github.com/dydxprotocol/slinky/abci/types"
"github.com/dydxprotocol/slinky/abci/ve"
"github.com/dydxprotocol/slinky/aggregator"
slinkytypes "github.com/dydxprotocol/slinky/pkg/types"
servicemetrics "github.com/dydxprotocol/slinky/service/metrics"
)

// PreBlockHandler is responsible for aggregating oracle data from each
Expand Down
34 changes: 17 additions & 17 deletions abci/preblock/oracle/preblock_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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/dydxprotocol/slinky/abci/preblock/oracle"
compression "github.com/dydxprotocol/slinky/abci/strategies/codec"
codecmock "github.com/dydxprotocol/slinky/abci/strategies/codec/mocks"
"github.com/dydxprotocol/slinky/abci/strategies/currencypair"
currencypairmock "github.com/dydxprotocol/slinky/abci/strategies/currencypair/mocks"
"github.com/dydxprotocol/slinky/abci/testutils"
"github.com/dydxprotocol/slinky/abci/types"
slinkyabcimocks "github.com/dydxprotocol/slinky/abci/types/mocks"
vetypes "github.com/dydxprotocol/slinky/abci/ve/types"
"github.com/dydxprotocol/slinky/aggregator"
"github.com/dydxprotocol/slinky/pkg/math/voteweighted"
voteweightedmocks "github.com/dydxprotocol/slinky/pkg/math/voteweighted/mocks"
slinkytypes "github.com/dydxprotocol/slinky/pkg/types"
servicemetrics "github.com/dydxprotocol/slinky/service/metrics"
metricmock "github.com/dydxprotocol/slinky/service/metrics/mocks"
"github.com/dydxprotocol/slinky/x/oracle/keeper"
oracletypes "github.com/dydxprotocol/slinky/x/oracle/types"
)

var maxUint256, _ = new(big.Int).SetString("115792089237316195423570985008687907853269984665640564039457584007913129639935", 10)
Expand Down
4 changes: 2 additions & 2 deletions abci/preblock/oracle/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -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/dydxprotocol/slinky/pkg/types"
servicemetrics "github.com/dydxprotocol/slinky/service/metrics"
)

// recordPrice records all the given prices per ticker, and reports them as a float64.
Expand Down
10 changes: 5 additions & 5 deletions abci/proposals/proposals.go
Original file line number Diff line number Diff line change
Expand Up @@ -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/dydxprotocol/slinky/abci/strategies/codec"
"github.com/dydxprotocol/slinky/abci/strategies/currencypair"
slinkyabci "github.com/dydxprotocol/slinky/abci/types"
"github.com/dydxprotocol/slinky/abci/ve"
servicemetrics "github.com/dydxprotocol/slinky/service/metrics"
)

// ProposalHandler is responsible primarily for:
Expand Down
20 changes: 10 additions & 10 deletions abci/proposals/proposals_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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/dydxprotocol/slinky/abci/proposals"
"github.com/dydxprotocol/slinky/abci/strategies/codec"
codecmocks "github.com/dydxprotocol/slinky/abci/strategies/codec/mocks"
"github.com/dydxprotocol/slinky/abci/strategies/currencypair"
currencypairmocks "github.com/dydxprotocol/slinky/abci/strategies/currencypair/mocks"
"github.com/dydxprotocol/slinky/abci/testutils"
"github.com/dydxprotocol/slinky/abci/types"
"github.com/dydxprotocol/slinky/abci/ve"
servicemetrics "github.com/dydxprotocol/slinky/service/metrics"
servicemetricsmocks "github.com/dydxprotocol/slinky/service/metrics/mocks"
)

var (
Expand Down
6 changes: 3 additions & 3 deletions abci/proposals/validate.go
Original file line number Diff line number Diff line change
Expand Up @@ -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/dydxprotocol/slinky/abci/strategies/codec"
"github.com/dydxprotocol/slinky/abci/strategies/currencypair"
"github.com/dydxprotocol/slinky/abci/ve"
)

// ValidateExtendedCommitInfo validates the extended commit info for a block. It first
Expand Down
2 changes: 1 addition & 1 deletion abci/strategies/aggregator/mocks/mock_price_applier.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions abci/strategies/aggregator/mocks/mock_vote_aggregator.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions abci/strategies/aggregator/price_applier.go
Original file line number Diff line number Diff line change
Expand Up @@ -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/dydxprotocol/slinky/abci/strategies/codec"
slinkyabcitypes "github.com/dydxprotocol/slinky/abci/types"
oracletypes "github.com/dydxprotocol/slinky/x/oracle/types"

slinkytypes "github.com/skip-mev/slinky/pkg/types"
slinkytypes "github.com/dydxprotocol/slinky/pkg/types"
)

// PriceApplier is an interface used in `ExtendVote` and `PreBlock` to apply the prices
Expand Down
16 changes: 8 additions & 8 deletions abci/strategies/aggregator/price_applier_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,20 @@ import (
abcitypes "github.com/cometbft/cometbft/abci/types"
sdk "github.com/cosmos/cosmos-sdk/types"

"github.com/skip-mev/slinky/abci/strategies/aggregator"
"github.com/skip-mev/slinky/abci/strategies/aggregator/mocks"
"github.com/skip-mev/slinky/abci/strategies/codec"
"github.com/skip-mev/slinky/abci/testutils"
abcimocks "github.com/skip-mev/slinky/abci/types/mocks"
"github.com/dydxprotocol/slinky/abci/strategies/aggregator"
"github.com/dydxprotocol/slinky/abci/strategies/aggregator/mocks"
"github.com/dydxprotocol/slinky/abci/strategies/codec"
"github.com/dydxprotocol/slinky/abci/testutils"
abcimocks "github.com/dydxprotocol/slinky/abci/types/mocks"

"cosmossdk.io/log"
cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"

vetypes "github.com/skip-mev/slinky/abci/ve/types"
slinkytypes "github.com/skip-mev/slinky/pkg/types"
oracletypes "github.com/skip-mev/slinky/x/oracle/types"
vetypes "github.com/dydxprotocol/slinky/abci/ve/types"
slinkytypes "github.com/dydxprotocol/slinky/pkg/types"
oracletypes "github.com/dydxprotocol/slinky/x/oracle/types"
)

func TestPriceApplier(t *testing.T) {
Expand Down
12 changes: 6 additions & 6 deletions abci/strategies/aggregator/vote_aggregator.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ import (
"cosmossdk.io/log"
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"
vetypes "github.com/skip-mev/slinky/abci/ve/types"
"github.com/skip-mev/slinky/aggregator"
slinkytypes "github.com/skip-mev/slinky/pkg/types"
"github.com/dydxprotocol/slinky/abci/strategies/codec"
"github.com/dydxprotocol/slinky/abci/strategies/currencypair"
slinkyabci "github.com/dydxprotocol/slinky/abci/types"
vetypes "github.com/dydxprotocol/slinky/abci/ve/types"
"github.com/dydxprotocol/slinky/aggregator"
slinkytypes "github.com/dydxprotocol/slinky/pkg/types"
)

// Vote encapsulates the validator and oracle data contained within a vote extension.
Expand Down
14 changes: 7 additions & 7 deletions abci/strategies/aggregator/vote_aggregator_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ import (
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/suite"

"github.com/skip-mev/slinky/abci/strategies/aggregator"
"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"
"github.com/skip-mev/slinky/pkg/math/voteweighted"
"github.com/skip-mev/slinky/pkg/math/voteweighted/mocks"
slinkytypes "github.com/skip-mev/slinky/pkg/types"
"github.com/dydxprotocol/slinky/abci/strategies/aggregator"
"github.com/dydxprotocol/slinky/abci/strategies/codec"
currencypairmocks "github.com/dydxprotocol/slinky/abci/strategies/currencypair/mocks"
"github.com/dydxprotocol/slinky/abci/testutils"
"github.com/dydxprotocol/slinky/pkg/math/voteweighted"
"github.com/dydxprotocol/slinky/pkg/math/voteweighted/mocks"
slinkytypes "github.com/dydxprotocol/slinky/pkg/types"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion abci/strategies/codec/codec.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
cometabci "github.com/cometbft/cometbft/abci/types"
"github.com/klauspost/compress/zstd"

vetypes "github.com/skip-mev/slinky/abci/ve/types"
vetypes "github.com/dydxprotocol/slinky/abci/ve/types"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions abci/strategies/codec/codec_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (

cmtabci "github.com/cometbft/cometbft/abci/types"

compression "github.com/skip-mev/slinky/abci/strategies/codec"
vetypes "github.com/skip-mev/slinky/abci/ve/types"
compression "github.com/dydxprotocol/slinky/abci/strategies/codec"
vetypes "github.com/dydxprotocol/slinky/abci/ve/types"
)

func TestDefaultVoteExtensionCodec(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion abci/strategies/codec/mocks/vote_extension_codec.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion abci/strategies/currencypair/default.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

sdk "github.com/cosmos/cosmos-sdk/types"

slinkytypes "github.com/skip-mev/slinky/pkg/types"
slinkytypes "github.com/dydxprotocol/slinky/pkg/types"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions abci/strategies/currencypair/default_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/stretchr/testify/require"

strategies "github.com/skip-mev/slinky/abci/strategies/currencypair"
"github.com/skip-mev/slinky/abci/strategies/currencypair/mocks"
slinkytypes "github.com/skip-mev/slinky/pkg/types"
strategies "github.com/dydxprotocol/slinky/abci/strategies/currencypair"
"github.com/dydxprotocol/slinky/abci/strategies/currencypair/mocks"
slinkytypes "github.com/dydxprotocol/slinky/pkg/types"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions abci/strategies/currencypair/delta.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (

sdk "github.com/cosmos/cosmos-sdk/types"

slinkytypes "github.com/skip-mev/slinky/pkg/types"
oracletypes "github.com/skip-mev/slinky/x/oracle/types"
slinkytypes "github.com/dydxprotocol/slinky/pkg/types"
oracletypes "github.com/dydxprotocol/slinky/x/oracle/types"
)

// DeltaCurrencyPairStrategy is a strategy that inherits from the DefaultCurrencyPairStrategy but
Expand Down
10 changes: 5 additions & 5 deletions abci/strategies/currencypair/delta_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import (
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"

"github.com/skip-mev/slinky/abci/strategies/currencypair"
mocks "github.com/skip-mev/slinky/abci/strategies/currencypair/mocks"
"github.com/skip-mev/slinky/abci/testutils"
slinkytypes "github.com/skip-mev/slinky/pkg/types"
oracletypes "github.com/skip-mev/slinky/x/oracle/types"
"github.com/dydxprotocol/slinky/abci/strategies/currencypair"
mocks "github.com/dydxprotocol/slinky/abci/strategies/currencypair/mocks"
"github.com/dydxprotocol/slinky/abci/testutils"
slinkytypes "github.com/dydxprotocol/slinky/pkg/types"
oracletypes "github.com/dydxprotocol/slinky/x/oracle/types"
)

func TestDeltaCurrencyPairStrategyGetEncodedPrice(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion abci/strategies/currencypair/hash.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

sdk "github.com/cosmos/cosmos-sdk/types"

slinkytypes "github.com/skip-mev/slinky/pkg/types"
slinkytypes "github.com/dydxprotocol/slinky/pkg/types"
)

// HashCurrencyPairStrategy is a strategy that uses the sha256 hash of the currency
Expand Down
Loading
Loading