From 70b2cab096af313ae6017d4ca9554574d440eb7a Mon Sep 17 00:00:00 2001 From: Stefan Date: Thu, 11 Jan 2024 09:48:40 -0600 Subject: [PATCH] chore(wallet) rename pokt urls to grove in config and tests Change tests to account for new urls Updates status-desktop #13189 --- api/create_account_and_login_test.go | 6 +++--- api/default_networks.go | 12 ++++++------ api/default_networks_test.go | 2 +- server/pairing/sync_device_test.go | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/api/create_account_and_login_test.go b/api/create_account_and_login_test.go index 381bdfc36..a8eb3214d 100644 --- a/api/create_account_and_login_test.go +++ b/api/create_account_and_login_test.go @@ -17,7 +17,7 @@ func TestCreateAccountAndLogin(t *testing.T) { requestJSONTemplateString := ` { - "upstreamConfig":"https://eth-archival.gateway.pokt.network/v1/lb/3ef2018191814b7e1009b8d9", + "upstreamConfig":"https://eth-archival.rpc.grove.city/v1/3ef2018191814b7e1009b8d9", "openseaAPIKey":"", "wakuV2Nameserver":"1.1.1.1", "mnemonic":null, @@ -31,9 +31,9 @@ func TestCreateAccountAndLogin(t *testing.T) { "customizationColor":"blue", "emoji": "some", "previewPrivacy":true, - "verifyTransactionURL":"https://eth-archival.gateway.pokt.network/v1/lb/3ef2018191814b7e1009b8d9", + "verifyTransactionURL":"https://eth-archival.rpc.grove.city/v1/3ef2018191814b7e1009b8d9", "imagePath":null, - "verifyENSURL":"https://eth-archival.gateway.pokt.network/v1/lb/3ef2018191814b7e1009b8d9", + "verifyENSURL":"https://eth-archival.rpc.grove.city/v1/3ef2018191814b7e1009b8d9", "logLevel":"INFO", "logFilePath":"%s", "networkId":1 diff --git a/api/default_networks.go b/api/default_networks.go index 90067ab63..46c81f199 100644 --- a/api/default_networks.go +++ b/api/default_networks.go @@ -27,7 +27,7 @@ var ganacheTokenAddress = common.HexToAddress("0x8571Ddc46b10d31EF963aF49b6C7799 var mainnet = params.Network{ ChainID: mainnetChainID, ChainName: "Ethereum Mainnet", - RPCURL: "https://eth-archival.gateway.pokt.network/v1/lb/", + RPCURL: "https://eth-archival.rpc.grove.city/v1/", FallbackURL: "https://mainnet.infura.io/v3/", BlockExplorerURL: "https://etherscan.io/", IconURL: "network/Network=Ethereum", @@ -45,7 +45,7 @@ var mainnet = params.Network{ var goerli = params.Network{ ChainID: goerliChainID, ChainName: "Ethereum Mainnet", - RPCURL: "https://goerli-archival.gateway.pokt.network/v1/lb/", + RPCURL: "https://goerli-archival.rpc.grove.city/v1/", FallbackURL: "https://goerli.infura.io/v3/", BlockExplorerURL: "https://goerli.etherscan.io/", IconURL: "network/Network=Testnet", @@ -63,7 +63,7 @@ var goerli = params.Network{ var optimism = params.Network{ ChainID: optimismChainID, ChainName: "Optimism", - RPCURL: "https://optimism-mainnet.gateway.pokt.network/v1/lb/", + RPCURL: "https://optimism-mainnet.rpc.grove.city/v1/", FallbackURL: "https://optimism-mainnet.infura.io/v3/", BlockExplorerURL: "https://optimistic.etherscan.io", IconURL: "network/Network=Optimism", @@ -98,7 +98,7 @@ var optimismGoerli = params.Network{ var arbitrum = params.Network{ ChainID: arbitrumChainID, ChainName: "Arbitrum", - RPCURL: "https://arbitrum-one.gateway.pokt.network/v1/lb/", + RPCURL: "https://arbitrum-one.rpc.grove.city/v1/", FallbackURL: "https://arbitrum-mainnet.infura.io/v3/", BlockExplorerURL: "https://arbiscan.io/", IconURL: "network/Network=Arbitrum", @@ -166,10 +166,10 @@ func setRPCs(networks []params.Network, request *requests.WalletSecretsConfig) [ } if request.PoktToken != "" { - if strings.Contains(n.RPCURL, "pokt") { + if strings.Contains(n.RPCURL, "grove") { n.RPCURL += request.PoktToken } - if strings.Contains(n.FallbackURL, "pokt") { + if strings.Contains(n.FallbackURL, "grove") { n.FallbackURL += request.PoktToken } diff --git a/api/default_networks_test.go b/api/default_networks_test.go index 371f6fcb0..bc7e38299 100644 --- a/api/default_networks_test.go +++ b/api/default_networks_test.go @@ -10,7 +10,7 @@ import ( ) func TestBuildDefaultNetworks(t *testing.T) { - poktToken := "poket-token" + poktToken := "grove-token" infuraToken := "infura-token" request := &requests.CreateAccount{ WalletSecretsConfig: requests.WalletSecretsConfig{ diff --git a/server/pairing/sync_device_test.go b/server/pairing/sync_device_test.go index 741f8f2a1..750034d6f 100644 --- a/server/pairing/sync_device_test.go +++ b/server/pairing/sync_device_test.go @@ -629,7 +629,7 @@ func defaultSettings(generatedAccountInfo generator.GeneratedAccountInfo, derive visibleTokenJSONRaw := json.RawMessage(visibleTokensJSON) syncSettings.WalletVisibleTokens = &visibleTokenJSONRaw - networks := `[{"id":"goerli_rpc","chain-explorer-link":"https://goerli.etherscan.io/address/","name":"Goerli with upstream RPC","config":{"NetworkId":5,"DataDir":"/ethereum/goerli_rpc","UpstreamConfig":{"Enabled":true,"URL":"https://goerli-archival.gateway.pokt.network/v1/lb/3ef2018191814b7e1009b8d9"}}},{"id":"mainnet_rpc","chain-explorer-link":"https://etherscan.io/address/","name":"Mainnet with upstream RPC","config":{"NetworkId":1,"DataDir":"/ethereum/mainnet_rpc","UpstreamConfig":{"Enabled":true,"URL":"https://eth-archival.gateway.pokt.network/v1/lb/3ef2018191814b7e1009b8d9"}}}]` + networks := `[{"id":"goerli_rpc","chain-explorer-link":"https://goerli.etherscan.io/address/","name":"Goerli with upstream RPC","config":{"NetworkId":5,"DataDir":"/ethereum/goerli_rpc","UpstreamConfig":{"Enabled":true,"URL":"https://goerli-archival.rpc.grove.city/v1/3ef2018191814b7e1009b8d9"}}},{"id":"mainnet_rpc","chain-explorer-link":"https://etherscan.io/address/","name":"Mainnet with upstream RPC","config":{"NetworkId":1,"DataDir":"/ethereum/mainnet_rpc","UpstreamConfig":{"Enabled":true,"URL":"https://eth-archival.rpc.grove.city/v1/3ef2018191814b7e1009b8d9"}}}]` var networksRawMessage json.RawMessage = []byte(networks) syncSettings.Networks = &networksRawMessage syncSettings.CurrentNetwork = currentNetwork