Remove solana watcher from contract-watcher (#1087)
This commit is contained in:
parent
e7b7f358b5
commit
c0e233fc75
|
@ -79,8 +79,6 @@ func newWatcherForMainnet(cfg *config.BackfillerConfiguration, repo *storage.Rep
|
||||||
watcher = builder.CreateAnkrEvmWatcher(cfg.RateLimitPerSecond, cfg.ChainUrl, config.FANTOM_MAINNET, repo, metrics, logger)
|
watcher = builder.CreateAnkrEvmWatcher(cfg.RateLimitPerSecond, cfg.ChainUrl, config.FANTOM_MAINNET, repo, metrics, logger)
|
||||||
case config.AVALANCHE_MAINNET.ChainID.String():
|
case config.AVALANCHE_MAINNET.ChainID.String():
|
||||||
watcher = builder.CreateAnkrEvmWatcher(cfg.RateLimitPerSecond, cfg.ChainUrl, config.AVALANCHE_MAINNET, repo, metrics, logger)
|
watcher = builder.CreateAnkrEvmWatcher(cfg.RateLimitPerSecond, cfg.ChainUrl, config.AVALANCHE_MAINNET, repo, metrics, logger)
|
||||||
case config.SOLANA_MAINNET.ChainID.String():
|
|
||||||
watcher = builder.CreateSolanaWatcher(cfg.RateLimitPerSecond, cfg.ChainUrl, config.SOLANA_MAINNET, logger, repo, metrics)
|
|
||||||
case config.TERRA_MAINNET.ChainID.String():
|
case config.TERRA_MAINNET.ChainID.String():
|
||||||
watcher = builder.CreateTerraWatcher(cfg.RateLimitPerSecond, cfg.ChainUrl, config.TERRA_MAINNET, logger, repo, metrics)
|
watcher = builder.CreateTerraWatcher(cfg.RateLimitPerSecond, cfg.ChainUrl, config.TERRA_MAINNET, logger, repo, metrics)
|
||||||
case config.APTOS_MAINNET.ChainID.String():
|
case config.APTOS_MAINNET.ChainID.String():
|
||||||
|
@ -116,8 +114,6 @@ func newWatcherForTestnet(cfg *config.BackfillerConfiguration, repo *storage.Rep
|
||||||
watcher = builder.CreateAnkrEvmWatcher(cfg.RateLimitPerSecond, cfg.ChainUrl, config.FANTOM_TESTNET, repo, metrics, logger)
|
watcher = builder.CreateAnkrEvmWatcher(cfg.RateLimitPerSecond, cfg.ChainUrl, config.FANTOM_TESTNET, repo, metrics, logger)
|
||||||
case config.AVALANCHE_TESTNET.ChainID.String():
|
case config.AVALANCHE_TESTNET.ChainID.String():
|
||||||
watcher = builder.CreateAnkrEvmWatcher(cfg.RateLimitPerSecond, cfg.ChainUrl, config.AVALANCHE_TESTNET, repo, metrics, logger)
|
watcher = builder.CreateAnkrEvmWatcher(cfg.RateLimitPerSecond, cfg.ChainUrl, config.AVALANCHE_TESTNET, repo, metrics, logger)
|
||||||
case config.SOLANA_TESTNET.ChainID.String():
|
|
||||||
watcher = builder.CreateSolanaWatcher(cfg.RateLimitPerSecond, cfg.ChainUrl, config.SOLANA_TESTNET, logger, repo, metrics)
|
|
||||||
case config.APTOS_TESTNET.ChainID.String():
|
case config.APTOS_TESTNET.ChainID.String():
|
||||||
watcher = builder.CreateAptosWatcher(cfg.RateLimitPerSecond, cfg.ChainUrl, config.APTOS_TESTNET, logger, repo, metrics)
|
watcher = builder.CreateAptosWatcher(cfg.RateLimitPerSecond, cfg.ChainUrl, config.APTOS_TESTNET, logger, repo, metrics)
|
||||||
case config.OASIS_TESTNET.ChainID.String():
|
case config.OASIS_TESTNET.ChainID.String():
|
||||||
|
|
|
@ -54,7 +54,6 @@ type watchersConfig struct {
|
||||||
oasis *config.WatcherBlockchainAddresses
|
oasis *config.WatcherBlockchainAddresses
|
||||||
optimism *config.WatcherBlockchainAddresses
|
optimism *config.WatcherBlockchainAddresses
|
||||||
polygon *config.WatcherBlockchainAddresses
|
polygon *config.WatcherBlockchainAddresses
|
||||||
solana *config.WatcherBlockchain
|
|
||||||
terra *config.WatcherBlockchain
|
terra *config.WatcherBlockchain
|
||||||
rateLimit rateLimitConfig
|
rateLimit rateLimitConfig
|
||||||
}
|
}
|
||||||
|
@ -73,7 +72,6 @@ type rateLimitConfig struct {
|
||||||
oasis int
|
oasis int
|
||||||
optimism int
|
optimism int
|
||||||
polygon int
|
polygon int
|
||||||
solana int
|
|
||||||
terra int
|
terra int
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -197,12 +195,6 @@ func newWatchers(config *config.ServiceConfiguration, testnetConfig *config.Test
|
||||||
result = append(result, ethereumSepoliaWatcher)
|
result = append(result, ethereumSepoliaWatcher)
|
||||||
}
|
}
|
||||||
|
|
||||||
// add solana watcher
|
|
||||||
if watchers.solana != nil {
|
|
||||||
solanaWatcher := builder.CreateSolanaWatcher(watchers.rateLimit.solana, config.SolanaUrl, *watchers.solana, logger, repo, metrics)
|
|
||||||
result = append(result, solanaWatcher)
|
|
||||||
}
|
|
||||||
|
|
||||||
// add avalanche watcher
|
// add avalanche watcher
|
||||||
if watchers.avalanche != nil {
|
if watchers.avalanche != nil {
|
||||||
avalancheWatcher := builder.CreateEvmWatcher(watchers.rateLimit.avalanche, config.AvalancheUrl, *watchers.avalanche, logger, repo, metrics)
|
avalancheWatcher := builder.CreateEvmWatcher(watchers.rateLimit.avalanche, config.AvalancheUrl, *watchers.avalanche, logger, repo, metrics)
|
||||||
|
@ -288,7 +280,6 @@ func newWatchersForMainnet(cfg *config.ServiceConfiguration) *watchersConfig {
|
||||||
oasis: &config.OASIS_MAINNET,
|
oasis: &config.OASIS_MAINNET,
|
||||||
optimism: &config.OPTIMISM_MAINNET,
|
optimism: &config.OPTIMISM_MAINNET,
|
||||||
polygon: &config.POLYGON_MAINNET,
|
polygon: &config.POLYGON_MAINNET,
|
||||||
solana: &config.SOLANA_MAINNET,
|
|
||||||
terra: &config.TERRA_MAINNET,
|
terra: &config.TERRA_MAINNET,
|
||||||
|
|
||||||
rateLimit: rateLimitConfig{
|
rateLimit: rateLimitConfig{
|
||||||
|
@ -303,7 +294,6 @@ func newWatchersForMainnet(cfg *config.ServiceConfiguration) *watchersConfig {
|
||||||
oasis: cfg.OasisRequestsPerSecond,
|
oasis: cfg.OasisRequestsPerSecond,
|
||||||
optimism: cfg.OptimismRequestsPerSecond,
|
optimism: cfg.OptimismRequestsPerSecond,
|
||||||
polygon: cfg.PolygonRequestsPerSecond,
|
polygon: cfg.PolygonRequestsPerSecond,
|
||||||
solana: cfg.SolanaRequestsPerSecond,
|
|
||||||
terra: cfg.TerraRequestsPerSecond,
|
terra: cfg.TerraRequestsPerSecond,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
@ -327,7 +317,6 @@ func newWatchersForTestnet(cfg *config.ServiceConfiguration, testnetCfg *config.
|
||||||
oasis: &config.OASIS_TESTNET,
|
oasis: &config.OASIS_TESTNET,
|
||||||
optimism: &config.OPTIMISM_TESTNET,
|
optimism: &config.OPTIMISM_TESTNET,
|
||||||
polygon: &config.POLYGON_TESTNET,
|
polygon: &config.POLYGON_TESTNET,
|
||||||
solana: &config.SOLANA_TESTNET,
|
|
||||||
rateLimit: rateLimitConfig{
|
rateLimit: rateLimitConfig{
|
||||||
ankr: cfg.AnkrRequestsPerSecond,
|
ankr: cfg.AnkrRequestsPerSecond,
|
||||||
avalanche: cfg.AvalancheRequestsPerSecond,
|
avalanche: cfg.AvalancheRequestsPerSecond,
|
||||||
|
@ -342,7 +331,6 @@ func newWatchersForTestnet(cfg *config.ServiceConfiguration, testnetCfg *config.
|
||||||
oasis: cfg.OasisRequestsPerSecond,
|
oasis: cfg.OasisRequestsPerSecond,
|
||||||
optimism: cfg.OptimismRequestsPerSecond,
|
optimism: cfg.OptimismRequestsPerSecond,
|
||||||
polygon: cfg.PolygonRequestsPerSecond,
|
polygon: cfg.PolygonRequestsPerSecond,
|
||||||
solana: cfg.SolanaRequestsPerSecond,
|
|
||||||
terra: cfg.TerraRequestsPerSecond,
|
terra: cfg.TerraRequestsPerSecond,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
|
@ -34,8 +34,6 @@ type ServiceConfiguration struct {
|
||||||
OasisRequestsPerSecond int `env:"OASIS_REQUESTS_PER_SECOND,required"`
|
OasisRequestsPerSecond int `env:"OASIS_REQUESTS_PER_SECOND,required"`
|
||||||
PolygonUrl string `env:"POLYGON_URL,required"`
|
PolygonUrl string `env:"POLYGON_URL,required"`
|
||||||
PolygonRequestsPerSecond int `env:"POLYGON_REQUESTS_PER_SECOND,required"`
|
PolygonRequestsPerSecond int `env:"POLYGON_REQUESTS_PER_SECOND,required"`
|
||||||
SolanaUrl string `env:"SOLANA_URL,required"`
|
|
||||||
SolanaRequestsPerSecond int `env:"SOLANA_REQUESTS_PER_SECOND,required"`
|
|
||||||
TerraUrl string `env:"TERRA_URL,required"`
|
TerraUrl string `env:"TERRA_URL,required"`
|
||||||
TerraRequestsPerSecond int `env:"TERRA_REQUESTS_PER_SECOND,required"`
|
TerraRequestsPerSecond int `env:"TERRA_REQUESTS_PER_SECOND,required"`
|
||||||
}
|
}
|
||||||
|
|
|
@ -166,15 +166,6 @@ var FANTOM_MAINNET = WatcherBlockchainAddresses{
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
var SOLANA_MAINNET = WatcherBlockchain{
|
|
||||||
ChainID: vaa.ChainIDSolana,
|
|
||||||
Name: "solana",
|
|
||||||
Address: "wormDTUJ6AWPNvk59vGQbDvGJmqbDTdgWgAqcLBCgUb",
|
|
||||||
SizeBlocks: 10,
|
|
||||||
WaitSeconds: 10,
|
|
||||||
InitialBlock: 183675278,
|
|
||||||
}
|
|
||||||
|
|
||||||
var TERRA_MAINNET = WatcherBlockchain{
|
var TERRA_MAINNET = WatcherBlockchain{
|
||||||
ChainID: vaa.ChainIDTerra,
|
ChainID: vaa.ChainIDTerra,
|
||||||
Name: "terra",
|
Name: "terra",
|
||||||
|
|
|
@ -176,15 +176,6 @@ var FANTOM_TESTNET = WatcherBlockchainAddresses{
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
var SOLANA_TESTNET = WatcherBlockchain{
|
|
||||||
ChainID: vaa.ChainIDSolana,
|
|
||||||
Name: "solana",
|
|
||||||
Address: "DZnkkTmCiFWfYTfT41X3Rd1kDgozqzxWaHqsw6W4x2oe",
|
|
||||||
SizeBlocks: 10,
|
|
||||||
WaitSeconds: 10,
|
|
||||||
InitialBlock: 16820790,
|
|
||||||
}
|
|
||||||
|
|
||||||
var AVALANCHE_TESTNET = WatcherBlockchainAddresses{
|
var AVALANCHE_TESTNET = WatcherBlockchainAddresses{
|
||||||
ChainID: vaa.ChainIDAvalanche,
|
ChainID: vaa.ChainIDAvalanche,
|
||||||
Name: "avalanche_fuji",
|
Name: "avalanche_fuji",
|
||||||
|
|
|
@ -67,13 +67,6 @@ spec:
|
||||||
key: ankr-url
|
key: ankr-url
|
||||||
- name: ANKR_REQUESTS_PER_SECOND
|
- name: ANKR_REQUESTS_PER_SECOND
|
||||||
value: "{{ .ANKR_REQUESTS_PER_SECOND }}"
|
value: "{{ .ANKR_REQUESTS_PER_SECOND }}"
|
||||||
- name: SOLANA_URL
|
|
||||||
valueFrom:
|
|
||||||
secretKeyRef:
|
|
||||||
name: blockchain
|
|
||||||
key: solana-url
|
|
||||||
- name: SOLANA_REQUESTS_PER_SECOND
|
|
||||||
value: "{{ .SOLANA_REQUESTS_PER_SECOND }}"
|
|
||||||
- name: TERRA_URL
|
- name: TERRA_URL
|
||||||
valueFrom:
|
valueFrom:
|
||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
|
|
|
@ -23,7 +23,6 @@ OASIS_REQUESTS_PER_SECOND=3
|
||||||
OPTIMISM_REQUESTS_PER_SECOND=3
|
OPTIMISM_REQUESTS_PER_SECOND=3
|
||||||
POLYGON_REQUESTS_PER_SECOND=3
|
POLYGON_REQUESTS_PER_SECOND=3
|
||||||
SEI_REQUESTS_PER_SECOND=3
|
SEI_REQUESTS_PER_SECOND=3
|
||||||
SOLANA_REQUESTS_PER_SECOND=1000
|
|
||||||
SUI_REQUESTS_PER_SECOND=3
|
SUI_REQUESTS_PER_SECOND=3
|
||||||
TERRA_REQUESTS_PER_SECOND=10
|
TERRA_REQUESTS_PER_SECOND=10
|
||||||
ALERT_ENABLED=true
|
ALERT_ENABLED=true
|
|
@ -25,7 +25,6 @@ OASIS_REQUESTS_PER_SECOND=3
|
||||||
OPTIMISM_REQUESTS_PER_SECOND=3
|
OPTIMISM_REQUESTS_PER_SECOND=3
|
||||||
POLYGON_REQUESTS_PER_SECOND=3
|
POLYGON_REQUESTS_PER_SECOND=3
|
||||||
SEI_REQUESTS_PER_SECOND=3
|
SEI_REQUESTS_PER_SECOND=3
|
||||||
SOLANA_REQUESTS_PER_SECOND=5
|
|
||||||
SUI_REQUESTS_PER_SECOND=3
|
SUI_REQUESTS_PER_SECOND=3
|
||||||
TERRA_REQUESTS_PER_SECOND=5
|
TERRA_REQUESTS_PER_SECOND=5
|
||||||
ALERT_ENABLED=false
|
ALERT_ENABLED=false
|
|
@ -22,7 +22,6 @@ MOONBEAM_REQUESTS_PER_SECOND=5
|
||||||
OASIS_REQUESTS_PER_SECOND=3
|
OASIS_REQUESTS_PER_SECOND=3
|
||||||
OPTIMISM_REQUESTS_PER_SECOND=3
|
OPTIMISM_REQUESTS_PER_SECOND=3
|
||||||
POLYGON_REQUESTS_PER_SECOND=3
|
POLYGON_REQUESTS_PER_SECOND=3
|
||||||
SOLANA_REQUESTS_PER_SECOND=500
|
|
||||||
SEI_REQUESTS_PER_SECOND=3
|
SEI_REQUESTS_PER_SECOND=3
|
||||||
SUI_REQUESTS_PER_SECOND=3
|
SUI_REQUESTS_PER_SECOND=3
|
||||||
TERRA_REQUESTS_PER_SECOND=10
|
TERRA_REQUESTS_PER_SECOND=10
|
||||||
|
|
|
@ -25,7 +25,6 @@ OASIS_REQUESTS_PER_SECOND=1
|
||||||
OPTIMISM_REQUESTS_PER_SECOND=1
|
OPTIMISM_REQUESTS_PER_SECOND=1
|
||||||
POLYGON_REQUESTS_PER_SECOND=3
|
POLYGON_REQUESTS_PER_SECOND=3
|
||||||
SEI_REQUESTS_PER_SECOND=3
|
SEI_REQUESTS_PER_SECOND=3
|
||||||
SOLANA_REQUESTS_PER_SECOND=2
|
|
||||||
SUI_REQUESTS_PER_SECOND=3
|
SUI_REQUESTS_PER_SECOND=3
|
||||||
TERRA_REQUESTS_PER_SECOND=5
|
TERRA_REQUESTS_PER_SECOND=5
|
||||||
ALERT_ENABLED=false
|
ALERT_ENABLED=false
|
Loading…
Reference in New Issue