Merge remote-tracking branch 'tellor/main' into reporter-mtls-pr

Author: krasi

README.md

@@ -6,7 +6,7 @@
 
 The daemon loads environment variables from the current directory's `.env` file, or from `../.env` when run from a subdirectory. See [`env.example`](./env.example) for a complete starting point.
 
-Most CLI flags can also be provided as environment variables by uppercasing the flag name and replacing `-` or `.` with `_`, for example `--keyring-backend` becomes `KEYRING_BACKEND`. `LAYER_HOME` is preferred for the Layer home directory so the daemon does not accidentally use the shell's `HOME`.
+Most CLI flags can also be provided as environment variables by uppercasing the flag name and replacing `-` or `.` with `_`, for example `--keyring-backend` becomes `KEYRING_BACKEND` and `--from` becomes `FROM`. `LAYER_HOME` is preferred for the Layer home directory so the daemon does not accidentally use the shell's `HOME`.
 
 Layer endpoint configuration can be provided with comma-separated environment variables:
 
@@ -42,7 +42,7 @@ BRIDGE_CHAIN_RPC_NODES=https://mainnet.infura.io/v3/YOUR_INFURA_API_KEY,https://
 
 Ethereum mainnet custom query contract reads use the built-in mainnet endpoint templates by default. If `BRIDGE_CHAIN_RPC_NODES` points at a non-mainnet bridge chain such as Sepolia, set `ETH_MAINNET_RPC_NODES` to a comma-separated Ethereum mainnet endpoint list for custom queries.
 
-Custom query API keys are read from the generated `custom_query_config.toml` entries that reference environment placeholders. The current built-in templates use `CMC_PRO_API_KEY`, `CGPRO_API_KEY`, and `SUBGRAPH_API_KEY`.
+Custom query API keys are read from the generated `custom_query_config.toml` entries that reference environment placeholders. The current built-in templates use `CMC_PRO_API_KEY`, `CGPRO_API_KEY`, and `SUBGRAPH_API_KEY`. Built-in Ethereum mainnet RPC URL templates also expand `INFURA_API_KEY` and `ALCHEMY_API_KEY` when `ETH_MAINNET_RPC_NODES` is not set (see [`env.example`](./env.example)).
 
 ## Task loops
 

cmd/main.go

@@ -39,6 +39,9 @@ var rootCmd = &cobra.Command{
 		}
 		// Keep viper in sync for downstream consumers reading "home".
 		viper.Set(flags.FlagHome, homePath)
+		testMode := viper.GetBool("test")
+		testQueryID := viper.GetString("test-query-id")
+		prometheusPort := viper.GetInt("prometheus-port")
 		logLevelstr := viper.GetString(flags.FlagLogLevel)
 		configs.WriteDefaultPricefeedExchangeToml(homePath)
 		configs.WriteDefaultMarketParamsToml(homePath)
@@ -131,12 +134,6 @@ var rootCmd = &cobra.Command{
 	},
 }
 
