status-im/status-go
2
0
Fork 0
mirror of https://github.com/status-im/status-go.git synced 2025-02-16 08:50:09 +00:00
Code Issues Projects Releases Wiki Activity

fix: set is connected for chain without fallback

Browse Source
This commit is contained in:
Anthony Laibe 2023-03-28 12:50:01 +02:00 committed by Anthony Laibe
parent ec5449c2bd
commit c9a8ab13c2
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rpc/chain/client.go
View File

@ -133,7 +133,7 @@ func (c *ClientWithFallback) setIsConnected(value bool) {
c.LastCheckedAt = time.Now().Unix() c.LastCheckedAt = time.Now().Unix()
if !value { if !value {
c.consecutiveFailureCount += 1 c.consecutiveFailureCount += 1
if c.consecutiveFailureCount > 3 && c.IsConnected { if c.consecutiveFailureCount > 1 && c.IsConnected {
if c.WalletNotifier != nil { if c.WalletNotifier != nil {
c.WalletNotifier(c.ChainID, "down") c.WalletNotifier(c.ChainID, "down")
} }
@ -169,15 +169,19 @@ func (c *ClientWithFallback) makeCallNoReturn(main func() error, fallback func()
return nil return nil
}, func(err error) error { }, func(err error) error {
if c.fallback == nil { if c.fallback == nil {
c.setIsConnected(false)
return err return err
} }
err = fallback() err = fallback()
if err != nil { if err != nil {
<<<<<<< HEAD
if isVMError(err) { if isVMError(err) {
resultChan <- CommandResult{vmError: err} resultChan <- CommandResult{vmError: err}
return nil return nil
} }
=======
>>>>>>> fdaa1ce1b (fix: set is connected for chain without fallback)
c.setIsConnected(false) c.setIsConnected(false)
return err return err
} }
@ -214,6 +218,7 @@ func (c *ClientWithFallback) makeCallSingleReturn(main func() (any, error), fall
return nil return nil
}, func(err error) error { }, func(err error) error {
if c.fallback == nil { if c.fallback == nil {
c.setIsConnected(false)
return err return err
} }
@ -263,6 +268,7 @@ func (c *ClientWithFallback) makeCallDoubleReturn(main func() (any, any, error),
return nil return nil
}, func(err error) error { }, func(err error) error {
if c.fallback == nil { if c.fallback == nil {
c.setIsConnected(false)
return err return err
} }

13
services/wallet/thirdparty/opensea/client.go vendored
View File

@ -27,22 +27,9 @@ const (
const AssetLimit = 200 const AssetLimit = 200
const CollectionLimit = 300 const CollectionLimit = 300
<<<<<<< HEAD
const RequestTimeout = 5 * time.Second const RequestTimeout = 5 * time.Second
const GetRequestRetryMaxCount = 15 const GetRequestRetryMaxCount = 15
const GetRequestWaitTime = 300 * time.Millisecond const GetRequestWaitTime = 300 * time.Millisecond
=======
const RequestRetryMaxCount = 1
const RequestWaitTime = 300 * time.Millisecond
var OpenseaClientInstances = make(map[uint64]*Client)
var BaseURLs = map[uint64]string{
1: "https://api.opensea.io/api/v1",
4: "https://rinkeby-api.opensea.io/api/v1",
5: "https://testnets-api.opensea.io/api/v1",
}
>>>>>>> 6173eabe7 (feat: add error on get wallet token)
const ChainIDRequiringAPIKey = 1 const ChainIDRequiringAPIKey = 1