diff --git a/Jenkinsfile b/Jenkinsfile index 0de720210..f576abf81 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -32,9 +32,9 @@ def fail(reason) { /* comment out the next line to allow concurrent builds on the same branch */ properties([disableConcurrentBuilds(), pipelineTriggers([])]) -node('lisk-nano') { +node('lwf-nano') { try { - stage ('Checkout and Start Lisk Core') { + stage ('Checkout and Start LWF Core') { try { deleteDir() checkout scm @@ -68,7 +68,7 @@ node('lisk-nano') { ''' } catch (err) { echo "Error: ${err}" - fail('Stopping build: Lisk Core failed to start') + fail('Stopping build: LWF Core failed to start') } } @@ -136,7 +136,7 @@ node('lisk-nano') { stage ('Run E2E Tests') { try { ansiColor('xterm') { - withCredentials([string(credentialsId: 'lisk-nano-testnet-passphrase', variable: 'TESTNET_PASSPHRASE')]) { + withCredentials([string(credentialsId: 'lwf-nano-testnet-passphrase', variable: 'TESTNET_PASSPHRASE')]) { sh ''' N=${EXECUTOR_NUMBER:-0}; N=$((N+1)) @@ -146,9 +146,17 @@ node('lisk-nano') { # Run end-to-end tests - npm run --silent e2e-test -- --params.baseURL file://$WORKSPACE/app/build/index.html --params.liskCoreURL https://testnet.lisk.io --cucumberOpts.tags @testnet --params.useTestnetPassphrase true - npm run --silent e2e-test -- --params.baseURL file://$WORKSPACE/app/build/index.html --params.liskCoreURL http://127.0.0.1:400$N --cucumberOpts.tags @testnet --params.useTestnetPassphrase true --params.network testnet + if [ -z $CHANGE_BRANCH ]; then + npm run --silent e2e-test -- --params.baseURL file://$WORKSPACE/app/build/index.html --params.liskCoreURL https://testnet.lisk.io --cucumberOpts.tags @testnet --params.useTestnetPassphrase true + else + echo "Skipping @testnet end-to-end tests because we're not on 'development' branch" + fi npm run --silent e2e-test -- --params.baseURL file://$WORKSPACE/app/build/index.html --params.liskCoreURL http://127.0.0.1:400$N + if [ -z $CHANGE_BRANCH ]; then + npm run --silent e2e-test -- --params.baseURL file://$WORKSPACE/app/build/index.html --cucumberOpts.tags @testnet --params.useTestnetPassphrase true --params.network testnet + else + echo "Skipping @testnet end-to-end tests because we're not on 'development' branch" + fi ''' } } diff --git a/README.md b/README.md index 32f6be8f7..abb7e0001 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,10 @@ -# Lisk Nano - -[![Build Status](https://jenkins.lisk.io/buildStatus/icon?job=lisk-nano/development)](https://jenkins.lisk.io/job/lisk-nano/job/development) -[![Coverage Status](https://coveralls.io/repos/github/LiskHQ/lisk-nano/badge.svg?branch=development)](https://coveralls.io/github/LiskHQ/lisk-nano?branch=development) -[![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](http://www.gnu.org/licenses/gpl-3.0) -[![Join the chat at https://gitter.im/LiskHQ/lisk](https://badges.gitter.im/LiskHQ/lisk.svg)](https://gitter.im/LiskHQ/lisk?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) -[![devDependencies Status](https://david-dm.org/liskHQ/lisk-nano/dev-status.svg)](https://david-dm.org/liskHQ/lisk-nano?type=dev) +# LWF-Nano ## Development ``` -git clone https://github.com/LiskHQ/lisk-nano.git -cd lisk-nano +git clone https://github.com/lwfcoin/lwf-nano.git +cd lwf-nano npm install npm run dev ``` @@ -38,7 +32,7 @@ npm run build ### Start -Start the Electron client. Before staring you need to make sure the application is built. If you need to built the entire application, run +Start the Electron client. Before starting you need to make sure the application is built. If you need to built the entire application, run ``` npm run build @@ -80,57 +74,6 @@ Build package for Linux (on Linux). npm run pack ``` -## Run unit tests - -### Single run -``` -npm run test -``` - -### Run each time a file changes -``` -npm run test-live -``` - -## Run end-to-end tests - -### Setup - -Setup protractor - -``` -./node_modules/protractor/bin/webdriver-manager update -``` - -Setup a lisk test node to run on localhost:4000 as described in https://github.com/LiskHQ/lisk#tests - -And run it with [pm2](http://pm2.keymetrics.io/). - -### Run - -Start the development version of lisk-nano: - -``` -npm run dev -``` - -Run the protractor tests (replace `~/git/lisk/` with your path to lisk core): - -``` -./e2e-test-setup.sh ~/git/lisk/ -npm run e2e-test -``` - -## Launch React Storybook - -To launch storybook sandbox with components run -``` -npm run storybook -``` -and go to - -http://localhost:6006/ - ## Authors @@ -144,18 +87,21 @@ http://localhost:6006/ ## License +Copyright © 2017-2018 LWF +Copyright © 2017-2018 Oxycoin Copyright © 2016-2017 Lisk Foundation This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -You should have received a copy of the [GNU General Public License](https://github.com/LiskHQ/lisk-nano/tree/master/LICENSE) along with this program. If not, see . +You should have received a copy of the [GNU General Public License](https://github.com/lwfcoin/lwf-nano/tree/master/LICENSE) along with this program. If not, see . *** This program also incorporates work previously released with lisk-nano `0.1.2` (and earlier) versions under the [MIT License](https://opensource.org/licenses/MIT). To comply with the requirements of that license, the following permission notice, applicable to those parts of the code only, is included below: +Copyright © 2017-2018 Oxycoin Copyright © 2016-2017 Lisk Foundation Copyright © 2015 Crypti diff --git a/app/assets/lisk.icns b/app/assets/lisk.icns deleted file mode 100644 index 227caf4de..000000000 Binary files a/app/assets/lisk.icns and /dev/null differ diff --git a/app/assets/lisk.ico b/app/assets/lisk.ico deleted file mode 100644 index 2a1510585..000000000 Binary files a/app/assets/lisk.ico and /dev/null differ diff --git a/app/assets/lisk.png b/app/assets/lisk.png deleted file mode 100644 index f8d409982..000000000 Binary files a/app/assets/lisk.png and /dev/null differ diff --git a/app/assets/lwf.icns b/app/assets/lwf.icns new file mode 100644 index 000000000..5ad2bf09a Binary files /dev/null and b/app/assets/lwf.icns differ diff --git a/app/assets/lwf.ico b/app/assets/lwf.ico new file mode 100644 index 000000000..d03ee0057 Binary files /dev/null and b/app/assets/lwf.ico differ diff --git a/app/assets/lwf.png b/app/assets/lwf.png new file mode 100644 index 000000000..204bb7d04 Binary files /dev/null and b/app/assets/lwf.png differ diff --git a/app/dev-app-update.yml b/app/dev-app-update.yml index 9cebd3fbb..8974e552d 100644 --- a/app/dev-app-update.yml +++ b/app/dev-app-update.yml @@ -1,3 +1,3 @@ -owner: LiskHQ -repo: lisk-nano +owner: lwfcoin +repo: lwf-nano provider: github diff --git a/app/package.json b/app/package.json index 58c2ed2ae..569db9f1a 100644 --- a/app/package.json +++ b/app/package.json @@ -1,10 +1,10 @@ { - "name": "lisk-nano", - "version": "1.3.0", - "description": "Lisk Nano", + "name": "lwf-nano", + "version": "1.3.1", + "description": "LWF Nano", "main": "./build/main.js", - "author":{ - "name": "Lisk Foundation", - "email": "admin@lisk.io" + "author": { + "name": "LWF Logistics S.a.r.l-s", + "email": "info@lwf.io" } } diff --git a/app/src/main.js b/app/src/main.js index 8c040e93b..84d244538 100644 --- a/app/src/main.js +++ b/app/src/main.js @@ -23,8 +23,8 @@ app.on('window-all-closed', () => { // This will override the values defined in the app’s .plist file (macOS) if (process.platform === 'darwin') { - const copyright = `Copyright © 2016 - ${new Date().getFullYear()} Lisk Foundation`; - app.setAboutPanelOptions({ applicationName: 'Lisk Nano', copyright }); + const copyright = `Copyright © 2017 - ${new Date().getFullYear()} LWF Logistics S.a.r.l-s`; + app.setAboutPanelOptions({ applicationName: 'LWF Nano', copyright }); } app.on('activate', () => { diff --git a/app/src/menu.js b/app/src/menu.js index 685e83cd3..ab75dcad0 100644 --- a/app/src/menu.js +++ b/app/src/menu.js @@ -17,15 +17,15 @@ const addAboutMenuForMac = ({ template, name }) => { }; const addAboutMenuForNonMac = ({ template, electron }) => { - const copyright = `Copyright © 2016 - ${new Date().getFullYear()} Lisk Foundation`; + const copyright = `Copyright © 2017 - ${new Date().getFullYear()} LWF Logistics S.a.r.l-s`; template[template.length - 1].submenu.push({ label: i18n.t('About'), click(item, focusedWindow) { if (focusedWindow) { const options = { buttons: ['OK'], - icon: `${__dirname}/assets/images/LISK.png`, - message: `${i18n.t('Lisk Nano')}\n${i18n.t('Version')} ${electron.app.getVersion()}\n${copyright}`, + icon: `${__dirname}/assets/images/LWF.png`, + message: `${i18n.t('LWF Nano')}\n${i18n.t('Version')} ${electron.app.getVersion()}\n${copyright}`, }; electron.dialog.showMessageBox(focusedWindow, options, () => {}); } @@ -116,31 +116,31 @@ const menu = { label: i18n.t('Help'), submenu: [ { - label: i18n.t('Lisk Website'), - click: menu.onClickLink.bind(null, electron, 'https://lisk.io'), + label: i18n.t('LWF Website'), + click: menu.onClickLink.bind(null, electron, 'https://lwf.io'), }, { - label: i18n.t('Lisk Chat'), - click: menu.onClickLink.bind(null, electron, 'https://lisk.chat'), + label: i18n.t('LWF Chat'), + click: menu.onClickLink.bind(null, electron, 'https://lwfcoin.slack.com'), }, { - label: i18n.t('Lisk Explorer'), - click: menu.onClickLink.bind(null, electron, 'https://explorer.lisk.io'), + label: i18n.t('LWF Explorer'), + click: menu.onClickLink.bind(null, electron, 'https://explorer.lwf.io'), }, { - label: i18n.t('Lisk Forum'), - click: menu.onClickLink.bind(null, electron, 'https://forum.lisk.io'), + label: i18n.t('LWF Forum'), + click: menu.onClickLink.bind(null, electron, 'https://lwfcoin.slack.com'), }, { type: 'separator', }, { label: i18n.t('Report Issue...'), - click: menu.onClickLink.bind(null, electron, 'https://lisk.zendesk.com/hc/en-us/requests/new'), + click: menu.onClickLink.bind(null, electron, 'https://github.com/lwfcoin/lwf-nano/issues'), }, { label: i18n.t('What\'s New...'), - click: menu.onClickLink.bind(null, electron, 'https://github.com/LiskHQ/lisk-nano/releases'), + click: menu.onClickLink.bind(null, electron, 'https://github.com/lwfcoin/lwf-nano/releases'), }, ], }, diff --git a/app/src/menu.test.js b/app/src/menu.test.js index 4ab00904d..e0090323f 100644 --- a/app/src/menu.test.js +++ b/app/src/menu.test.js @@ -12,14 +12,14 @@ describe('MenuBuilder', () => { setApplicationMenu: spy(), buildFromTemplate: template => (template), }, - app: { getName: () => ('Lisk Nano'), getVersion: () => ('some version') }, + app: { getName: () => ('LWF Nano'), getVersion: () => ('some version') }, }; }); it('Builds the electron about menu when os is mac', () => { process.platform = 'darwin'; const template = menu.build(electron); - expect(template[0].label).to.equal('Lisk Nano'); + expect(template[0].label).to.equal('LWF Nano'); expect(template[0].submenu[0].role).to.equal('about'); expect(template[0].submenu[0].label).to.equal('About'); expect(template[0].submenu[1].role).to.equal('quit'); @@ -37,11 +37,11 @@ describe('MenuBuilder', () => { expect(submenu[submenu.length - 1].label).to.equal('About'); // make sure the mac about menu was not added - expect(template[0].label).to.not.equal('Lisk Nano'); + expect(template[0].label).to.not.equal('LWF Nano'); }); it('Should open link on click', () => { - menu.onClickLink(electron, 'https://lisk.io'); - expect(electron.shell.openExternal).to.have.been.calledWith('https://lisk.io'); + menu.onClickLink(electron, 'https://lwf.io'); + expect(electron.shell.openExternal).to.have.been.calledWith('https://lwf.io'); }); }); diff --git a/app/src/modules/win.test.js b/app/src/modules/win.test.js index d8c797ac9..b38e096a0 100644 --- a/app/src/modules/win.test.js +++ b/app/src/modules/win.test.js @@ -113,7 +113,7 @@ describe('Electron Browser Window Wrapper', () => { buildFromTemplate: () => (electron.Menu), popup: spy(), }, - app: { getName: () => ('Lisk Nano'), getVersion: () => ('some version') }, + app: { getName: () => ('LWF Nano'), getVersion: () => ('some version') }, }; afterEach(() => { diff --git a/build/icon.icns b/build/icon.icns index 227caf4de..5ad2bf09a 100644 Binary files a/build/icon.icns and b/build/icon.icns differ diff --git a/build/icon.ico b/build/icon.ico index 2a1510585..e0b2ba4ac 100644 Binary files a/build/icon.ico and b/build/icon.ico differ diff --git a/i18n/locales/de/common.json b/i18n/locales/de/common.json index 24354f1f6..110550f98 100644 --- a/i18n/locales/de/common.json +++ b/i18n/locales/de/common.json @@ -1,5 +1,5 @@ { - " Make sure that you are using the latest version of Lisk Nano.": "Stelle sicher, dass du die neuste Version von Lisk Nano benutzt.", + " Make sure that you are using the latest version of LWF Nano.": "Stelle sicher, dass du die neuste Version von LWF Nano benutzt.", "Vote_noun": "Abstimmung", "Vote_verb": "Abstimmen", "About": "Über", @@ -48,29 +48,29 @@ "Failed to connect to node {{address}}": "Verbindung zum Node {{address}} fehlgeschlagen", "Failed to connect: Node {{address}} is not active": "Verbindung fehlgeschlagen: Node {{address}} ist nicht aktiv", "Fee": "Gebühr", - "Fee: {{amount}} LSK": "Gebühr: {{amount}} LSK", - "Fee: {{fee}} LSK": "Gebühr: {{fee}} LSK", + "Fee: {{amount}} LWF": "Gebühr: {{amount}} LWF", + "Fee: {{fee}} LWF": "Gebühr: {{fee}} LWF", "Forget": "Vergessen", "Forging": "Forging", "From / To": "Von / An", "Help": "Hilfe", "Hide passphrase": "Passphrase ausblenden", "Insufficient funds": "Nicht genügend Guthaben", - "Insufficient funds for {{amount}} LSK fee": "Nicht genügend Guthaben für {{amount}} LSK Gebühren", + "Insufficient funds for {{amount}} LWF fee": "Nicht genügend Guthaben für {{amount}} LWF Gebühren", "Invalid": "Ungültig", - "LSK Earned": "LSK verdient", - "LSK received": "LSK erhalten", + "LWF Earned": "LWF verdient", + "LWF received": "LWF erhalten", "Language": "Sprache", "Last 24 hours": "Die letzten 24 Stunden", "Last {{count}} days": "Letzter {{count}} Tag", "Last {{count}} days_plural": "Die letzten {{count}} Tage", "Later": "Später", - "Lisk Address": "Lisk Adresse", - "Lisk Chat": "Lisk Chat", - "Lisk Explorer": "Lisk Explorer", - "Lisk Forum": "Lisk Forum", - "Lisk Nano": "Lisk Nano", - "Lisk Website": "Lisk Webseite", + "LWF Address": "LWF Adresse", + "LWF Chat": "LWF Chat", + "LWF Explorer": "LWF Explorer", + "LWF Forum": "LWF Forum", + "LWF Nano": "LWF Nano", + "LWF Website": "LWF Webseite", "Login": "Einloggen", "Losing access to this passphrase will mean no funds can be sent from this account.": "Das Verlieren der Passphrase führt dazu, dass kein Geld mehr von diesem Konto versendet werden kann.", "Mainnet": "Mainnet", @@ -117,7 +117,7 @@ "Public key : ": "Public Key:", "Quit": "Beenden", "Rank": "Rang", - "Receive LSK": "LSK erhalten", + "Receive LWF": "LWF erhalten", "Recipient Address": "Empfängeradresse", "Recipient PublicKey": "Public Key des Empfängers ", "Redo": "Wiederholen", @@ -144,8 +144,8 @@ "Select a network": "Wähle ein Netzwerk", "Select all": "Alles auswählen", "Send": "Senden", - "Send Lisk from Blockchain Application": "Lisk von einer Blockchain Anwendung verschicken", - "Send Lisk to Blockchain Application": "Lisk an eine Blockchain Anwendung schicken", + "Send LWF from Blockchain Application": "LWF von einer Blockchain Anwendung verschicken", + "Send LWF to Blockchain Application": "LWF an eine Blockchain Anwendung schicken", "Send to this address": "Zu dieser Adresse senden", "Sender PublicKey": "Public Key des Senders", "Set maximum amount": "Übernehme den maximalen Betrag", @@ -205,8 +205,8 @@ "You have already registered as a delegate.": "Du bist bereits als Delegierter registriert.", "You have not forged any blocks yet": "Du hast noch keine Blöcke geforged", "You need to become a delegate to start forging. If you already registered to become a delegate, your registration hasn't been processed, yet.": "Um Blöcke forgen (erstellen) zu können, musst du Delegierter werden. Wenn du dich schon als Delegierter registriert hast, wurde deine Registrierung noch nicht verarbeitet.", - "You've received {{value}} LSK.": "Du hast {{value}} LSK erhalten.", - "Your transaction of {{amount}} LSK to {{recipientAddress}} was accepted and will be processed in a few seconds.": "Deine Transaktion von {{amount}} LSK zu {{recipientAddress}} wurde akzeptiert und wird in wenigen Sekunden verarbeitet.", + "You've received {{value}} LWF.": "Du hast {{value}} LWF erhalten.", + "Your transaction of {{amount}} LWF to {{recipientAddress}} was accepted and will be processed in a few seconds.": "Deine Transaktion von {{amount}} LWF zu {{recipientAddress}} wurde akzeptiert und wird in wenigen Sekunden verarbeitet.", "Your votes were successfully submitted. It can take several seconds before they are processed.": "Deine Stimmen wurden erfolgreich abgegeben. Es kann einige Sekunden dauern, bis sie verarbeitet sind.", "Zero not allowed": "Null ist nicht erlaubt", "confirmation": "Bestätigung", diff --git a/i18n/locales/en/common.json b/i18n/locales/en/common.json index b2efb97cf..b2bfcfb7e 100644 --- a/i18n/locales/en/common.json +++ b/i18n/locales/en/common.json @@ -46,29 +46,29 @@ "Failed to connect to node {{address}}": "Failed to connect to node {{address}}", "Failed to connect: Node {{address}} is not active": "Failed to connect: Node {{address}} is not active", "Fee": "Fee", - "Fee: {{amount}} LSK": "Fee: {{amount}} LSK", - "Fee: {{fee}} LSK": "Fee: {{fee}} LSK", + "Fee: {{amount}} LWF": "Fee: {{amount}} LWF", + "Fee: {{fee}} LWF": "Fee: {{fee}} LWF", "Forget": "Forget", "Forging": "Forging", "From / To": "From / To", "Help": "Help", "Hide passphrase": "Hide passphrase", "Insufficient funds": "Insufficient funds", - "Insufficient funds for {{amount}} LSK fee": "Insufficient funds for {{amount}} LSK fee", + "Insufficient funds for {{amount}} LWF fee": "Insufficient funds for {{amount}} LWF fee", "Invalid": "Invalid", - "LSK Earned": "LSK Earned", - "LSK received": "LSK received", + "LWF Address": "LWF Address", + "LWF Chat": "LWF Chat", + "LWF Earned": "LWF Earned", + "LWF Explorer": "LWF Explorer", + "LWF Forum": "LWF Forum", + "LWF Nano": "LWF Nano", + "LWF Website": "LWF Website", + "LWF received": "LWF received", "Language": "Language", "Last 24 hours": "Last 24 hours", "Last {{count}} days": "Last {{count}} day", "Last {{count}} days_plural": "Last {{count}} days", "Later": "Later", - "Lisk Address": "Lisk Address", - "Lisk Chat": "Lisk Chat", - "Lisk Explorer": "Lisk Explorer", - "Lisk Forum": "Lisk Forum", - "Lisk Nano": "Lisk Nano", - "Lisk Website": "Lisk Website", "Login": "Login", "Losing access to this passphrase will mean no funds can be sent from this account.": "Losing access to this passphrase will mean no funds can be sent from this account.", "Mainnet": "Mainnet", @@ -114,7 +114,7 @@ "Public Key": "Public Key", "Quit": "Quit", "Rank": "Rank", - "Receive LSK": "Receive LSK", + "Receive LWF": "Receive LWF", "Recipient Address": "Recipient Address", "Recipient PublicKey": "Recipient PublicKey", "Redo": "Redo", @@ -203,8 +203,8 @@ "You have already registered as a delegate.": "You have already registered as a delegate.", "You have not forged any blocks yet": "You have not forged any blocks yet", "You need to become a delegate to start forging. If you already registered to become a delegate, your registration hasn't been processed, yet.": "You need to become a delegate to start forging. If you already registered to become a delegate, your registration hasn't been processed, yet.", - "You've received {{value}} LSK.": "You've received {{value}} LSK.", - "Your transaction of {{amount}} LSK to {{recipientAddress}} was accepted and will be processed in a few seconds.": "Your transaction of {{amount}} LSK to {{recipientAddress}} was accepted and will be processed in a few seconds.", + "You've received {{value}} LWF.": "You've received {{value}} LWF.", + "Your transaction of {{amount}} LWF to {{recipientAddress}} was accepted and will be processed in a few seconds.": "Your transaction of {{amount}} LWF to {{recipientAddress}} was accepted and will be processed in a few seconds.", "Your votes were successfully submitted. It can take several seconds before they are processed.": "Your votes were successfully submitted. It can take several seconds before they are processed.", "Zero not allowed": "Zero not allowed", "confirmation": "confirmation", diff --git a/package.json b/package.json index e1a09b0fc..e31d5ef5c 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,9 @@ { - "name": "lisk-nano", - "version": "1.3.0", - "description": "Lisk Nano", - "homepage": "https://github.com/LiskHQ/lisk-nano", - "bugs": "https://github.com/LiskHQ/lisk-nano/issues", + "name": "lwf-nano", + "version": "1.3.1", + "description": "LWF Nano", + "homepage": "https://github.com/lwfcoin/lwf-nano", + "bugs": "https://github.com/lwfcoin/lwf-nano/issues", "main": "main.js", "scripts": { "build": "npm run clean-build && npm run copy-files && npm run build-prod && npm run build-electron", @@ -31,7 +31,7 @@ "license": "GPL-3.0", "repository": { "type": "git", - "url": "https://github.com/LiskHQ/lisk-nano" + "url": "https://github.com/lwfcoin/lwf-nano" }, "dependencies": { "bignumber.js": "4.0.4", @@ -44,7 +44,7 @@ "i18next": "=10.0.3", "i18next-localstorage-cache": "=1.1.1", "i18next-xhr-backend": "=1.4.2", - "lisk-js": "0.5.0", + "lwf-nano-js": "git+https://github.com/lwfcoin/lwf-nano-js.git#master", "moment": "2.18.1", "numeral": "=2.0.6", "postcss": "6.0.12", @@ -146,15 +146,15 @@ "webpack-dev-server": "2.8.2" }, "build": { - "appId": "io.lisk.nano", - "productName": "Lisk Nano", + "appId": "io.lwfcoin.nano", + "productName": "LWF Nano", "protocols": { - "name": "lisk-nano", + "name": "lwf-nano", "schemes": [ - "lisk" + "lwf" ] }, - "artifactName": "lisk-nano-${os}-${arch}-${version}.${ext}", + "artifactName": "lwf-nano-${os}-${arch}-${version}.${ext}", "publish": [ "github" ], @@ -166,7 +166,7 @@ "tar.gz" ], "desktop": { - "MimeType": "application/lisk;x-scheme-handler/lisk" + "MimeType": "application/lwf;x-scheme-handler/lwf" }, "category": "Network" }, diff --git a/protractor.conf.js b/protractor.conf.js index 3e38c395f..a03477cda 100644 --- a/protractor.conf.js +++ b/protractor.conf.js @@ -23,7 +23,7 @@ exports.config = { params: { screenshotFolder: 'e2e-test-screenshots', baseURL: 'http://localhost:8080/', - liskCoreURL: 'http://localhost:4000/', + liskCoreURL: 'http://localhost:18124/', testnetPassphrase: process.env.TESTNET_PASSPHRASE, useTestnetPassphrase: false, network: 'customNode', diff --git a/src/actions/account.test.js b/src/actions/account.test.js index 70d62b258..71df76986 100644 --- a/src/actions/account.test.js +++ b/src/actions/account.test.js @@ -158,7 +158,7 @@ describe('actions: account', () => { let accountApiMock; const data = { activePeer: {}, - recipientId: '15833198055097037957L', + recipientId: '15833198055097037957X', amount: 100, passphrase: 'sample passphrase', secondPassphrase: null, diff --git a/src/actions/peers.js b/src/actions/peers.js index 411a93c95..1489996ab 100644 --- a/src/actions/peers.js +++ b/src/actions/peers.js @@ -1,5 +1,5 @@ import i18next from 'i18next'; -import Lisk from 'lisk-js'; +import Lisk from 'lwf-nano-js'; import actionTypes from '../constants/actions'; import { getNethash } from './../utils/api/nethash'; import { errorToastDisplayed } from './toaster'; @@ -35,10 +35,10 @@ export const activePeerSet = data => config.node = hostname; config.ssl = protocol === 'https:'; - config.port = port || (config.ssl ? 443 : 80); + config.port = port || (config.ssl ? 10001 : 10000); } if (config.testnet === undefined && config.port !== undefined) { - config.testnet = config.port === '7000'; + config.testnet = config.port === '9998'; } if (config.custom) { getNethash(Lisk.api(config)).then((response) => { diff --git a/src/actions/peers.test.js b/src/actions/peers.test.js index d407d4ea8..5454fd82b 100644 --- a/src/actions/peers.test.js +++ b/src/actions/peers.test.js @@ -8,7 +8,7 @@ import * as nethashApi from './../utils/api/nethash'; describe('actions: peers', () => { const passphrase = 'wagon stock borrow episode laundry kitten salute link globe zero feed marble'; - const nethash = '198f2b61a8eb95fbeed58b8216780b68f697f26b849acf00c8c93bb9b24f783d'; + const nethash = '0daee950841005a3f56f6588b4b084695f0d74aaa38b21edab73446064638552'; describe('activePeerUpdate', () => { it('should create an action to update the active peer', () => { @@ -44,7 +44,7 @@ describe('actions: peers', () => { network: { name: 'Custom Node', custom: true, - address: 'http://localhost:4000', + address: 'http://localhost:10000', testnet: true, nethash, }, @@ -67,7 +67,7 @@ describe('actions: peers', () => { it('dispatch activePeerSet with testnet config set to true when the network is a custom node and nethash is testnet', () => { getNetHash.returnsPromise(); const network = { - address: 'http://localhost:4000', + address: 'http://localhost:10000', custom: true, }; @@ -80,7 +80,7 @@ describe('actions: peers', () => { it('dispatch activePeerSet with testnet config set to false when the network is a custom node and nethash is testnet', () => { getNetHash.returnsPromise(); const network = { - address: 'http://localhost:4000', + address: 'http://localhost:10000', custom: true, }; @@ -103,8 +103,8 @@ describe('actions: peers', () => { }); it('should set to testnet if not defined in config but port is 7000', () => { - const network7000 = { address: 'http://127.0.0.1:7000', nethash }; - const network4000 = { address: 'http://127.0.0.1:4000', nethash }; + const network7000 = { address: 'http://127.0.0.1:9998', nethash }; + const network4000 = { address: 'http://127.0.0.1:10000', nethash }; activePeerSet({ passphrase, network: network7000 })(dispatch); expect(dispatch).to.have.been.calledWith(match.hasNested('data.activePeer.options.testnet', true)); diff --git a/src/actions/savedAccounts.test.js b/src/actions/savedAccounts.test.js index 06191fa23..990fd9c19 100644 --- a/src/actions/savedAccounts.test.js +++ b/src/actions/savedAccounts.test.js @@ -14,7 +14,7 @@ describe('actions: savedAccount', () => { const data = { publicKey: 'sample_key', network: 1, - address: 'http://localhost:400', + address: 'http://localhost:10000', }; describe('accountsRetrieved', () => { diff --git a/src/actions/voting.test.js b/src/actions/voting.test.js index ab6742902..1f368ab61 100644 --- a/src/actions/voting.test.js +++ b/src/actions/voting.test.js @@ -19,8 +19,8 @@ import { errorAlertDialogDisplayed } from './dialog'; import * as delegateApi from '../utils/api/delegate'; const delegateList = [ - { username: 'username1', publicKey: '123HG3452245L' }, - { username: 'username2', publicKey: '123HG3522345L' }, + { username: 'username1', publicKey: '123HG3452245X' }, + { username: 'username2', publicKey: '123HG3522345X' }, ]; describe('actions: voting', () => { @@ -151,7 +151,7 @@ describe('actions: voting', () => { let delegateApiMock; const data = { activePeer: {}, - address: '8096217735672704724L', + address: '8096217735672704724X', }; const delegates = delegateList; @@ -221,7 +221,7 @@ describe('actions: voting', () => { let delegateApiMock; const data = { activePeer: {}, - address: '8096217735672704724L', + address: '8096217735672704724X', upvotes: [], unvotes: [], }; diff --git a/src/assets/images/LISK-alt.svg b/src/assets/images/LISK-alt.svg deleted file mode 100755 index df340fa08..000000000 --- a/src/assets/images/LISK-alt.svg +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - diff --git a/src/assets/images/LISK-nano.png b/src/assets/images/LISK-nano.png deleted file mode 100644 index 374b14f5c..000000000 Binary files a/src/assets/images/LISK-nano.png and /dev/null differ diff --git a/src/assets/images/LISK.png b/src/assets/images/LISK.png deleted file mode 100644 index 32ca0ef46..000000000 Binary files a/src/assets/images/LISK.png and /dev/null differ diff --git a/src/assets/images/LISK.svg b/src/assets/images/LISK.svg deleted file mode 100755 index c19bb8675..000000000 --- a/src/assets/images/LISK.svg +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - diff --git a/src/assets/images/LWF-nano.png b/src/assets/images/LWF-nano.png new file mode 100644 index 000000000..ab80b994d Binary files /dev/null and b/src/assets/images/LWF-nano.png differ diff --git a/src/assets/images/LWF.png b/src/assets/images/LWF.png new file mode 100644 index 000000000..b91538f06 Binary files /dev/null and b/src/assets/images/LWF.png differ diff --git a/src/components/account/account.js b/src/components/account/account.js index 86507309b..5e352b99a 100644 --- a/src/components/account/account.js +++ b/src/components/account/account.js @@ -60,7 +60,7 @@ const Account = ({ rawAmount={Math.max(0, account.balance - toRawLsk(0.1))} >

- LSK + LWF

{t('Click to send all funds')} diff --git a/src/components/account/account.test.js b/src/components/account/account.test.js index ac1215b47..3d720fbbd 100644 --- a/src/components/account/account.test.js +++ b/src/components/account/account.test.js @@ -30,8 +30,8 @@ describe('Account', () => { }, account: { isDelegate: false, - address: '16313739661670634666L', - username: 'lisk-nano', + address: '16313739661670634666LWF', + username: 'lwf-nano', balance: 1e8, }, }; diff --git a/src/components/account/address.test.js b/src/components/account/address.test.js index 606f2aa34..2bf389517 100644 --- a/src/components/account/address.test.js +++ b/src/components/account/address.test.js @@ -7,7 +7,7 @@ describe('Address', () => { it('when value of "isDelegate" is "false" expect text of "h3#firstBox" to be equal "Address"', () => { const inputValue = { isDelegate: false, - address: '16313739661670634666L', + address: '16313739661670634666LWF', t: key => key, }; const expectedHeaderValue = 'Address'; @@ -18,9 +18,9 @@ describe('Address', () => { it('when value of "isDelegate" is "true" expect text of "h3#firstBox" to be equal "Delegate"', () => { const inputValue = { isDelegate: true, - address: '16313739661670634666L', + address: '16313739661670634666LWF', delegate: { - username: 'lisk-nano', + username: 'lwf-nano', }, t: key => key, }; @@ -32,13 +32,13 @@ describe('Address', () => { it('when value of "isDelegate" is "true" expect text of "p.secondary" to be equal expectedValue', () => { const inputValue = { isDelegate: true, - address: '16313739661670634666L', + address: '16313739661670634666LWF', delegate: { - username: 'lisk-nano', + username: 'lwf-nano', }, t: key => key, }; - const expectedValue = 'lisk-nano'; + const expectedValue = 'lwf-nano'; const wrapper = shallow(

); expect(wrapper.find('p.primary').text()).to.be.equal(expectedValue); }); diff --git a/src/components/account/index.test.js b/src/components/account/index.test.js index b0601af61..1d9f0ce6d 100644 --- a/src/components/account/index.test.js +++ b/src/components/account/index.test.js @@ -22,8 +22,8 @@ describe('Account HOC', () => { }; const account = { isDelegate: false, - address: '16313739661670634666L', - username: 'lisk-nano', + address: '16313739661670634666LWF', + username: 'lwf-nano', }; const store = configureMockStore([])({ diff --git a/src/components/account/stories.js b/src/components/account/stories.js index 374c02e78..bea93de0f 100644 --- a/src/components/account/stories.js +++ b/src/components/account/stories.js @@ -24,7 +24,7 @@ storiesOf('Account', module) }} account={{ isDelegate: true, - address: '9396639332432599292L', + address: '9396639332432599292X', delegate: { username: 'testy', }, @@ -39,12 +39,12 @@ storiesOf('Address', module)
)) .add('non-delegate', () => (
)); diff --git a/src/components/authenticate/authenticate.test.js b/src/components/authenticate/authenticate.test.js index 9446de60a..9fef510c4 100644 --- a/src/components/authenticate/authenticate.test.js +++ b/src/components/authenticate/authenticate.test.js @@ -32,7 +32,7 @@ describe('Authenticate', () => { const account = { isDelegate: false, publicKey: 'c094ebee7ec0c50ebee32918655e089f6e1a604b83bcaa760293c61e0f18ab6f', - address: '16313739661670634666L', + address: '16313739661670634666X', }; const passphrase = 'wagon stock borrow episode laundry kitten salute link globe zero feed marble'; diff --git a/src/components/authenticate/index.test.js b/src/components/authenticate/index.test.js index 57823c593..994e774c9 100644 --- a/src/components/authenticate/index.test.js +++ b/src/components/authenticate/index.test.js @@ -23,8 +23,8 @@ describe('AuthenticateHOC', () => { const account = { isDelegate: false, - address: '16313739661670634666L', - username: 'lisk-nano', + address: '16313739661670634666LWF', + username: 'lwf-nano', }; const store = configureMockStore([])({ diff --git a/src/components/clickToSend/index.test.js b/src/components/clickToSend/index.test.js index 44ed69928..f690ba44e 100644 --- a/src/components/clickToSend/index.test.js +++ b/src/components/clickToSend/index.test.js @@ -23,7 +23,7 @@ describe('ClickToSend', () => { it('should render a RelativeLink component', () => { const wrapper = shallow( - , options); expect(wrapper.find(RelativeLink)).to.have.length(1); }); diff --git a/src/components/decryptMessage/decryptMessage.js b/src/components/decryptMessage/decryptMessage.js index 30a62fd57..208320e63 100644 --- a/src/components/decryptMessage/decryptMessage.js +++ b/src/components/decryptMessage/decryptMessage.js @@ -1,6 +1,6 @@ import React from 'react'; import Input from 'react-toolbox/lib/input'; -import Lisk from 'lisk-js'; +import Lisk from 'lwf-nano-js'; import { translate } from 'react-i18next'; import ActionBar from '../actionBar'; import Authenticate from '../authenticate'; diff --git a/src/components/decryptMessage/decryptMessage.test.js b/src/components/decryptMessage/decryptMessage.test.js index 25a018943..105c2024f 100644 --- a/src/components/decryptMessage/decryptMessage.test.js +++ b/src/components/decryptMessage/decryptMessage.test.js @@ -4,7 +4,7 @@ import { mount } from 'enzyme'; import sinon from 'sinon'; import { Provider } from 'react-redux'; import { I18nextProvider } from 'react-i18next'; -import Lisk from 'lisk-js'; +import Lisk from 'lwf-nano-js'; import i18n from '../../i18n'; import store from '../../store'; import DecryptMessage from './decryptMessage'; diff --git a/src/components/dialog/dialogs.js b/src/components/dialog/dialogs.js index 5d5d1412d..6f2f8fe6f 100644 --- a/src/components/dialog/dialogs.js +++ b/src/components/dialog/dialogs.js @@ -38,7 +38,7 @@ export default () => ({ component: VoteDialog, }, receive: { - title: i18next.t('Receive LSK'), + title: i18next.t('Receive LWF'), component: ReceiveDialog, }, register: { diff --git a/src/components/encryptMessage/encryptMessage.js b/src/components/encryptMessage/encryptMessage.js index 2134f299a..3449320f3 100644 --- a/src/components/encryptMessage/encryptMessage.js +++ b/src/components/encryptMessage/encryptMessage.js @@ -1,6 +1,6 @@ import React from 'react'; import Input from 'react-toolbox/lib/input'; -import Lisk from 'lisk-js'; +import Lisk from 'lwf-nano-js'; import { translate } from 'react-i18next'; import ActionBar from '../actionBar'; import Authenticate from '../authenticate'; @@ -44,14 +44,14 @@ class EncryptMessage extends React.Component { } if (cryptoResult) { const result = [ - '-----BEGIN LISK ENCRYPTED MESSAGE-----', + '-----BEGIN LWF ENCRYPTED MESSAGE-----', '-----SENDER PUBLIC KEY-----', this.props.account.publicKey, '-----ENCRYPTED MESSAGE-----', cryptoResult.encryptedMessage, '-----NONCE-----', cryptoResult.nonce, - '-----END LISK ENCRYPTED MESSAGE-----', + '-----END LWF ENCRYPTED MESSAGE-----', ].join('\n'); this.setState({ result }); this.showResult(result); diff --git a/src/components/encryptMessage/encryptMessage.test.js b/src/components/encryptMessage/encryptMessage.test.js index 0a55cef07..0d0fe8075 100644 --- a/src/components/encryptMessage/encryptMessage.test.js +++ b/src/components/encryptMessage/encryptMessage.test.js @@ -3,7 +3,7 @@ import { expect } from 'chai'; import { mount } from 'enzyme'; import sinon from 'sinon'; import PropTypes from 'prop-types'; -import Lisk from 'lisk-js'; +import Lisk from 'lwf-nano-js'; import i18n from '../../i18n'; import store from '../../store'; import Authenticate from '../authenticate'; diff --git a/src/components/forging/forgingStats.js b/src/components/forging/forgingStats.js index 9ff2bf673..6d07b5e78 100644 --- a/src/components/forging/forgingStats.js +++ b/src/components/forging/forgingStats.js @@ -45,7 +45,7 @@ class ForgingStats extends React.Component { {cardObj.label} LSK + roundTo={2} /> LWF
diff --git a/src/components/forging/forgingStats.test.js b/src/components/forging/forgingStats.test.js index 528cf5e61..6ae6068d0 100644 --- a/src/components/forging/forgingStats.test.js +++ b/src/components/forging/forgingStats.test.js @@ -38,18 +38,18 @@ describe('ForgingStats', () => { }); it('should render Card component for Last 24 hours', () => { - expect(wrapper.find('Card').at(0).text().trim()).to.equal('Last 24 hours 0 LSK'); + expect(wrapper.find('Card').at(0).text().trim()).to.equal('Last 24 hours 0 LWF'); }); it('should render Card component for Last 7 days', () => { - expect(wrapper.find('Card').at(1).text().trim()).to.equal('Last 7 days 32.13 LSK'); + expect(wrapper.find('Card').at(1).text().trim()).to.equal('Last 7 days 32.13 LWF'); }); it('should render Card component for Last 30 days', () => { - expect(wrapper.find('Card').at(2).text().trim()).to.equal('Last 30 days 3,213.18 LSK'); + expect(wrapper.find('Card').at(2).text().trim()).to.equal('Last 30 days 3,213.18 LWF'); }); it('should render Card component for Last 365 days', () => { - expect(wrapper.find('Card').at(3).text().trim()).to.equal('Last 365 days 321,317.91 LSK'); + expect(wrapper.find('Card').at(3).text().trim()).to.equal('Last 365 days 321,317.91 LWF'); }); }); diff --git a/src/components/forging/forgingTitle.js b/src/components/forging/forgingTitle.js index 8279bdf41..581416731 100644 --- a/src/components/forging/forgingTitle.js +++ b/src/components/forging/forgingTitle.js @@ -21,7 +21,7 @@ class ForgingTitle extends React.Component { {this.props.account.delegate.username} - {this.props.t('LSK Earned')} + {this.props.t('LWF Earned')} diff --git a/src/components/forging/index.test.js b/src/components/forging/index.test.js index ee28023fb..73db85e6a 100644 --- a/src/components/forging/index.test.js +++ b/src/components/forging/index.test.js @@ -12,7 +12,7 @@ describe('Forging HOC', () => { beforeEach(() => { store = configureMockStore([])({ - account: { address: '10171906415056299071L' }, + account: { address: '10171906415056299071X' }, peers: { data: {} }, forging: { statistics: {}, diff --git a/src/components/header/header.js b/src/components/header/header.js index b82455285..6a6f9ded5 100644 --- a/src/components/header/header.js +++ b/src/components/header/header.js @@ -4,7 +4,7 @@ import React from 'react'; import grid from 'flexboxgrid/dist/flexboxgrid.css'; import PrivateWrapper from '../privateWrapper'; -import logo from '../../assets/images/LISK-nano.png'; +import logo from '../../assets/images/LWF-nano.png'; import offlineStyle from '../offlineWrapper/offlineWrapper.css'; import styles from './header.css'; import RelativeLink from '../relativeLink'; @@ -63,7 +63,7 @@ const Header = props => ( {props.t('Receive LSK')} + to='receive'>{props.t('Receive LWF')} {props.t('send')} diff --git a/src/components/header/header.test.js b/src/components/header/header.test.js index f5c0c6772..6dcb357eb 100644 --- a/src/components/header/header.test.js +++ b/src/components/header/header.test.js @@ -8,7 +8,7 @@ import sinon from 'sinon'; import styles from './header.css'; import Header from './header'; import RelativeLink from '../relativeLink'; -import logo from '../../assets/images/LISK-nano.png'; +import logo from '../../assets/images/LWF-nano.png'; import i18n from '../../i18n'; describe('Header', () => { diff --git a/src/components/login/index.test.js b/src/components/login/index.test.js index de444b47a..d7f851d75 100644 --- a/src/components/login/index.test.js +++ b/src/components/login/index.test.js @@ -23,8 +23,8 @@ describe('LoginHOC', () => { }; const account = { isDelegate: false, - address: '16313739661670634666L', - username: 'lisk-nano', + address: '16313739661670634666LWF', + username: 'lwf-nano', }; const store = configureMockStore([])({ peers, diff --git a/src/components/login/login.test.js b/src/components/login/login.test.js index 9c2817cd2..f7df8dd00 100644 --- a/src/components/login/login.test.js +++ b/src/components/login/login.test.js @@ -4,7 +4,7 @@ import { spy } from 'sinon'; import { mount, shallow } from 'enzyme'; import { BrowserRouter as Router } from 'react-router-dom'; import configureMockStore from 'redux-mock-store'; -import Lisk from 'lisk-js'; +import Lisk from 'lwf-nano-js'; import PropTypes from 'prop-types'; import i18n from '../../i18n'; import Login from './login'; @@ -16,8 +16,8 @@ describe('Login', () => { // Mocking store const account = { isDelegate: false, - address: '16313739661670634666L', - username: 'lisk-nano', + address: '16313739661670634666LWF', + username: 'lwf-nano', }; const peers = { data: {} }; const store = configureMockStore([])({ diff --git a/src/components/pricedButton/index.js b/src/components/pricedButton/index.js index c0cc2be8e..1e0603526 100644 --- a/src/components/pricedButton/index.js +++ b/src/components/pricedButton/index.js @@ -14,8 +14,8 @@ export const PricedButtonComponent = ({ fee && ( { - hasFunds ? t('Fee: {{amount}} LSK', { amount: fromRawLsk(fee) }) : - t('Insufficient funds for {{amount}} LSK fee', { amount: fromRawLsk(fee) }) + hasFunds ? t('Fee: {{amount}} LWF', { amount: fromRawLsk(fee) }) : + t('Insufficient funds for {{amount}} LWF fee', { amount: fromRawLsk(fee) }) } ) } diff --git a/src/components/pricedButton/index.test.js b/src/components/pricedButton/index.test.js index e9c68c43d..6b5e43c19 100644 --- a/src/components/pricedButton/index.test.js +++ b/src/components/pricedButton/index.test.js @@ -28,8 +28,8 @@ describe('PricedButton', () => { wrapper = shallow(); }); - it('renders a span saying "Fee: 5 LSK"', () => { - expect(wrapper.find(`.${styles.fee}`).text()).to.be.equal(i18n.t('Fee: {{fee}} LSK', { fee: 5 })); + it('renders a span saying "Fee: 5 LWF"', () => { + expect(wrapper.find(`.${styles.fee}`).text()).to.be.equal(i18n.t('Fee: {{fee}} LWF', { fee: 5 })); }); it('allows to click on Button', () => { @@ -43,8 +43,8 @@ describe('PricedButton', () => { wrapper = shallow(); }); - it('renders a span saying "Insufficient funds for 5 LSK fee"', () => { - expect(wrapper.find(`.${styles.fee}`).text()).to.be.equal('Insufficient funds for 5 LSK fee'); + it('renders a span saying "Insufficient funds for 5 LWF fee"', () => { + expect(wrapper.find(`.${styles.fee}`).text()).to.be.equal('Insufficient funds for 5 LWF fee'); }); it('sets the disabled attribute of the button', () => { diff --git a/src/components/receiveDialog/index.test.js b/src/components/receiveDialog/index.test.js index c7775cfcf..20985e073 100644 --- a/src/components/receiveDialog/index.test.js +++ b/src/components/receiveDialog/index.test.js @@ -15,7 +15,7 @@ const fakeStore = configureStore(); describe('ReceiveDialogHOC', () => { let wrapper; - const address = '544792633152563672L'; + const address = '544792633152563672X'; beforeEach(() => { const store = fakeStore({ @@ -52,7 +52,7 @@ describe('ReceiveDialogHOC', () => { }); // TODO: this doesn't work for some reason - it.skip('should bind copy to AccountComponent props.copyToClipboard', () => { + it.skip('should bind copy to AccountComponent props.copyToClipboard', () => { const actionsSpy = sinon.spy(copy); wrapper.find('ReceiveDialog').props().copyToClipboard({}); expect(actionsSpy).to.be.calledWith(); diff --git a/src/components/receiveDialog/receiveDialog.test.js b/src/components/receiveDialog/receiveDialog.test.js index 87a2b39c5..a89379187 100644 --- a/src/components/receiveDialog/receiveDialog.test.js +++ b/src/components/receiveDialog/receiveDialog.test.js @@ -10,7 +10,7 @@ import ReceiveDialog from './receiveDialog'; describe('ReceiveDialog', () => { let props; let store; - const address = '544792633152563672L'; + const address = '544792633152563672X'; beforeEach(() => { store = configureStore()({ diff --git a/src/components/registerDelegate/index.test.js b/src/components/registerDelegate/index.test.js index 1aaf04918..5403425da 100644 --- a/src/components/registerDelegate/index.test.js +++ b/src/components/registerDelegate/index.test.js @@ -23,8 +23,8 @@ describe('RegisterDelegateHOC', () => { const account = { isDelegate: false, - address: '16313739661670634666L', - username: 'lisk-nano', + address: '16313739661670634666LWF', + username: 'lwf-nano', }; const store = configureMockStore([])({ diff --git a/src/components/registerDelegate/registerDelegate.test.js b/src/components/registerDelegate/registerDelegate.test.js index 952ccac5a..aab2cd1e5 100644 --- a/src/components/registerDelegate/registerDelegate.test.js +++ b/src/components/registerDelegate/registerDelegate.test.js @@ -2,7 +2,7 @@ import React from 'react'; import { expect } from 'chai'; import { mount } from 'enzyme'; import sinon from 'sinon'; -import Lisk from 'lisk-js'; +import Lisk from 'lwf-nano-js'; import { Provider } from 'react-redux'; import { I18nextProvider } from 'react-i18next'; import i18n from '../../i18n'; // initialized i18next instance @@ -14,26 +14,26 @@ import * as delegateApi from '../../utils/api/delegate'; const normalAccount = { passphrase: 'pass', isDelegate: false, - address: '16313739661670634666L', + address: '16313739661670634666LWF', balance: 1000e8, }; const delegateAccount = { passphrase: 'pass', isDelegate: true, - address: '16313739661670634666L', + address: '16313739661670634666LWF', balance: 1000e8, delegate: { - username: 'lisk-nano', + username: 'lwf-nano', }, }; const withSecondSecretAccount = { passphrase: 'pass', - address: '16313739661670634666L', + address: '16313739661670634666LWF', balance: 1000e8, delegate: { - username: 'lisk-nano', + username: 'lwf-nano', }, secondSignature: 1, }; @@ -43,9 +43,9 @@ const props = { data: Lisk.api({ name: 'Custom Node', custom: true, - address: 'http://localhost:4000', + address: 'http://localhost:10000', testnet: true, - nethash: '198f2b61a8eb95fbeed58b8216780b68f697f26b849acf00c8c93bb9b24f783d', + nethash: '4c1170a3edb03f961e5e3f7cedcd25563f0a46ec4aa3342715d09c47b398ea19', }), }, closeDialog: () => {}, diff --git a/src/components/savedAccounts/index.test.js b/src/components/savedAccounts/index.test.js index e02f41682..b6455ad4d 100644 --- a/src/components/savedAccounts/index.test.js +++ b/src/components/savedAccounts/index.test.js @@ -14,10 +14,10 @@ describe('SavedAccountsHOC', () => { const account = { isDelegate: false, publicKey: 'sample_key', - username: 'lisk-nano', + username: 'lwf-nano', }; const options = { - address: 'http://localhost:4000', + address: 'http://localhost:10000', network: 'Custom node', }; const peers = { data: { options }, options }; diff --git a/src/components/savedAccounts/savedAccounts.test.js b/src/components/savedAccounts/savedAccounts.test.js index 30ee7968f..e00005362 100644 --- a/src/components/savedAccounts/savedAccounts.test.js +++ b/src/components/savedAccounts/savedAccounts.test.js @@ -22,7 +22,7 @@ describe('SavedAccounts', () => { { network: 2, publicKey, - address: 'http://localhost:4000', + address: 'http://localhost:10000', }, { network: 0, diff --git a/src/components/send/send.js b/src/components/send/send.js index 35cf6cfbd..164d5457e 100644 --- a/src/components/send/send.js +++ b/src/components/send/send.js @@ -22,7 +22,7 @@ class Send extends React.Component { }; this.fee = 0.1; this.inputValidationRegexps = { - recipient: /^\d{1,21}[L|l]$/, + recipient: /^\d{1,21}LWF|lwf$/, amount: /^\d+(\.\d{1,8})?$/, }; } @@ -101,7 +101,7 @@ class Send extends React.Component { passphrase={this.state.passphrase} secondPassphrase={this.state.secondPassphrase} onChange={this.handleChange.bind(this)} /> -
{this.props.t('Fee: {{fee}} LSK', { fee: this.fee })}
+
{this.props.t('Fee: {{fee}} LWF', { fee: this.fee })}
{ }); it('accepts valid recipient', () => { - wrapper.find('.recipient input').simulate('change', { target: { value: '11004588490103196952L' } }); + wrapper.find('.recipient input').simulate('change', { target: { value: '11004588490103196952X' } }); expect(wrapper.find('Input.recipient').text()).to.not.contain('Invalid'); }); @@ -91,14 +91,14 @@ describe('Send', () => { it('allows to send a transaction', () => { wrapper.find('.amount input').simulate('change', { target: { value: '120.25' } }); - wrapper.find('.recipient input').simulate('change', { target: { value: '11004588490103196952L' } }); + wrapper.find('.recipient input').simulate('change', { target: { value: '11004588490103196952X' } }); wrapper.find('.primary-button button').simulate('submit'); expect(props.sent).to.have.been.calledWith({ account: props.account, activePeer: {}, amount: '120.25', passphrase: props.account.passphrase, - recipientId: '11004588490103196952L', + recipientId: '11004588490103196952X', secondPassphrase: null, }); }); diff --git a/src/components/send/stories.js b/src/components/send/stories.js index 0e6fe7c00..bdd0625db 100644 --- a/src/components/send/stories.js +++ b/src/components/send/stories.js @@ -9,7 +9,7 @@ import store from '../../store'; const account = { passphrase: 'wagon stock borrow episode laundry kitten salute link globe zero feed marble', - address: '16313739661670634666L', + address: '16313739661670634666X', balance: 1000e8, }; @@ -20,7 +20,7 @@ storiesOf('Send', module) )) .add('pre-filled recipient and amount', () => ( - + )) .add('without pre-filles', () => ( diff --git a/src/components/signMessage/signMessage.js b/src/components/signMessage/signMessage.js index 7acb3f31f..71497f059 100644 --- a/src/components/signMessage/signMessage.js +++ b/src/components/signMessage/signMessage.js @@ -1,6 +1,6 @@ import React from 'react'; import Input from 'react-toolbox/lib/input'; -import Lisk from 'lisk-js'; +import Lisk from 'lwf-nano-js'; import InfoParagraph from '../infoParagraph'; import SignVerifyResult from '../signVerifyResult'; diff --git a/src/components/signMessage/signMessage.test.js b/src/components/signMessage/signMessage.test.js index 8ea6c05a0..3745e2f9e 100644 --- a/src/components/signMessage/signMessage.test.js +++ b/src/components/signMessage/signMessage.test.js @@ -26,14 +26,14 @@ describe('SignMessage', () => { passphrase: 'wagon stock borrow episode laundry kitten salute link globe zero feed marble', publicKey, }; - const getResult = (message, signature) => (`-----BEGIN LISK SIGNED MESSAGE----- + const getResult = (message, signature) => (`-----BEGIN LWF SIGNED MESSAGE----- -----MESSAGE----- ${message} -----PUBLIC KEY----- ${publicKey} -----SIGNATURE----- ${signature} ------END LISK SIGNED MESSAGE-----`); +-----END LWF SIGNED MESSAGE-----`); beforeEach(() => { successToastSpy = sinon.spy(); diff --git a/src/components/transactions/amount.test.js b/src/components/transactions/amount.test.js index 1eac72141..5f03004e2 100644 --- a/src/components/transactions/amount.test.js +++ b/src/components/transactions/amount.test.js @@ -13,8 +13,8 @@ describe('Amount', () => { const inputValue = { value: { type: 0, - recipientId: '1085993630748340485L', - senderId: '1085993630748340485L', + recipientId: '1085993630748340485X', + senderId: '1085993630748340485X', }, address: 'address', }; @@ -35,8 +35,8 @@ describe('Amount', () => { const inputValue = { value: { type: 1, - recipientId: '1085993630748340485L', - senderId: '1085993630748340485L', + recipientId: '1085993630748340485X', + senderId: '1085993630748340485X', }, address: 'address', }; @@ -57,7 +57,7 @@ describe('Amount', () => { const inputValue = { value: { type: 1, - recipientId: '1085993630748340485L', + recipientId: '1085993630748340485X', senderId: 'address', }, address: 'address', diff --git a/src/components/transactions/index.test.js b/src/components/transactions/index.test.js index 55bafa23e..95c836e49 100644 --- a/src/components/transactions/index.test.js +++ b/src/components/transactions/index.test.js @@ -19,7 +19,7 @@ describe('TransactionsHOC', () => { confirmed, count: confirmed.length, }; - const account = { address: '16313739661670634666L' }; + const account = { address: '16313739661670634666X' }; const peers = { data: {} }; beforeEach(() => { diff --git a/src/components/transactions/status.test.js b/src/components/transactions/status.test.js index 2ac05c72b..d74f62b4a 100644 --- a/src/components/transactions/status.test.js +++ b/src/components/transactions/status.test.js @@ -9,8 +9,8 @@ describe('Status', () => { const inputValue = { value: { type: 0, - recipientId: '1085993630748340485L', - senderId: '1085993630748340485L', + recipientId: '1085993630748340485X', + senderId: '1085993630748340485X', }, address: 'address', }; @@ -24,8 +24,8 @@ describe('Status', () => { const inputValue = { value: { type: 1, - recipientId: '1085993630748340485L', - senderId: '1085993630748340485L', + recipientId: '1085993630748340485X', + senderId: '1085993630748340485X', }, address: 'address', }; @@ -39,7 +39,7 @@ describe('Status', () => { const inputValue = { value: { type: 1, - recipientId: '1085993630748340485L', + recipientId: '1085993630748340485X', senderId: 'address', }, address: 'address', diff --git a/src/components/transactions/transactionRow.test.js b/src/components/transactions/transactionRow.test.js index ea3928618..10aac4688 100644 --- a/src/components/transactions/transactionRow.test.js +++ b/src/components/transactions/transactionRow.test.js @@ -20,8 +20,8 @@ describe('TransactionRow', () => { type: 0, timestamp: 35929631, senderPublicKey: 'c094ebee7ec0c50ebee32918655e089f6e1a604b83bcaa760293c61e0f18ab6f', - senderId: '16313739661670634666L', - recipientId: '537318935439898807L', + senderId: '16313739661670634666X', + recipientId: '537318935439898807X', recipientPublicKey: '86499879448d1b0215d59cbf078836e3d7d9d2782d56a2274a568761bff36f19', amount: 464000000000, fee: 10000000, @@ -30,7 +30,7 @@ describe('TransactionRow', () => { confirmations: 892, asset: {}, }; - const address = '16313739661670634666L'; + const address = '16313739661670634666X'; const options = { context: { store, history }, diff --git a/src/components/transactions/transactionType.test.js b/src/components/transactions/transactionType.test.js index e0938877e..a13cf4ab2 100644 --- a/src/components/transactions/transactionType.test.js +++ b/src/components/transactions/transactionType.test.js @@ -57,7 +57,7 @@ const createTest = (type) => { it(`show TransactionType equal to "${expectedValue}" for transaction type ${type}`, () => { const inputValue = { type, - senderId: '1085993630748340485L', + senderId: '1085993630748340485X', }; const wrapper = mount(, options); expect(wrapper.find('span').text()).to.be.equal(expectedValue); @@ -72,7 +72,7 @@ describe('TransactionType', () => { it('sets TransactionType equal the values of "props.senderId"', () => { const inputValue = { type: 0, - senderId: '1085993630748340485L', + senderId: '1085993630748340485X', }; const wrapper = mount(, options); expect(wrapper.find(TooltipWrapper)).to.have.lengthOf(1); diff --git a/src/components/transactions/transactions.js b/src/components/transactions/transactions.js index ba61e69ec..6cae55686 100644 --- a/src/components/transactions/transactions.js +++ b/src/components/transactions/transactions.js @@ -50,7 +50,7 @@ class Transactions extends React.Component {

{this.props.t('There are no transactions, yet.')}   {this.props.t('Receive LSK')} + to='receive'>{this.props.t('Receive LWF')}

} { beforeEach(() => { const account = { balance: 1000e8, - address: '16313739661670634666L', + address: '16313739661670634666X', passphrase: 'recipe bomb asset salon coil symbol tiger engine assist pact pumpkin visit', }; diff --git a/src/components/voting/voting.js b/src/components/voting/voting.js index d4dde3f78..3f5aeb938 100644 --- a/src/components/voting/voting.js +++ b/src/components/voting/voting.js @@ -107,7 +107,7 @@ class Voting extends React.Component { {this.props.t('Vote', { context: 'verb' })} {this.props.t('Rank')} {this.props.t('Name')} - {this.props.t('Lisk Address')} + {this.props.t('LWF Address')} {this.props.t('Uptime')} {this.props.t('Approval')} diff --git a/src/components/voting/voting.test.js b/src/components/voting/voting.test.js index 84de9f96c..03f52db91 100644 --- a/src/components/voting/voting.test.js +++ b/src/components/voting/voting.test.js @@ -33,7 +33,7 @@ describe('Voting', () => { totalDelegates: 10, votes, activePeer: {}, - address: '16313739661670634666L', + address: '16313739661670634666X', setActiveDialog: sinon.spy(), voteToggled: sinon.spy(), addTransaction: sinon.spy(), diff --git a/src/constants/netHashes.js b/src/constants/netHashes.js index 5c9baac29..13e392eb7 100644 --- a/src/constants/netHashes.js +++ b/src/constants/netHashes.js @@ -1,6 +1,6 @@ const netHash = { - testnet: 'da3ed6a45429278bac2666961289ca17ad86595d33b31037615d4b8e8f158bba', - mainnet: 'ed14889723f24ecc54871d058d98ce91ff2f973192075c0155ba2b7b70ad2511', + testnet: 'c16656e85880df9a41abed0aa13b2987b0d853adadc91cbc7e5c8332ea37ccc9', + mainnet: '704f232786a9bff25d0630c06abbc34957448ba6309d6dcef949cf9a6f43954a', }; export default netHash; diff --git a/src/constants/networks.js b/src/constants/networks.js index 4ebac39f2..082793f4e 100644 --- a/src/constants/networks.js +++ b/src/constants/networks.js @@ -15,7 +15,7 @@ module.exports = { customNode: { // network name translation t('Custom Node'); name: 'Custom Node', custom: true, - address: 'http://localhost:4000', + address: 'http://localhost:10000', code: 2, }, }; diff --git a/src/constants/voting.js b/src/constants/voting.js index bc8bcaa0f..1e19d72f8 100644 --- a/src/constants/voting.js +++ b/src/constants/voting.js @@ -1,6 +1,6 @@ const votingConst = { - maxCountOfVotesInOneTurn: 33, - maxCountOfVotes: 101, + maxCountOfVotesInOneTurn: 25, + maxCountOfVotes: 51, }; export default votingConst; diff --git a/src/index.html b/src/index.html index 6a2671b74..4fbb0e86b 100644 --- a/src/index.html +++ b/src/index.html @@ -3,9 +3,9 @@ - Lisk Nano + LWF Nano - +
diff --git a/src/store/middlewares/login.test.js b/src/store/middlewares/login.test.js index 3c98d9d9c..70b82b61b 100644 --- a/src/store/middlewares/login.test.js +++ b/src/store/middlewares/login.test.js @@ -1,4 +1,4 @@ -import Lisk from 'lisk-js'; +import Lisk from 'lwf-nano-js'; import { expect } from 'chai'; import { spy, stub } from 'sinon'; import middleware from './login'; @@ -13,7 +13,7 @@ describe('Login middleware', () => { const activePeer = Lisk.api({ name: 'Custom Node', custom: true, - address: 'http://localhost:4000', + address: 'http://localhost:10000', testnet: true, nethash: '198f2b61a8eb95fbeed58b8216780b68f697f26b849acf00c8c93bb9b24f783d', }); diff --git a/src/store/middlewares/savedAccounts.test.js b/src/store/middlewares/savedAccounts.test.js index ee852fac9..411197c01 100644 --- a/src/store/middlewares/savedAccounts.test.js +++ b/src/store/middlewares/savedAccounts.test.js @@ -10,7 +10,7 @@ import middleware from './savedAccounts'; describe('SavedAccounts middleware', () => { let store; let next; - const address = 'https://testnet.lisk.io'; + const address = 'https://wallet.lwf.io'; const publicKey = 'fab9d261ea050b9e326d7e11587eccc343a20e64e29d8781b50fd06683cacc88'; beforeEach(() => { diff --git a/src/store/middlewares/socket.test.js b/src/store/middlewares/socket.test.js index 710e9b6b7..9a83f6cee 100644 --- a/src/store/middlewares/socket.test.js +++ b/src/store/middlewares/socket.test.js @@ -32,7 +32,7 @@ describe('Socket middleware', () => { store = { getState: () => ({ - peers: { data: { options: { address: 'localhost:4000' } } }, + peers: { data: { options: { address: 'localhost:10000' } } }, account: { address: '1234' }, }), dispatch: spy(), diff --git a/src/store/middlewares/transactions.js b/src/store/middlewares/transactions.js index 3980afbce..a569ae939 100644 --- a/src/store/middlewares/transactions.js +++ b/src/store/middlewares/transactions.js @@ -13,7 +13,7 @@ const transactionAdded = (store, action) => { [transactionTypes.registerDelegate]: i18next.t('Delegate registration was successfully submitted with username: "{{username}}". It can take several seconds before it is processed.', { username: action.data.username }), [transactionTypes.vote]: i18next.t('Your votes were successfully submitted. It can take several seconds before they are processed.'), - [transactionTypes.send]: i18next.t('Your transaction of {{amount}} LSK to {{recipientAddress}} was accepted and will be processed in a few seconds.', + [transactionTypes.send]: i18next.t('Your transaction of {{amount}} LWF to {{recipientAddress}} was accepted and will be processed in a few seconds.', { amount: fromRawLsk(action.data.amount), recipientAddress: action.data.recipientId }), }; const text = texts[action.data.type]; diff --git a/src/store/middlewares/transactions.test.js b/src/store/middlewares/transactions.test.js index 5c464bc3f..29d8c048e 100644 --- a/src/store/middlewares/transactions.test.js +++ b/src/store/middlewares/transactions.test.js @@ -15,7 +15,7 @@ describe('transaction middleware', () => { const mockTransaction = { username: 'test', amount: 1e8, - recipientId: '16313739661670634666L', + recipientId: '16313739661670634666X', }; beforeEach(() => { @@ -25,7 +25,7 @@ describe('transaction middleware', () => { data: {}, }, account: { - address: '8096217735672704724L', + address: '8096217735672704724X', }, transactions: { pending: [], @@ -57,7 +57,7 @@ describe('transaction middleware', () => { }; const expectedMessages = [ - 'Your transaction of 1 LSK to 16313739661670634666L was accepted and will be processed in a few seconds.', + 'Your transaction of 1 LWF to 16313739661670634666LWF was accepted and will be processed in a few seconds.', 'Second passphrase registration was successfully submitted. It can take several seconds before it is processed.', 'Delegate registration was successfully submitted with username: "test". It can take several seconds before it is processed.', 'Your votes were successfully submitted. It can take several seconds before they are processed.', diff --git a/src/store/reducers/account.test.js b/src/store/reducers/account.test.js index ff0cce46e..b1a0a115c 100644 --- a/src/store/reducers/account.test.js +++ b/src/store/reducers/account.test.js @@ -11,7 +11,7 @@ describe('Reducer: account(state, action)', () => { balance: 0, passphrase: 'wagon stock borrow episode laundry kitten salute link globe zero feed marble', publicKey: 'c094ebee7ec0c50ebee32918655e089f6e1a604b83bcaa760293c61e0f18ab6f', - address: '16313739661670634666L', + address: '16313739661670634666X', }; }); diff --git a/src/store/reducers/savedAccounts.test.js b/src/store/reducers/savedAccounts.test.js index 436394691..0df1ff3e3 100644 --- a/src/store/reducers/savedAccounts.test.js +++ b/src/store/reducers/savedAccounts.test.js @@ -6,12 +6,12 @@ describe('Reducer: savedAccounts(state, action)', () => { const account = { publicKey: 'sample_key_1', network: 'Custom node', - address: 'http://localhost:4000', + address: 'http://localhost:10000', }; const account2 = { publicKey: 'sample_key_2', network: 'Custom node', - address: 'http://localhost:4000', + address: 'http://localhost:10000', }; it('should return action.data if action.type = actionTypes.accountsRetrieved', () => { diff --git a/src/utils/api/account.js b/src/utils/api/account.js index 20ed14460..e1ae1c24a 100644 --- a/src/utils/api/account.js +++ b/src/utils/api/account.js @@ -1,4 +1,4 @@ -import Lisk from 'lisk-js'; +import Lisk from 'lwf-nano-js'; import { requestToActivePeer } from './peers'; export const getAccount = (activePeer, address) => diff --git a/src/utils/api/account.test.js b/src/utils/api/account.test.js index 986eba7b3..fbb28d746 100644 --- a/src/utils/api/account.test.js +++ b/src/utils/api/account.test.js @@ -4,7 +4,7 @@ import { getAccount, setSecondPassphrase, send, transactions, unconfirmedTransac extractPublicKey, extractAddress } from './account'; describe('Utils: Account', () => { - const address = '1449310910991872227L'; + const address = '1449310910991872227X'; describe('getAccount', () => { let activePeerMock; @@ -87,13 +87,13 @@ describe('Utils: Account', () => { describe('extractAddress', () => { it('should return the account address from given passphrase', () => { const passphrase = 'field organ country moon fancy glare pencil combine derive fringe security pave'; - const derivedAddress = '440670704090200331L'; + const derivedAddress = '440670704090200331X'; expect(extractAddress(passphrase)).to.be.equal(derivedAddress); }); it('should return the account address from given public key', () => { const publicKey = 'a89751689c446067cc2107ec2690f612eb47b5939d5570d0d54b81eafaf328de'; - const derivedAddress = '440670704090200331L'; + const derivedAddress = '440670704090200331X'; expect(extractAddress(publicKey)).to.be.equal(derivedAddress); }); }); diff --git a/src/utils/notification.js b/src/utils/notification.js index b4ace4691..63596c15f 100644 --- a/src/utils/notification.js +++ b/src/utils/notification.js @@ -53,8 +53,8 @@ class Notification { * @memberof Notify */ _deposit(amount) { // eslint-disable-line - const body = i18next.t('You\'ve received {{value}} LSK.', { value: fromRawLsk(amount) }); - new window.Notification(i18next.t('LSK received'), { body }); // eslint-disable-line + const body = i18next.t('You\'ve received {{value}} LWF.', { value: fromRawLsk(amount) }); + new window.Notification(i18next.t('LWF received'), { body }); // eslint-disable-line } } diff --git a/src/utils/notification.test.js b/src/utils/notification.test.js index d4b0a884a..f66a5bf87 100644 --- a/src/utils/notification.test.js +++ b/src/utils/notification.test.js @@ -23,12 +23,12 @@ describe('Notification', () => { it('should call window.Notification', () => { window.Notification = mockNotification; - const msg = `You've received ${fromRawLsk(amount)} LSK.`; + const msg = `You've received ${fromRawLsk(amount)} LWF.`; notify.isFocused = false; notify.about('deposit', amount); expect(mockNotification).to.have.been.calledWith( - 'LSK received', { body: msg }, + 'LWF received', { body: msg }, ); mockNotification.reset(); }); diff --git a/src/utils/savedAccounts.test.js b/src/utils/savedAccounts.test.js index ab404fe9a..806ce9281 100644 --- a/src/utils/savedAccounts.test.js +++ b/src/utils/savedAccounts.test.js @@ -23,7 +23,7 @@ describe('savedAccounts', () => { { publicKey, network: 2, - address: 'http://localhost:4000', + address: 'http://localhost:10000', }, ]; diff --git a/test/e2e/registerDelegate.feature b/test/e2e/registerDelegate.feature index f5b0459c2..f47b02bc3 100644 --- a/test/e2e/registerDelegate.feature +++ b/test/e2e/registerDelegate.feature @@ -29,7 +29,7 @@ Feature: Register delegate Scenario: should not allow to register delegate if not enough funds for the fee Given I'm logged in as "empty account" When I click "register as delegate" in main menu - Then I should see "Insufficient funds for 25 LSK fee" error message + Then I should see "Insufficient funds for 25 LWF fee" error message And "register button" should be disabled diff --git a/test/e2e/registerSecondPassphrase.feature b/test/e2e/registerSecondPassphrase.feature index 07b4a7580..be9c78ca5 100644 --- a/test/e2e/registerSecondPassphrase.feature +++ b/test/e2e/registerSecondPassphrase.feature @@ -22,14 +22,14 @@ Feature: Register second passphrase When I click "register second passphrase" in main menu And I fill in passphrase of "empty account" to "passphrase" field And I click "authenticate button" - Then I should see "Insufficient funds for 5 LSK fee" error message + Then I should see "Insufficient funds for 5 LWF fee" error message And "next button" should be disabled @integration Scenario: should not allow to set 2nd passphrase if not enough funds for the fee Given I'm logged in as "empty account" When I click "register second passphrase" in main menu - Then I should see "Insufficient funds for 5 LSK fee" error message + Then I should see "Insufficient funds for 5 LWF fee" error message And "next button" should be disabled @integration diff --git a/test/e2e/savedAccounts.feature b/test/e2e/savedAccounts.feature index 37cbee63e..4b6c9bde2 100644 --- a/test/e2e/savedAccounts.feature +++ b/test/e2e/savedAccounts.feature @@ -12,16 +12,16 @@ Feature: Saved Accounts And I click "send button" And I should see empty "passphrase" field And I fill in "1" to "amount" field - And I fill in "537318935439898807L" to "recipient" field + And I fill in "537318935439898807X" to "recipient" field And I fill in passphrase of "genesis" to "passphrase" field And I click "submit button" And I click "ok button" And I wait 1 seconds And I click "send button" And I fill in "2" to "amount" field - And I fill in "537318935439898807L" to "recipient" field + And I fill in "537318935439898807X" to "recipient" field And I click "submit button" - And I should see alert dialog with title "Success" and text "Your transaction of 2 LSK to 537318935439898807L was accepted and will be processed in a few seconds." + And I should see alert dialog with title "Success" and text "Your transaction of 2 LWF to 537318935439898807X was accepted and will be processed in a few seconds." Scenario: should allow to save second account Given I'm logged in as "genesis" diff --git a/test/e2e/send.feature b/test/e2e/send.feature index c44e836aa..b0e63b4e4 100644 --- a/test/e2e/send.feature +++ b/test/e2e/send.feature @@ -4,16 +4,16 @@ Feature: Send dialog Given I'm logged in as "genesis" When I click "send button" And I fill in "1" to "amount" field - And I fill in "537318935439898807L" to "recipient" field + And I fill in "537318935439898807X" to "recipient" field And I click "submit button" - Then I should see alert dialog with title "Success" and text "Your transaction of 1 LSK to 537318935439898807L was accepted and will be processed in a few seconds." + Then I should see alert dialog with title "Success" and text "Your transaction of 1 LWF to 537318935439898807X was accepted and will be processed in a few seconds." @integration Scenario: should not allow to send when not enough funds Given I'm logged in as "empty account" When I click "send button" And I fill in "1" to "amount" field - And I fill in "537318935439898807L" to "recipient" field + And I fill in "537318935439898807X" to "recipient" field Then I should see "Insufficient funds" error message @integration @@ -28,7 +28,7 @@ Feature: Send dialog Given I'm logged in as "second passphrase account" When I click "send button" And I fill in "1" to "amount" field - And I fill in "537318935439898807L" to "recipient" field + And I fill in "537318935439898807X" to "recipient" field And I fill in second passphrase of "second passphrase account" to "second passphrase" field And I click "submit button" - Then I should see alert dialog with title "Success" and text "Your transaction of 1 LSK to 537318935439898807L was accepted and will be processed in a few seconds." + Then I should see alert dialog with title "Success" and text "Your transaction of 1 LWF to 537318935439898807X was accepted and will be processed in a few seconds." diff --git a/test/e2e/signMessage.feature b/test/e2e/signMessage.feature index 142b955e9..bd680f25c 100644 --- a/test/e2e/signMessage.feature +++ b/test/e2e/signMessage.feature @@ -6,14 +6,14 @@ Feature: Sign message And I click "primary button" Then I should see in "result" field: """ - -----BEGIN LISK SIGNED MESSAGE----- + -----BEGIN LWF SIGNED MESSAGE----- -----MESSAGE----- Hello world -----PUBLIC KEY----- c094ebee7ec0c50ebee32918655e089f6e1a604b83bcaa760293c61e0f18ab6f -----SIGNATURE----- 079331d868678fd5f272f09d6dc8792fb21335aec42af7f11caadbfbc17d4707e7d7f343854b0c619b647b81ba3f29b23edb4eaf382a47c534746bad4529560b48656c6c6f20776f726c64 - -----END LISK SIGNED MESSAGE----- + -----END LWF SIGNED MESSAGE----- """ @integration diff --git a/test/e2e/support/accounts.js b/test/e2e/support/accounts.js index 530aea0ba..6b5a25791 100644 --- a/test/e2e/support/accounts.js +++ b/test/e2e/support/accounts.js @@ -1,34 +1,34 @@ const accounts = { genesis: { passphrase: 'wagon stock borrow episode laundry kitten salute link globe zero feed marble', - address: '16313739661670634666L', + address: '16313739661670634666X', }, delegate: { passphrase: 'recipe bomb asset salon coil symbol tiger engine assist pact pumpkin visit', - address: '537318935439898807L', + address: '537318935439898807X', username: 'genesis_17', }, 'empty account': { passphrase: 'stay undo beyond powder sand laptop grow gloom apology hamster primary arrive', - address: '5932438298200837883L', + address: '5932438298200837883X', }, 'delegate candidate': { passphrase: 'right cat soul renew under climb middle maid powder churn cram coconut', - address: '544792633152563672L', + address: '544792633152563672X', username: 'test', }, 'second passphrase candidate': { passphrase: 'dolphin inhale planet talk insect release maze engine guilt loan attend lawn', - address: '4264113712245538326L', + address: '4264113712245538326X', }, 'send all account': { passphrase: 'oyster flush inquiry bright leopard gas replace ball hold pudding teach swear', - address: '16422276087748907680L', + address: '16422276087748907680X', }, 'second passphrase account': { passphrase: 'awkward service glimpse punch genre calm grow life bullet boil match like', secondPassphrase: 'forest around decrease farm vanish permit hotel clay senior matter endorse domain', - address: '1155682438012955434L', + address: '1155682438012955434X', }, }; accounts['any account'] = accounts.genesis; diff --git a/test/e2e/transactions.feature b/test/e2e/transactions.feature index 6e6bd8f24..c6cbf3f29 100644 --- a/test/e2e/transactions.feature +++ b/test/e2e/transactions.feature @@ -13,7 +13,7 @@ Feature: Transactions tab And I click "from-to" element on table row no. 1 And I fill in "1" to "amount" field And I click "submit button" - Then I should see alert dialog with title "Success" and text "Your transaction of 1 LSK to 537318935439898807L was accepted and will be processed in a few seconds." + Then I should see alert dialog with title "Success" and text "Your transaction of 1 LWF to 537318935439898807X was accepted and will be processed in a few seconds." @integration @pending @@ -23,13 +23,13 @@ Feature: Transactions tab And I click "amount" element on table row no. 1 And I wait 1 seconds And I click "submit button" - Then I should see alert dialog with title "Success" and text "Your transaction of 1 LSK to 537318935439898807L was accepted and will be processed in a few seconds." + Then I should see alert dialog with title "Success" and text "Your transaction of 1 LWF to 537318935439898807X was accepted and will be processed in a few seconds." - Scenario: should provide "Receive LSK" modal if there are "No transactions" + Scenario: should provide "Receive LWF" modal if there are "No transactions" Given I'm logged in as "empty account" When I click tab number 1 And I should see table with 0 lines - And I should see text "There are no transactions, yet. RECEIVE LSK" in "empty message" element + And I should see text "There are no transactions, yet. RECEIVE LWF" in "empty message" element And I click "receive lsk button" And I wait 1 seconds - Then I should see text "5932438298200837883L" in "receive modal address" element + Then I should see text "5932438298200837883X" in "receive modal address" element diff --git a/test/e2e/voting.feature b/test/e2e/voting.feature index 56a6d0aa7..391211208 100644 --- a/test/e2e/voting.feature +++ b/test/e2e/voting.feature @@ -34,7 +34,7 @@ Feature: Voting tab When I click tab number 2 And I click checkbox on table row no. 3 And I click "vote button" - Then I should see "Insufficient funds for 1 LSK fee" error message + Then I should see "Insufficient funds for 1 LWF fee" error message And "submit button" should be disabled @integration diff --git a/test/integration/voteDialog/index.test.js b/test/integration/voteDialog/index.test.js index e08b6d7c9..8eaef130b 100644 --- a/test/integration/voteDialog/index.test.js +++ b/test/integration/voteDialog/index.test.js @@ -13,12 +13,12 @@ import * as delegateApi from '../../../src/utils/api/delegate'; import VoteDialog from '../../../src/components/voteDialog'; const delegates = [ - { username: 'username1', publicKey: '123HG3452245L' }, - { username: 'username2', publicKey: '123HG3522345L' }, + { username: 'username1', publicKey: '123HG3452245X' }, + { username: 'username2', publicKey: '123HG3522345X' }, ]; const unvotedDelegate = [ - { username: 'username3', publicKey: '123HG3522445L' }, - { username: 'username4', publicKey: '123HG3522545L' }, + { username: 'username3', publicKey: '123HG3522445X' }, + { username: 'username4', publicKey: '123HG3522545X' }, ]; const keyCodes = { @@ -29,7 +29,7 @@ const keyCodes = { }; const realAccount = { - address: '16313739661670634666L', + address: '16313739661670634666X', balance: '346215336704', delegate: {}, multisignatures: [], @@ -41,15 +41,13 @@ const realAccount = { const peers = { defaultPeers: [ - 'node01.lisk.io', - 'node02.lisk.io', + 'wallet.lwf.io' ], defaultSSLPeers: [ - 'node01.lisk.io', - 'node02.lisk.io', + 'wallet.lwf.io' ], defaultTestnetPeers: [ - 'testnet.lisk.io', + 'twallet.lwf.io', ], options: { name: 'Testnet', @@ -62,16 +60,16 @@ const peers = { randomPeer: true, testnet: true, bannedPeers: [], - currentPeer: 'testnet.lisk.io', - port: 443, + currentPeer: 'wallet.lwf.io', + port: 9999, nethash: { 'Content-Type': 'application/json', - nethash: 'da3ed6a45429278bac2666961289ca17ad86595d33b31037615d4b8e8f158bba', - broadhash: 'da3ed6a45429278bac2666961289ca17ad86595d33b31037615d4b8e8f158bba', + nethash: '0daee950841005a3f56f6588b4b084695f0d74aaa38b21edab73446064638552', + broadhash: '0daee950841005a3f56f6588b4b084695f0d74aaa38b21edab73446064638552', os: 'lisk-js-api', version: '1.0.0', minVersion: '>=0.5.0', - port: 443, + port: 9999, }, };