-var (
-	prometheusPort int
-	testMode       bool
-	testQueryID    string
-)
-
 func main() {
 	daemonflags.AddDaemonFlagsToCmd(rootCmd)
 	if err := rootCmd.Execute(); err != nil {
@@ -153,7 +150,7 @@ func init() {
 	rootCmd.Flags().String(flags.FlagLogLevel, zerolog.InfoLevel.String(), "The logging level (trace|debug|info|warn|error|fatal|panic|disabled or '*:<level>,<key>:<level>')")
 	rootCmd.Flags().String(flags.FlagBroadcastMode, flags.BroadcastSync, "Transaction broadcasting mode (sync|async)")
 	rootCmd.Flags().String(flags.FlagNode, "", "<host>:<port> to CometBFT RPC interface for layer")
-	rootCmd.Flags().IntVar(&prometheusPort, "prometheus-port", 26661, "Port to serve Prometheus metrics on (default 26661). Applicable only if telemetry is enabled in app.toml.")
+	rootCmd.Flags().Int("prometheus-port", 26661, "Port to serve Prometheus metrics on (default 26661). Applicable only if telemetry is enabled in app.toml.")
 
 	// Price Guard Flags
 	rootCmd.Flags().Bool("price-guard-enabled", false, "Enable price guard to prevent reporting prices that differ from last reported price by a given threshold")
@@ -162,8 +159,8 @@ func init() {
 	rootCmd.Flags().Bool("price-guard-update-on-blocked", false, "Update last known price even if submission is blocked (default false)")
 
 	// Test mode flag
-	rootCmd.Flags().BoolVar(&testMode, "test", false, "Test mode: verify price feed configurations and calculate medians without starting daemon")
-	rootCmd.Flags().StringVar(&testQueryID, "test-query-id", "", "With --test, only run this custom query id (64-char hex); skips exchange/market tests. Exits non-zero if the query fails.")
+	rootCmd.Flags().Bool("test", false, "Test mode: verify price feed configurations and calculate medians without starting daemon")
+	rootCmd.Flags().String("test-query-id", "", "With --test, only run this custom query id (64-char hex); skips exchange/market tests. Exits non-zero if the query fails.")
 	// Automatic Unbonding flags
 	rootCmd.Flags().Uint32("auto-unbonding-frequency", 0, "Enable automatic unbonding every N days (0 = disabled, 1 - 21 days = valid)")
 	rootCmd.Flags().Uint32("auto-unbonding-amount", 0, "Amount of tokens in loya to unbond each unbonding transaction (0 = disabled)")

cmd/viper_flags_test.go

@@ -0,0 +1,41 @@
+package main
+
+import (
+	"strings"
+	"testing"
+
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+	"github.com/stretchr/testify/require"
+)
+
+func bindViperForTest(t *testing.T, cmd *cobra.Command) {
+	t.Helper()
+	viper.Reset()
+	require.NoError(t, viper.BindPFlags(cmd.Flags()))
+	viper.SetEnvKeyReplacer(strings.NewReplacer("-", "_", ".", "_"))
+	viper.AutomaticEnv()
+}
+
+func TestViperReadsPrometheusPortFromEnv(t *testing.T) {
+	t.Setenv("PROMETHEUS_PORT", "12345")
+
+	cmd := &cobra.Command{}
+	cmd.Flags().Int("prometheus-port", 26661, "")
+	bindViperForTest(t, cmd)
+
+	require.Equal(t, 12345, viper.GetInt("prometheus-port"))
+}
+
+func TestViperReadsTestModeFlagsFromEnv(t *testing.T) {
+	t.Setenv("TEST", "true")
+	t.Setenv("TEST_QUERY_ID", "abc123")
+
+	cmd := &cobra.Command{}
+	cmd.Flags().Bool("test", false, "")
+	cmd.Flags().String("test-query-id", "", "")
+	bindViperForTest(t, cmd)
+
+	require.True(t, viper.GetBool("test"))
+	require.Equal(t, "abc123", viper.GetString("test-query-id"))
+}

custom_query/constants.go

@@ -156,46 +156,6 @@ var StaticQueriesConfig = map[string]*QueryConfig{
 			},
 		},
 	},
-	"e010d752f28dcd2804004d0b57ab1bdc4eca092895d49160204120af11d15f3e": {
-		ID:                "e010d752f28dcd2804004d0b57ab1bdc4eca092895d49160204120af11d15f3e",
-		AggregationMethod: "median",
-		MinResponses:      1,
-		MaxSpreadPercent:  100.0,
-		ResponseType:      "ufixed256x18",
-		Endpoints: []EndpointConfig{
-			{
-				EndpointType: "coingeckoPro",
-				ResponsePath: []string{"noble-dollar-usdn", "usd"},
-				Params: map[string]string{
-					"coin_id": "noble-dollar-usdn",
-				},
-				MarketId: "USDN-USD",
-			},
-			{
-				EndpointType: "coinmarketcap",
-				ResponsePath: []string{"data", "36538", "quote", "USD", "price"},
-				Params: map[string]string{
-					// "symbol": "USDN",
-					"id": "36538",
-				},
-				MarketId: "USDN-USD",
-			},
-			{
-				EndpointType: "osmosis",
-				Handler:      "osmosis_pool_price_handler",
-				ResponsePath: []string{"pool"},
-				Params: map[string]string{
-					"pool_id":         "3061",
-					"target_token":    "ibc/0C39BD03B5C57A1753A9B73164705871A9B549F1A5226CFD7E39BE7BF73CF8CF",
-					"quote_token":     "ibc/498A0751C798A0D9A389AA3691123DADA57DAA4FE165D5C75894505B876BA6E4",
-					"target_decimals": "6",
-					"quote_decimals":  "6",
-				},
-				UsdViaID: exchange_common.USDCUSD_ID,
-				MarketId: "USDN-USD",
-			},
-		},
-	},
 	"59ae85cec665c779f18255dd4f3d97821e6a122691ee070b9a26888bc2a0e45a": {
 		ID:                "59ae85cec665c779f18255dd4f3d97821e6a122691ee070b9a26888bc2a0e45a",
 		AggregationMethod: "median",
@@ -229,21 +189,6 @@ var StaticQueriesConfig = map[string]*QueryConfig{
 			},
 		},
 	},
-	"35155b44678db9e9e021c2cf49dd20c31b49e03415325c2beffb5221cf63882d": {
-		ID:                "35155b44678db9e9e021c2cf49dd20c31b49e03415325c2beffb5221cf63882d",
-		AggregationMethod: "median",
-		MaxSpreadPercent:  10.0,
-		MinResponses:      1,
-		ResponseType:      "ufixed256x18",
-		Endpoints: []EndpointConfig{
-			{
-				EndpointType: "contract",
-				Handler:      "yieldfi_yusd_handler",
-				Chain:        "ethereum",
-				MarketId:     "YTOKEN-USD",
-			},
-		},
-	},
 	"03731257e35c49e44b267640126358e5decebdd8f18b5e8f229542ec86e318cf": {
 		ID:                "03731257e35c49e44b267640126358e5decebdd8f18b5e8f229542ec86e318cf",
 		AggregationMethod: "median",
@@ -394,21 +339,6 @@ var StaticQueriesConfig = map[string]*QueryConfig{
 			},
 		},
 	},
