From 25fd297573b504d98925823880a1f9394654226b Mon Sep 17 00:00:00 2001 From: Andrey Shovkoplyas Date: Fri, 7 Feb 2020 09:39:51 +0100 Subject: [PATCH] fixes ENS to new registry for verification Signed-off-by: Andrey Shovkoplyas --- src/status_im/constants.cljs | 4 +++- src/status_im/node/core.cljs | 27 ++++++++++++++------------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/status_im/constants.cljs b/src/status_im/constants.cljs index 997f07bac7..1a55f2e79d 100644 --- a/src/status_im/constants.cljs +++ b/src/status_im/constants.cljs @@ -43,6 +43,8 @@ (def system "system") +(def mainnet-rpc-url "https://mainnet.infura.io/v3/f315575765b14720b32382a61a89341a") + (def mainnet-networks [{:id "mainnet_rpc", :etherscan-link "https://etherscan.io/address/", @@ -50,7 +52,7 @@ :config {:NetworkId (ethereum/chain-keyword->chain-id :mainnet) :DataDir "/ethereum/mainnet_rpc" :UpstreamConfig {:Enabled true - :URL "https://mainnet.infura.io/v3/f315575765b14720b32382a61a89341a"}}}]) + :URL mainnet-rpc-url}}}]) (def sidechain-networks [{:id "xdai_rpc", diff --git a/src/status_im/node/core.cljs b/src/status_im/node/core.cljs index 10a96f847e..1f891f1237 100644 --- a/src/status_im/node/core.cljs +++ b/src/status_im/node/core.cljs @@ -7,7 +7,8 @@ [status-im.utils.fx :as fx] [status-im.utils.platform :as utils.platform] [status-im.utils.types :as types] - [taoensso.timbre :as log]) + [taoensso.timbre :as log] + [status-im.ethereum.ens :as ens]) (:require-macros [status-im.utils.slurp :refer [slurp]])) (defn- add-custom-bootnodes [config network all-bootnodes] @@ -121,20 +122,20 @@ :PermissionsConfig {:Enabled true} :MailserversConfig {:Enabled true} :EnableNTPSync true - :WhisperConfig {:Enabled true - :LightClient true - :MinimumPoW 0.001} + :WhisperConfig {:Enabled true + :LightClient true + :MinimumPoW 0.001} :ShhextConfig - {:BackupDisabledDataDir (utils.platform/no-backup-directory) - :InstallationID installation-id + {:BackupDisabledDataDir (utils.platform/no-backup-directory) + :InstallationID installation-id :MaxMessageDeliveryAttempts config/max-message-delivery-attempts - :MailServerConfirmations config/mailserver-confirmations-enabled? - :VerifyTransactionURL "https://mainnet.infura.io/v3/f315575765b14720b32382a61a89341a" - :VerifyENSURL "https://mainnet.infura.io/v3/f315575765b14720b32382a61a89341a" - :VerifyENSContractAddress "0x314159265dd8dbb310642f98f50c066173c1259b" - :VerifyTransactionChainID 1 - :DataSyncEnabled true - :PFSEnabled true} + :MailServerConfirmations config/mailserver-confirmations-enabled? + :VerifyTransactionURL constants/mainnet-rpc-url + :VerifyENSURL constants/mainnet-rpc-url + :VerifyENSContractAddress (:mainnet ens/ens-registries) + :VerifyTransactionChainID 1 + :DataSyncEnabled true + :PFSEnabled true} :RequireTopics (get-topics current-network) :StatusAccountsConfig {:Enabled true})