Merge branch 'main' into terpay/removal-fix

skip-mev · Apr 9, 2024 · 9f9f72b · 9f9f72b
2 parents 4e14c77 + 56fde74
commit 9f9f72b
Show file tree

Hide file tree

Showing 84 changed files with 6,547 additions and 444 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -35,7 +35,7 @@ jobs:
         id: login-ecr
         uses: aws-actions/amazon-ecr-login@v2 
       - name: Log in to the Container registry
-        uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
+        uses: docker/login-action@5f4866a30a54f16a52d2ecb4a3898e9e424939cf
         with:
           registry: ghcr.io
           username: ${{ github.actor }}

diff --git a/Makefile b/Makefile
@@ -18,6 +18,8 @@ GENESIS ?= $(HOMEDIR)/config/genesis.json
 GENESIS_TMP ?= $(HOMEDIR)/config/genesis_tmp.json
 COVER_FILE ?= cover.out
 BENCHMARK_ITERS ?= 10
+DEFI_PROVIDERS_ENABLED ?= false
+SOLANA_NODE_ENDPOINT ?= https://api.devnet.solana.com
 
 LEVANT_VAR_FILE:=$(shell mktemp -d)/levant.yaml
 NOMAD_FILE_SLINKY:=contrib/nomad/slinky.nomad
@@ -43,7 +45,8 @@ run-prom-client:
 
 update-local-configs: build
 	@echo "Updating local config..."
-	@./build/slinky-config --oracle-config-path ${ORACLE_CONFIG_FILE} --market-config-path ${MARKET_CONFIG_FILE}
+	@./build/slinky-config --oracle-config-path ${ORACLE_CONFIG_FILE} --market-config-path ${MARKET_CONFIG_FILE} --raydium-enabled ${DEFI_ORACLE_ENABLED} \
+		--solana-node-endpoint ${SOLANA_NODE_ENDPOINT}
 
 start-oracle:
 	@echo "Starting oracle side-car, blockchain, and prometheus dashboard..."

diff --git a/README.md b/README.md
@@ -98,7 +98,3 @@ To test these numbers yourself, spin up the the oracle server following the inst
 * [Data Provider Queries](./providers/base/metrics/README.md#usage): Provides general insight into how often price feeds are updated by status (success/failure), provider (binance, coinbase, etc.), price feed (BTC/USD, ETH/USD), and provider type (api/websocket).
 * [Websocket Performance Queries](./providers/base/websocket/metrics/README.md#usage): Provides insight into how often websocket providers are successfully updating their data. This is a combination of metrics related to the underlying connection as well as the data handler which is responsible for processing the data received from the Websocket connection.
 * [API Performance Queries](./providers/base/api/metrics/README.md#usage): Provides insight into how often API providers are successfully updating their data.
-
-## Future Work
-
-The oracle side car is a combination of the oracle and provider packages. This is being moved to a [separate repository](https://github.com/skip-mev/slinky-sidecar).
diff --git a/abci/preblock/oracle/mocks/mock_oracle_keeper.go b/abci/preblock/oracle/mocks/mock_oracle_keeper.go
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/mocks/mock_staking_keeper.go b/abci/preblock/sla/mocks/mock_staking_keeper.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/codec/mocks/extended_commit_codec.go b/abci/strategies/codec/mocks/extended_commit_codec.go
diff --git a/abci/strategies/codec/mocks/vote_extension_codec.go b/abci/strategies/codec/mocks/vote_extension_codec.go
diff --git a/abci/strategies/currencypair/mocks/mock_currency_pair_strategy.go b/abci/strategies/currencypair/mocks/mock_currency_pair_strategy.go
diff --git a/abci/strategies/currencypair/mocks/mock_oracle_keeper.go b/abci/strategies/currencypair/mocks/mock_oracle_keeper.go
diff --git a/cmd/client/main.go b/cmd/client/main.go
@@ -31,7 +31,7 @@ var (
 
 			// Set up a connection to the server.
 			url := fmt.Sprintf("%s:%s", host, port)
-			conn, err := grpc.Dial(url, grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithBlock())
+			conn, err := grpc.NewClient(url, grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithBlock())
 			if err != nil {
 				log.Fatalf("did not connect: %v", err)
 			}