Merge remote-tracking branch 'origin/main' into nikw9944/adhoc-413

Author: nikw9944

CHANGELOG.md

@@ -8,13 +8,30 @@ All notable changes to this project will be documented in this file.
 
 ### Changes
 
-
 - Geolocation
   - geoprobe-target drops LocationOffsets whose signature chain does not verify instead of caching them and writing them to `location_offsets`, which the lake explorer publishes unfiltered. Verification itself now rejects the zero authority pubkey, since `ed25519.Verify` accepts the all-zero (pubkey, signature) pair for roughly one message in four — the zero key decodes to an order-4 point, not to nothing — so an unsigned datagram would otherwise verify. The same guard is applied to the signed TWAMP `ProbePacket.Verify` and `ReplyPacket.Verify`, the other two places a wire-supplied pubkey is used as the verification key.
   - The geoprobe agent enforces RFC-16's replay mitigation: an inbound DZD offset is rejected unless its `MeasurementSlot` is within 15 minutes behind or 5 minutes ahead of the current ledger slot, which covers the 5-minute slot caches on both ends. An equal-RTT offset also no longer replaces the cache's best entry, because replacing it reset its expiry clock and let a replay pin the probe's reference point indefinitely.
   - The signed TWAMP reflector verifies a probe's signature before touching per-sender pair state. `target_pk` is public onchain, so spoofed probes could previously consume a paying sender's pair budget, repoint its source IP and clear its challenge nonce. Unverified probes still get a reply, now off throwaway state and capped at one per rate-limit window.
   - A completed target scan that matches nothing propagates instead of being mistaken for a skipped scan, so removing a user's last target or flipping them to Delinquent stops the probing.
   - ICMP echo replies are matched on source address as well as ID and sequence.
