status-im
/
status-go
mirror of https://github.com/status-im/status-go.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: allow to update rpc urls 

* in all cases update the original urls in case they changed with a new
  api key
* Update current urls only if the current one is the same as the
  previous original one and the original one did change
This commit is contained in:
Anthony Laibe 2024-01-16 14:47:57 +01:00 committed by Anthony Laibe
parent 1924828f8d
commit 3af8cfc054
1 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
rpc/network/network.go
View File

@ -130,13 +130,8 @@ func (nm *Manager) Init(networks []params.Network) error {
// Add new networks and update related chain id for the old ones // Add new networks and update related chain id for the old ones
for i := range networks { for i := range networks {
found := false found := false
// Update original urls if they are empty
if networks[i].OriginalRPCURL == "" {
networks[i].OriginalRPCURL = networks[i].RPCURL networks[i].OriginalRPCURL = networks[i].RPCURL
}
if networks[i].OriginalFallbackURL == "" {
networks[i].OriginalFallbackURL = networks[i].FallbackURL networks[i].OriginalFallbackURL = networks[i].FallbackURL
}
for j := range currentNetworks { for j := range currentNetworks {
if currentNetworks[j].ChainID == networks[i].ChainID { if currentNetworks[j].ChainID == networks[i].ChainID {
@ -148,7 +143,22 @@ func (nm *Manager) Init(networks []params.Network) error {
errors += fmt.Sprintf("error updating network fallback_url for ChainID: %d, %s", currentNetworks[j].ChainID, err.Error()) errors += fmt.Sprintf("error updating network fallback_url for ChainID: %d, %s", currentNetworks[j].ChainID, err.Error())
} }
} }
err := nm.UpdateRPCURLs(currentNetworks[j].ChainID, networks[i].RPCURL, networks[i].OriginalRPCURL, networks[i].FallbackURL, networks[i].OriginalFallbackURL)
if networks[i].OriginalRPCURL != currentNetworks[j].OriginalRPCURL && currentNetworks[j].RPCURL == currentNetworks[j].OriginalRPCURL {
err := nm.updateRPCURL(networks[i].ChainID, networks[i].OriginalRPCURL)
if err != nil {
errors += fmt.Sprintf("error updating rpc url for ChainID: %d, %s", currentNetworks[j].ChainID, err.Error())
}
}
if networks[i].OriginalFallbackURL != currentNetworks[j].OriginalFallbackURL && currentNetworks[j].FallbackURL == currentNetworks[j].OriginalFallbackURL {
err := nm.updateFallbackURL(networks[i].ChainID, networks[i].OriginalFallbackURL)
if err != nil {
errors += fmt.Sprintf("error updating rpc url for ChainID: %d, %s", currentNetworks[j].ChainID, err.Error())
}
}
err := nm.updateOriginalURLs(networks[i].ChainID, networks[i].OriginalRPCURL, networks[i].OriginalFallbackURL)
if err != nil { if err != nil {
errors += fmt.Sprintf("error updating network original url for ChainID: %d, %s", currentNetworks[j].ChainID, err.Error()) errors += fmt.Sprintf("error updating network original url for ChainID: %d, %s", currentNetworks[j].ChainID, err.Error())
} }
@ -193,9 +203,18 @@ func (nm *Manager) UpdateRelatedChainID(chainID uint64, relatedChainID uint64) e
return err return err
} }
func (nm *Manager) UpdateRPCURLs(chainID uint64, rpcURL, originalRPCURL, fallbackURL, originalFallbackURL string) error { func (nm *Manager) updateRPCURL(chainID uint64, rpcURL string) error {
_, err := nm.db.Exec(`UPDATE networks SET rpc_url = ?, original_rpc_url = ?, fallback_url = ?, original_fallback_url = ? WHERE chain_id = ?`, _, err := nm.db.Exec(`UPDATE networks SET rpc_url = ? WHERE chain_id = ?`, rpcURL, chainID)
rpcURL, originalRPCURL, fallbackURL, originalFallbackURL, chainID) return err
}
func (nm *Manager) updateFallbackURL(chainID uint64, fallbackURL string) error {
_, err := nm.db.Exec(`UPDATE networks SET fallback_url = ? WHERE chain_id = ?`, fallbackURL, chainID)
return err
}
func (nm *Manager) updateOriginalURLs(chainID uint64, originalRPCURL, OriginalFallbackURL string) error {
_, err := nm.db.Exec(`UPDATE networks SET original_rpc_url = ?, original_fallback_url = ? WHERE chain_id = ?`, originalRPCURL, OriginalFallbackURL, chainID)
return err return err
} }