-	"91513b15db3cef441d52058b24412957f9cc8645c53aecf39446ac9b0d2dcca4": {
-		ID:                "91513b15db3cef441d52058b24412957f9cc8645c53aecf39446ac9b0d2dcca4",
-		AggregationMethod: "median",
-		MaxSpreadPercent:  10.0,
-		MinResponses:      1,
-		ResponseType:      "ufixed256x18",
-		Endpoints: []EndpointConfig{
-			{
-				EndpointType: "contract",
-				Handler:      "yieldfi_vyusd_handler",
-				Chain:        "ethereum",
-				MarketId:     "VYUSD-USD",
-			},
-		},
-	},
 	"187f74d310dc494e6efd928107713d4229cd319c2cf300224de02776090809f1": {
 		ID:                "187f74d310dc494e6efd928107713d4229cd319c2cf300224de02776090809f1",
 		AggregationMethod: "median",
@@ -483,19 +413,4 @@ var StaticQueriesConfig = map[string]*QueryConfig{
 			},
 		},
 	},
-	"9874c1c7b7e76b78afdfdda6dcecef56edf6bf3d49d6d6ef2a98404ea2e04a59": {
-		ID:                "9874c1c7b7e76b78afdfdda6dcecef56edf6bf3d49d6d6ef2a98404ea2e04a59",
-		AggregationMethod: "median",
-		MaxSpreadPercent:  10.0,
-		MinResponses:      1,
-		ResponseType:      "ufixed256x18",
-		Endpoints: []EndpointConfig{
-			{
-				EndpointType: "contract",
-				Handler:      "yieldfi_yeth_handler",
-				Chain:        "ethereum",
-				MarketId:     "YIELDFI-YETH-USD",
-			},
-		},
-	},
 }

custom_query/query_feed_comment.go