+
+## [v0.39.0](https://github.com/malbeclabs/doublezero/compare/client/v0.38.0...client/v0.39.0) - 2026-09-04
+
+### Breaking
+
+- CLI
+  - Remove `revenue-distribution convert-2z` and `harvest-2z` (malbeclabs/infra#2527).
+  - Validator deposit no longer accepts `--convert-2z-limit-price`.
+- SDK
+  - Remove the Go, Python, and TypeScript revenue-distribution clients that fetched `/swap-rate`.
+
+### Changes
+
+- Monitor
+  - Stop polling the SOL/2Z swap oracle (malbeclabs/infra#2527).
+  - `-twoz-oracle-interval` still parses so existing ansible extra args do not fail the process.
+- CLI
+  - `revenue-distribution fetch sol-conversion` no longer requests a swap quote.
 - SDK
   - The TypeScript and Python `GlobalState` deserializers expose `ip_verifier_authority_pk`, the RFC-27 trust root the Go SDK and the Rust state already carried, so those consumers can read which key signs IP ownership proofs. The field is appended, so an account written before the upgrade decodes it as the default pubkey rather than failing. (#4231)
 - CI

Cargo.lock

@@ -51,7 +51,7 @@ exclude = [
 resolver = "2"
 
 [workspace.package]
-version = "0.38.0"
+version = "0.39.0"
 authors = ["Malbec Labs <dev@malbeclabs.com>"]
 readme = "README.md"
 edition = "2021"

Cargo.toml

@@ -7,7 +7,6 @@ const (
 	MainnetTelemetryProgramID            = "tE1exJ5VMyoC9ByZeSmgtNzJCFF74G9JAv338sJiqkC"
 	MainnetInternetLatencyCollectorPK    = "8xHn4r7oQuqNZ5cLYwL5YZcDy1JjDQcpVkyoA8Dw5uXH"
 	MainnetDeviceLocalASN                = 209321
-	MainnetTwoZOracleURL                 = "https://sol-2z-oracle-api-v1.mainnet-beta.doublezero.xyz"
 	MainnetSolanaRPC                     = "https://api.mainnet-beta.solana.com"
 	MainnetTelemetryFlowIngestURL        = "http://telemetry-flow-in.mainnet-beta.doublezero.xyz"
 	MainnetTelemetryStateIngestURL       = "https://telemetry-state-in-mainnet-beta.doublezero.xyz"
@@ -24,7 +23,6 @@ const (
 	TestnetTelemetryProgramID         = "3KogTMmVxc5eUHtjZnwm136H5P8tvPwVu4ufbGPvM7p1"
 	TestnetInternetLatencyCollectorPK = "HWGQSTmXWMB85NY2vFLhM1nGpXA8f4VCARRyeGNbqDF1"
 	TestnetDeviceLocalASN             = 65342
-	TestnetTwoZOracleURL              = "https://sol-2z-oracle-api-v1.testnet.doublezero.xyz"
 	TestnetSolanaRPC                  = "https://api.testnet.solana.com"
 	TestnetTelemetryFlowIngestURL     = "http://telemetry-flow-in.testnet.doublezero.xyz"
 	TestnetTelemetryStateIngestURL    = "https://telemetry-state-in-testnet.doublezero.xyz"
@@ -41,7 +39,6 @@ const (
 	DevnetTelemetryProgramID            = "C9xqH76NSm11pBS6maNnY163tWHT8Govww47uyEmSnoG"
 	DevnetInternetLatencyCollectorPK    = "3fXen9LP5JUAkaaDJtyLo1ohPiJ2LdzVqAnmhtGgAmwJ"
 	DevnetDeviceLocalASN                = 21682
-	DevnetTwoZOracleURL                 = ""
 	DevnetTelemetryFlowIngestURL        = "http://telemetry-flow-in.devnet.doublezero.xyz"
 	DevnetTelemetryStateIngestURL       = "https://telemetry-state-in-devnet.doublezero.xyz"
 	DevnetGeolocationProgramID          = "EXUUFfAjjuXnaBtsAMLsJX18ynnNHPwtkmk33bLVVoCm"
@@ -55,7 +52,6 @@ const (
 	LocalnetTelemetryProgramID            = "C9xqH76NSm11pBS6maNnY163tWHT8Govww47uyEmSnoG"
 	LocalnetInternetLatencyCollectorPK    = "3fXen9LP5JUAkaaDJtyLo1ohPiJ2LdzVqAnmhtGgAmwJ"
 	LocalnetDeviceLocalASN                = 21682
-	LocalnetTwoZOracleURL                 = ""
 	LocalnetSolanaRPC                     = "http://localhost:8899"
 	LocalnetTelemetryFlowIngestURL        = "http://localhost:8911"
 	LocalnetTelemetryStateIngestURL       = "http://localhost:8911"

config/constants.go

@@ -23,7 +23,6 @@ type NetworkConfig struct {
 	RevenueDistributionProgramID  solana.PublicKey
 	InternetLatencyCollectorPK    solana.PublicKey
 	DeviceLocalASN                uint32
-	TwoZOracleURL                 string
 	SolanaRPCURL                  string
 	TelemetryFlowIngestURL        string
 	TelemetryStateIngestURL       string
@@ -68,7 +67,6 @@ func NetworkConfigForEnv(env string) (*NetworkConfig, error) {
 			ShredSubscriptionProgramID:    MainnetShredSubscriptionProgramID,
 			USDCMint:                      MainnetUSDCMint,
 			DeviceLocalASN:                MainnetDeviceLocalASN,
-			TwoZOracleURL:                 MainnetTwoZOracleURL,
 			SolanaRPCURL:                  MainnetSolanaRPC,
 			TelemetryFlowIngestURL:        MainnetTelemetryFlowIngestURL,
 			TelemetryStateIngestURL:       MainnetTelemetryStateIngestURL,
@@ -101,7 +99,6 @@ func NetworkConfigForEnv(env string) (*NetworkConfig, error) {
 			ShredSubscriptionProgramID:    TestnetShredSubscriptionProgramID,
 			USDCMint:                      TestnetUSDCMint,
 			DeviceLocalASN:                TestnetDeviceLocalASN,
-			TwoZOracleURL:                 TestnetTwoZOracleURL,
 			SolanaRPCURL:                  TestnetSolanaRPC,
 			TelemetryFlowIngestURL:        TestnetTelemetryFlowIngestURL,
 			TelemetryStateIngestURL:       TestnetTelemetryStateIngestURL,
@@ -134,7 +131,6 @@ func NetworkConfigForEnv(env string) (*NetworkConfig, error) {
 			ShredSubscriptionProgramID:    DevnetShredSubscriptionProgramID,
 			USDCMint:                      DevnetUSDCMint,
 			DeviceLocalASN:                DevnetDeviceLocalASN,
-			TwoZOracleURL:                 DevnetTwoZOracleURL,
 			SolanaRPCURL:                  TestnetSolanaRPC,
 			TelemetryFlowIngestURL:        DevnetTelemetryFlowIngestURL,
 			TelemetryStateIngestURL:       DevnetTelemetryStateIngestURL,
@@ -167,7 +163,6 @@ func NetworkConfigForEnv(env string) (*NetworkConfig, error) {
 			ShredSubscriptionProgramID:    LocalnetShredSubscriptionProgramID,
 			USDCMint:                      LocalnetUSDCMint,
 			DeviceLocalASN:                LocalnetDeviceLocalASN,
-			TwoZOracleURL:                 LocalnetTwoZOracleURL,
 			SolanaRPCURL:                  LocalnetSolanaRPC,
 			TelemetryFlowIngestURL:        LocalnetTelemetryFlowIngestURL,
 			TelemetryStateIngestURL:       LocalnetTelemetryStateIngestURL,

config/env.go

@@ -26,7 +26,6 @@ func TestConfig_NetworkConfigForEnv(t *testing.T) {
 				RevenueDistributionProgramID:  solana.MustPublicKeyFromBase58(config.MainnetRevenueDistributionProgramID),
 				InternetLatencyCollectorPK:    solana.MustPublicKeyFromBase58(config.MainnetInternetLatencyCollectorPK),
 				DeviceLocalASN:                config.MainnetDeviceLocalASN,
-				TwoZOracleURL:                 config.MainnetTwoZOracleURL,
 				SolanaRPCURL:                  config.MainnetSolanaRPC,
 				TelemetryFlowIngestURL:        config.MainnetTelemetryFlowIngestURL,
 				TelemetryStateIngestURL:       config.MainnetTelemetryStateIngestURL,
@@ -46,7 +45,6 @@ func TestConfig_NetworkConfigForEnv(t *testing.T) {
 				RevenueDistributionProgramID:  solana.MustPublicKeyFromBase58(config.MainnetRevenueDistributionProgramID),
 				InternetLatencyCollectorPK:    solana.MustPublicKeyFromBase58(config.MainnetInternetLatencyCollectorPK),
 				DeviceLocalASN:                config.MainnetDeviceLocalASN,
-				TwoZOracleURL:                 config.MainnetTwoZOracleURL,
 				SolanaRPCURL:                  config.MainnetSolanaRPC,
 				TelemetryFlowIngestURL:        config.MainnetTelemetryFlowIngestURL,
 				TelemetryStateIngestURL:       config.MainnetTelemetryStateIngestURL,
@@ -65,7 +63,6 @@ func TestConfig_NetworkConfigForEnv(t *testing.T) {
 				TelemetryProgramID:            solana.MustPublicKeyFromBase58(config.TestnetTelemetryProgramID),
 				InternetLatencyCollectorPK:    solana.MustPublicKeyFromBase58(config.TestnetInternetLatencyCollectorPK),
 				DeviceLocalASN:                config.TestnetDeviceLocalASN,
-				TwoZOracleURL:                 config.TestnetTwoZOracleURL,
 				SolanaRPCURL:                  config.TestnetSolanaRPC,
 				TelemetryFlowIngestURL:        config.TestnetTelemetryFlowIngestURL,
 				TelemetryStateIngestURL:       config.TestnetTelemetryStateIngestURL,
@@ -84,7 +81,6 @@ func TestConfig_NetworkConfigForEnv(t *testing.T) {
 				TelemetryProgramID:            solana.MustPublicKeyFromBase58(config.DevnetTelemetryProgramID),
 				InternetLatencyCollectorPK:    solana.MustPublicKeyFromBase58(config.DevnetInternetLatencyCollectorPK),
 				DeviceLocalASN:                config.DevnetDeviceLocalASN,
-				TwoZOracleURL:                 config.DevnetTwoZOracleURL,
 				SolanaRPCURL:                  config.TestnetSolanaRPC,
 				TelemetryFlowIngestURL:        config.DevnetTelemetryFlowIngestURL,
 				TelemetryStateIngestURL:       config.DevnetTelemetryStateIngestURL,

config/env_test.go

@@ -17,7 +17,6 @@ import (
 	solanarpc "github.com/gagliardetto/solana-go/rpc"
 	influxdb2 "github.com/influxdata/influxdb-client-go/v2"
 	"github.com/malbeclabs/doublezero/config"
-	twozoracle "github.com/malbeclabs/doublezero/controlplane/monitor/internal/2z-oracle"
 	"github.com/malbeclabs/doublezero/controlplane/monitor/internal/worker"
 	"github.com/malbeclabs/doublezero/smartcontract/sdk/go/serviceability"
 	"github.com/malbeclabs/doublezero/smartcontract/sdk/go/telemetry"
@@ -27,7 +26,6 @@ import (
 
 const (
 	defaultInterval            = 1 * time.Minute
-	defaultTwoZOracleInterval  = 5 * time.Second
 	defaultSolBalanceInterval  = 30 * time.Second
 	defaultSolBalanceThreshold = 0.1
 )
@@ -44,7 +42,7 @@ var (
 	metricsAddr                = flag.String("metrics-addr", ":8080", "Address to listen on for prometheus metrics")
 	slackWebhookURL            = flag.String("slack-webhook-url", "", "The Slack webhook URL to send alerts")
 	allowOwnUsers              = flag.Bool("allow-own-users", false, "Include DoubleZero's own users instead of filtering them out")
-	twoZOracleInterval         = flag.Duration("twoz-oracle-interval", defaultTwoZOracleInterval, "interval to execute twoz oracle watcher ticks")
+	_                          = flag.Duration("twoz-oracle-interval", 5*time.Second, "ignored; ansible still passes this")
 	solBalanceAccounts         = flag.String("sol-balance-accounts", "", "comma-separated label:pubkey pairs (e.g., debt_accountant:ABC123,rewards_accountant:XYZ789)")
 	solBalanceThreshold        = flag.Float64("sol-balance-threshold", defaultSolBalanceThreshold, "SOL balance threshold for warning logs")
 	solBalanceInterval         = flag.Duration("sol-balance-interval", defaultSolBalanceInterval, "interval to check SOL balances")
@@ -154,12 +152,6 @@ func main() {
 		}
 	}()
 
-	var twoZOracleClient twozoracle.TwoZOracleClient
-	if networkConfig.TwoZOracleURL != "" {
-		// 2ZOracle is not configured in some environments.
-		twoZOracleClient = twozoracle.NewTwoZOracleClient(http.DefaultClient, networkConfig.TwoZOracleURL)
-	}
-
 	// Initialize InfluxDB writer
 	var influxClient influxdb2.Client
 	var influxWriter worker.InfluxWriter
@@ -222,8 +214,6 @@ func main() {
 		Interval:                   *interval,
 		SlackWebhookURL:            *slackWebhookURL,
 		AllowOwnUsers:              *allowOwnUsers,
-		TwoZOracleClient:           twoZOracleClient,
-		TwoZOracleInterval:         *twoZOracleInterval,
 		InfluxWriter:               influxWriter,
 		Env:                        *env,
 		SolBalanceRPCClient:        rpcClient,