Merge branch 'main' into eric/docker-user

skip-mev · Aug 23, 2024 · b50b828 · b50b828
2 parents 65e39c9 + 7bc5f15
commit b50b828
Show file tree

Hide file tree

Showing 65 changed files with 346 additions and 279 deletions.
diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
@@ -270,6 +270,10 @@ ETHUSDTAMMID
 EUR
 eux
 evm
+<<<<<<< HEAD
+copyloopvar
+=======
+>>>>>>> main
 extendee
 fabf
 FAQs

diff --git a/.golangci.yml b/.golangci.yml
@@ -16,10 +16,10 @@ linters:
     - dogsled
     # Check for two durations multiplied together.
     - durationcheck
+    - copyloopvar
     - goconst
     - gocritic
-      # re-enable this once golangci-lint has a new release
-      # - gofumpt
+    - gofumpt
     - gosec
     - gosimple
     - govet

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_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/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/abci/types/mocks/mock_oracle_keeper.go b/abci/types/mocks/mock_oracle_keeper.go
diff --git a/docs/snippets/quickstart.mdx b/docs/snippets/quickstart.mdx
@@ -1,5 +1,5 @@
 To run Connect, which starts the service on the default port of `8080`, enter the following command:
 
 ```shell
-slinky --market-map-endpoint="<YOUR_NODE_GRPC_URL>:<YOUR_NODE_GRPC_PORT>"
+connect --market-map-endpoint="<YOUR_NODE_GRPC_URL>:<YOUR_NODE_GRPC_PORT>"
 ```
diff --git a/docs/snippets/stargaze-quickstart-guide.mdx b/docs/snippets/stargaze-quickstart-guide.mdx
@@ -0,0 +1,25 @@
+**The minimum required version for Connect with Stargaze is `v1.0.10+`.**
+
+You need to configure a custom API endpoint for use with the Osmosis provider, `https://rest.osmosis-1.interchain-apis.com`.
+Set the following `oracle.json` configuration file. **Keep the file path handy** as we will pass it into a flag when running Connect.
+
+```json oracle.json
+{
+  "providers":{
+    "osmosis_api":{
+      "api":{
+        "endpoints":[
+          {"url":"https://rest.osmosis-1.interchain-apis.com"}
+        ]
+      }
+    }
+  }
+}
+```
+ With the `oracle.json` file path, enter the following command to run Connect.
+
+```shell
+connect \
+--market-map-endpoint="<YOUR_NODE_GRPC_URL>:<YOUR_NODE_GRPC_PORT>" \
+--oracle-config path/to/oracle.json
+```
diff --git a/docs/validators/quickstart.mdx b/docs/validators/quickstart.mdx
@@ -6,6 +6,7 @@ icon: person-running-fast
 
 import QuickStartSnippet from '/snippets/quickstart.mdx';
 import QuickStartDYDXSnippet from '/snippets/dydx-quickstart-guide.mdx';
+import QuickStartStargazeSnippet from '/snippets/stargaze-quickstart-guide.mdx';
 
 
 <Info>
@@ -59,6 +60,9 @@ slinky version
         **The minimum required Connect version for the Neutron chain is `v1.0.3+`.**
         <QuickStartSnippet />
     </Tab>
+    <Tab title="Stargaze Blockchain">
+        <QuickStartStargazeSnippet />
+    </Tab>
 </Tabs>
 
 