@@ -45,9 +45,7 @@ var combinedHandlerLabel = map[string]string{
 
 // queryTargetAsset overrides inferred display names for specific query IDs.
 var queryTargetAsset = map[string]string{
-	"35155b44678db9e9e021c2cf49dd20c31b49e03415325c2beffb5221cf63882d": "yUSD",
 	"187f74d310dc494e6efd928107713d4229cd319c2cf300224de02776090809f1": "SUSN",
-	"9874c1c7b7e76b78afdfdda6dcecef56edf6bf3d49d6d6ef2a98404ea2e04a59": "yETH",
 }
 
 // ClassifyQueryFeed returns the feed type, target asset symbol, and collateral asset

custom_query/query_feed_comment_test.go

@@ -20,19 +20,10 @@ func TestClassifyQueryFeed(t *testing.T) {
 			feedType: customquery.FeedTypeMarket,
 			target:   "SDAI",
 		},
-		"e010d752f28dcd2804004d0b57ab1bdc4eca092895d49160204120af11d15f3e": {
-			feedType: customquery.FeedTypeMarket,
-			target:   "USDN",
-		},
 		"59ae85cec665c779f18255dd4f3d97821e6a122691ee070b9a26888bc2a0e45a": {
 			feedType: customquery.FeedTypeMarket,
 			target:   "SUSDS",
 		},
-		"35155b44678db9e9e021c2cf49dd20c31b49e03415325c2beffb5221cf63882d": {
-			feedType:   customquery.FeedTypeFundamental,
-			target:     "yUSD",
-			collateral: "USDC",
-		},
 		"03731257e35c49e44b267640126358e5decebdd8f18b5e8f229542ec86e318cf": {
 			feedType:   customquery.FeedTypeFundamental,
 			target:     "SUSDE",
@@ -60,11 +51,6 @@ func TestClassifyQueryFeed(t *testing.T) {
 			feedType: customquery.FeedTypeMarket,
 			target:   "stATOM",
 		},
-		"91513b15db3cef441d52058b24412957f9cc8645c53aecf39446ac9b0d2dcca4": {
-			feedType:   customquery.FeedTypeFundamental,
-			target:     "VYUSD",
-			collateral: "USDC",
-		},
 		"187f74d310dc494e6efd928107713d4229cd319c2cf300224de02776090809f1": {
 			feedType:   customquery.FeedTypeFundamental,
 			target:     "SUSN",
@@ -75,11 +61,6 @@ func TestClassifyQueryFeed(t *testing.T) {
 			target:     "SFRXUSD",
 			collateral: "FRX",
 		},
-		"9874c1c7b7e76b78afdfdda6dcecef56edf6bf3d49d6d6ef2a98404ea2e04a59": {
-			feedType:   customquery.FeedTypeFundamental,
-			target:     "yETH",
-			collateral: "ETH",
-		},
 	}
 
 	for queryID, tc := range tests {
@@ -105,7 +86,6 @@ func TestGenerateFeedComment(t *testing.T) {
 	tests := map[string]string{
 		"05cddb6b67074aa61fcbe1d2fd5924e028bb699b506267df28c88f7deac4edc6": "SDAI/USD: (market) median of 3 sources.",
 		"03731257e35c49e44b267640126358e5decebdd8f18b5e8f229542ec86e318cf": "SUSDE/USD: (fundamental) ratio from susde contract × USDE/USD pricefeed cache.",
-		"35155b44678db9e9e021c2cf49dd20c31b49e03415325c2beffb5221cf63882d": "yUSD/USD: (fundamental) ratio from yieldfi-yusd contract × USDC/USD pricefeed cache.",
 		"187f74d310dc494e6efd928107713d4229cd319c2cf300224de02776090809f1": "SUSN/USD: (fundamental) ratio from susn contract × median USN/USD from 3 sources.",
 		"ab30caa3e7827a27c153063bce02c0b260b29c0c164040c003f0f9ec66002510": "SFRXUSD/USD: (fundamental) ratio from sfrxusd contract × median FRX/USD from 3 sources.",
 	}

env.example

@@ -1,60 +1,67 @@
 # Copy to .env and fill in values for the features you want.
 # .env is loaded from the current directory, or ../.env from subdirectories.
 
-# Reporter
+## REQUIRED VARIABLES ##
 LAYER_HOME=/home/<reporter-username>/.layer
 FROM=your-key-name
-KEYRING_BACKEND=file
+KEYRING_BACKEND=test
 # KEYRING_PASSWORD_FILE=/etc/layer-daemons/reporter-keyring-password
-# BROADCAST_MODE=sync
-# LOG_LEVEL=info
-# PROMETHEUS_PORT=26661
 
 # Layer endpoints (comma-separated primary, then fallbacks)
-RPC_NODES=http://node_endpoint1:26657,http://node_endpoint2:26657
-GRPC_NODES=node1:9090,node2:9090
+RPC_NODES=http://node_endpoint1:26657,https://node_endpoint2:26657
+GRPC_NODES=0.0.0.0:9090,node2_ip:9090
 
 # Bridge-chain RPC endpoints for token bridge reads
 BRIDGE_CHAIN_RPC_NODES=https://mainnet.infura.io/v3/YOUR_INFURA_API_KEY,https://eth-mainnet.g.alchemy.com/v2/YOUR_ALCHEMY_API_KEY
-# Optional Ethereum mainnet RPC endpoints for custom query contract reads.
-# Use this when BRIDGE_CHAIN_RPC_NODES points at a non-mainnet bridge chain such as Sepolia.
-# ETH_MAINNET_RPC_NODES=https://mainnet.infura.io/v3/YOUR_INFURA_API_KEY,https://eth-mainnet.g.alchemy.com/v2/YOUR_ALCHEMY_API_KEY
+# Ethereum mainnet RPC endpoints for custom query contract reads.
+ETH_MAINNET_RPC_NODES=https://mainnet.infura.io/v3/YOUR_INFURA_API_KEY,https://eth-mainnet.g.alchemy.com/v2/YOUR_ALCHEMY_API_KEY
 
-# Optional local/custom-chain token bridge contract override
-# TOKEN_BRIDGE_TEST_CONTRACT=0x0000000000000000000000000000000000000000
+# Custom query API keys (endpoint auth and Ethereum mainnet RPC template expansion)
+CMC_PRO_API_KEY=your_coinmarketcap_api_key
+CGPRO_API_KEY=your_coingecko_pro_api_key
+SUBGRAPH_API_KEY=your_the_graph_api_key
+# Used by built-in Ethereum mainnet RPC templates when ETH_MAINNET_RPC_NODES is unset
+INFURA_API_KEY=YOUR_INFURA_API_KEY
+ALCHEMY_API_KEY=YOUR_ALCHEMY_API_KEY
+
+## OPTIONAL VARIABLES ##
+# daemon settings:
+# BROADCAST_MODE=sync
+# LOG_LEVEL=info
+# PROMETHEUS_PORT=26661
 
-# Reward withdrawals
+# Set Automatic Reward withdrawals:
 # REPORTERS_VALIDATOR_ADDRESS=tellorvaloper1...
 # WITHDRAW_FREQUENCY=43200
 
-# Price guard
+# Price guard:
 # PRICE_GUARD_ENABLED=false
 # PRICE_GUARD_THRESHOLD=0.5 # 50%
 # PRICE_GUARD_MAX_AGE=1h
 # PRICE_GUARD_UPDATE_ON_BLOCKED=false
 
-# Auto-unbonding
+# Auto-unbonding:
 # AUTO_UNBONDING_FREQUENCY=7
 # AUTO_UNBONDING_AMOUNT=1000000
 # AUTO_UNBONDING_MAX_STAKE_PERCENTAGE=0.1
 
-# Auto balance-to-keep bridge
+# Auto balance-to-keep bridge:
 # AUTO_BALANCE_TO_KEEP=5000000
 # AUTO_BALANCE_EXECUTION_TIME=03:00
 # AUTO_BALANCE_BRIDGE_TO_ETH_ADDR=0x0000000000000000000000000000000000000000
 
-# Gas estimate cache refresh
+# Gas estimate cache refresh:
 # REFRESH_GAS_ESTIMATES_INTERVAL=12h
 
-# Daemon internals
+# Daemon internals:
 # UNIX_SOCKET_ADDRESS=/tmp/daemons.sock
 # PANIC_ON_DAEMON_FAILURE_ENABLED=true
 # MAX_DAEMON_UNHEALTHY_SECONDS=300
 # PRICE_DAEMON_LOOP_DELAY_MS=3000
 
-# Custom query API keys
-CMC_PRO_API_KEY=your_coinmarketcap_api_key
-CGPRO_API_KEY=your_coingecko_pro_api_key
-SUBGRAPH_API_KEY=your_the_graph_api_key
-ALCHEMY_API_KEY=YOUR_ALCHEMY_API_KEY
-INFURA_API_KEY=YOUR_INFURA_API_KEY
+# for testing: local/custom-chain token bridge contract override:
+# TOKEN_BRIDGE_TEST_CONTRACT=0x0000000000000000000000000000000000000000
+
+# Test mode (verify configs without starting the daemon):
+# TEST=true
+# TEST_QUERY_ID=0000000000000000000000000000000000000000000000000000000000000000