Merge branch 'release/v1.x.x' into chore/backport-757

skip-mev · Dec 11, 2024 · eca2ea6 · eca2ea6
2 parents d719ea9 + f73a9b0
commit eca2ea6
Show file tree

Hide file tree

Showing 51 changed files with 644 additions and 198 deletions.
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/go.mod b/go.mod
@@ -38,7 +38,7 @@ require (
 	github.com/spf13/cobra v1.8.1
 	github.com/spf13/viper v1.19.0
 	github.com/stretchr/testify v1.10.0
-	github.com/vektra/mockery/v2 v2.46.0
+	github.com/vektra/mockery/v2 v2.50.0
 	go.uber.org/zap v1.27.0
 	golang.org/x/exp v0.0.0-20240909161429-701f63a606c0
 	golang.org/x/net v0.32.0

diff --git a/go.sum b/go.sum
@@ -1428,8 +1428,8 @@ github.com/uudashr/iface v1.2.1 h1:vHHyzAUmWZ64Olq6NZT3vg/z1Ws56kyPdBOd5kTXDF8=
 github.com/uudashr/iface v1.2.1/go.mod h1:4QvspiRd3JLPAEXBQ9AiZpLbJlrWWgRChOKDJEuQTdg=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
-github.com/vektra/mockery/v2 v2.46.0 h1:DKIFj6hAPGwmOYiWfWzdsQtBgU8ozPXo3Bwbmf+Ku80=
-github.com/vektra/mockery/v2 v2.46.0/go.mod h1:XNTE9RIu3deGAGQRVjP1VZxGpQNm0YedZx4oDs3prr8=
+github.com/vektra/mockery/v2 v2.50.0 h1:0GYRH38nKiRghwUq+0aJXG1sT3yyTYj/J1xQRM8kGzQ=
+github.com/vektra/mockery/v2 v2.50.0/go.mod h1:xO2DeYemEPC2tCzIZ+a1tifZ/7Laf/Chxg3vlc+oDsI=
 github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
 github.com/xdg-go/scram v1.1.1/go.mod h1:RaEWvsqvNKKvBPvcKeFjrG2cJqOkHTiyTpzz23ni57g=
 github.com/xdg-go/stringprep v1.0.3/go.mod h1:W3f5j4i+9rC0kuIEJL0ky1VpHXQU3ocBgklLGvcBnW8=

diff --git a/oracle/config/api.go b/oracle/config/api.go
@@ -40,6 +40,11 @@ type APIConfig struct {
 
 	// Name is the name of the provider that corresponds to this config.
 	Name string `json:"name"`
+
+	// MaxBlockHeightAge is the oldest an update from an on-chain data source can be without having its
+	// block height incremented.  In the case where a data source has exceeded this limit and the block
+	// height is not increasing, price reporting will be skipped until the block height increases.
+	MaxBlockHeightAge time.Duration `json:"maxBlockHeightAge"`
 }
 
 // Endpoint holds all data necessary for an API provider to connect to a given endpoint
@@ -123,5 +128,9 @@ func (c *APIConfig) ValidateBasic() error {
 		}
 	}
 
+	if c.MaxBlockHeightAge < 0 {
+		return fmt.Errorf("max_block_height_age cannot be negative")
+	}
+
 	return nil
 }
diff --git a/oracle/config/api_test.go b/oracle/config/api_test.go
@@ -135,6 +135,36 @@ func TestAPIConfig(t *testing.T) {
 			},
 			expectedErr: false,
 		},
+		{
+			name: "good config with max_block_height_age",
+			config: config.APIConfig{
+				Enabled:           true,
+				Timeout:           time.Second,
+				Interval:          time.Second,
+				ReconnectTimeout:  time.Second,
+				MaxQueries:        1,
+				Name:              "test",
+				Endpoints:         []config.Endpoint{{URL: "http://test.com"}},
+				BatchSize:         1,
+				MaxBlockHeightAge: 10 * time.Second,
+			},
+			expectedErr: false,
+		},
+		{
+			name: "bad config with negative max_block_height_age",
+			config: config.APIConfig{
+				Enabled:           true,
+				Timeout:           time.Second,
+				Interval:          time.Second,
+				ReconnectTimeout:  time.Second,
+				MaxQueries:        1,
+				Name:              "test",
+				Endpoints:         []config.Endpoint{{URL: "http://test.com"}},
+				BatchSize:         1,
+				MaxBlockHeightAge: -10 * time.Second,
+			},
+			expectedErr: true,
+		},
 		{
 			name: "bad config with invalid endpoint (no url)",
 			config: config.APIConfig{

diff --git a/oracle/metrics/mocks/mock_metrics.go b/oracle/metrics/mocks/mock_metrics.go
diff --git a/oracle/mocks/PriceAggregator.go b/oracle/mocks/PriceAggregator.go
diff --git a/oracle/mocks/mock_oracle.go b/oracle/mocks/mock_oracle.go
diff --git a/pkg/math/voteweighted/mocks/mock_cc_validator_store.go b/pkg/math/voteweighted/mocks/mock_cc_validator_store.go
diff --git a/pkg/math/voteweighted/mocks/mock_validator.go b/pkg/math/voteweighted/mocks/mock_validator.go
diff --git a/pkg/math/voteweighted/mocks/mock_validator_store.go b/pkg/math/voteweighted/mocks/mock_validator_store.go
diff --git a/providers/apis/defi/ethmulticlient/mocks/EVMClient.go b/providers/apis/defi/ethmulticlient/mocks/EVMClient.go