diff --git a/go.mod b/go.mod
@@ -21,13 +21,13 @@ require (
 	github.com/cosmos/gogogateway v1.2.0
 	github.com/cosmos/gogoproto v1.7.0
 	github.com/cosmos/interchain-security/v5 v5.1.1
-	github.com/ethereum/go-ethereum v1.14.7
+	github.com/ethereum/go-ethereum v1.14.8
 	github.com/gagliardetto/binary v0.8.0
 	github.com/gagliardetto/solana-go v1.11.0
 	github.com/gogo/protobuf v1.3.2
 	github.com/golang/mock v1.6.0
 	github.com/golang/protobuf v1.5.4
-	github.com/golangci/golangci-lint v1.60.1
+	github.com/golangci/golangci-lint v1.60.3
 	github.com/gorilla/websocket v1.5.3
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0
 	github.com/klauspost/compress v1.17.9
@@ -38,9 +38,9 @@ require (
 	github.com/spf13/cobra v1.8.1
 	github.com/spf13/viper v1.19.0
 	github.com/stretchr/testify v1.9.0
-	github.com/vektra/mockery/v2 v2.44.2
+	github.com/vektra/mockery/v2 v2.45.0
 	go.uber.org/zap v1.27.0
-	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
+	golang.org/x/exp v0.0.0-20240823005443-9b4947da3948
 	golang.org/x/net v0.28.0
 	golang.org/x/sync v0.8.0
 	golang.org/x/vuln v1.1.3
@@ -54,10 +54,10 @@ require (
 require (
 	4d63.com/gocheckcompilerdirectives v1.2.1 // indirect
 	4d63.com/gochecknoglobals v0.2.1 // indirect
-	cosmossdk.io/client/v2 v2.0.0-beta.4 // indirect
+	cloud.google.com/go/iam v1.1.12 // indirect
+	cloud.google.com/go/storage v1.41.0 // indirect
 	cosmossdk.io/errors v1.0.1 // indirect
-	cosmossdk.io/x/circuit v0.1.1 // indirect
-	cosmossdk.io/x/upgrade v0.1.4 // indirect
+	cosmossdk.io/x/upgrade v0.1.2 // indirect
 	filippo.io/edwards25519 v1.0.0 // indirect
 	github.com/4meepo/tagalign v1.3.4 // indirect
 	github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
@@ -92,7 +92,7 @@ require (
 	github.com/bombsimon/wsl/v4 v4.4.1 // indirect
 	github.com/breml/bidichk v0.2.7 // indirect
 	github.com/breml/errchkjson v0.3.6 // indirect
-	github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
+	github.com/btcsuite/btcd/btcec/v2 v2.3.4 // indirect
 	github.com/buger/jsonparser v1.1.1 // indirect
 	github.com/butuzov/ireturn v0.3.0 // indirect
 	github.com/butuzov/mirror v1.2.0 // indirect
@@ -168,7 +168,7 @@ require (
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
 	github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect
-	github.com/golangci/gofmt v0.0.0-20231018234816-f50ced29576e // indirect
+	github.com/golangci/gofmt v0.0.0-20240816233607-d8596aa466a9 // indirect
 	github.com/golangci/misspell v0.6.0 // indirect
 	github.com/golangci/modinfo v0.3.4 // indirect
 	github.com/golangci/plugin-module-register v0.1.1 // indirect
@@ -201,7 +201,7 @@ require (
 	github.com/hashicorp/yamux v0.1.1 // indirect
 	github.com/hdevalence/ed25519consensus v0.1.0 // indirect
 	github.com/hexops/gotextdiff v1.0.3 // indirect
-	github.com/holiman/uint256 v1.3.0 // indirect
+	github.com/holiman/uint256 v1.3.1 // indirect
 	github.com/huandu/skiplist v1.2.0 // indirect
 	github.com/huandu/xstrings v1.4.0 // indirect
 	github.com/iancoleman/strcase v0.3.0 // indirect
@@ -285,7 +285,7 @@ require (
 	github.com/sasha-s/go-deadlock v0.3.1 // indirect
 	github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
 	github.com/sashamelentyev/usestdlibvars v1.27.0 // indirect
-	github.com/securego/gosec/v2 v2.20.1-0.20240525090044-5f0084eb01a9 // indirect
+	github.com/securego/gosec/v2 v2.20.1-0.20240822074752-ab3f6c1c83a0 // indirect
 	github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect
 	github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
@@ -303,15 +303,15 @@ require (
 	github.com/subosito/gotenv v1.6.0 // indirect
 	github.com/supranational/blst v0.3.11 // indirect
 	github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
-	github.com/tdakkota/asciicheck v0.2.0 // indirect
+	github.com/tdakkota/asciicheck v0.2.0 // indirect; indirectdependabot/go_modules/golang.org/x/net-0.28.0
 	github.com/tendermint/go-amino v0.16.0 // indirect
 	github.com/tetafro/godot v1.4.16 // indirect
 	github.com/tidwall/btree v1.7.0 // indirect
 	github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966 // indirect
 	github.com/timonwong/loggercheck v0.9.4 // indirect
 	github.com/tklauser/go-sysconf v0.3.12 // indirect
 	github.com/tklauser/numcpus v0.6.1 // indirect
-	github.com/tomarrell/wrapcheck/v2 v2.8.3 // indirect
+	github.com/tomarrell/wrapcheck/v2 v2.9.0 // indirect
 	github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect
 	github.com/ultraware/funlen v0.1.0 // indirect
 	github.com/ultraware/whitespace v0.1.1 // indirect
@@ -338,15 +338,15 @@ require (
 	golang.org/x/telemetry v0.0.0-20240522233618-39ace7a40ae7 // indirect
 	golang.org/x/term v0.23.0 // indirect
 	golang.org/x/text v0.17.0 // indirect
-	golang.org/x/time v0.5.0 // indirect
+	golang.org/x/time v0.6.0 // indirect
 	golang.org/x/tools v0.24.0 // indirect
-	google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240722135656-d784300faade // indirect
+	google.golang.org/genproto v0.0.0-20240722135656-d784300faade // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	gotest.tools/v3 v3.5.1 // indirect
-	honnef.co/go/tools v0.5.0 // indirect
+	honnef.co/go/tools v0.5.1 // indirect
 	mvdan.cc/unparam v0.0.0-20240528143540-8a5130ca722f // indirect
 	nhooyr.io/websocket v1.8.6 // indirect
 	pgregory.net/rapid v1.1.0 // indirect
@@ -358,5 +358,6 @@ replace (
 	cosmossdk.io/client/v2 => cosmossdk.io/client/v2 v2.0.0-20230719143845-dff6b0e26aa4
 	github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0
 	github.com/GeertJohan/go.rice => github.com/GeertJohan/go.rice v1.0.3
+	github.com/btcsuite/btcd/btcec/v2 => github.com/btcsuite/btcd/btcec/v2 v2.3.2
 	github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
 )