diff --git a/app/components/Root/Root.jsx b/app/components/Root/Root.jsx index b956710f0..edcb7327d 100644 --- a/app/components/Root/Root.jsx +++ b/app/components/Root/Root.jsx @@ -3,6 +3,11 @@ import React from 'react' import { Provider } from 'react-redux' import { HashRouter } from 'react-router-dom' import { WalletConnectContextProvider } from '../../context/WalletConnect/WalletConnectContext' +import { + DEFAULT_APP_METADATA, + DEFAULT_PROJECT_ID, + DEFAULT_RELAY_PROVIDER, +} from '../../core/constants' import IntlWrapper from './IntlWrapper' import Routes from './Routes' @@ -12,25 +17,9 @@ type Props = { } const wcOptions = { - chainIds: ['neo3:testnet', 'neo3:mainnet'], - methods: [ - 'invokeFunction', - 'testInvoke', - 'multiInvoke', - 'multiTestInvoke', - 'signMessage', - 'verifyMessage', - ], - relayServer: 'wss://relay.walletconnect.org', - appMetadata: { - name: 'Neon Wallet', - description: - 'An open source cross-platform light wallet for the NEO blockchain available on Windows, Mac OS, and Linux.', - url: 'https://coz.io/', - icons: [ - 'https://raw.githubusercontent.com/CityOfZion/visual-identity/develop/_CoZ%20Branding/_Logo/_Logo%20icon/_PNG%20200x178px/CoZ_Icon_DARKBLUE_200x178px.png', - ], - }, + appMetadata: DEFAULT_APP_METADATA, + relayServer: DEFAULT_RELAY_PROVIDER, + projectId: DEFAULT_PROJECT_ID, } const Root = ({ store }: Props) => ( diff --git a/app/context/WalletConnect/constants.js b/app/context/WalletConnect/constants.js deleted file mode 100644 index a5691c9d6..000000000 --- a/app/context/WalletConnect/constants.js +++ /dev/null @@ -1,14 +0,0 @@ -export const DEFAULT_RELAY_PROVIDER = 'wss://relay.walletconnect.org' -export const DEFAULT_METHODS = ['invokefunction', 'testInvoke'] -// export const DEFAULT_LOGGER = 'debug' -export const DEFAULT_APP_METADATA = { - name: 'CoZ Wallet Prototype', - description: 'WalletConnect integration Prototype', - url: 'https://coz.io/', - icons: [ - 'https://raw.githubusercontent.com/CityOfZion/visual-identity/develop/_CoZ%20Branding/_Logo/_Logo%20icon/_PNG%20200x178px/CoZ_Icon_DARKBLUE_200x178px.png', - ], -} -export const DEFAULT_CHAIN_ID = 'neo3:testnet' -export const DEFAULT_NEO_RPC_ADDRESS = 'https://testnet1.neo.coz.io:443' -export const DEFAULT_NEO_NETWORK_MAGIC = 877933390 diff --git a/package.json b/package.json index c9f7190dd..53516933c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Neon", - "version": "2.14.0", + "version": "2.14.1", "main": "./main.js", "description": "Light wallet for NEO blockchain", "homepage": "https://github.com/CityOfZion/neon-wallet", diff --git a/yarn.lock b/yarn.lock index e498dbef2..4b9d8a083 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1837,7 +1837,7 @@ resolved "https://registry.yarnpkg.com/@stablelib/wipe/-/wipe-1.0.1.tgz#d21401f1d59ade56a62e139462a97f104ed19a36" integrity sha512-WfqfX/eXGiAd3RJe4VU2snh/ZPwtSjLG4ynQ/vYzvghTh7dHFcI1wl+nrkWG6lGhukOxOsUHfv8dUXr58D0ayg== -"@stablelib/x25519@1.0.2", "@stablelib/x25519@^1.0.2": +"@stablelib/x25519@1.0.2": version "1.0.2" resolved "https://registry.yarnpkg.com/@stablelib/x25519/-/x25519-1.0.2.tgz#ae21e2ab668076ec2eb2b4853b82a27fab045fa1" integrity sha512-wTR0t0Bp1HABLFRbYaE3vFLuco2QbAg6QvxBnzi5j9qjhYezWHW7OiCZyaWbt25UkSaoolUUT4Il0nS/2vcbSw== @@ -1846,6 +1846,15 @@ "@stablelib/random" "^1.0.1" "@stablelib/wipe" "^1.0.1" +"@stablelib/x25519@^1.0.2": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@stablelib/x25519/-/x25519-1.0.3.tgz#13c8174f774ea9f3e5e42213cbf9fc68a3c7b7fd" + integrity sha512-KnTbKmUhPhHavzobclVJQG5kuivH+qDLpe84iRqX3CLrKp881cF160JvXJ+hjn1aMyCwYOKeIZefIH/P5cJoRw== + dependencies: + "@stablelib/keyagreement" "^1.0.1" + "@stablelib/random" "^1.0.2" + "@stablelib/wipe" "^1.0.1" + "@szmarczak/http-timer@^1.1.2": version "1.1.2" resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421" @@ -2255,7 +2264,7 @@ resolved "https://registry.yarnpkg.com/@walletconnect/time/-/time-1.0.1.tgz#645f596887e67c56522edbc2b170d46a97c87ce0" integrity sha512-LtNtHupTNranehLMh8Z/JN6xVySysSoJNjNCQ0ML+hOUkim5QX/VdvfovSpaX9qA2b95u7bIuTcq0O3UBk7Iyw== -"@walletconnect/types@2.0.0-beta.17", "@walletconnect/types@^2.0.0-beta.17": +"@walletconnect/types@2.0.0-beta.17": version "2.0.0-beta.17" resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-2.0.0-beta.17.tgz#9432b01aec32cb1847faea13de0ecc00c4e3c82a" integrity sha512-YQjS9HqQSR6yztTarzeT9+DW5BTnDWBAlWedGGxiEdhuwV56FQJTZKnMjpM1f8yS5j0vBH/mSst65h7jS/65zQ== @@ -2265,7 +2274,7 @@ pino "^6.7.0" pino-pretty "^4.3.0" -"@walletconnect/types@2.0.0-rc.3": +"@walletconnect/types@2.0.0-rc.3", "@walletconnect/types@^2.0.0-beta.17": version "2.0.0-rc.3" resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-2.0.0-rc.3.tgz#fdb8b9d8e2d55e87faaad2723a2a56b4762a2714" integrity sha512-PkzgdBr4tSXQtyGT91P6cdQJ44dCwRRwIW4BDW6tRqsvziPcyt6aQzWYfKQiMl6i2fIMK/8fgr1oDYPcLQLvbA==