From 037c797692936ffab3bbd49588f66f440ba18913 Mon Sep 17 00:00:00 2001 From: Scott Donald Date: Wed, 20 Jun 2018 17:38:44 +0200 Subject: [PATCH 01/10] Refactoring grpc connections --- imports/startup/both/nodes.js | 127 +++++--- imports/startup/client/functions.js | 42 ++- imports/startup/server/index.js | 287 ++++++++++++------ imports/ui/layouts/body/body.html | 2 +- imports/ui/layouts/body/body.js | 61 ++-- imports/ui/pages/tokens/tokenCreate.js | 13 +- imports/ui/pages/tokens/tokenCreateConfirm.js | 13 +- imports/ui/pages/tokens/tokenCreateResult.js | 9 +- imports/ui/pages/transfer/transfer.js | 32 +- imports/ui/pages/verify/tx.js | 16 +- mocknet.json | 14 +- testnet.json | 38 --- testslocal/001-wallet-loading.feature | 9 + testslocal/001-wallet-loading_steps.js | 3 + .../003-open-wallet-from-mnemonic.feature | 14 + .../003-open-wallet-from-mnemonic_steps.js | 26 ++ testslocal/004-create-wallet.feature | 14 + testslocal/004-create-wallet_steps.js | 5 + .../005-open-wallet-and-send-txn.feature | 29 ++ .../005-open-wallet-and-send-txn_steps.js | 3 + .../007-open-wallet-and-create-token.feature | 34 +++ .../007-open-wallet-and-create-token_steps.js | 112 +++++++ ...pen-wallet-and-send-token-transfer.feature | 27 ++ ...en-wallet-and-send-token-transfer_steps.js | 70 +++++ .../010-send-txn-from-shake256-wallet.feature | 26 ++ ...010-send-txn-from-shake256-wallet_steps.js | 3 + .../011-send-txn-from-sha2256-wallet.feature | 26 ++ .../011-send-txn-from-sha2256-wallet_steps.js | 3 + testslocal/features/helpers.js | 168 ++++++++++ 29 files changed, 954 insertions(+), 272 deletions(-) delete mode 100644 testnet.json create mode 100644 testslocal/001-wallet-loading.feature create mode 100644 testslocal/001-wallet-loading_steps.js create mode 100644 testslocal/003-open-wallet-from-mnemonic.feature create mode 100644 testslocal/003-open-wallet-from-mnemonic_steps.js create mode 100644 testslocal/004-create-wallet.feature create mode 100644 testslocal/004-create-wallet_steps.js create mode 100644 testslocal/005-open-wallet-and-send-txn.feature create mode 100644 testslocal/005-open-wallet-and-send-txn_steps.js create mode 100644 testslocal/007-open-wallet-and-create-token.feature create mode 100644 testslocal/007-open-wallet-and-create-token_steps.js create mode 100644 testslocal/009-open-wallet-and-send-token-transfer.feature create mode 100644 testslocal/009-open-wallet-and-send-token-transfer_steps.js create mode 100644 testslocal/010-send-txn-from-shake256-wallet.feature create mode 100644 testslocal/010-send-txn-from-shake256-wallet_steps.js create mode 100644 testslocal/011-send-txn-from-sha2256-wallet.feature create mode 100644 testslocal/011-send-txn-from-sha2256-wallet_steps.js create mode 100644 testslocal/features/helpers.js diff --git a/imports/startup/both/nodes.js b/imports/startup/both/nodes.js index 3d00af49..10d114bf 100644 --- a/imports/startup/both/nodes.js +++ b/imports/startup/both/nodes.js @@ -3,83 +3,126 @@ // All functions and variables are here are not defined by 'let' or 'const' // so that they can be utilised in other files within Meteor. -// Define the default nodes available in the UI. +// Define the default networks available in the UI. // eslint-disable-next-line no-unused-vars, no-undef -DEFAULT_NODES = [ +DEFAULT_NETWORKS = [ { - id: 'testnet-1', - name: 'Testnet (Official QRL Node 1)', + id: 'testnet', + name: 'Testnet', disabled: '', - explorerUrl: 'https://explorer.theqrl.org', - grpc: '104.237.3.185:9009', - type: 'both', - }, - { - id: 'testnet-2', - name: 'Testnet (Official QRL Node 2)', - disabled: '', - explorerUrl: 'https://explorer.theqrl.org', - grpc: '104.251.219.215:9009', - type: 'both', - }, - { - id: 'testnet-3', - name: 'Testnet (Official QRL Node 3)', - disabled: '', - explorerUrl: 'https://explorer.theqrl.org', - grpc: '104.251.219.145:9009', - type: 'both', - }, - { - id: 'testnet-4', - name: 'Testnet (Official QRL Node 4)', - disabled: '', - explorerUrl: 'https://explorer.theqrl.org', - grpc: '104.251.219.40:9009', + explorerUrl: 'https://testnet-explorer.theqrl.org', type: 'both', + healthy: false, + nodes: [ + { + id: 'testnet-1', + grpc: 'testnet-1.automated.theqrl.org:9009', + state: false, + height: 0 + }, + { + id: 'testnet-2', + grpc: 'testnet-2.automated.theqrl.org:9009', + state: false, + height: 0 + }, + { + id: 'testnet-3', + grpc: 'testnet-3.automated.theqrl.org:9009', + state: false, + height: 0 + }, + { + id: 'testnet-4', + grpc: 'testnet-4.automated.theqrl.org:9009', + state: false, + height: 0 + } + ] }, { id: 'mainnet', - name: 'Mainnet (Official QRL Node)', + name: 'Mainnet (QRL Foundation Nodes)', disabled: 'disabled', explorerUrl: 'https://explorer.theqrl.org', - grpc: '127.0.0.1:9009', type: 'both', + healthy: false, + nodes: [ + { + id: 'mainnet-1', + grpc: 'mainnet-1.automated.theqrl.org:9009', + state: false, + height: 0 + }, + { + id: 'mainnet-2', + grpc: 'mainnet-2.automated.theqrl.org:9009', + state: false, + height: 0 + }, + { + id: 'mainnet-3', + grpc: 'mainnet-3.automated.theqrl.org:9009', + state: false, + height: 0 + }, + { + id: 'mainnet-4', + grpc: 'mainnet-4.automated.theqrl.org:9009', + state: false, + height: 0 + } + ] }, { id: 'localhost', name: 'Localhost (Desktop App Only)', disabled: '', explorerUrl: 'http://explorer.theqrl.org', - grpc: 'localhost:9009', type: 'desktop', + healthy: false, + nodes: [ + { + id: 'localhost', + grpc: 'localhost:9009', + state: false, + height: 0 + } + ] } ] -// Override DEFAULT_NODES if provided in settings file +// Override DEFAULT_NETWORKS if provided in settings file try { - if (Meteor.settings.public.defaultNodes.length > 0) { - // Reset DEFAULT_NODES - DEFAULT_NODES = [] - // Set DEFAULT_NODES from Meteor settings - DEFAULT_NODES=Meteor.settings.public.defaultNodes + if (Meteor.settings.public.defaultNetworks.length > 0) { + // Reset DEFAULT_NETWORKS + DEFAULT_NETWORKS = [] + // Set DEFAULT_NETWORKS from Meteor settings + DEFAULT_NETWORKS=Meteor.settings.public.defaultNetworks } } catch (e) { // no configuration file used } -// Function to search through the DEFAULT_NODES array and identify and return an +// Function to search through the DEFAULT_NETWORKS array and identify and return an // object based on its 'id' value. // eslint-disable-next-line no-unused-vars, no-undef -findNodeData = (array, key) => { +findNetworkData = (array, key) => { if((LocalStore.get('nodeId') == 'custom') && (LocalStore.get('nodeStatus') != 'connecting')) { const nodeData = { id: 'custom', name: LocalStore.get('customNodeName'), disabled: '', explorerUrl: LocalStore.get('customNodeExplorerUrl'), - grpc: LocalStore.get('customNodeGrpc'), type: 'both', + nodes: [ + { + id: 'custom', + grpc: LocalStore.get('customNodeGrpc'), + state: false, + height: 0 + } + ] } return nodeData } else { diff --git a/imports/startup/client/functions.js b/imports/startup/client/functions.js index 1e2f9af8..139c6df3 100644 --- a/imports/startup/client/functions.js +++ b/imports/startup/client/functions.js @@ -12,9 +12,9 @@ isElectrified = () => { } // Returns the selected node -selectedNode = () => { - const selectedNode = document.getElementById('network').value - return selectedNode +selectedNetwork = () => { + const selectedNetwork = document.getElementById('network').value + return selectedNetwork } // Fetchs XMSS details from the global XMSS_OBJECT variable @@ -179,15 +179,31 @@ supportedBrowser = () => { } +// Wrapper for Meteor.call +wrapMeteorCall = (method, request, callback) => { + // Modify network to gRPC endpoint for custom/localhost settings + if (request.network == "localhost") { + // Override network to localhost + request.network = 'localhost:9009' + } + if (request.network == "custom") { + // Override network to localhost + request.network = LocalStore.get('nodeGrpc') + } + + Meteor.call(method, request, (err, res) => { + callback(err, res) + }) +} + // Get wallet address state details getBalance = (getAddress, callBack) => { - const grpcEndpoint = findNodeData(DEFAULT_NODES, selectedNode()).grpc const request = { address: addressForAPI(getAddress), - grpc: grpcEndpoint, + network: selectedNetwork() } - Meteor.call('getAddress', request, (err, res) => { + wrapMeteorCall('getAddress', request, (err, res) => { if (err) { console.log('err: ',err) LocalStore.set('transferFromBalance', 0) @@ -226,13 +242,13 @@ getBalance = (getAddress, callBack) => { loadAddressTransactions = (txArray) => { const request = { tx: txArray, - grpc: findNodeData(DEFAULT_NODES, selectedNode()).grpc, + network: selectedNetwork() } LocalStore.set('addressTransactions', []) $('#loadingTransactions').show() - Meteor.call('addressTransactions', request, (err, res) => { + wrapMeteorCall('addressTransactions', request, (err, res) => { if (err) { LocalStore.set('addressTransactions', { error: err }) } else { @@ -244,13 +260,12 @@ loadAddressTransactions = (txArray) => { } getTokenBalances = (getAddress, callback) => { - const grpcEndpoint = findNodeData(DEFAULT_NODES, selectedNode()).grpc const request = { address: addressForAPI(getAddress), - grpc: grpcEndpoint, + network: selectedNetwork() } - Meteor.call('getAddress', request, (err, res) => { + wrapMeteorCall('getAddress', request, (err, res) => { if (err) { console.log('err: ',err) LocalStore.set('transferFromBalance', 0) @@ -269,13 +284,12 @@ getTokenBalances = (getAddress, callback) => { let thisToken = {} - const grpcEndpoint = findNodeData(DEFAULT_NODES, selectedNode()).grpc const request = { query: tokenHash, - grpc: grpcEndpoint, + network: selectedNetwork() } - Meteor.call('getTxnHash', request, (err, res) => { + wrapMeteorCall('getTxnHash', request, (err, res) => { if (err) { console.log('err:',err) LocalStore.set('tokensHeld', []) diff --git a/imports/startup/server/index.js b/imports/startup/server/index.js index e25be1aa..b5f6d70e 100644 --- a/imports/startup/server/index.js +++ b/imports/startup/server/index.js @@ -36,29 +36,32 @@ const errorCallback = (error, message, alert) => { } // Load the qrl.proto gRPC client into qrlClient from a remote node. -const loadGrpcClient = (request, callback) => { +const loadGrpcClient = (endpoint, callback) => { // Load qrlbase.proto and fetch current qrl.proto from node const baseGrpcObject = grpc.load(Assets.absoluteFilePath('qrlbase.proto')) - const client = new baseGrpcObject.qrl.Base(request.grpc, grpc.credentials.createInsecure()) + const client = new baseGrpcObject.qrl.Base(endpoint, grpc.credentials.createInsecure()) client.getNodeInfo({}, (err, res) => { if (err) { - console.log(`Error fetching qrl.proto from ${request.grpc}`) + console.log(`Error fetching qrl.proto from ${endpoint}`) callback(err, null) } else { // Write a new temp file for this grpc connection const qrlProtoFilePath = tmp.fileSync({ mode: '0644', prefix: 'qrl-', postfix: '.proto' }).name fs.writeFile(qrlProtoFilePath, res.grpcProto, (fsErr) => { - if (fsErr) throw fsErr + if (fsErr) { + console.log(fsErr) + throw fsErr + } const grpcObject = grpc.load(qrlProtoFilePath) // Create the gRPC Connection - qrlClient[request.grpc] = - new grpcObject.qrl.PublicAPI(request.grpc, grpc.credentials.createInsecure()) + qrlClient[endpoint] = + new grpcObject.qrl.PublicAPI(endpoint, grpc.credentials.createInsecure()) - console.log(`qrlClient loaded for ${request.grpc}`) + console.log(`qrlClient loaded for ${endpoint}`) callback(null, true) }) @@ -66,36 +69,36 @@ const loadGrpcClient = (request, callback) => { }) } -// Client side function to establish a connection with a remote node. +// Establish a connection with a remote node. // If there is no active server side connection for the requested node, // this function will call loadGrpcClient to establish one. -const connectToNode = (request, callback) => { +const connectToNode = (endpoint, callback) => { // First check if there is an existing object to store the gRPC connection - if (qrlClient.hasOwnProperty(request.grpc) === true) { - console.log('Existing connection found for ', request.grpc, ' - attempting getNodeState') + if (qrlClient.hasOwnProperty(endpoint) === true) { + console.log('Existing connection found for ', endpoint, ' - attempting getNodeState') // There is already a gRPC object for this server stored. // Attempt to connect to it. try { - qrlClient[request.grpc].getNodeState({}, (err, response) => { + qrlClient[endpoint].getNodeState({}, (err, response) => { if (err) { - console.log('Error fetching node state for ', request.grpc) + console.log('Error fetching node state for ', endpoint) // If it errors, we're going to remove the object and attempt to connect again. - delete qrlClient[request.grpc] + delete qrlClient[endpoint] - console.log('Attempting re-connection to ', request.grpc) + console.log('Attempting re-connection to ', endpoint) - loadGrpcClient(request, (loadErr, loadResponse) => { + loadGrpcClient(endpoint, (loadErr, loadResponse) => { if (loadErr) { - console.log(`Failed to re-connect to node ${request.grpc}`) + console.log(`Failed to re-connect to node ${endpoint}`) const myError = errorCallback(err, 'Cannot connect to remote node', '**ERROR/connection** ') callback(myError, null) } else { - console.log(`Connected to ${request.grpc}`) + console.log(`Connected to ${endpoint}`) callback(null, loadResponse) } }) } else { - console.log(`Node state for ${request.grpc} ok`) + console.log(`Node state for ${endpoint} ok`) callback(null, response) } }) @@ -105,25 +108,140 @@ const connectToNode = (request, callback) => { callback(myError, null) } } else { - console.log(`Establishing new connection to ${request.grpc}`) + console.log(`Establishing new connection to ${endpoint}`) // We've not connected to this node before, let's establish a connection to it. - loadGrpcClient(request, (err, response) => { + loadGrpcClient(endpoint, (err) => { if (err) { - console.log(`Failed to connect to node ${request.grpc}`) + console.log(`Failed to connect to node ${endpoint}`) const myError = errorCallback(err, 'Cannot connect to remote node', '**ERROR/connection** ') callback(myError, null) } else { - console.log(`Connected to ${request.grpc}`) - callback(null, response) + console.log(`Connected to ${endpoint}`) + qrlClient[endpoint].getNodeState({}, (errState, response) => { + if (errState) { + console.log(`Failed to query node state ${endpoint}`) + const myError = errorCallback(err, 'Cannot connect to remote node', '**ERROR/connection** ') + callback(myError, null) + } else { + callback(null, response) + } + }) } }) } } +const checkNetworkHealth = (userNetwork, callback) => { + let networkHealthy = false + + // Determine current active nodes + DEFAULT_NETWORKS.forEach((network, networkIndex) => { + // Only look at health of userNetwork + if(network.id == userNetwork) { + if(network.healthy == true) { + networkHealthy = true + } + } + }) + + if (networkHealthy == true) { + callback(null, true) + } else { + callback(true, null) + } +} + +// Connect to all nodes +const connectNodes = () => { + // Establish gRPC connections with all enabled, non-localhost DEFAULT_NETWORKS + DEFAULT_NETWORKS.forEach((network, networkIndex) => { + if ((network.disabled === '') && (network.id !== 'localhost')) { + console.log(`Attempting to create gRPC connections to network: ${network.name} ...`) + + // Loop each node in the network and establish a gRPC connection. + const networkNodes = network.nodes + networkNodes.forEach((node, nodeIndex) => { + console.log(`Attempting to create gRPC connection to network: ${network.name}, node: ${node.id} (${node.grpc}) ...`) + const endpoint = node.grpc + connectToNode(endpoint, (err, res) => { + if (err) { + console.log(`Failed to connect to node ${endpoint}`) + DEFAULT_NETWORKS[networkIndex].nodes[nodeIndex].state = false + DEFAULT_NETWORKS[networkIndex].nodes[nodeIndex].height = 0 + } else { + console.log(`Connected to ${endpoint}`) + DEFAULT_NETWORKS[networkIndex].nodes[nodeIndex].state = true + DEFAULT_NETWORKS[networkIndex].nodes[nodeIndex].height = parseInt(res.info.block_height, 10) + // At least one node in the network is online, set network as healthy + DEFAULT_NETWORKS[networkIndex].healthy = true + } + }) + }) + } + }) +} + +// Wrapper to provide highly available API results in the event +// the primary or secondary nodes go offline +const qrlApi = (api, request, callback) => { + // Handle multi node network api requests + if((request.network == "devnet") || (request.network == "testnet") || (request.network == "mainnet")) { + // Store active nodes + const activeNodes = [] + + // Determine current active nodes + DEFAULT_NETWORKS.forEach((network, networkIndex) => { + // Only get nodes from user selected network + if(network.id == request.network) { + const networkNodes = network.nodes + networkNodes.forEach((node, nodeIndex) => { + if (node.state === true) { + activeNodes.push(node) + } + }) + } + }) + + // Determine node with highest block height and set as bestNode + const bestNode = {} + bestNode.grpc = '' + bestNode.height = 0 + activeNodes.forEach((node) => { + if (node.height > bestNode.height) { + bestNode.grpc = node.grpc + bestNode.height = node.height + } + }) + + // If all nodes are offline, fail + if (activeNodes.length === 0) { + const myError = errorCallback('The wallet server cannot connect to any API node', 'Cannot connect to API', '**ERROR/noActiveNodes/b**') + callback(myError, null) + } else { + // Make the API call + // Delete network from request object + delete request.network; + console.log('Making', api, 'request to', bestNode.grpc) + + qrlClient[bestNode.grpc][api](request, (error, response) => { + callback(error, response) + }) + } + } else { + // Handle custom and localhost connections + const apiEndpoint = request.network + // Delete network from request object + delete request.network; + qrlClient[apiEndpoint][api](request, (error, response) => { + callback(error, response) + }) + } +} + // Function to call getKnownPeers API. const getKnownPeers = (request, callback) => { - qrlClient[request.grpc].getKnownPeers({}, (err, response) => { + qrlApi('getKnownPeers', request, (err, response) => { if (err) { callback(err, null) } else { @@ -134,7 +252,7 @@ const getKnownPeers = (request, callback) => { const getStats = (request, callback) => { try { - qrlClient[request.grpc].getStats({}, (err, response) => { + qrlApi('getStats', request, (err, response) => { if (err) { const myError = errorCallback(err, 'Cannot access API/GetStats', '**ERROR/getStats** ') callback(myError, null) @@ -150,7 +268,7 @@ const getStats = (request, callback) => { // Function to call getAddressState API const getAddressState = (request, callback) => { - qrlClient[request.grpc].getAddressState({ address: request.address }, (err, response) => { + qrlApi('getAddressState', request, (err, response) => { if (err) { console.log(`Error: ${err.message}`) callback(err, null) @@ -228,7 +346,7 @@ const getTxnHash = (request, callback) => { const txnHash = Buffer.from(request.query, 'hex') try { - qrlClient[request.grpc].getObject({ query: txnHash }, (err, response) => { + qrlApi('getObject', { query: txnHash, network: request.network }, (err, response) => { if (err) { console.log(`Error: ${err.message}`) callback(err, null) @@ -248,10 +366,11 @@ const transferCoins = (request, callback) => { addresses_to: request.addresses_to, amounts: request.amounts, fee: request.fee, - xmss_pk: request.xmssPk + xmss_pk: request.xmssPk, + network: request.network } - qrlClient[request.grpc].transferCoins(tx, (err, response) => { + qrlApi('transferCoins', tx, (err, response) => { if (err) { console.log(`Error: ${err.message}`) callback(err, null) @@ -281,6 +400,7 @@ const confirmTransaction = (request, callback) => { // Overwrite addrs_to with our updated one confirmTxn.transaction_signed.transfer.addrs_to = addrs_to_Formatted + confirmTxn.network = request.network // Relay transaction through user node, then all default nodes. let txnResponse @@ -289,7 +409,7 @@ const confirmTransaction = (request, callback) => { // Relay through user node. function (wfcb) { try { - qrlClient[request.grpc].pushTransaction(confirmTxn, (err, res) => { + qrlApi('pushTransaction', confirmTxn, (err, res) => { console.log('Relayed Txn: ', Buffer.from(res.tx_hash).toString('hex')) if (err) { @@ -313,6 +433,7 @@ const confirmTransaction = (request, callback) => { wfcb() } }, + /* // Now relay through all default nodes that we have a connection too function(wfcb) { async.eachSeries(DEFAULT_NODES, (node, cb) => { @@ -342,6 +463,7 @@ const confirmTransaction = (request, callback) => { wfcb() }) }, + */ ], () => { // All done, send txn response txnResponse.relayed = relayedThrough @@ -364,9 +486,10 @@ const createTokenTxn = (request, callback) => { owner: request.owner, xmss_pk: request.xmssPk, xmss_ots_index: request.xmssOtsKey, + network: request.network } - qrlClient[request.grpc].getTokenTxn(tx, (err, response) => { + qrlApi('getTokenTxn', tx, (err, response) => { if (err) { console.log(`Error: ${err.message}`) callback(err, null) @@ -381,7 +504,6 @@ const createTokenTxn = (request, callback) => { }) } - const confirmTokenCreation = (request, callback) => { const confirmTxn = { transaction_signed: request.extended_transaction_unsigned.tx } const relayedThrough = [] @@ -408,6 +530,7 @@ const confirmTokenCreation = (request, callback) => { // Overwrite inital_balances with our updated one confirmTxn.transaction_signed.token.initial_balances = initialBalancesFormatted + confirmTxn.network = request.network // Relay transaction through user node, then all default nodes. let txnResponse @@ -416,7 +539,7 @@ const confirmTokenCreation = (request, callback) => { // Relay through user node. function (wfcb) { try{ - qrlClient[request.grpc].pushTransaction(confirmTxn, (err) => { + qrlApi('pushTransaction', confirmTxn, (err) => { if (err) { console.log(`Error: Failed to send transaction through ${request.grpc} - ${err}`) txnResponse = { error: err.message, response: err.message } @@ -438,6 +561,7 @@ const confirmTokenCreation = (request, callback) => { wfcb() } }, + /* // Now relay through all default nodes that we have a connection too function(wfcb) { async.eachSeries(DEFAULT_NODES, (node, cb) => { @@ -467,6 +591,7 @@ const confirmTokenCreation = (request, callback) => { wfcb() }) }, + */ ], () => { // All done, send txn response txnResponse.relayed = relayedThrough @@ -483,9 +608,10 @@ const createTokenTransferTxn = (request, callback) => { token_txhash: request.tokenHash, fee: request.fee, xmss_pk: request.xmssPk, + network: request.network } - qrlClient[request.grpc].getTransferTokenTxn(tx, (err, response) => { + qrlApi('getTransferTokenTxn', tx, (err, response) => { if (err) { console.log(`Error: ${err.message}`) callback(err, null) @@ -499,7 +625,6 @@ const createTokenTransferTxn = (request, callback) => { }) } - const confirmTokenTransfer = (request, callback) => { const confirmTxn = { transaction_signed: request.extended_transaction_unsigned.tx } const relayedThrough = [] @@ -521,6 +646,7 @@ const confirmTokenTransfer = (request, callback) => { // Overwrite addrs_to with our updated one confirmTxn.transaction_signed.transfer_token.addrs_to = addrs_to_Formatted + confirmTxn.network = request.network // Relay transaction through user node, then all default nodes. let txnResponse @@ -529,7 +655,7 @@ const confirmTokenTransfer = (request, callback) => { // Relay through user node. function (wfcb) { try { - qrlClient[request.grpc].pushTransaction(confirmTxn, (err) => { + qrlApi('pushTransaction', confirmTxn, (err) => { if (err) { console.log(`Error: Failed to send transaction through ${request.grpc} - ${err}`) txnResponse = { error: err.message, response: err.message } @@ -551,6 +677,7 @@ const confirmTokenTransfer = (request, callback) => { wfcb() } }, + /* // Now relay through all default nodes that we have a connection too function(wfcb) { async.eachSeries(DEFAULT_NODES, (node, cb) => { @@ -580,6 +707,7 @@ const confirmTokenTransfer = (request, callback) => { wfcb() }) }, + */ ], () => { // All done, send txn response txnResponse.relayed = relayedThrough @@ -602,17 +730,19 @@ const apiCall = (apiUrl, callback) => { Meteor.methods({ connectToNode(request) { this.unblock() - check(request, Object) + check(request, String) const response = Meteor.wrapAsync(connectToNode)(request) return response }, + checkNetworkHealth(request) { + this.unblock() + check(request, String) + const response = Meteor.wrapAsync(checkNetworkHealth)(request) + return response + }, status(request) { this.unblock() check(request, Object) - if (qrlClient[request.grpc] == null) { - console.log(`No active grpc connection available - connecting to: ${request.grpc}`) - Meteor.wrapAsync(connectToNode)(request) - } const response = Meteor.wrapAsync(getStats)(request) return response }, @@ -625,20 +755,12 @@ Meteor.methods({ getAddress(request) { this.unblock() check(request, Object) - if (qrlClient[request.grpc] == null) { - console.log(`No active grpc connection available - connecting to: ${request.grpc}`) - Meteor.wrapAsync(connectToNode)(request) - } const response = Meteor.wrapAsync(getAddressState)(request) return response }, getTxnHash(request) { this.unblock() check(request, Object) - if (qrlClient[request.grpc] == null) { - console.log(`No active grpc connection available - connecting to: ${request.grpc}`) - Meteor.wrapAsync(connectToNode)(request) - } const response = Meteor.wrapAsync(getTxnHash)(request) return response }, @@ -646,10 +768,7 @@ Meteor.methods({ txhash(request) { this.unblock() check(request, Object) - if (qrlClient[request.grpc] == null) { - console.log(`No active grpc connection available - connecting to: ${request.grpc}`) - Meteor.wrapAsync(connectToNode)(request) - } + // asynchronous call to API const response = Meteor.wrapAsync(getTxnHash)(request) // use explorer-helpers npm module to format the reponse @@ -659,9 +778,10 @@ Meteor.methods({ if (output.transaction.tx.transactionType === 'transfer_token') { // Request Token Decimals / Symbol const symbolRequest = { - query: Buffer.from(output.transaction.tx.transfer_token.token_txhash).toString('hex'), - grpc: request.grpc, - } + query: Buffer.from(output.transaction.tx.transfer_token.token_txhash).toString('hex'), + network: request.network + } + const thisSymbolResponse = Meteor.wrapAsync(getTxnHash)(symbolRequest) const thisSymbol = Buffer.from(thisSymbolResponse.transaction.tx.token.symbol).toString() const thisName = Buffer.from(thisSymbolResponse.transaction.tx.token.name).toString() @@ -712,19 +832,11 @@ Meteor.methods({ transferCoins(request) { this.unblock() check(request, Object) - if (qrlClient[request.grpc] == null) { - console.log(`No active grpc connection available - connecting to: ${request.grpc}`) - Meteor.wrapAsync(connectToNode)(request) - } const response = Meteor.wrapAsync(transferCoins)(request) return response }, addressTransactions(request) { check(request, Object) - if (qrlClient[request.grpc] == null) { - console.log(`No active grpc connection available - connecting to: ${request.grpc}`) - Meteor.wrapAsync(connectToNode)(request) - } const targets = request.tx @@ -732,7 +844,7 @@ Meteor.methods({ targets.forEach((arr) => { const thisRequest = { query: arr.txhash, - grpc: request.grpc, + network: request.network } try { @@ -911,50 +1023,30 @@ Meteor.methods({ confirmTransaction(request) { this.unblock() check(request, Object) - if (qrlClient[request.grpc] == null) { - console.log(`No active grpc connection available - connecting to: ${request.grpc}`) - Meteor.wrapAsync(connectToNode)(request) - } const response = Meteor.wrapAsync(confirmTransaction)(request) return response }, createTokenTxn(request) { this.unblock() check(request, Object) - if (qrlClient[request.grpc] == null) { - console.log(`No active grpc connection available - connecting to: ${request.grpc}`) - Meteor.wrapAsync(connectToNode)(request) - } const response = Meteor.wrapAsync(createTokenTxn)(request) return response }, confirmTokenCreation(request) { this.unblock() check(request, Object) - if (qrlClient[request.grpc] == null) { - console.log(`No active grpc connection available - connecting to: ${request.grpc}`) - Meteor.wrapAsync(connectToNode)(request) - } const response = Meteor.wrapAsync(confirmTokenCreation)(request) return response }, createTokenTransferTxn(request) { this.unblock() check(request, Object) - if (qrlClient[request.grpc] == null) { - console.log(`No active grpc connection available - connecting to: ${request.grpc}`) - Meteor.wrapAsync(connectToNode)(request) - } const response = Meteor.wrapAsync(createTokenTransferTxn)(request) return response }, confirmTokenTransfer(request) { this.unblock() check(request, Object) - if (qrlClient[request.grpc] == null) { - console.log(`No active grpc connection available - connecting to: ${request.grpc}`) - Meteor.wrapAsync(connectToNode)(request) - } const response = Meteor.wrapAsync(confirmTokenTransfer)(request) return response }, @@ -975,20 +1067,15 @@ if (Meteor.isServer) { Meteor.startup(() => { console.log(`QRL Wallet Starting - Version: ${WALLET_VERSION}`) - // Establish gRPC connections with all enabled, non-localhost DEFAULT_NODES - DEFAULT_NODES.forEach((node) => { - if ((node.disabled === '') && (node.id !== 'localhost')) { - console.log(`Attempting to create gRPC connection to node: ${node.name} (${node.grpc}) ...`) - - loadGrpcClient(node, (err) => { - if (err) { - console.log(`Error connecting to: ${node.name} (${node.grpc}) ...`) - } else { - console.log(`Connection created successfully for: ${node.name} (${node.grpc}) ...`) - } - }) - } - }) + // Attempt to create connections with all nodes + connectNodes() }) } +// Maintain node connection status +Meteor.setInterval(() => { + console.log('Refreshing node connection status') + + // Maintain state of connections to all nodes + connectNodes() +}, 20000) diff --git a/imports/ui/layouts/body/body.html b/imports/ui/layouts/body/body.html index 7fb08b0d..3119e2fa 100644 --- a/imports/ui/layouts/body/body.html +++ b/imports/ui/layouts/body/body.html @@ -89,7 +89,7 @@
- {{#each defaultNodes}} + {{#each defaultNetworks}}
{{this.name}}
{{/each}} {{#if customNodeCreated}} diff --git a/imports/ui/layouts/body/body.js b/imports/ui/layouts/body/body.js index 5b5e8b1d..d54562fc 100644 --- a/imports/ui/layouts/body/body.js +++ b/imports/ui/layouts/body/body.js @@ -1,8 +1,8 @@ /* eslint no-console:0 */ /* global LocalStore */ -/* global findNodeData */ -/* global DEFAULT_NODES */ -/* global selectedNode */ +/* global findNetworkData */ +/* global DEFAULT_NETWORKS */ +/* global selectedNetwork */ /* global isElectrified */ /* global WALLET_VERSION */ @@ -12,8 +12,18 @@ import '../../stylesheets/overrides.css' BlazeLayout.setRoot('body') -const connectToNode = (nodeData, callback) => { - Meteor.call('connectToNode', nodeData, (err, res) => { +const connectToNode = (endpoint, callback) => { + wrapMeteorCall('connectToNode', endpoint, (err, res) => { + if (err) { + callback(err, null) + } else { + callback(null, res) + } + }) +} + +const checkNetworkHealth = (network, callback) => { + wrapMeteorCall('checkNetworkHealth', network, (err, res) => { if (err) { callback(err, null) } else { @@ -23,16 +33,16 @@ const connectToNode = (nodeData, callback) => { } // Set session state based on selected network node. -const updateNode = (selectedNode) => { +const updateNetwork = (selectedNetwork) => { // Set node status to connecting LocalStore.set('nodeStatus', 'connecting') // Update local node connection details - switch (selectedNode) { + switch (selectedNetwork) { case 'add': { $('#addNode').modal({ onDeny: () => { LocalStore.set('modalEventTriggered', true) - $('#networkDropdown').dropdown('set selected', 'testnet-1') + $('#networkDropdown').dropdown('set selected', 'testnet') }, onApprove: () => { LocalStore.set('nodeId', 'custom') @@ -70,15 +80,15 @@ const updateNode = (selectedNode) => { }, }).modal('show') break - } + }; case 'custom': { const nodeData = { id: 'custom', name: LocalStore.get('customNodeName'), disabled: '', explorerUrl: LocalStore.get('customNodeExplorerUrl'), - grpc: LocalStore.get('customNodeGrpc'), type: 'both', + grpc: LocalStore.get('customNodeGrpc'), } LocalStore.set('nodeId', 'custom') @@ -87,7 +97,7 @@ const updateNode = (selectedNode) => { LocalStore.set('nodeExplorerUrl', LocalStore.get('customNodeExplorerUrl')) console.log('Connecting to custom remote gRPC node: ', nodeData.grpc) - connectToNode(nodeData, (err) => { + connectToNode(nodeData.grpc, (err) => { if (err) { console.log('Error: ', err) LocalStore.set('nodeStatus', 'failed') @@ -97,21 +107,21 @@ const updateNode = (selectedNode) => { } }) break - } + }; default: { - const nodeData = findNodeData(DEFAULT_NODES, selectedNode) + const nodeData = findNetworkData(DEFAULT_NETWORKS, selectedNetwork) LocalStore.set('nodeId', nodeData.id) LocalStore.set('nodeName', nodeData.name) LocalStore.set('nodeExplorerUrl', nodeData.explorerUrl) LocalStore.set('nodeGrpc', nodeData.grpc) - console.log('Connecting to remote gRPC node: ', nodeData.grpc) - connectToNode(nodeData, (err) => { + console.log('Connecting to network: ', nodeData.name) + checkNetworkHealth(nodeData.id, (err) => { if (err) { - console.log(err) + console.log('the error: ', err) LocalStore.set('nodeStatus', 'failed') } else { - console.log('gRPC client loaded: ', nodeData.grpc) + console.log('Connection to network is healthy: ', nodeData.id) LocalStore.set('nodeStatus', 'ok') } }) @@ -123,12 +133,10 @@ const updateNode = (selectedNode) => { Template.appBody.onRendered(() => { LocalStore.set('modalEventTriggered', false) - // $('.sidebar').first().sidebar('attach events', '#hamburger', 'show') - $('#networkDropdown').dropdown({ allowReselection: true }) $('.small.modal').modal() - updateNode(selectedNode()) + updateNetwork(selectedNetwork()) // Hide wallet warning on electrified clients if (isElectrified()) { @@ -184,14 +192,13 @@ Template.appBody.onRendered(() => { } }) - Template.appBody.events({ 'click #hamburger': (event) => { event.preventDefault() $('.sidebar').sidebar('show') }, 'change #network': () => { - updateNode(selectedNode()) + updateNetwork(selectedNetwork()) }, 'click #sendAndReceiveButton': () => { // Three primary sections @@ -248,27 +255,27 @@ Template.appBody.events({ Template.appBody.helpers({ nodeId() { if ((LocalStore.get('nodeId') === '') || (LocalStore.get('nodeId') === null)) { - return DEFAULT_NODES[0].id + return DEFAULT_NETWORKS[0].id } return LocalStore.get('nodeId') }, nodeName() { if ((LocalStore.get('nodeName') === '') || (LocalStore.get('nodeName') === null)) { - return DEFAULT_NODES[0].name + return DEFAULT_NETWORKS[0].name } return LocalStore.get('nodeName') }, nodeExplorerUrl() { if ((LocalStore.get('nodeExplorerUrl') === '') || (LocalStore.get('nodeExplorerUrl') === null)) { - return DEFAULT_NODES[0].explorerUrl + return DEFAULT_NETWORKS[0].explorerUrl } return LocalStore.get('nodeExplorerUrl') }, - defaultNodes() { + defaultNetworks() { const visibleNodes = [] // Only return nodes specific to this (web/desktop/both). - _.each(DEFAULT_NODES, (node) => { + _.each(DEFAULT_NETWORKS, (node) => { // Desktop Electrified Clients if ((node.type === 'desktop') && (isElectrified())) { visibleNodes.push(node) diff --git a/imports/ui/pages/tokens/tokenCreate.js b/imports/ui/pages/tokens/tokenCreate.js index 4919051a..4dd58da8 100644 --- a/imports/ui/pages/tokens/tokenCreate.js +++ b/imports/ui/pages/tokens/tokenCreate.js @@ -1,9 +1,8 @@ import './tokenCreate.html' /* global LocalStore */ -/* global selectedNode */ +/* global selectedNetwork */ /* global XMSS_OBJECT */ -/* global findNodeData */ -/* global DEFAULT_NODES */ +/* global DEFAULT_NETWORKS */ /* global SHOR_PER_QUANTA */ /* global nodeReturnedValidResponse */ @@ -61,7 +60,6 @@ function createTokenTxn() { } // Construct request - const grpcEndpoint = findNodeData(DEFAULT_NODES, selectedNode()).grpc const request = { addressFrom: sendFrom, owner: owner, @@ -71,10 +69,10 @@ function createTokenTxn() { initialBalances: tokenHolders, fee: txnFee * SHOR_PER_QUANTA, xmssPk: pubKey, - grpc: grpcEndpoint, + network: selectedNetwork() } - Meteor.call('createTokenTxn', request, (err, res) => { + wrapMeteorCall('createTokenTxn', request, (err, res) => { if (err) { LocalStore.set('tokenCreationError', err) $('#tokenCreationFailed').show() @@ -92,7 +90,6 @@ function createTokenTxn() { otsKey: otsKey, } - if (nodeReturnedValidResponse(request, confirmation, 'createTokenTxn')) { LocalStore.set('tokenCreationConfirmation', confirmation) LocalStore.set('tokenCreationConfirmationResponse', res.response) @@ -338,7 +335,7 @@ Template.appTokenCreate.helpers({ }, nodeExplorerUrl() { if ((LocalStore.get('nodeExplorerUrl') === '') || (LocalStore.get('nodeExplorerUrl') === null)) { - return DEFAULT_NODES[0].explorerUrl + return DEFAULT_NETWORKS[0].explorerUrl } return LocalStore.get('nodeExplorerUrl') }, diff --git a/imports/ui/pages/tokens/tokenCreateConfirm.js b/imports/ui/pages/tokens/tokenCreateConfirm.js index d62148f4..508d525e 100644 --- a/imports/ui/pages/tokens/tokenCreateConfirm.js +++ b/imports/ui/pages/tokens/tokenCreateConfirm.js @@ -1,11 +1,9 @@ import './tokenCreateConfirm.html' /* global LocalStore */ /* global QRLLIB */ -/* global selectedNode */ /* global XMSS_OBJECT */ -/* global findNodeData */ -/* global selectedNode */ -/* global DEFAULT_NODES */ +/* global selectedNetwork */ +/* global DEFAULT_NETWORKS */ function confirmTokenCreation() { const tx = LocalStore.get('tokenCreationConfirmationResponse') @@ -65,10 +63,9 @@ function confirmTokenCreation() { console.log('Txn Hash: ', txnHash) - const grpcEndpoint = findNodeData(DEFAULT_NODES, selectedNode()).grpc - tx.grpc = grpcEndpoint + tx.network = selectedNetwork() - Meteor.call('confirmTokenCreation', tx, (err, res) => { + wrapMeteorCall('confirmTokenCreation', tx, (err, res) => { if (res.error) { $('#tokenCreationConfirmation').hide() $('#transactionFailed').show() @@ -137,7 +134,7 @@ Template.appTokenCreationConfirm.helpers({ }, nodeExplorerUrl() { if ((LocalStore.get('nodeExplorerUrl') === '') || (LocalStore.get('nodeExplorerUrl') === null)) { - return DEFAULT_NODES[0].explorerUrl + return DEFAULT_NETWORKS[0].explorerUrl } return LocalStore.get('nodeExplorerUrl') }, diff --git a/imports/ui/pages/tokens/tokenCreateResult.js b/imports/ui/pages/tokens/tokenCreateResult.js index 49fad593..bd6ccfe4 100644 --- a/imports/ui/pages/tokens/tokenCreateResult.js +++ b/imports/ui/pages/tokens/tokenCreateResult.js @@ -3,6 +3,8 @@ import './tokenCreateResult.html' /* global LocalStore */ /* global POLL_TXN_RATE */ /* global POLL_MAX_CHECKS */ +/* global DEFAULT_NETWORKS */ +/* global selectedNetwork */ /* eslint no-console:0 */ function sleep(ms) { @@ -68,14 +70,13 @@ function pollTransaction(thisTxId, firstPoll = false, failureCount = 0) { LocalStore.set('txstatus', 'Pending') - const grpcEndpoint = findNodeData(DEFAULT_NODES, selectedNode()).grpc const request = { query: thisTxId, - grpc: grpcEndpoint, + network: selectedNetwork() } if (thisTxId) { - Meteor.call('getTxnHash', request, (err, res) => { + wrapMeteorCall('getTxnHash', request, (err, res) => { if (err) { if(failureCount < 60) { LocalStore.set('txhash', { }) @@ -142,7 +143,7 @@ Template.appTokenCreationResult.helpers({ }, nodeExplorerUrl() { if ((LocalStore.get('nodeExplorerUrl') === '') || (LocalStore.get('nodeExplorerUrl') === null)) { - return DEFAULT_NODES[0].explorerUrl + return DEFAULT_NETWORKS[0].explorerUrl } return LocalStore.get('nodeExplorerUrl') }, diff --git a/imports/ui/pages/transfer/transfer.js b/imports/ui/pages/transfer/transfer.js index b20b9a6a..11087247 100644 --- a/imports/ui/pages/transfer/transfer.js +++ b/imports/ui/pages/transfer/transfer.js @@ -3,10 +3,9 @@ import JSONFormatter from 'json-formatter-js' import './transfer.html' /* global LocalStore */ /* global QRLLIB */ -/* global selectedNode */ +/* global selectedNetwork */ /* global XMSS_OBJECT */ -/* global findNodeData */ -/* global DEFAULT_NODES */ +/* global DEFAULT_NETWORKS */ /* global SHOR_PER_QUANTA */ /* global POLL_TXN_RATE */ /* global POLL_MAX_CHECKS */ @@ -35,17 +34,16 @@ function generateTransaction() { } // Construct request - const grpcEndpoint = findNodeData(DEFAULT_NODES, selectedNode()).grpc const request = { fromAddress: sendFrom, addresses_to: this_addresses_to, amounts: this_amounts, fee: txnFee * SHOR_PER_QUANTA, xmssPk: pubKey, - grpc: grpcEndpoint, + network: selectedNetwork() } - Meteor.call('transferCoins', request, (err, res) => { + wrapMeteorCall('transferCoins', request, (err, res) => { if (err) { LocalStore.set('transactionGenerationError', err) $('#transactionGenFailed').show() @@ -149,10 +147,9 @@ function confirmTransaction() { console.log('Txn Hash: ', txnHash) // Prepare gRPC call - const grpcEndpoint = findNodeData(DEFAULT_NODES, selectedNode()).grpc - tx.grpc = grpcEndpoint + tx.network = selectedNetwork() - Meteor.call('confirmTransaction', tx, (err, res) => { + wrapMeteorCall('confirmTransaction', tx, (err, res) => { if (res.error) { $('#transactionConfirmation').hide() $('#transactionFailed').show() @@ -212,7 +209,6 @@ function sendTokensTxnCreate(tokenHash, decimals) { } // Construct request - const grpcEndpoint = findNodeData(DEFAULT_NODES, selectedNode()).grpc const request = { addressFrom: sendFromAddress, addresses_to: this_addresses_to, @@ -220,10 +216,10 @@ function sendTokensTxnCreate(tokenHash, decimals) { tokenHash: tokenHashBytes, fee: txnFee * SHOR_PER_QUANTA, xmssPk: pubKey, - grpc: grpcEndpoint, + network: selectedNetwork() } - Meteor.call('createTokenTransferTxn', request, (err, res) => { + wrapMeteorCall('createTokenTransferTxn', request, (err, res) => { if (err) { LocalStore.set('tokenTransferError', err) $('#transactionGenFailed').show() @@ -341,10 +337,9 @@ function confirmTokenTransfer() { console.log('Txn Hash: ', txnHash) - const grpcEndpoint = findNodeData(DEFAULT_NODES, selectedNode()).grpc - tx.grpc = grpcEndpoint + tx.network = selectedNetwork() - Meteor.call('confirmTokenTransfer', tx, (err, res) => { + wrapMeteorCall('confirmTokenTransfer', tx, (err, res) => { if (res.error) { $('#tokenCreationConfirmation').hide() $('#transactionFailed').show() @@ -434,14 +429,13 @@ function pollTransaction(thisTxId, firstPoll = false, failureCount = 0) { LocalStore.set('txstatus', 'Pending') LocalStore.set('transactionConfirmed', "false") - const grpcEndpoint = findNodeData(DEFAULT_NODES, selectedNode()).grpc const request = { query: thisTxId, - grpc: grpcEndpoint, + network: selectedNetwork() } if (thisTxId) { - Meteor.call('getTxnHash', request, (err, res) => { + wrapMeteorCall('getTxnHash', request, (err, res) => { if (err) { if(failureCount < POLL_MAX_CHECKS) { LocalStore.set('txhash', { }) @@ -721,7 +715,7 @@ Template.appTransfer.helpers({ }, nodeExplorerUrl() { if ((LocalStore.get('nodeExplorerUrl') === '') || (LocalStore.get('nodeExplorerUrl') === null)) { - return DEFAULT_NODES[0].explorerUrl + return DEFAULT_NETWORKS[0].explorerUrl } return LocalStore.get('nodeExplorerUrl') }, diff --git a/imports/ui/pages/verify/tx.js b/imports/ui/pages/verify/tx.js index f7a6db7b..f8da288a 100644 --- a/imports/ui/pages/verify/tx.js +++ b/imports/ui/pages/verify/tx.js @@ -2,9 +2,7 @@ import JSONFormatter from 'json-formatter-js' import './tx.html' /* global LocalStore */ -/* global findNodeData */ -/* global selectedNode */ -/* global DEFAULT_NODES */ +/* global selectedNetwork */ /* global SHOR_PER_QUANTA */ /* eslint no-console: 0 */ /* ^^^ remove once testing complete @@ -18,14 +16,13 @@ Template.appVerifyTxid.onRendered(() => { LocalStore.set('status', {}) const thisTxId = FlowRouter.getParam('txId') - const grpcEndpoint = findNodeData(DEFAULT_NODES, selectedNode()).grpc const request = { query: thisTxId, - grpc: grpcEndpoint, + network: selectedNetwork() } if (thisTxId) { - Meteor.call('txhash', request, (err, res) => { + wrapMeteorCall('txhash', request, (err, res) => { if (err) { LocalStore.set('txhash', { error: err, id: thisTxId }) } else { @@ -41,7 +38,7 @@ Template.appVerifyTxid.onRendered(() => { } }) - Meteor.call('status', request, (err, res) => { + wrapMeteorCall('status', { network: request.network }, (err, res) => { if (err) { LocalStore.set('status', { error: err }) } else { @@ -163,8 +160,11 @@ Template.appVerifyTxid.helpers({ return false }, nodeExplorerUrl() { + if ((LocalStore.get('nodeExplorerUrl') === '') || (LocalStore.get('nodeExplorerUrl') === null)) { + return DEFAULT_NETWORKS[0].explorerUrl + } return LocalStore.get('nodeExplorerUrl') - }, + } }) Template.appVerifyTxid.events({ diff --git a/mocknet.json b/mocknet.json index 22c25936..70bc15ba 100644 --- a/mocknet.json +++ b/mocknet.json @@ -1,13 +1,21 @@ { "public" :{ - "defaultNodes": [ + "defaultNetworks": [ { "id": "mocknet", "name": "Mocknet", "disabled": "", "explorerUrl": "https://explorer.theqrl.org", - "grpc": "127.0.0.1:10002", - "type": "both" + "type": "both", + "healthy": false, + "nodes": [ + { + "id": "mocknet", + "grpc": "127.0.0.1:10002", + "state": false, + "height": 0 + } + ] } ] } diff --git a/testnet.json b/testnet.json deleted file mode 100644 index a7b1b9b2..00000000 --- a/testnet.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "public" :{ - "defaultNodes": [ - { - "id": "testnet-1", - "name": "testnet-1", - "disabled": "", - "explorerUrl": "https://testnet-explorer.automated.theqrl.org", - "grpc": "testnet-1.automated.theqrl.org:9009", - "type": "both" - }, - { - "id": "testnet-2", - "name": "testnet-2", - "disabled": "", - "explorerUrl": "https://testnet-explorer.automated.theqrl.org", - "grpc": "testnet-2.automated.theqrl.org:9009", - "type": "both" - }, - { - "id": "testnet-3", - "name": "testnet-3", - "disabled": "", - "explorerUrl": "https://testnet-explorer.automated.theqrl.org", - "grpc": "testnet-3.automated.theqrl.org:9009", - "type": "both" - }, - { - "id": "testnet-4", - "name": "testnet-4", - "disabled": "", - "explorerUrl": "https://testnet-explorer.automated.theqrl.org", - "grpc": "testnet-4.automated.theqrl.org:9009", - "type": "both" - } - ] - } -} \ No newline at end of file diff --git a/testslocal/001-wallet-loading.feature b/testslocal/001-wallet-loading.feature new file mode 100644 index 00000000..39dbad00 --- /dev/null +++ b/testslocal/001-wallet-loading.feature @@ -0,0 +1,9 @@ +Feature: QRL Wallet is Loading + The QRL wallet website should load and have the correct title + +Background: + Given I am on the wallet site + +@watch +Scenario: Visitor opens homepage + Then I should see the title as "QRL Wallet" \ No newline at end of file diff --git a/testslocal/001-wallet-loading_steps.js b/testslocal/001-wallet-loading_steps.js new file mode 100644 index 00000000..61099080 --- /dev/null +++ b/testslocal/001-wallet-loading_steps.js @@ -0,0 +1,3 @@ +module.exports = function () { + 'use strict'; +}; \ No newline at end of file diff --git a/testslocal/003-open-wallet-from-mnemonic.feature b/testslocal/003-open-wallet-from-mnemonic.feature new file mode 100644 index 00000000..5a2c9e64 --- /dev/null +++ b/testslocal/003-open-wallet-from-mnemonic.feature @@ -0,0 +1,14 @@ +Feature: Open Wallet from Seed + As a visitor to the site, + I should be able to open a wallet from seed. + +Background: + Given I am on the wallet site + +@watch +Scenario: Visitor opens wallet from seed + When I click Open Wallet + And enter my mnemonic phrase "absorb filled perch retain tattoo likely snake photo rabbit editor shirt france exact angola style farce feels least zurich added gale risk hereby comedy yield pile mane signal camel stool depth throne torque orient" + And click Unlock Wallet + Then I should see "Unlocking wallet..." on the page + And I should then see my wallet address "Q01050095b99edcc2eb80153f30475bdbff8737723f9c9072be60c74c82983548e4a5bcbaab216f" on the page \ No newline at end of file diff --git a/testslocal/003-open-wallet-from-mnemonic_steps.js b/testslocal/003-open-wallet-from-mnemonic_steps.js new file mode 100644 index 00000000..a4fba554 --- /dev/null +++ b/testslocal/003-open-wallet-from-mnemonic_steps.js @@ -0,0 +1,26 @@ +module.exports = function () { + 'use strict'; + + this.When(/^I click Open Wallet$/, function () { + client.moveToObject('#openWalletButton') + browser.click('#openWalletButton') + }) + + this.When(/^click Unlock Wallet$/, function () { + client.moveToObject('#unlockButton') + browser.click('#unlockButton') + }) + + this.Then(/^I should see "([^"]*)" on the page$/, function (arg1) { + let _el = '#unlocking p' + browser.waitForVisible(_el, 30000) + expect(browser.getText(_el)).toEqual(arg1) + }) + + this.Then(/^I should then see my wallet address "([^"]*)" on the page$/, function (arg1) { + let _el = '#walletAddress' + // All time for gRPC call to be made and reply with data for view state. + browser.waitForText(_el, 30000) + expect(browser.getText(_el)).toEqual(arg1) + }) +}; \ No newline at end of file diff --git a/testslocal/004-create-wallet.feature b/testslocal/004-create-wallet.feature new file mode 100644 index 00000000..9ea846f4 --- /dev/null +++ b/testslocal/004-create-wallet.feature @@ -0,0 +1,14 @@ +Feature: Create Wallet + As a visitor to the site, + I should be able to create a new wallet. + +Background: + Given I am on the wallet site + +@watch +Scenario: Visitor creates a wallet + When I click New Wallet + And type a passphrase "password123" in + And press Create Wallet + Then I should see Generating new wallet + And I should then see my wallet details \ No newline at end of file diff --git a/testslocal/004-create-wallet_steps.js b/testslocal/004-create-wallet_steps.js new file mode 100644 index 00000000..28bc6895 --- /dev/null +++ b/testslocal/004-create-wallet_steps.js @@ -0,0 +1,5 @@ +module.exports = function () { + 'use strict'; + + // All steps are shared +}; \ No newline at end of file diff --git a/testslocal/005-open-wallet-and-send-txn.feature b/testslocal/005-open-wallet-and-send-txn.feature new file mode 100644 index 00000000..96b9f04f --- /dev/null +++ b/testslocal/005-open-wallet-and-send-txn.feature @@ -0,0 +1,29 @@ +Feature: Open Wallet and Send Txn + As a visitor to the site, + I should be able to open an existing wallet + And send a transaction from it + +Background: + Given I am on the wallet site + +@watch +Scenario: Visitor opens a wallet and sends a transaction + When I click Open Wallet + And enter my mnemonic phrase "absorb filled syrup axle occupy club fairly break liquid major patrol forbid throat swing emit hey inward blood pillow esteem madame cope under tent hawse glory muscle order bruise bold dad get carpet talk" + And click Unlock Wallet + Then I should see "Unlocking wallet..." on the page + And I should then see my wallet address "Q01050058bb3f8cb66fd90d0347478e5bdf3a475e82cfc5fe5dc276500ca21531e6edaf3d2d0f7e" on the page + When I then fill in the to address as "Q02040084c25e7c81ea109853ef474c925a3f6a10ae7ceb5651e26282e5877bd4ce49039fc59bb9" + And enter the amount as "5" + And I click Add Another Recipient + When I then fill in the second to address as "Q000400243b6f4a60669afbb192a04157822da2dfb1d0f1b99856df6f6948b1704a5fc552c4e3f8" + And enter the second amount as "10" + And enter the fee as "0.005" + And change the OTS Key Index to "10" + And click confirm + And I should then see a form confirming my transaction + When I then click confirmation transaction + Then I should see "Your transaction is being relayed into the QRL network..." + And I should see shortly after "Success! Your transaction has been relayed into the QRL network through the following nodes, and is pending validation." + And I should "Transaction Status: Pending" + And shortly after I should see "Transaction Status: Complete - Transaction" diff --git a/testslocal/005-open-wallet-and-send-txn_steps.js b/testslocal/005-open-wallet-and-send-txn_steps.js new file mode 100644 index 00000000..b0fe90a0 --- /dev/null +++ b/testslocal/005-open-wallet-and-send-txn_steps.js @@ -0,0 +1,3 @@ +module.exports = function () { + 'use strict'; +}; \ No newline at end of file diff --git a/testslocal/007-open-wallet-and-create-token.feature b/testslocal/007-open-wallet-and-create-token.feature new file mode 100644 index 00000000..b51367f8 --- /dev/null +++ b/testslocal/007-open-wallet-and-create-token.feature @@ -0,0 +1,34 @@ +Feature: Open Wallet and Send Token Creation Txn + As a visitor to the site, + I should be able to open an existing wallet + And create a token with it + +Background: + Given I am on the wallet site + +@watch +Scenario: Visitor opens a wallet and creates a token + When I click Open Wallet + And enter my mnemonic phrase "absorb filled syrup axle occupy club fairly break liquid major patrol forbid throat swing emit hey inward blood pillow esteem madame cope under tent hawse glory muscle order bruise bold dad get carpet talk" + And click Unlock Wallet + Then I should see "Unlocking wallet..." on the page + And I should then see my wallet address "Q01050058bb3f8cb66fd90d0347478e5bdf3a475e82cfc5fe5dc276500ca21531e6edaf3d2d0f7e" on the page + When I click Create Token + And I fill in the Owner address as "Q01050058bb3f8cb66fd90d0347478e5bdf3a475e82cfc5fe5dc276500ca21531e6edaf3d2d0f7e" + And I fill in the token symbol as "MNT" + And I fill in the token name as "Mocknet Test" + And I set the decimals to "4" + And I fill in holder address 1 as "Q01050058bb3f8cb66fd90d0347478e5bdf3a475e82cfc5fe5dc276500ca21531e6edaf3d2d0f7e" + And I fill in holder balance 1 as "50000" + And I click Add Another Holder + And I fill in holder address 2 as "Q010200a3f33bbfff9432bee62828345ba4cb6e24182a43ea38f472ad3cf775941b25c0870d6f41" + And I fill in holder balance 2 as "60000" + And enter the fee as "0.005" + And change the OTS Key Index to "11" + And click create token + And I should then see a form confirming my token creation transaction + When I then click confirmation token + Then I should see the relaying message "Your token is being relayed into the QRL network..." + And I should see shortly after success message "Success! Your token has been relayed into the QRL network through the following nodes, and is pending validation." + And I should see the pending message "Transaction Status: Pending" + And shortly after I should see confirmation message "Transaction Status: Complete - Transaction" diff --git a/testslocal/007-open-wallet-and-create-token_steps.js b/testslocal/007-open-wallet-and-create-token_steps.js new file mode 100644 index 00000000..10e0307d --- /dev/null +++ b/testslocal/007-open-wallet-and-create-token_steps.js @@ -0,0 +1,112 @@ +var fs = require('fs') + +module.exports = function () { + 'use strict'; + + this.setDefaultTimeout(300000); // 5 minute default timeout + + this.When(/^I click Create Token$/, function () {4 + client.moveToObject('#createTokenButton') + browser.click('#createTokenButton') + }) + + this.Then(/^I should see my new address$/, function () { + let _el = '#transferFormFromAddress' + + // All time for gRPC call to be made and reply with data for view state. + browser.waitForText(_el, 30000) + }) + + this.When(/^I fill in the Owner address as "([^"]*)"$/, function (arg1) { + browser.setValue('#owner', arg1) + }) + + this.When(/^I fill in the token symbol as "([^"]*)"$/, function (arg1) { + browser.setValue('#symbol', arg1) + }) + + + this.When(/^I fill in the token name as "([^"]*)"$/, function (arg1) { + browser.setValue('#name', arg1) + }) + + this.When(/^I set the decimals to "([^"]*)"$/, function (arg1) { + browser.setValue('#decimals', arg1) + }) + + + this.When(/^I fill in holder address 1 as "([^"]*)"$/, function (arg1) { + browser.setValue('#initialBalancesAddress_1', arg1) + }) + + this.When(/^I fill in holder balance 1 as "([^"]*)"$/, function (arg1) { + browser.setValue('#initialBalancesAddressAmount_1', arg1) + }) + + this.When(/^I click Add Another Holder$/, function () {4 + client.moveToObject('#addTokenHolder') + browser.click('#addTokenHolder') + }) + + this.When(/^I fill in holder address 2 as "([^"]*)"$/, function (arg1) { + browser.setValue('#initialBalancesAddress_2', arg1) + }) + + this.When(/^I fill in holder balance 2 as "([^"]*)"$/, function (arg1) { + browser.setValue('#initialBalancesAddressAmount_2', arg1) + }) + + this.When(/^click create token$/, function () { + client.moveToObject('#createToken') + browser.click('#createToken') + }) + + this.Then(/^I should then see a form confirming my token creation transaction$/, function () { + let _el = '#tokenCreationConfirmation' + browser.waitForVisible(_el, 60000) + }) + + this.When(/^I then click confirmation token$/, function () { + client.moveToObject('#confirmToken') + browser.click('#confirmToken') + }) + + this.Then(/^I should see the relaying message "([^"]*)"$/, function (arg1) { + let _el = '#tokenRelayingMsg' + browser.waitForVisible(_el) + expect(browser.getText(_el)).toEqual(arg1) + }) + + this.Then(/^I should see shortly after success message "([^"]*)"$/, function (arg1) { + let _el = '#successMessage' + browser.waitForVisible(_el, 120000) + expect(browser.getText(_el)).toEqual(arg1) + + // Write token hash to file for Explorer test 8 + fs.writeFileSync('/tmp/chimp-TOKEN_HASH', browser.getText('#confirmedTokenHash')) + }) + + this.Then(/^I should see the pending message "([^"]*)"$/, function (arg1) { + let _el = '#finalTxnStatus' + + browser.waitUntil(function () { + const thisResult = browser.getText(_el) + if(thisResult.indexOf(arg1) >=0) { + return true + } + }, 300000, 'expected transaction to be in pending state') + }) + + this.Then(/^shortly after I should see confirmation message "([^"]*)"$/, function (arg1) { + let _el = '#finalTxnStatus' + + browser.waitUntil(function () { + const thisResult = browser.getText(_el) + if(thisResult.indexOf(arg1) >=0) { + return true + } + }, 300000, 'expected transaction confirmation within 5 minutes') + + }) + +}; \ No newline at end of file diff --git a/testslocal/009-open-wallet-and-send-token-transfer.feature b/testslocal/009-open-wallet-and-send-token-transfer.feature new file mode 100644 index 00000000..1a48403d --- /dev/null +++ b/testslocal/009-open-wallet-and-send-token-transfer.feature @@ -0,0 +1,27 @@ +Feature: Open Wallet and Send Token Transfer Txn + As a visitor to the site, + I should be able to open an existing wallet + And send a token transfer transaction from it + +Background: + Given I am on the wallet site + +@watch +Scenario: Visitor opens a wallet and sends a token transfer transaction + When I click Open Wallet + And enter my mnemonic phrase "absorb filled syrup axle occupy club fairly break liquid major patrol forbid throat swing emit hey inward blood pillow esteem madame cope under tent hawse glory muscle order bruise bold dad get carpet talk" + And click Unlock Wallet + Then I should see "Unlocking wallet..." on the page + And I should then see my wallet address "Q01050058bb3f8cb66fd90d0347478e5bdf3a475e82cfc5fe5dc276500ca21531e6edaf3d2d0f7e" on the page + When I then fill in the to address as "Q010200a3f33bbfff9432bee62828345ba4cb6e24182a43ea38f472ad3cf775941b25c0870d6f41" + And set the transfer type to my recently created token + And enter the amount as "50" + And enter the fee as "0.005" + And change the OTS Key Index to "12" + And click confirm + And I should then see a form confirming my token transfer transaction + When I then click confirmation transaction for token transfer + Then I should see a token relaying message "Your transaction is being relayed into the QRL network..." + And I should see shortly after sending my token transfer "Success! Your token transfer has been relayed into the QRL network through the following nodes, and is pending validation." + And I should see the token transfer pending "Transaction Status: Pending" + And shortly after I should see the token transfer complete "Transaction Status: Complete - Transaction" diff --git a/testslocal/009-open-wallet-and-send-token-transfer_steps.js b/testslocal/009-open-wallet-and-send-token-transfer_steps.js new file mode 100644 index 00000000..3a9485df --- /dev/null +++ b/testslocal/009-open-wallet-and-send-token-transfer_steps.js @@ -0,0 +1,70 @@ +var fs = require('fs') + +module.exports = function () { + 'use strict'; + + this.setDefaultTimeout(300000); // 5 minute default timeout + + this.When(/^set the transfer type to my recently created token$/, function () { + // Grab txn hash from temp file + var txnHash = fs.readFileSync('/tmp/chimp-TOKEN_HASH').toString() + + // Give API 10 seconds to respond with address state for tokens + browser.pause(10000) + + // This is how we have to click the Semantic UI dropdowns ... + browser.waitForVisible('#amountFields', 30000) + browser.click('#amountFields > div') + + browser.waitForVisible('#amountFields > div > div.menu.transition.visible > div:nth-child(2)', 30000) + browser.click('#amountFields > div > div.menu.transition.visible > div:nth-child(2)') + }) + + this.Then(/^I should then see a form confirming my token transfer transaction$/, function () { + let _el = '#confirmTokenTransactionArea' + browser.waitForVisible(_el, 60000) + }) + + this.When(/^I then click confirmation transaction for token transfer$/, function () { + browser.click('#confirmTokenTransaction') + }) + + this.Then(/^I should see a token relaying message "([^"]*)"$/, function (arg1) { + let _el = '#tokenTransferRelayingMsg' + browser.waitForVisible(_el) + expect(browser.getText(_el)).toEqual(arg1) + }) + + this.Then(/^I should see shortly after sending my token transfer "([^"]*)"$/, function (arg1) { + let _el = '#successMessage' + browser.waitForVisible(_el, 120000) + expect(browser.getText(_el)).toEqual(arg1) + + // Write txn hash to file for Explorer test 10 + fs.writeFileSync('/tmp/chimp-TOKEN_XFER_HASH', browser.getText('#confirmedTransferTokenTxnHash')) + }) + + this.Then(/^I should see the token transfer pending "([^"]*)"$/, function (arg1) { + let _el = '#finalTokenXferTxnStatus' + + browser.waitUntil(function () { + const thisResult = browser.getText(_el) + if(thisResult.indexOf(arg1) >=0) { + return true + } + }, 300000, 'expected transaction to be in pending state') + }) + + this.Then(/^shortly after I should see the token transfer complete "([^"]*)"$/, function (arg1) { + let _el = '#finalTokenXferTxnStatus' + + browser.waitUntil(function () { + const thisResult = browser.getText(_el) + if(thisResult.indexOf(arg1) >=0) { + return true + } + }, 300000, 'expected transaction confirmation within 5 minutes') + + }) + +}; \ No newline at end of file diff --git a/testslocal/010-send-txn-from-shake256-wallet.feature b/testslocal/010-send-txn-from-shake256-wallet.feature new file mode 100644 index 00000000..7d2ab8b6 --- /dev/null +++ b/testslocal/010-send-txn-from-shake256-wallet.feature @@ -0,0 +1,26 @@ +Feature: Open Shake 256 Wallet and Send Txn + As a visitor to the site, + I should be able to open an existing shake 256 wallet + And send a transaction from it + +Background: + Given I am on the wallet site + +@watch +Scenario: Visitor opens a wallet and sends a transaction + When I click Open Wallet + And enter my mnemonic phrase "action drank axle clay bulk align spoon cheery squash moor mine linger dispel rest timid aura aunt lead robert niche almond boil devote kindly slam sigh burden amazon equity embark limit noble sport knight" + And click Unlock Wallet + Then I should see "Unlocking wallet..." on the page + And I should then see my wallet address "Q02040084c25e7c81ea109853ef474c925a3f6a10ae7ceb5651e26282e5877bd4ce49039fc59bb9" on the page + When I then fill in the to address as "Q010200a3f33bbfff9432bee62828345ba4cb6e24182a43ea38f472ad3cf775941b25c0870d6f41" + And enter the amount as "1" + And enter the fee as "0.005" + And change the OTS Key Index to "5" + And click confirm + And I should then see a form confirming my transaction + When I then click confirmation transaction + Then I should see "Your transaction is being relayed into the QRL network..." + And I should see shortly after "Success! Your transaction has been relayed into the QRL network through the following nodes, and is pending validation." + And I should "Transaction Status: Pending" + And shortly after I should see "Transaction Status: Complete - Transaction" diff --git a/testslocal/010-send-txn-from-shake256-wallet_steps.js b/testslocal/010-send-txn-from-shake256-wallet_steps.js new file mode 100644 index 00000000..b0fe90a0 --- /dev/null +++ b/testslocal/010-send-txn-from-shake256-wallet_steps.js @@ -0,0 +1,3 @@ +module.exports = function () { + 'use strict'; +}; \ No newline at end of file diff --git a/testslocal/011-send-txn-from-sha2256-wallet.feature b/testslocal/011-send-txn-from-sha2256-wallet.feature new file mode 100644 index 00000000..5ea21a0a --- /dev/null +++ b/testslocal/011-send-txn-from-sha2256-wallet.feature @@ -0,0 +1,26 @@ +Feature: Open SHA2_256 Wallet and Send Txn + As a visitor to the site, + I should be able to open an existing SHA2_256 wallet + And send a transaction from it + +Background: + Given I am on the wallet site + +@watch +Scenario: Visitor opens a wallet and sends a transaction + When I click Open Wallet + And enter my mnemonic phrase "aback drank itself lousy kitten tenant task cheek fort tom series heyday fig sorrow swan tehran legend gemini calmly beech arrive prior with airy orphan for royal afloat loaf host gorge stair avenue midst" + And click Unlock Wallet + Then I should see "Unlocking wallet..." on the page + And I should then see my wallet address "Q000400243b6f4a60669afbb192a04157822da2dfb1d0f1b99856df6f6948b1704a5fc552c4e3f8" on the page + When I then fill in the to address as "Q010200a3f33bbfff9432bee62828345ba4cb6e24182a43ea38f472ad3cf775941b25c0870d6f41" + And enter the amount as "1" + And enter the fee as "0.005" + And change the OTS Key Index to "5" + And click confirm + And I should then see a form confirming my transaction + When I then click confirmation transaction + Then I should see "Your transaction is being relayed into the QRL network..." + And I should see shortly after "Success! Your transaction has been relayed into the QRL network through the following nodes, and is pending validation." + And I should "Transaction Status: Pending" + And shortly after I should see "Transaction Status: Complete - Transaction" diff --git a/testslocal/011-send-txn-from-sha2256-wallet_steps.js b/testslocal/011-send-txn-from-sha2256-wallet_steps.js new file mode 100644 index 00000000..b0fe90a0 --- /dev/null +++ b/testslocal/011-send-txn-from-sha2256-wallet_steps.js @@ -0,0 +1,3 @@ +module.exports = function () { + 'use strict'; +}; \ No newline at end of file diff --git a/testslocal/features/helpers.js b/testslocal/features/helpers.js new file mode 100644 index 00000000..ab2b8164 --- /dev/null +++ b/testslocal/features/helpers.js @@ -0,0 +1,168 @@ +var fs = require('fs') + +// This file contains steps shared over multiple tests. +module.exports = function() { + 'use strict'; + + this.setDefaultTimeout(300000); // 5 minute default timeout + + /* SHARED */ + this.Then(/^I should see the title as "([^"]*)"$/, function (arg1) { + expect(browser.getTitle()).toEqual(arg1) + }) + + /* WALLET */ + this.Given(/^I am on the wallet site$/, function () { + browser.url('http://localhost:3000') + // Hide top warning bar + browser.execute(function() { + document.getElementsByClassName('main-content-warning')[0].style.visibility = 'hidden'; + }) + }) + + this.When(/^I click New Wallet$/, function () { + browser.click('#newWalletButton') + }) + + this.When(/^type a passphrase "([^"]*)" in$/, function (arg1) { + // For some reason, having a password type input element on the page breaks + // the tests. This is a hack to change the type of the passphrase input + // to text such that the walletCode setValue statement works. + browser.execute(function() { + // browser context + passphraseBox = document.getElementById("passphrase"); + passphraseBox.type = "text"; + + passphraseBox2 = document.getElementById("passphraseConfirm"); + passphraseBox2.type = "text"; + }) + + browser.setValue('#passphrase', arg1) + browser.setValue('#passphraseConfirm', arg1) + }) + + this.When(/^press Create Wallet$/, function () { + client.moveToObject('#generate') + browser.click('#generate') + }) + + this.Then(/^I should see Generating new wallet$/, function () { + let _el = '#generating' + // client.moveToObject(_el) + browser.waitForVisible(_el, 30000) + }) + + this.Then(/^I should then see my wallet details$/, function () { + let _el = '#newAddressMnemonic' + browser.waitForText(_el, 30000) // Wait for a mnemonic to appear + }) + + this.Then(/^I should see a loader icon$/, function () { + let _el = '.loader' + browser.waitForVisible(_el, 30000) + }) + + this.Then(/^I should see a loading icon$/, function () { + let _el = '.loading' + browser.waitForVisible(_el, 30000) + }) + + this.When(/^enter my mnemonic phrase "([^"]*)"$/, function (arg1) { + // For some reason, having a password type input element on the page breaks + // the tests. This is a hack to change the type of the passphrase input + // to text such that the walletCode setValue statement works. + browser.execute(function() { + // browser context + passphraseBox = document.getElementById("passphrase"); + passphraseBox.type = "text"; + }) + + browser.setValue('#walletCode', arg1) + }) + + // Sending Txn Shared Functions + this.When(/^enter the fee as "([^"]*)"$/, function (arg1) { + browser.setValue('#fee', arg1) + }) + + this.When(/^change the OTS Key Index to "([^"]*)"$/, function (arg1) { + browser.setValue('#otsKey', arg1) + }) + + this.When(/^click confirm$/, function () { + browser.click('#generateTransaction') + }) + + this.When(/^I then fill in the to address as "([^"]*)"$/, function (arg1) { + browser.setValue('#to_1', arg1) + }) + + this.When(/^enter the amount as "([^"]*)"$/, function (arg1) { + browser.setValue('#amounts_1', arg1) + }) + + this.When(/^I click Add Another Recipient$/, function () { + browser.click('#addTransferRecipient') + }) + + this.When(/^I then fill in the second to address as "([^"]*)"$/, function (arg1) { + browser.setValue('#to_2', arg1) + }) + + this.When(/^enter the second amount as "([^"]*)"$/, function (arg1) { + browser.setValue('#amounts_2', arg1) + }) + + this.Then(/^I should then see a form confirming my transaction$/, function () { + let _el = '#confirmTransactionArea' + browser.waitForVisible(_el, 60000) + }) + + this.When(/^I then click confirmation transaction$/, function () { + browser.click('#confirmTransaction') + }) + + this.Then(/^I should see shortly after "([^"]*)"$/, function (arg1) { + let _el = '#transferSuccessMessage' + browser.waitForVisible(_el, 120000) + expect(browser.getText(_el)).toEqual(arg1) + + // Write txn hash to file for Explorer test 6 + fs.writeFileSync('/tmp/chimp-TXN_HASH', browser.getText('#confirmedTransferTxnHash')) + }) + + this.Then(/^I should see "([^"]*)"$/, function (arg1) { + let _el = '#transferRelayingMsg' + browser.waitForVisible(_el) + expect(browser.getText(_el)).toEqual(arg1) + }) + + this.Then(/^I should "([^"]*)"$/, function (arg1) { + let _el = '#transferFinalTxnStatus' + + browser.waitUntil(function () { + const thisResult = browser.getText(_el) + if(thisResult.indexOf(arg1) >=0) { + return true + } + }, 300000, 'expected transaction to be in pending state') + }) + + this.Then(/^shortly after I should see "([^"]*)"$/, function (arg1) { + let _el = '#transferFinalTxnStatus' + + browser.waitUntil(function () { + const thisResult = browser.getText(_el) + if(thisResult.indexOf(arg1) >=0) { + return true + } + }, 300000, 'expected transaction confirmation within 5 minutes') + + }) + + /* EXPLORER */ + this.Given(/^I am on the explorer site$/, function () { + browser.url('http://localhost:3003') + }) + +}; From d42acaecc9ce3d73aaf19fa9bb5a528f20c54ef0 Mon Sep 17 00:00:00 2001 From: Scott Donald Date: Wed, 20 Jun 2018 17:43:37 +0200 Subject: [PATCH 02/10] Removing local tests --- .gitignore | 1 + testslocal/001-wallet-loading.feature | 9 - testslocal/001-wallet-loading_steps.js | 3 - .../003-open-wallet-from-mnemonic.feature | 14 -- .../003-open-wallet-from-mnemonic_steps.js | 26 --- testslocal/004-create-wallet.feature | 14 -- testslocal/004-create-wallet_steps.js | 5 - .../005-open-wallet-and-send-txn.feature | 29 --- .../005-open-wallet-and-send-txn_steps.js | 3 - .../007-open-wallet-and-create-token.feature | 34 ---- .../007-open-wallet-and-create-token_steps.js | 112 ------------ ...pen-wallet-and-send-token-transfer.feature | 27 --- ...en-wallet-and-send-token-transfer_steps.js | 70 -------- .../010-send-txn-from-shake256-wallet.feature | 26 --- ...010-send-txn-from-shake256-wallet_steps.js | 3 - .../011-send-txn-from-sha2256-wallet.feature | 26 --- .../011-send-txn-from-sha2256-wallet_steps.js | 3 - testslocal/features/helpers.js | 168 ------------------ 18 files changed, 1 insertion(+), 572 deletions(-) delete mode 100644 testslocal/001-wallet-loading.feature delete mode 100644 testslocal/001-wallet-loading_steps.js delete mode 100644 testslocal/003-open-wallet-from-mnemonic.feature delete mode 100644 testslocal/003-open-wallet-from-mnemonic_steps.js delete mode 100644 testslocal/004-create-wallet.feature delete mode 100644 testslocal/004-create-wallet_steps.js delete mode 100644 testslocal/005-open-wallet-and-send-txn.feature delete mode 100644 testslocal/005-open-wallet-and-send-txn_steps.js delete mode 100644 testslocal/007-open-wallet-and-create-token.feature delete mode 100644 testslocal/007-open-wallet-and-create-token_steps.js delete mode 100644 testslocal/009-open-wallet-and-send-token-transfer.feature delete mode 100644 testslocal/009-open-wallet-and-send-token-transfer_steps.js delete mode 100644 testslocal/010-send-txn-from-shake256-wallet.feature delete mode 100644 testslocal/010-send-txn-from-shake256-wallet_steps.js delete mode 100644 testslocal/011-send-txn-from-sha2256-wallet.feature delete mode 100644 testslocal/011-send-txn-from-sha2256-wallet_steps.js delete mode 100644 testslocal/features/helpers.js diff --git a/.gitignore b/.gitignore index 601db3f1..3b26a32e 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ public/web-libjsqrl.wasm .build/ .DS_Store .idea/ +localtests/ \ No newline at end of file diff --git a/testslocal/001-wallet-loading.feature b/testslocal/001-wallet-loading.feature deleted file mode 100644 index 39dbad00..00000000 --- a/testslocal/001-wallet-loading.feature +++ /dev/null @@ -1,9 +0,0 @@ -Feature: QRL Wallet is Loading - The QRL wallet website should load and have the correct title - -Background: - Given I am on the wallet site - -@watch -Scenario: Visitor opens homepage - Then I should see the title as "QRL Wallet" \ No newline at end of file diff --git a/testslocal/001-wallet-loading_steps.js b/testslocal/001-wallet-loading_steps.js deleted file mode 100644 index 61099080..00000000 --- a/testslocal/001-wallet-loading_steps.js +++ /dev/null @@ -1,3 +0,0 @@ -module.exports = function () { - 'use strict'; -}; \ No newline at end of file diff --git a/testslocal/003-open-wallet-from-mnemonic.feature b/testslocal/003-open-wallet-from-mnemonic.feature deleted file mode 100644 index 5a2c9e64..00000000 --- a/testslocal/003-open-wallet-from-mnemonic.feature +++ /dev/null @@ -1,14 +0,0 @@ -Feature: Open Wallet from Seed - As a visitor to the site, - I should be able to open a wallet from seed. - -Background: - Given I am on the wallet site - -@watch -Scenario: Visitor opens wallet from seed - When I click Open Wallet - And enter my mnemonic phrase "absorb filled perch retain tattoo likely snake photo rabbit editor shirt france exact angola style farce feels least zurich added gale risk hereby comedy yield pile mane signal camel stool depth throne torque orient" - And click Unlock Wallet - Then I should see "Unlocking wallet..." on the page - And I should then see my wallet address "Q01050095b99edcc2eb80153f30475bdbff8737723f9c9072be60c74c82983548e4a5bcbaab216f" on the page \ No newline at end of file diff --git a/testslocal/003-open-wallet-from-mnemonic_steps.js b/testslocal/003-open-wallet-from-mnemonic_steps.js deleted file mode 100644 index a4fba554..00000000 --- a/testslocal/003-open-wallet-from-mnemonic_steps.js +++ /dev/null @@ -1,26 +0,0 @@ -module.exports = function () { - 'use strict'; - - this.When(/^I click Open Wallet$/, function () { - client.moveToObject('#openWalletButton') - browser.click('#openWalletButton') - }) - - this.When(/^click Unlock Wallet$/, function () { - client.moveToObject('#unlockButton') - browser.click('#unlockButton') - }) - - this.Then(/^I should see "([^"]*)" on the page$/, function (arg1) { - let _el = '#unlocking p' - browser.waitForVisible(_el, 30000) - expect(browser.getText(_el)).toEqual(arg1) - }) - - this.Then(/^I should then see my wallet address "([^"]*)" on the page$/, function (arg1) { - let _el = '#walletAddress' - // All time for gRPC call to be made and reply with data for view state. - browser.waitForText(_el, 30000) - expect(browser.getText(_el)).toEqual(arg1) - }) -}; \ No newline at end of file diff --git a/testslocal/004-create-wallet.feature b/testslocal/004-create-wallet.feature deleted file mode 100644 index 9ea846f4..00000000 --- a/testslocal/004-create-wallet.feature +++ /dev/null @@ -1,14 +0,0 @@ -Feature: Create Wallet - As a visitor to the site, - I should be able to create a new wallet. - -Background: - Given I am on the wallet site - -@watch -Scenario: Visitor creates a wallet - When I click New Wallet - And type a passphrase "password123" in - And press Create Wallet - Then I should see Generating new wallet - And I should then see my wallet details \ No newline at end of file diff --git a/testslocal/004-create-wallet_steps.js b/testslocal/004-create-wallet_steps.js deleted file mode 100644 index 28bc6895..00000000 --- a/testslocal/004-create-wallet_steps.js +++ /dev/null @@ -1,5 +0,0 @@ -module.exports = function () { - 'use strict'; - - // All steps are shared -}; \ No newline at end of file diff --git a/testslocal/005-open-wallet-and-send-txn.feature b/testslocal/005-open-wallet-and-send-txn.feature deleted file mode 100644 index 96b9f04f..00000000 --- a/testslocal/005-open-wallet-and-send-txn.feature +++ /dev/null @@ -1,29 +0,0 @@ -Feature: Open Wallet and Send Txn - As a visitor to the site, - I should be able to open an existing wallet - And send a transaction from it - -Background: - Given I am on the wallet site - -@watch -Scenario: Visitor opens a wallet and sends a transaction - When I click Open Wallet - And enter my mnemonic phrase "absorb filled syrup axle occupy club fairly break liquid major patrol forbid throat swing emit hey inward blood pillow esteem madame cope under tent hawse glory muscle order bruise bold dad get carpet talk" - And click Unlock Wallet - Then I should see "Unlocking wallet..." on the page - And I should then see my wallet address "Q01050058bb3f8cb66fd90d0347478e5bdf3a475e82cfc5fe5dc276500ca21531e6edaf3d2d0f7e" on the page - When I then fill in the to address as "Q02040084c25e7c81ea109853ef474c925a3f6a10ae7ceb5651e26282e5877bd4ce49039fc59bb9" - And enter the amount as "5" - And I click Add Another Recipient - When I then fill in the second to address as "Q000400243b6f4a60669afbb192a04157822da2dfb1d0f1b99856df6f6948b1704a5fc552c4e3f8" - And enter the second amount as "10" - And enter the fee as "0.005" - And change the OTS Key Index to "10" - And click confirm - And I should then see a form confirming my transaction - When I then click confirmation transaction - Then I should see "Your transaction is being relayed into the QRL network..." - And I should see shortly after "Success! Your transaction has been relayed into the QRL network through the following nodes, and is pending validation." - And I should "Transaction Status: Pending" - And shortly after I should see "Transaction Status: Complete - Transaction" diff --git a/testslocal/005-open-wallet-and-send-txn_steps.js b/testslocal/005-open-wallet-and-send-txn_steps.js deleted file mode 100644 index b0fe90a0..00000000 --- a/testslocal/005-open-wallet-and-send-txn_steps.js +++ /dev/null @@ -1,3 +0,0 @@ -module.exports = function () { - 'use strict'; -}; \ No newline at end of file diff --git a/testslocal/007-open-wallet-and-create-token.feature b/testslocal/007-open-wallet-and-create-token.feature deleted file mode 100644 index b51367f8..00000000 --- a/testslocal/007-open-wallet-and-create-token.feature +++ /dev/null @@ -1,34 +0,0 @@ -Feature: Open Wallet and Send Token Creation Txn - As a visitor to the site, - I should be able to open an existing wallet - And create a token with it - -Background: - Given I am on the wallet site - -@watch -Scenario: Visitor opens a wallet and creates a token - When I click Open Wallet - And enter my mnemonic phrase "absorb filled syrup axle occupy club fairly break liquid major patrol forbid throat swing emit hey inward blood pillow esteem madame cope under tent hawse glory muscle order bruise bold dad get carpet talk" - And click Unlock Wallet - Then I should see "Unlocking wallet..." on the page - And I should then see my wallet address "Q01050058bb3f8cb66fd90d0347478e5bdf3a475e82cfc5fe5dc276500ca21531e6edaf3d2d0f7e" on the page - When I click Create Token - And I fill in the Owner address as "Q01050058bb3f8cb66fd90d0347478e5bdf3a475e82cfc5fe5dc276500ca21531e6edaf3d2d0f7e" - And I fill in the token symbol as "MNT" - And I fill in the token name as "Mocknet Test" - And I set the decimals to "4" - And I fill in holder address 1 as "Q01050058bb3f8cb66fd90d0347478e5bdf3a475e82cfc5fe5dc276500ca21531e6edaf3d2d0f7e" - And I fill in holder balance 1 as "50000" - And I click Add Another Holder - And I fill in holder address 2 as "Q010200a3f33bbfff9432bee62828345ba4cb6e24182a43ea38f472ad3cf775941b25c0870d6f41" - And I fill in holder balance 2 as "60000" - And enter the fee as "0.005" - And change the OTS Key Index to "11" - And click create token - And I should then see a form confirming my token creation transaction - When I then click confirmation token - Then I should see the relaying message "Your token is being relayed into the QRL network..." - And I should see shortly after success message "Success! Your token has been relayed into the QRL network through the following nodes, and is pending validation." - And I should see the pending message "Transaction Status: Pending" - And shortly after I should see confirmation message "Transaction Status: Complete - Transaction" diff --git a/testslocal/007-open-wallet-and-create-token_steps.js b/testslocal/007-open-wallet-and-create-token_steps.js deleted file mode 100644 index 10e0307d..00000000 --- a/testslocal/007-open-wallet-and-create-token_steps.js +++ /dev/null @@ -1,112 +0,0 @@ -var fs = require('fs') - -module.exports = function () { - 'use strict'; - - this.setDefaultTimeout(300000); // 5 minute default timeout - - this.When(/^I click Create Token$/, function () {4 - client.moveToObject('#createTokenButton') - browser.click('#createTokenButton') - }) - - this.Then(/^I should see my new address$/, function () { - let _el = '#transferFormFromAddress' - - // All time for gRPC call to be made and reply with data for view state. - browser.waitForText(_el, 30000) - }) - - this.When(/^I fill in the Owner address as "([^"]*)"$/, function (arg1) { - browser.setValue('#owner', arg1) - }) - - this.When(/^I fill in the token symbol as "([^"]*)"$/, function (arg1) { - browser.setValue('#symbol', arg1) - }) - - - this.When(/^I fill in the token name as "([^"]*)"$/, function (arg1) { - browser.setValue('#name', arg1) - }) - - this.When(/^I set the decimals to "([^"]*)"$/, function (arg1) { - browser.setValue('#decimals', arg1) - }) - - - this.When(/^I fill in holder address 1 as "([^"]*)"$/, function (arg1) { - browser.setValue('#initialBalancesAddress_1', arg1) - }) - - this.When(/^I fill in holder balance 1 as "([^"]*)"$/, function (arg1) { - browser.setValue('#initialBalancesAddressAmount_1', arg1) - }) - - this.When(/^I click Add Another Holder$/, function () {4 - client.moveToObject('#addTokenHolder') - browser.click('#addTokenHolder') - }) - - this.When(/^I fill in holder address 2 as "([^"]*)"$/, function (arg1) { - browser.setValue('#initialBalancesAddress_2', arg1) - }) - - this.When(/^I fill in holder balance 2 as "([^"]*)"$/, function (arg1) { - browser.setValue('#initialBalancesAddressAmount_2', arg1) - }) - - this.When(/^click create token$/, function () { - client.moveToObject('#createToken') - browser.click('#createToken') - }) - - this.Then(/^I should then see a form confirming my token creation transaction$/, function () { - let _el = '#tokenCreationConfirmation' - browser.waitForVisible(_el, 60000) - }) - - this.When(/^I then click confirmation token$/, function () { - client.moveToObject('#confirmToken') - browser.click('#confirmToken') - }) - - this.Then(/^I should see the relaying message "([^"]*)"$/, function (arg1) { - let _el = '#tokenRelayingMsg' - browser.waitForVisible(_el) - expect(browser.getText(_el)).toEqual(arg1) - }) - - this.Then(/^I should see shortly after success message "([^"]*)"$/, function (arg1) { - let _el = '#successMessage' - browser.waitForVisible(_el, 120000) - expect(browser.getText(_el)).toEqual(arg1) - - // Write token hash to file for Explorer test 8 - fs.writeFileSync('/tmp/chimp-TOKEN_HASH', browser.getText('#confirmedTokenHash')) - }) - - this.Then(/^I should see the pending message "([^"]*)"$/, function (arg1) { - let _el = '#finalTxnStatus' - - browser.waitUntil(function () { - const thisResult = browser.getText(_el) - if(thisResult.indexOf(arg1) >=0) { - return true - } - }, 300000, 'expected transaction to be in pending state') - }) - - this.Then(/^shortly after I should see confirmation message "([^"]*)"$/, function (arg1) { - let _el = '#finalTxnStatus' - - browser.waitUntil(function () { - const thisResult = browser.getText(_el) - if(thisResult.indexOf(arg1) >=0) { - return true - } - }, 300000, 'expected transaction confirmation within 5 minutes') - - }) - -}; \ No newline at end of file diff --git a/testslocal/009-open-wallet-and-send-token-transfer.feature b/testslocal/009-open-wallet-and-send-token-transfer.feature deleted file mode 100644 index 1a48403d..00000000 --- a/testslocal/009-open-wallet-and-send-token-transfer.feature +++ /dev/null @@ -1,27 +0,0 @@ -Feature: Open Wallet and Send Token Transfer Txn - As a visitor to the site, - I should be able to open an existing wallet - And send a token transfer transaction from it - -Background: - Given I am on the wallet site - -@watch -Scenario: Visitor opens a wallet and sends a token transfer transaction - When I click Open Wallet - And enter my mnemonic phrase "absorb filled syrup axle occupy club fairly break liquid major patrol forbid throat swing emit hey inward blood pillow esteem madame cope under tent hawse glory muscle order bruise bold dad get carpet talk" - And click Unlock Wallet - Then I should see "Unlocking wallet..." on the page - And I should then see my wallet address "Q01050058bb3f8cb66fd90d0347478e5bdf3a475e82cfc5fe5dc276500ca21531e6edaf3d2d0f7e" on the page - When I then fill in the to address as "Q010200a3f33bbfff9432bee62828345ba4cb6e24182a43ea38f472ad3cf775941b25c0870d6f41" - And set the transfer type to my recently created token - And enter the amount as "50" - And enter the fee as "0.005" - And change the OTS Key Index to "12" - And click confirm - And I should then see a form confirming my token transfer transaction - When I then click confirmation transaction for token transfer - Then I should see a token relaying message "Your transaction is being relayed into the QRL network..." - And I should see shortly after sending my token transfer "Success! Your token transfer has been relayed into the QRL network through the following nodes, and is pending validation." - And I should see the token transfer pending "Transaction Status: Pending" - And shortly after I should see the token transfer complete "Transaction Status: Complete - Transaction" diff --git a/testslocal/009-open-wallet-and-send-token-transfer_steps.js b/testslocal/009-open-wallet-and-send-token-transfer_steps.js deleted file mode 100644 index 3a9485df..00000000 --- a/testslocal/009-open-wallet-and-send-token-transfer_steps.js +++ /dev/null @@ -1,70 +0,0 @@ -var fs = require('fs') - -module.exports = function () { - 'use strict'; - - this.setDefaultTimeout(300000); // 5 minute default timeout - - this.When(/^set the transfer type to my recently created token$/, function () { - // Grab txn hash from temp file - var txnHash = fs.readFileSync('/tmp/chimp-TOKEN_HASH').toString() - - // Give API 10 seconds to respond with address state for tokens - browser.pause(10000) - - // This is how we have to click the Semantic UI dropdowns ... - browser.waitForVisible('#amountFields', 30000) - browser.click('#amountFields > div') - - browser.waitForVisible('#amountFields > div > div.menu.transition.visible > div:nth-child(2)', 30000) - browser.click('#amountFields > div > div.menu.transition.visible > div:nth-child(2)') - }) - - this.Then(/^I should then see a form confirming my token transfer transaction$/, function () { - let _el = '#confirmTokenTransactionArea' - browser.waitForVisible(_el, 60000) - }) - - this.When(/^I then click confirmation transaction for token transfer$/, function () { - browser.click('#confirmTokenTransaction') - }) - - this.Then(/^I should see a token relaying message "([^"]*)"$/, function (arg1) { - let _el = '#tokenTransferRelayingMsg' - browser.waitForVisible(_el) - expect(browser.getText(_el)).toEqual(arg1) - }) - - this.Then(/^I should see shortly after sending my token transfer "([^"]*)"$/, function (arg1) { - let _el = '#successMessage' - browser.waitForVisible(_el, 120000) - expect(browser.getText(_el)).toEqual(arg1) - - // Write txn hash to file for Explorer test 10 - fs.writeFileSync('/tmp/chimp-TOKEN_XFER_HASH', browser.getText('#confirmedTransferTokenTxnHash')) - }) - - this.Then(/^I should see the token transfer pending "([^"]*)"$/, function (arg1) { - let _el = '#finalTokenXferTxnStatus' - - browser.waitUntil(function () { - const thisResult = browser.getText(_el) - if(thisResult.indexOf(arg1) >=0) { - return true - } - }, 300000, 'expected transaction to be in pending state') - }) - - this.Then(/^shortly after I should see the token transfer complete "([^"]*)"$/, function (arg1) { - let _el = '#finalTokenXferTxnStatus' - - browser.waitUntil(function () { - const thisResult = browser.getText(_el) - if(thisResult.indexOf(arg1) >=0) { - return true - } - }, 300000, 'expected transaction confirmation within 5 minutes') - - }) - -}; \ No newline at end of file diff --git a/testslocal/010-send-txn-from-shake256-wallet.feature b/testslocal/010-send-txn-from-shake256-wallet.feature deleted file mode 100644 index 7d2ab8b6..00000000 --- a/testslocal/010-send-txn-from-shake256-wallet.feature +++ /dev/null @@ -1,26 +0,0 @@ -Feature: Open Shake 256 Wallet and Send Txn - As a visitor to the site, - I should be able to open an existing shake 256 wallet - And send a transaction from it - -Background: - Given I am on the wallet site - -@watch -Scenario: Visitor opens a wallet and sends a transaction - When I click Open Wallet - And enter my mnemonic phrase "action drank axle clay bulk align spoon cheery squash moor mine linger dispel rest timid aura aunt lead robert niche almond boil devote kindly slam sigh burden amazon equity embark limit noble sport knight" - And click Unlock Wallet - Then I should see "Unlocking wallet..." on the page - And I should then see my wallet address "Q02040084c25e7c81ea109853ef474c925a3f6a10ae7ceb5651e26282e5877bd4ce49039fc59bb9" on the page - When I then fill in the to address as "Q010200a3f33bbfff9432bee62828345ba4cb6e24182a43ea38f472ad3cf775941b25c0870d6f41" - And enter the amount as "1" - And enter the fee as "0.005" - And change the OTS Key Index to "5" - And click confirm - And I should then see a form confirming my transaction - When I then click confirmation transaction - Then I should see "Your transaction is being relayed into the QRL network..." - And I should see shortly after "Success! Your transaction has been relayed into the QRL network through the following nodes, and is pending validation." - And I should "Transaction Status: Pending" - And shortly after I should see "Transaction Status: Complete - Transaction" diff --git a/testslocal/010-send-txn-from-shake256-wallet_steps.js b/testslocal/010-send-txn-from-shake256-wallet_steps.js deleted file mode 100644 index b0fe90a0..00000000 --- a/testslocal/010-send-txn-from-shake256-wallet_steps.js +++ /dev/null @@ -1,3 +0,0 @@ -module.exports = function () { - 'use strict'; -}; \ No newline at end of file diff --git a/testslocal/011-send-txn-from-sha2256-wallet.feature b/testslocal/011-send-txn-from-sha2256-wallet.feature deleted file mode 100644 index 5ea21a0a..00000000 --- a/testslocal/011-send-txn-from-sha2256-wallet.feature +++ /dev/null @@ -1,26 +0,0 @@ -Feature: Open SHA2_256 Wallet and Send Txn - As a visitor to the site, - I should be able to open an existing SHA2_256 wallet - And send a transaction from it - -Background: - Given I am on the wallet site - -@watch -Scenario: Visitor opens a wallet and sends a transaction - When I click Open Wallet - And enter my mnemonic phrase "aback drank itself lousy kitten tenant task cheek fort tom series heyday fig sorrow swan tehran legend gemini calmly beech arrive prior with airy orphan for royal afloat loaf host gorge stair avenue midst" - And click Unlock Wallet - Then I should see "Unlocking wallet..." on the page - And I should then see my wallet address "Q000400243b6f4a60669afbb192a04157822da2dfb1d0f1b99856df6f6948b1704a5fc552c4e3f8" on the page - When I then fill in the to address as "Q010200a3f33bbfff9432bee62828345ba4cb6e24182a43ea38f472ad3cf775941b25c0870d6f41" - And enter the amount as "1" - And enter the fee as "0.005" - And change the OTS Key Index to "5" - And click confirm - And I should then see a form confirming my transaction - When I then click confirmation transaction - Then I should see "Your transaction is being relayed into the QRL network..." - And I should see shortly after "Success! Your transaction has been relayed into the QRL network through the following nodes, and is pending validation." - And I should "Transaction Status: Pending" - And shortly after I should see "Transaction Status: Complete - Transaction" diff --git a/testslocal/011-send-txn-from-sha2256-wallet_steps.js b/testslocal/011-send-txn-from-sha2256-wallet_steps.js deleted file mode 100644 index b0fe90a0..00000000 --- a/testslocal/011-send-txn-from-sha2256-wallet_steps.js +++ /dev/null @@ -1,3 +0,0 @@ -module.exports = function () { - 'use strict'; -}; \ No newline at end of file diff --git a/testslocal/features/helpers.js b/testslocal/features/helpers.js deleted file mode 100644 index ab2b8164..00000000 --- a/testslocal/features/helpers.js +++ /dev/null @@ -1,168 +0,0 @@ -var fs = require('fs') - -// This file contains steps shared over multiple tests. -module.exports = function() { - 'use strict'; - - this.setDefaultTimeout(300000); // 5 minute default timeout - - /* SHARED */ - this.Then(/^I should see the title as "([^"]*)"$/, function (arg1) { - expect(browser.getTitle()).toEqual(arg1) - }) - - /* WALLET */ - this.Given(/^I am on the wallet site$/, function () { - browser.url('http://localhost:3000') - // Hide top warning bar - browser.execute(function() { - document.getElementsByClassName('main-content-warning')[0].style.visibility = 'hidden'; - }) - }) - - this.When(/^I click New Wallet$/, function () { - browser.click('#newWalletButton') - }) - - this.When(/^type a passphrase "([^"]*)" in$/, function (arg1) { - // For some reason, having a password type input element on the page breaks - // the tests. This is a hack to change the type of the passphrase input - // to text such that the walletCode setValue statement works. - browser.execute(function() { - // browser context - passphraseBox = document.getElementById("passphrase"); - passphraseBox.type = "text"; - - passphraseBox2 = document.getElementById("passphraseConfirm"); - passphraseBox2.type = "text"; - }) - - browser.setValue('#passphrase', arg1) - browser.setValue('#passphraseConfirm', arg1) - }) - - this.When(/^press Create Wallet$/, function () { - client.moveToObject('#generate') - browser.click('#generate') - }) - - this.Then(/^I should see Generating new wallet$/, function () { - let _el = '#generating' - // client.moveToObject(_el) - browser.waitForVisible(_el, 30000) - }) - - this.Then(/^I should then see my wallet details$/, function () { - let _el = '#newAddressMnemonic' - browser.waitForText(_el, 30000) // Wait for a mnemonic to appear - }) - - this.Then(/^I should see a loader icon$/, function () { - let _el = '.loader' - browser.waitForVisible(_el, 30000) - }) - - this.Then(/^I should see a loading icon$/, function () { - let _el = '.loading' - browser.waitForVisible(_el, 30000) - }) - - this.When(/^enter my mnemonic phrase "([^"]*)"$/, function (arg1) { - // For some reason, having a password type input element on the page breaks - // the tests. This is a hack to change the type of the passphrase input - // to text such that the walletCode setValue statement works. - browser.execute(function() { - // browser context - passphraseBox = document.getElementById("passphrase"); - passphraseBox.type = "text"; - }) - - browser.setValue('#walletCode', arg1) - }) - - // Sending Txn Shared Functions - this.When(/^enter the fee as "([^"]*)"$/, function (arg1) { - browser.setValue('#fee', arg1) - }) - - this.When(/^change the OTS Key Index to "([^"]*)"$/, function (arg1) { - browser.setValue('#otsKey', arg1) - }) - - this.When(/^click confirm$/, function () { - browser.click('#generateTransaction') - }) - - this.When(/^I then fill in the to address as "([^"]*)"$/, function (arg1) { - browser.setValue('#to_1', arg1) - }) - - this.When(/^enter the amount as "([^"]*)"$/, function (arg1) { - browser.setValue('#amounts_1', arg1) - }) - - this.When(/^I click Add Another Recipient$/, function () { - browser.click('#addTransferRecipient') - }) - - this.When(/^I then fill in the second to address as "([^"]*)"$/, function (arg1) { - browser.setValue('#to_2', arg1) - }) - - this.When(/^enter the second amount as "([^"]*)"$/, function (arg1) { - browser.setValue('#amounts_2', arg1) - }) - - this.Then(/^I should then see a form confirming my transaction$/, function () { - let _el = '#confirmTransactionArea' - browser.waitForVisible(_el, 60000) - }) - - this.When(/^I then click confirmation transaction$/, function () { - browser.click('#confirmTransaction') - }) - - this.Then(/^I should see shortly after "([^"]*)"$/, function (arg1) { - let _el = '#transferSuccessMessage' - browser.waitForVisible(_el, 120000) - expect(browser.getText(_el)).toEqual(arg1) - - // Write txn hash to file for Explorer test 6 - fs.writeFileSync('/tmp/chimp-TXN_HASH', browser.getText('#confirmedTransferTxnHash')) - }) - - this.Then(/^I should see "([^"]*)"$/, function (arg1) { - let _el = '#transferRelayingMsg' - browser.waitForVisible(_el) - expect(browser.getText(_el)).toEqual(arg1) - }) - - this.Then(/^I should "([^"]*)"$/, function (arg1) { - let _el = '#transferFinalTxnStatus' - - browser.waitUntil(function () { - const thisResult = browser.getText(_el) - if(thisResult.indexOf(arg1) >=0) { - return true - } - }, 300000, 'expected transaction to be in pending state') - }) - - this.Then(/^shortly after I should see "([^"]*)"$/, function (arg1) { - let _el = '#transferFinalTxnStatus' - - browser.waitUntil(function () { - const thisResult = browser.getText(_el) - if(thisResult.indexOf(arg1) >=0) { - return true - } - }, 300000, 'expected transaction confirmation within 5 minutes') - - }) - - /* EXPLORER */ - this.Given(/^I am on the explorer site$/, function () { - browser.url('http://localhost:3003') - }) - -}; From 931aef3e5eecb638b7ef3a3ed02359ea3806db8c Mon Sep 17 00:00:00 2001 From: Scott Donald Date: Thu, 21 Jun 2018 06:50:43 +0200 Subject: [PATCH 03/10] Cleaning up codacy issues --- imports/startup/both/nodes.js | 24 +++++++++---------- imports/startup/client/functions.js | 8 +++---- imports/startup/server/index.js | 6 ++--- imports/ui/pages/tokens/tokenCreate.js | 3 ++- imports/ui/pages/tokens/tokenCreateConfirm.js | 1 + imports/ui/pages/tokens/tokenCreateResult.js | 3 ++- imports/ui/pages/transfer/transfer.js | 7 +++--- imports/ui/pages/verify/tx.js | 4 +++- 8 files changed, 31 insertions(+), 25 deletions(-) diff --git a/imports/startup/both/nodes.js b/imports/startup/both/nodes.js index 10d114bf..a58377d9 100644 --- a/imports/startup/both/nodes.js +++ b/imports/startup/both/nodes.js @@ -18,27 +18,27 @@ DEFAULT_NETWORKS = [ id: 'testnet-1', grpc: 'testnet-1.automated.theqrl.org:9009', state: false, - height: 0 + height: 0, }, { id: 'testnet-2', grpc: 'testnet-2.automated.theqrl.org:9009', state: false, - height: 0 + height: 0, }, { id: 'testnet-3', grpc: 'testnet-3.automated.theqrl.org:9009', state: false, - height: 0 + height: 0, }, { id: 'testnet-4', grpc: 'testnet-4.automated.theqrl.org:9009', state: false, - height: 0 + height: 0, } - ] + ], }, { id: 'mainnet', @@ -52,27 +52,27 @@ DEFAULT_NETWORKS = [ id: 'mainnet-1', grpc: 'mainnet-1.automated.theqrl.org:9009', state: false, - height: 0 + height: 0, }, { id: 'mainnet-2', grpc: 'mainnet-2.automated.theqrl.org:9009', state: false, - height: 0 + height: 0, }, { id: 'mainnet-3', grpc: 'mainnet-3.automated.theqrl.org:9009', state: false, - height: 0 + height: 0, }, { id: 'mainnet-4', grpc: 'mainnet-4.automated.theqrl.org:9009', state: false, - height: 0 + height: 0, } - ] + ], }, { id: 'localhost', @@ -86,9 +86,9 @@ DEFAULT_NETWORKS = [ id: 'localhost', grpc: 'localhost:9009', state: false, - height: 0 + height: 0, } - ] + ], } ] diff --git a/imports/startup/client/functions.js b/imports/startup/client/functions.js index 139c6df3..f13b4130 100644 --- a/imports/startup/client/functions.js +++ b/imports/startup/client/functions.js @@ -200,7 +200,7 @@ wrapMeteorCall = (method, request, callback) => { getBalance = (getAddress, callBack) => { const request = { address: addressForAPI(getAddress), - network: selectedNetwork() + network: selectedNetwork(), } wrapMeteorCall('getAddress', request, (err, res) => { @@ -242,7 +242,7 @@ getBalance = (getAddress, callBack) => { loadAddressTransactions = (txArray) => { const request = { tx: txArray, - network: selectedNetwork() + network: selectedNetwork(), } LocalStore.set('addressTransactions', []) @@ -262,7 +262,7 @@ loadAddressTransactions = (txArray) => { getTokenBalances = (getAddress, callback) => { const request = { address: addressForAPI(getAddress), - network: selectedNetwork() + network: selectedNetwork(), } wrapMeteorCall('getAddress', request, (err, res) => { @@ -286,7 +286,7 @@ getTokenBalances = (getAddress, callback) => { const request = { query: tokenHash, - network: selectedNetwork() + network: selectedNetwork(), } wrapMeteorCall('getTxnHash', request, (err, res) => { diff --git a/imports/startup/server/index.js b/imports/startup/server/index.js index b5f6d70e..03a8b322 100644 --- a/imports/startup/server/index.js +++ b/imports/startup/server/index.js @@ -136,10 +136,10 @@ const checkNetworkHealth = (userNetwork, callback) => { let networkHealthy = false // Determine current active nodes - DEFAULT_NETWORKS.forEach((network, networkIndex) => { + DEFAULT_NETWORKS.forEach((network) => { // Only look at health of userNetwork - if(network.id == userNetwork) { - if(network.healthy == true) { + if (network.id == userNetwork) { + if (network.healthy == true) { networkHealthy = true } } diff --git a/imports/ui/pages/tokens/tokenCreate.js b/imports/ui/pages/tokens/tokenCreate.js index 4dd58da8..2130f4df 100644 --- a/imports/ui/pages/tokens/tokenCreate.js +++ b/imports/ui/pages/tokens/tokenCreate.js @@ -4,6 +4,7 @@ import './tokenCreate.html' /* global XMSS_OBJECT */ /* global DEFAULT_NETWORKS */ /* global SHOR_PER_QUANTA */ +/* global wrapMeteorCall */ /* global nodeReturnedValidResponse */ let countRecipientsForValidation = 1 @@ -69,7 +70,7 @@ function createTokenTxn() { initialBalances: tokenHolders, fee: txnFee * SHOR_PER_QUANTA, xmssPk: pubKey, - network: selectedNetwork() + network: selectedNetwork(), } wrapMeteorCall('createTokenTxn', request, (err, res) => { diff --git a/imports/ui/pages/tokens/tokenCreateConfirm.js b/imports/ui/pages/tokens/tokenCreateConfirm.js index 508d525e..789b182a 100644 --- a/imports/ui/pages/tokens/tokenCreateConfirm.js +++ b/imports/ui/pages/tokens/tokenCreateConfirm.js @@ -4,6 +4,7 @@ import './tokenCreateConfirm.html' /* global XMSS_OBJECT */ /* global selectedNetwork */ /* global DEFAULT_NETWORKS */ +/* global wrapMeteorCall */ function confirmTokenCreation() { const tx = LocalStore.get('tokenCreationConfirmationResponse') diff --git a/imports/ui/pages/tokens/tokenCreateResult.js b/imports/ui/pages/tokens/tokenCreateResult.js index bd6ccfe4..396d772a 100644 --- a/imports/ui/pages/tokens/tokenCreateResult.js +++ b/imports/ui/pages/tokens/tokenCreateResult.js @@ -5,6 +5,7 @@ import './tokenCreateResult.html' /* global POLL_MAX_CHECKS */ /* global DEFAULT_NETWORKS */ /* global selectedNetwork */ +/* global wrapMeteorCall */ /* eslint no-console:0 */ function sleep(ms) { @@ -72,7 +73,7 @@ function pollTransaction(thisTxId, firstPoll = false, failureCount = 0) { const request = { query: thisTxId, - network: selectedNetwork() + network: selectedNetwork(), } if (thisTxId) { diff --git a/imports/ui/pages/transfer/transfer.js b/imports/ui/pages/transfer/transfer.js index 11087247..38bd1159 100644 --- a/imports/ui/pages/transfer/transfer.js +++ b/imports/ui/pages/transfer/transfer.js @@ -9,6 +9,7 @@ import './transfer.html' /* global SHOR_PER_QUANTA */ /* global POLL_TXN_RATE */ /* global POLL_MAX_CHECKS */ +/* global wrapMeteorCall */ /* global nodeReturnedValidResponse */ let tokensHeld = [] @@ -40,7 +41,7 @@ function generateTransaction() { amounts: this_amounts, fee: txnFee * SHOR_PER_QUANTA, xmssPk: pubKey, - network: selectedNetwork() + network: selectedNetwork(), } wrapMeteorCall('transferCoins', request, (err, res) => { @@ -216,7 +217,7 @@ function sendTokensTxnCreate(tokenHash, decimals) { tokenHash: tokenHashBytes, fee: txnFee * SHOR_PER_QUANTA, xmssPk: pubKey, - network: selectedNetwork() + network: selectedNetwork(), } wrapMeteorCall('createTokenTransferTxn', request, (err, res) => { @@ -431,7 +432,7 @@ function pollTransaction(thisTxId, firstPoll = false, failureCount = 0) { const request = { query: thisTxId, - network: selectedNetwork() + network: selectedNetwork(), } if (thisTxId) { diff --git a/imports/ui/pages/verify/tx.js b/imports/ui/pages/verify/tx.js index f8da288a..fdbc92c3 100644 --- a/imports/ui/pages/verify/tx.js +++ b/imports/ui/pages/verify/tx.js @@ -4,6 +4,8 @@ import './tx.html' /* global LocalStore */ /* global selectedNetwork */ /* global SHOR_PER_QUANTA */ +/* global DEFAULT_NETWORKS */ +/* global wrapMeteorCall */ /* eslint no-console: 0 */ /* ^^^ remove once testing complete */ @@ -164,7 +166,7 @@ Template.appVerifyTxid.helpers({ return DEFAULT_NETWORKS[0].explorerUrl } return LocalStore.get('nodeExplorerUrl') - } + }, }) Template.appVerifyTxid.events({ From 16c7c5f5a9bfefb9e24b5c7b6f6f32ca1130e666 Mon Sep 17 00:00:00 2001 From: Scott Donald Date: Thu, 21 Jun 2018 06:54:27 +0200 Subject: [PATCH 04/10] Small tweaks --- imports/startup/both/nodes.js | 4 ++-- imports/startup/server/index.js | 2 +- imports/ui/pages/verify/tx.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/imports/startup/both/nodes.js b/imports/startup/both/nodes.js index a58377d9..683351ce 100644 --- a/imports/startup/both/nodes.js +++ b/imports/startup/both/nodes.js @@ -120,9 +120,9 @@ findNetworkData = (array, key) => { id: 'custom', grpc: LocalStore.get('customNodeGrpc'), state: false, - height: 0 + height: 0, } - ] + ], } return nodeData } else { diff --git a/imports/startup/server/index.js b/imports/startup/server/index.js index 03a8b322..dfea66a1 100644 --- a/imports/startup/server/index.js +++ b/imports/startup/server/index.js @@ -191,7 +191,7 @@ const qrlApi = (api, request, callback) => { const activeNodes = [] // Determine current active nodes - DEFAULT_NETWORKS.forEach((network, networkIndex) => { + DEFAULT_NETWORKS.forEach((network) => { // Only get nodes from user selected network if(network.id == request.network) { const networkNodes = network.nodes diff --git a/imports/ui/pages/verify/tx.js b/imports/ui/pages/verify/tx.js index fdbc92c3..e400e1c0 100644 --- a/imports/ui/pages/verify/tx.js +++ b/imports/ui/pages/verify/tx.js @@ -20,7 +20,7 @@ Template.appVerifyTxid.onRendered(() => { const thisTxId = FlowRouter.getParam('txId') const request = { query: thisTxId, - network: selectedNetwork() + network: selectedNetwork(), } if (thisTxId) { From 3456448e4123686cdb863a4d5154b051411eb3a7 Mon Sep 17 00:00:00 2001 From: Scott Donald Date: Thu, 21 Jun 2018 09:31:06 +0200 Subject: [PATCH 05/10] Updates for localhost context, and fixing electron issue --- .electrify/index.js | 6 ++++++ imports/startup/both/nodes.js | 2 +- imports/startup/server/index.js | 7 +++---- imports/ui/layouts/body/body.js | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.electrify/index.js b/.electrify/index.js index 1ac126be..df21296e 100644 --- a/.electrify/index.js +++ b/.electrify/index.js @@ -34,6 +34,12 @@ app.on('ready', function() { window.webContents.on('contextmenu', () => { menu.popup(window); }); + + // Prevent drag and drop links from opening in electron window + window.webContents.on('will-navigate', ev => { + ev.preventDefault() + }) + var template = [{ label: "Application", submenu: [ diff --git a/imports/startup/both/nodes.js b/imports/startup/both/nodes.js index 683351ce..9bf50d50 100644 --- a/imports/startup/both/nodes.js +++ b/imports/startup/both/nodes.js @@ -42,7 +42,7 @@ DEFAULT_NETWORKS = [ }, { id: 'mainnet', - name: 'Mainnet (QRL Foundation Nodes)', + name: 'Mainnet', disabled: 'disabled', explorerUrl: 'https://explorer.theqrl.org', type: 'both', diff --git a/imports/startup/server/index.js b/imports/startup/server/index.js index dfea66a1..a752d0f5 100644 --- a/imports/startup/server/index.js +++ b/imports/startup/server/index.js @@ -131,7 +131,6 @@ const connectToNode = (endpoint, callback) => { } } - const checkNetworkHealth = (userNetwork, callback) => { let networkHealthy = false @@ -148,15 +147,15 @@ const checkNetworkHealth = (userNetwork, callback) => { if (networkHealthy == true) { callback(null, true) } else { - callback(true, null) + callback(true, {error: 'Network unhealthy'}) } } // Connect to all nodes const connectNodes = () => { - // Establish gRPC connections with all enabled, non-localhost DEFAULT_NETWORKS + // Establish gRPC connections with all enabled DEFAULT_NETWORKS DEFAULT_NETWORKS.forEach((network, networkIndex) => { - if ((network.disabled === '') && (network.id !== 'localhost')) { + if ((network.disabled === '')) { console.log(`Attempting to create gRPC connections to network: ${network.name} ...`) // Loop each node in the network and establish a gRPC connection. diff --git a/imports/ui/layouts/body/body.js b/imports/ui/layouts/body/body.js index d54562fc..03798bc1 100644 --- a/imports/ui/layouts/body/body.js +++ b/imports/ui/layouts/body/body.js @@ -116,7 +116,7 @@ const updateNetwork = (selectedNetwork) => { LocalStore.set('nodeGrpc', nodeData.grpc) console.log('Connecting to network: ', nodeData.name) - checkNetworkHealth(nodeData.id, (err) => { + checkNetworkHealth(nodeData.id, (err, res) => { if (err) { console.log('the error: ', err) LocalStore.set('nodeStatus', 'failed') From fe800f8471996595310aec6b4c741a835afd980c Mon Sep 17 00:00:00 2001 From: Scott Donald Date: Thu, 21 Jun 2018 09:49:43 +0200 Subject: [PATCH 06/10] Fix relayed through message --- imports/startup/server/index.js | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/imports/startup/server/index.js b/imports/startup/server/index.js index a752d0f5..cd76a814 100644 --- a/imports/startup/server/index.js +++ b/imports/startup/server/index.js @@ -224,6 +224,9 @@ const qrlApi = (api, request, callback) => { console.log('Making', api, 'request to', bestNode.grpc) qrlClient[bestNode.grpc][api](request, (error, response) => { + if (api == 'pushTransaction') { + response.relayed = bestNode.grpc + } callback(error, response) }) } @@ -232,7 +235,12 @@ const qrlApi = (api, request, callback) => { const apiEndpoint = request.network // Delete network from request object delete request.network; + console.log('Making', api, 'request to', bestNode.grpc) + qrlClient[apiEndpoint][api](request, (error, response) => { + if (api == 'pushTransaction') { + response.relayed = apiEndpoint + } callback(error, response) }) } @@ -421,13 +429,13 @@ const confirmTransaction = (request, callback) => { signature: Buffer.from(confirmTxn.transaction_signed.signature).toString('hex'), } txnResponse = { error: null, response: hashResponse } - relayedThrough.push(request.grpc) - console.log(`Transaction sent via user node ${request.grpc}`) + relayedThrough.push(res.relayed) + console.log(`Transaction sent via ${res.relayed}`) wfcb() } }) } catch(err) { - console.log(`Error: Failed to send transaction through ${request.grpc} - ${err}`) + console.log(`Error: Failed to send transaction through ${res.relayed} - ${err}`) txnResponse = { error: err, response: err } wfcb() } @@ -540,7 +548,7 @@ const confirmTokenCreation = (request, callback) => { try{ qrlApi('pushTransaction', confirmTxn, (err) => { if (err) { - console.log(`Error: Failed to send transaction through ${request.grpc} - ${err}`) + console.log(`Error: Failed to send transaction through ${rres.relayed} - ${err}`) txnResponse = { error: err.message, response: err.message } wfcb() } else { @@ -549,8 +557,8 @@ const confirmTokenCreation = (request, callback) => { signature: Buffer.from(confirmTxn.transaction_signed.signature).toString('hex'), } txnResponse = { error: null, response: hashResponse } - relayedThrough.push(request.grpc) - console.log(`Transaction sent via user node ${request.grpc}`) + relayedThrough.push(res.relayed) + console.log(`Transaction sent via ${res.relayed}`) wfcb() } }) @@ -656,7 +664,7 @@ const confirmTokenTransfer = (request, callback) => { try { qrlApi('pushTransaction', confirmTxn, (err) => { if (err) { - console.log(`Error: Failed to send transaction through ${request.grpc} - ${err}`) + console.log(`Error: Failed to send transaction through ${res.relayed} - ${err}`) txnResponse = { error: err.message, response: err.message } wfcb() } else { @@ -665,8 +673,8 @@ const confirmTokenTransfer = (request, callback) => { signature: Buffer.from(confirmTxn.transaction_signed.signature).toString('hex'), } txnResponse = { error: null, response: hashResponse } - relayedThrough.push(request.grpc) - console.log(`Transaction sent via user node ${request.grpc}`) + relayedThrough.push(res.relayed) + console.log(`Transaction sent via ${res.relayed}`) wfcb() } }) @@ -921,7 +929,7 @@ Meteor.methods({ // Request Token Symbol const symbolRequest = { query: Buffer.from(thisTxnHashResponse.transaction.tx.transfer_token.token_txhash).toString('hex'), - grpc: request.grpc, + network: request.network, } const thisSymbolResponse = Meteor.wrapAsync(getTxnHash)(symbolRequest) const thisSymbol = Buffer.from(thisSymbolResponse.transaction.tx.token.symbol).toString() From 4fd76d26b71423f50b1ab41d09b00d9c00743d4c Mon Sep 17 00:00:00 2001 From: Scott Donald Date: Thu, 21 Jun 2018 10:07:30 +0200 Subject: [PATCH 07/10] Fix bug --- imports/startup/server/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/imports/startup/server/index.js b/imports/startup/server/index.js index cd76a814..385b52b4 100644 --- a/imports/startup/server/index.js +++ b/imports/startup/server/index.js @@ -546,7 +546,7 @@ const confirmTokenCreation = (request, callback) => { // Relay through user node. function (wfcb) { try{ - qrlApi('pushTransaction', confirmTxn, (err) => { + qrlApi('pushTransaction', confirmTxn, (err, res) => { if (err) { console.log(`Error: Failed to send transaction through ${rres.relayed} - ${err}`) txnResponse = { error: err.message, response: err.message } @@ -662,7 +662,7 @@ const confirmTokenTransfer = (request, callback) => { // Relay through user node. function (wfcb) { try { - qrlApi('pushTransaction', confirmTxn, (err) => { + qrlApi('pushTransaction', confirmTxn, (err, res) => { if (err) { console.log(`Error: Failed to send transaction through ${res.relayed} - ${err}`) txnResponse = { error: err.message, response: err.message } From 5384d2e69252f63324cc3ee8de78804f36944dae Mon Sep 17 00:00:00 2001 From: Scott Donald Date: Thu, 21 Jun 2018 14:31:10 +0200 Subject: [PATCH 08/10] Update to version 1.0.0 --- .electrify/package-lock.json | 2 +- .electrify/package.json | 2 +- imports/startup/both/index.js | 2 +- package-lock.json | 8 ++++---- package.json | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.electrify/package-lock.json b/.electrify/package-lock.json index 51ccc793..ab86fff0 100644 --- a/.electrify/package-lock.json +++ b/.electrify/package-lock.json @@ -1,6 +1,6 @@ { "name": "QRLWallet", - "version": "0.4.0", + "version": "1.0.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/.electrify/package.json b/.electrify/package.json index bdb1b5a9..883e6d4a 100644 --- a/.electrify/package.json +++ b/.electrify/package.json @@ -2,7 +2,7 @@ "name": "QRLWallet", "productName": "QRLWallet", "projectName": "qrl-wallet", - "version": "0.4.0", + "version": "1.0.0", "main": "index.js", "dependencies": { "electrify-qrl": "0.0.1", diff --git a/imports/startup/both/index.js b/imports/startup/both/index.js index 1e422f2b..e2ec4a68 100644 --- a/imports/startup/both/index.js +++ b/imports/startup/both/index.js @@ -5,7 +5,7 @@ import './nodes.js' SHOR_PER_QUANTA=1000000000 // qrl-wallet Version -WALLET_VERSION="0.4.0" +WALLET_VERSION="1.0.0" // Function to cleanly represent large decimal numbers without exponentional formatting. numberToString = (num) => { diff --git a/package-lock.json b/package-lock.json index 8c7cc475..e4b83ffe 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "qrl-wallet", - "version": "0.4.0", + "version": "1.0.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -7449,9 +7449,9 @@ "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=" }, "qrllib": { - "version": "0.9.2", - "resolved": "https://registry.npmjs.org/qrllib/-/qrllib-0.9.2.tgz", - "integrity": "sha512-xUjjTSIIxZeJcDEUC+a+xPOgNtgpKVIDF5HfWPUrkpPTIvSnrXqfuRgGxN+DV8X7M75WlUwSsevGZWhOvgt36A==" + "version": "0.99.3", + "resolved": "https://registry.npmjs.org/qrllib/-/qrllib-0.99.3.tgz", + "integrity": "sha512-j3ckTjcri1Nq8qLJVZtLdWIx/jiD8Oaz+89fFU3uxIGLiZ7Gj5s1Yd72N+Dx9jLP5TjvQ/ksHvowqxrv/AgKzw==" }, "qs": { "version": "6.5.1", diff --git a/package.json b/package.json index 538751c4..85129dda 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "qrl-wallet", - "version": "0.4.0", + "version": "1.0.0", "description": "QRL Wallet", "main": "index.js", "dependencies": { @@ -17,7 +17,7 @@ "mathjs": "4.0.1", "meteor-babel-helpers": "0.0.3", "meteor-node-stubs": "^0.2.11", - "qrllib": "0.9.2", + "qrllib": "0.99.3", "run-script-os": "^1.0.3", "tmp": "0.0.33" }, From fa9fb02685ca816dc5d9f93baf073a352eaa3f17 Mon Sep 17 00:00:00 2001 From: Scott Donald Date: Mon, 25 Jun 2018 10:34:55 +0200 Subject: [PATCH 09/10] Updating node order --- imports/startup/both/nodes.js | 46 +++++++++++++++++------------------ 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/imports/startup/both/nodes.js b/imports/startup/both/nodes.js index 9bf50d50..ecd22c12 100644 --- a/imports/startup/both/nodes.js +++ b/imports/startup/both/nodes.js @@ -7,68 +7,68 @@ // eslint-disable-next-line no-unused-vars, no-undef DEFAULT_NETWORKS = [ { - id: 'testnet', - name: 'Testnet', + id: 'mainnet', + name: 'Mainnet', disabled: '', - explorerUrl: 'https://testnet-explorer.theqrl.org', + explorerUrl: 'https://explorer.theqrl.org', type: 'both', healthy: false, nodes: [ { - id: 'testnet-1', - grpc: 'testnet-1.automated.theqrl.org:9009', + id: 'mainnet-1', + grpc: 'mainnet-1.automated.theqrl.org:9009', state: false, height: 0, }, { - id: 'testnet-2', - grpc: 'testnet-2.automated.theqrl.org:9009', + id: 'mainnet-2', + grpc: 'mainnet-2.automated.theqrl.org:9009', state: false, height: 0, }, { - id: 'testnet-3', - grpc: 'testnet-3.automated.theqrl.org:9009', + id: 'mainnet-3', + grpc: 'mainnet-3.automated.theqrl.org:9009', state: false, height: 0, }, { - id: 'testnet-4', - grpc: 'testnet-4.automated.theqrl.org:9009', + id: 'mainnet-4', + grpc: 'mainnet-4.automated.theqrl.org:9009', state: false, height: 0, } ], }, { - id: 'mainnet', - name: 'Mainnet', - disabled: 'disabled', - explorerUrl: 'https://explorer.theqrl.org', + id: 'testnet', + name: 'Testnet', + disabled: '', + explorerUrl: 'https://testnet-explorer.theqrl.org', type: 'both', healthy: false, nodes: [ { - id: 'mainnet-1', - grpc: 'mainnet-1.automated.theqrl.org:9009', + id: 'testnet-1', + grpc: 'testnet-1.automated.theqrl.org:9009', state: false, height: 0, }, { - id: 'mainnet-2', - grpc: 'mainnet-2.automated.theqrl.org:9009', + id: 'testnet-2', + grpc: 'testnet-2.automated.theqrl.org:9009', state: false, height: 0, }, { - id: 'mainnet-3', - grpc: 'mainnet-3.automated.theqrl.org:9009', + id: 'testnet-3', + grpc: 'testnet-3.automated.theqrl.org:9009', state: false, height: 0, }, { - id: 'mainnet-4', - grpc: 'mainnet-4.automated.theqrl.org:9009', + id: 'testnet-4', + grpc: 'testnet-4.automated.theqrl.org:9009', state: false, height: 0, } From 62aadf6086b7b2a262a986848bd6da1813cb8b26 Mon Sep 17 00:00:00 2001 From: Scott Donald Date: Mon, 25 Jun 2018 11:08:53 +0200 Subject: [PATCH 10/10] Update ports --- imports/startup/both/nodes.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/imports/startup/both/nodes.js b/imports/startup/both/nodes.js index ecd22c12..96ed0aec 100644 --- a/imports/startup/both/nodes.js +++ b/imports/startup/both/nodes.js @@ -16,25 +16,25 @@ DEFAULT_NETWORKS = [ nodes: [ { id: 'mainnet-1', - grpc: 'mainnet-1.automated.theqrl.org:9009', + grpc: 'mainnet-1.automated.theqrl.org:19009', state: false, height: 0, }, { id: 'mainnet-2', - grpc: 'mainnet-2.automated.theqrl.org:9009', + grpc: 'mainnet-2.automated.theqrl.org:19009', state: false, height: 0, }, { id: 'mainnet-3', - grpc: 'mainnet-3.automated.theqrl.org:9009', + grpc: 'mainnet-3.automated.theqrl.org:19009', state: false, height: 0, }, { id: 'mainnet-4', - grpc: 'mainnet-4.automated.theqrl.org:9009', + grpc: 'mainnet-4.automated.theqrl.org:19009', state: false, height: 0, } @@ -50,25 +50,25 @@ DEFAULT_NETWORKS = [ nodes: [ { id: 'testnet-1', - grpc: 'testnet-1.automated.theqrl.org:9009', + grpc: 'testnet-1.automated.theqrl.org:19009', state: false, height: 0, }, { id: 'testnet-2', - grpc: 'testnet-2.automated.theqrl.org:9009', + grpc: 'testnet-2.automated.theqrl.org:19009', state: false, height: 0, }, { id: 'testnet-3', - grpc: 'testnet-3.automated.theqrl.org:9009', + grpc: 'testnet-3.automated.theqrl.org:19009', state: false, height: 0, }, { id: 'testnet-4', - grpc: 'testnet-4.automated.theqrl.org:9009', + grpc: 'testnet-4.automated.theqrl.org:19009', state: false, height: 0, } @@ -84,7 +84,7 @@ DEFAULT_NETWORKS = [ nodes: [ { id: 'localhost', - grpc: 'localhost:9009', + grpc: 'localhost:19009', state: false, height: 0, }