From d83c9be4b9c569578f73cc064b62bea43aae661e Mon Sep 17 00:00:00 2001 From: Andrey Bocharnikov Date: Wed, 29 Jan 2025 21:19:15 +0400 Subject: [PATCH] fix(test-functional)_: fix test data --- services/wallet/router/router_test_data.go | 74 +++++++++++++--------- tests-functional/clients/status_backend.py | 13 +++- tests-functional/config.json | 32 ++++++---- 3 files changed, 75 insertions(+), 44 deletions(-) diff --git a/services/wallet/router/router_test_data.go b/services/wallet/router/router_test_data.go index 89c1e39c682..498c44dd52c 100644 --- a/services/wallet/router/router_test_data.go +++ b/services/wallet/router/router_test_data.go @@ -4,6 +4,8 @@ import ( "fmt" "math/big" + "github.com/status-im/status-go/api" + "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" @@ -91,13 +93,15 @@ var ( ) var mainnet = params.Network{ - ChainID: walletCommon.EthereumMainnet, - ChainName: "Mainnet", - DefaultRPCURL: fmt.Sprintf("https://%s.api.status.im/nodefleet/ethereum/mainnet/", stageName), - DefaultFallbackURL: fmt.Sprintf("https://%s.api.status.im/infura/ethereum/mainnet/", stageName), - DefaultFallbackURL2: "https://mainnet.infura.io/v3/", - RPCURL: fmt.Sprintf("https://%s.api.status.im/grove/ethereum/mainnet/", stageName), - FallbackURL: "https://eth-archival.rpc.grove.city/v1/", + ChainID: walletCommon.EthereumMainnet, + ChainName: "Mainnet", + RpcProviders: []params.RpcProvider{ + *params.NewProxyProvider(walletCommon.EthereumMainnet, api.ProxyNodefleet, fmt.Sprintf("https://%s.api.status.im/nodefleet/ethereum/mainnet/", stageName), false), + *params.NewProxyProvider(walletCommon.EthereumMainnet, api.ProxyInfura, fmt.Sprintf("https://%s.api.status.im/infura/ethereum/mainnet/", stageName), false), + *params.NewDirectProvider(walletCommon.EthereumMainnet, api.DirectInfura, "https://mainnet.infura.io/v3/", true), + *params.NewProxyProvider(walletCommon.EthereumMainnet, api.ProxyGrove, fmt.Sprintf("https://%s.api.status.im/grove/ethereum/mainnet/", stageName), false), + *params.NewDirectProvider(walletCommon.EthereumMainnet, api.DirectGrove, "https://eth-archival.rpc.grove.city/v1/", false), + }, BlockExplorerURL: "https://etherscan.io/", IconURL: "network/Network=Ethereum", ChainColor: "#627EEA", @@ -112,13 +116,15 @@ var mainnet = params.Network{ } var optimism = params.Network{ - ChainID: walletCommon.OptimismMainnet, - ChainName: "Optimism", - DefaultRPCURL: fmt.Sprintf("https://%s.api.status.im/nodefleet/optimism/mainnet/", stageName), - DefaultFallbackURL: fmt.Sprintf("https://%s.api.status.im/infura/optimism/mainnet/", stageName), - DefaultFallbackURL2: "https://optimism-mainnet.infura.io/v3/", - RPCURL: fmt.Sprintf("https://%s.api.status.im/grove/optimism/mainnet/", stageName), - FallbackURL: "https://optimism-archival.rpc.grove.city/v1/", + ChainID: walletCommon.OptimismMainnet, + ChainName: "Optimism", + RpcProviders: []params.RpcProvider{ + *params.NewProxyProvider(walletCommon.OptimismMainnet, api.ProxyNodefleet, fmt.Sprintf("https://%s.api.status.im/nodefleet/optimism/mainnet/", stageName), false), + *params.NewProxyProvider(walletCommon.OptimismMainnet, api.ProxyInfura, fmt.Sprintf("https://%s.api.status.im/infura/optimism/mainnet/", stageName), false), + *params.NewDirectProvider(walletCommon.OptimismMainnet, api.DirectInfura, "https://optimism-mainnet.infura.io/v3/", true), + *params.NewProxyProvider(walletCommon.OptimismMainnet, api.ProxyGrove, fmt.Sprintf("https://%s.api.status.im/grove/optimism/mainnet/", stageName), true), + *params.NewDirectProvider(walletCommon.OptimismMainnet, api.DirectGrove, "https://optimism.rpc.grove.city/v1/", false), + }, BlockExplorerURL: "https://optimistic.etherscan.io", IconURL: "network/Network=Optimism", ChainColor: "#E90101", @@ -133,13 +139,16 @@ var optimism = params.Network{ } var arbitrum = params.Network{ - ChainID: walletCommon.ArbitrumMainnet, - ChainName: "Arbitrum", - DefaultRPCURL: fmt.Sprintf("https://%s.api.status.im/nodefleet/arbitrum/mainnet/", stageName), - DefaultFallbackURL: fmt.Sprintf("https://%s.api.status.im/infura/arbitrum/mainnet/", stageName), - DefaultFallbackURL2: "https://arbitrum-mainnet.infura.io/v3/", - RPCURL: fmt.Sprintf("https://%s.api.status.im/grove/arbitrum/mainnet/", stageName), - FallbackURL: "https://arbitrum-one.rpc.grove.city/v1/", + ChainID: walletCommon.ArbitrumMainnet, + ChainName: "Arbitrum", + RpcProviders: []params.RpcProvider{ + *params.NewProxyProvider(walletCommon.ArbitrumMainnet, api.ProxyNodefleet, fmt.Sprintf("https://%s.api.status.im/nodefleet/arbitrum/mainnet/", stageName), false), + *params.NewProxyProvider(walletCommon.ArbitrumMainnet, api.ProxyInfura, fmt.Sprintf("https://%s.api.status.im/infura/arbitrum/mainnet/", stageName), false), + *params.NewDirectProvider(walletCommon.ArbitrumMainnet, api.DirectInfura, "https://arbitrum-mainnet.infura.io/v3/", true), + *params.NewProxyProvider(walletCommon.ArbitrumMainnet, api.ProxyGrove, fmt.Sprintf("https://%s.api.status.im/grove/arbitrum/mainnet/", stageName), true), + *params.NewDirectProvider(walletCommon.ArbitrumMainnet, api.DirectGrove, "https://arbitrum-one.rpc.grove.city/v1/", false), + }, + BlockExplorerURL: "https://arbiscan.io/", IconURL: "network/Network=Arbitrum", ChainColor: "#51D0F0", ShortName: "arb1", @@ -153,13 +162,16 @@ var arbitrum = params.Network{ } var base = params.Network{ - ChainID: walletCommon.BaseMainnet, - ChainName: "Base", - DefaultRPCURL: fmt.Sprintf("https://%s.api.status.im/nodefleet/base/mainnet/", stageName), - DefaultFallbackURL: fmt.Sprintf("https://%s.api.status.im/infura/base/mainnet/", stageName), - DefaultFallbackURL2: "https://base-mainnet.infura.io/v3/", - RPCURL: fmt.Sprintf("https://%s.api.status.im/grove/base/mainnet/", stageName), - FallbackURL: "https://base.rpc.grove.city/v1/", + ChainID: walletCommon.BaseMainnet, + ChainName: "Base", + RpcProviders: []params.RpcProvider{ + *params.NewProxyProvider(walletCommon.BaseMainnet, api.ProxyNodefleet, fmt.Sprintf("https://%s.api.status.im/nodefleet/base/mainnet/", stageName), false), + *params.NewProxyProvider(walletCommon.BaseMainnet, api.ProxyInfura, fmt.Sprintf("https://%s.api.status.im/infura/base/mainnet/", stageName), false), + *params.NewDirectProvider(walletCommon.BaseMainnet, api.DirectInfura, "https://base-mainnet.infura.io/v3/", true), + *params.NewProxyProvider(walletCommon.BaseMainnet, api.ProxyGrove, fmt.Sprintf("https://%s.api.status.im/grove/base/mainnet/", stageName), true), + *params.NewDirectProvider(walletCommon.BaseMainnet, api.DirectGrove, "https://base.rpc.grove.city/v1/", false), + }, + BlockExplorerURL: "https://basescan.org", IconURL: "network/Network=Base", ChainColor: "#0052FF", ShortName: "base", @@ -868,13 +880,13 @@ func getNormalTestParamsList() []normalTestParams { ProcessorName: pathProcessorCommon.ProcessorBridgeHopName, FromChain: &mainnet, ToChain: &arbitrum, - ApprovalRequired: false, + ApprovalRequired: true, }, { ProcessorName: pathProcessorCommon.ProcessorBridgeHopName, FromChain: &arbitrum, ToChain: &mainnet, - ApprovalRequired: false, + ApprovalRequired: true, }, }, }, @@ -913,7 +925,7 @@ func getNormalTestParamsList() []normalTestParams { ProcessorName: pathProcessorCommon.ProcessorBridgeHopName, FromChain: &arbitrum, ToChain: &mainnet, - ApprovalRequired: false, + ApprovalRequired: true, }, }, }, diff --git a/tests-functional/clients/status_backend.py b/tests-functional/clients/status_backend.py index cd026c631d0..755e6759c5f 100644 --- a/tests-functional/clients/status_backend.py +++ b/tests-functional/clients/status_backend.py @@ -237,8 +237,17 @@ def restore_account_and_login( { "ChainID": network_id, "ChainName": "Anvil", - "DefaultRPCURL": "http://anvil:8545", - "RPCURL": "http://anvil:8545", + "RpcProviders": [ + { + "chainId": network_id, + "name": "Anvil Direct", + "url": "http://anvil:8545", + "enableRpsLimiter": False, + "type": "embedded-direct", + "enabled": True, + "authType": "no-auth", + } + ], "ShortName": "eth", "NativeCurrencyName": "Ether", "NativeCurrencySymbol": "ETH", diff --git a/tests-functional/config.json b/tests-functional/config.json index 4daa09ea98d..d5db59cc9b4 100644 --- a/tests-functional/config.json +++ b/tests-functional/config.json @@ -17,16 +17,26 @@ }, "Networks": [ { - "ChainID": 31337, - "ChainName": "Anvil", - "RPCURL": "http://anvil:8545", - "ShortName": "eth", - "NativeCurrencyName": "Ether", - "NativeCurrencySymbol": "ETH", - "NativeCurrencyDecimals": 18, - "IsTest": false, - "Layer": 1, - "Enabled": true - } + "ChainID": 31337, + "ChainName": "Anvil", + "RpcProviders": [ + { + "ChainID": 31337, + "Name": "Local Anvil", + "URL": "http://anvil:8545", + "EnableRPSLimiter": true, + "Type": "embedded-direct", + "Enabled": true, + "AuthType": "no-auth" + } + ], + "ShortName": "eth", + "NativeCurrencyName": "Ether", + "NativeCurrencySymbol": "ETH", + "NativeCurrencyDecimals": 18, + "IsTest": false, + "Layer": 1, + "Enabled": true, + } ] }