Fabo/sdk 0.26.1-rc1

app/src/main/index.js

@@ -3,10 +3,12 @@
 const assert = require(`assert`)
 let { app, BrowserWindow, ipcMain } = require(`electron`)
 let fs = require(`fs-extra`)
+const https = require(`https`)
 let { join, relative } = require(`path`)
 let childProcess = require(`child_process`)
 let semver = require(`semver`)
 let Raven = require(`raven`)
+const readline = require(`readline`)
 let axios = require(`axios`)
 
 let pkg = require(`../../../package.json`)
@@ -78,10 +80,6 @@ function logProcess(process, logPath) {
   }
 }
 
-function sleep(ms) {
-  return new Promise(resolve => setTimeout(resolve, ms))
-}
-
 function handleCrash(err) {
   afterBooted(() => {
     if (mainWindow) {
@@ -151,7 +149,7 @@ function createWindow() {
   })
 
   // start vue app
-  mainWindow.loadURL(winURL + `?lcd_port=` + LCD_PORT)
+  mainWindow.loadURL(winURL)
 
   mainWindow.on(`closed`, shutdown)
 
@@ -205,6 +203,17 @@ function startProcess(name, args, env) {
   }
   child.stdout.on(`data`, data => !shuttingDown && log(`${name}: ${data}`))
   child.stderr.on(`data`, data => !shuttingDown && log(`${name}: ${data}`))
+
+  // Make stdout more useful by emitting a line at a time.
+  readline.createInterface({ input: child.stdout }).on(`line`, line => {
+    child.stdout.emit(`line`, line)
+  })
+
+  // Make stderr more useful by emitting a line at a time.
+  readline.createInterface({ input: child.stderr }).on(`line`, line => {
+    child.stderr.emit(`line`, line)
+  })
+
   child.on(
     `exit`,
     code => !shuttingDown && log(`${name} exited with code ${code}`)
@@ -258,7 +267,6 @@ async function startLCD(home, nodeURL) {
     log(`startLCD`, home)
     let child = startProcess(LCD_BINARY_NAME, [
       `rest-server`,
-      `--insecure`,
       `--laddr`,
       `tcp://localhost:${LCD_PORT}`,
       `--home`,
@@ -272,27 +280,20 @@ async function startLCD(home, nodeURL) {
     ])
     logProcess(child, join(home, `lcd.log`))
 
-    child.stderr.on(`data`, error => {
+    child.stdout.once(`line`, async line => {
+      const certPath = /\(cert: "(.+?)"/.exec(line)[1]
+      resolve({ ca: fs.readFileSync(certPath, `utf8`), process: child })
+      lcdStarted = true
+    })
+
+    child.stderr.on(`line`, error => {
       let errorMessage = `The gaiacli rest-server (LCD) experienced an error:\n${error.toString(
         `utf8`
       )}`.substr(0, 1000)
       lcdStarted
         ? handleCrash(errorMessage) // if fails later
         : reject(errorMessage) // if fails immediatly
     })
-
-    // poll until LCD is started
-    let client = LcdClient(axios, `http://localhost:${LCD_PORT}`)
-    while (true) {
-      try {
-        await client.keys.values()
-        break // request succeeded
-      } catch (err) {
-        await sleep(1000)
-      }
-    }
-    lcdStarted = true
-    resolve(child)
   })
 }
 
@@ -306,12 +307,10 @@ function stopLCD() {
     try {
       // prevent the exit to signal bad termination warnings
       lcdProcess.removeAllListeners(`exit`)
-
       lcdProcess.on(`exit`, () => {
         lcdProcess = null
         resolve()
       })
-
       lcdProcess.kill(`SIGKILL`)
     } catch (err) {
       handleCrash(err)
@@ -422,9 +421,7 @@ const eventHandlers = {
 
   reconnect: () => reconnect(),
 
-  "stop-lcd": () => {
-    stopLCD()
-  },
+  "stop-lcd": () => stopLCD(),
 
   "successful-launch": () => {
     console.log(`[START SUCCESS] Vue app successfuly started`)
@@ -436,20 +433,16 @@ Object.entries(eventHandlers).forEach(([event, handler]) => {
   ipcMain.on(event, handler)
 })
 
-// query version of the used SDK via LCD
-async function getNodeVersion(nodeURL) {
-  let versionURL = `${nodeURL}/node_version`
-  let nodeVersion = await axios
-    .get(versionURL, { timeout: 3000 })
-    .then(res => res.data)
-    .then(fullversion => fullversion.split(`-`)[0])
-
-  return nodeVersion
-}
-
 // test an actual node version against the expected one and flag the node if incompatible
-async function testNodeVersion(nodeURL, expectedGaiaVersion) {
-  let nodeVersion = await getNodeVersion(nodeURL)
+async function testNodeVersion(client, expectedGaiaVersion) {
+  let result
+  try {
+    result = await client.nodeVersion()
+  } catch (err) {
+    debugger
+    return { compatible: false, nodeVersion: null }
+  }
+  let nodeVersion = result.split(`-`)[0]
   let semverDiff = semver.diff(nodeVersion, expectedGaiaVersion)
   if (semverDiff === `patch` || semverDiff === null) {
     return { compatible: true, nodeVersion }
@@ -458,20 +451,48 @@ async function testNodeVersion(nodeURL, expectedGaiaVersion) {
   return { compatible: false, nodeVersion }
 }
 
+// Proxy requests to Axios through the main process because we need
+// Node.js in order to support self-signed TLS certificates.
+const AxiosListener = axios => {
+  return async (event, id, options) => {
+    let response
+
+    try {
+      response = {
+        value: await axios(options)
+      }
+    } catch (exception) {
+      response = { exception }
+    }
+
+    event.sender.send(`Axios/${id}`, response)
+  }
+}
+
 // check if our node is reachable and the SDK version is compatible with the local one
 async function pickAndConnect() {
   let nodeURL = config.node_lcd
   connecting = true
+  let gaiaLite
+
   try {
-    await connect(nodeURL)
+    gaiaLite = await connect(nodeURL)
   } catch (err) {
     handleCrash(err)
     return
   }
 
+  // make the ca available to the view
+  global.config.ca = gaiaLite.ca
+  const axiosInstance = axios.create({
+    httpsAgent: new https.Agent({ ca: gaiaLite.ca })
+  })
+
   let compatible, nodeVersion
   try {
-    const out = await testNodeVersion(config.node_lcd, expectedGaiaCliVersion)
+    const client = LcdClient(axiosInstance, config.node_lcd)
+    const out = await testNodeVersion(client, expectedGaiaCliVersion)
+
     compatible = out.compatible
     nodeVersion = out.nodeVersion
   } catch (err) {
@@ -493,27 +514,27 @@ async function pickAndConnect() {
     return
   }
 
-  return nodeURL
+  ipcMain.removeAllListeners(`Axios`)
+  ipcMain.on(`Axios`, AxiosListener(axiosInstance))
 }
 
 async function connect() {
   log(`starting gaia rest server with nodeURL ${config.node_lcd}`)
-  try {
-    lcdProcess = await startLCD(lcdHome, config.node_rpc)
-    log(`gaia rest server ready`)
-
-    afterBooted(() => {
-      log(`Signaling connected node`)
-      mainWindow.webContents.send(`connected`, {
-        lcdURL: config.node_lcd,
-        rpcURL: config.node_rpc
-      })
+
+  const gaiaLite = await startLCD(lcdHome, config.node_rpc)
+  lcdProcess = gaiaLite.process
+  log(`gaia rest server ready`)
+
+  afterBooted(() => {
+    log(`Signaling connected node`)
+    mainWindow.webContents.send(`connected`, {
+      lcdURL: config.node_lcd,
+      rpcURL: config.node_rpc
     })
-  } catch (err) {
-    throw err
-  }
+  })
 
   connecting = false
+  return gaiaLite
 }
 
 async function reconnect() {
@@ -662,5 +683,6 @@ module.exports = main()
   .then(() => ({
     shutdown,
     processes: { lcdProcess },
-    eventHandlers
+    eventHandlers,
+    getLCDProcess: () => lcdProcess
   }))

app/src/renderer/components/wallet/PageTransactions.vue

@@ -108,12 +108,10 @@ export default {
         let unbondingDelegation = this.delegation.unbondingDelegations[
           tx.validator_addr
         ]
-        // TODO hack, use creation_height when https://github.com/cosmos/cosmos-sdk/issues/2314 is resolved
         if (
           unbondingDelegation &&
-          new Date(unbondingDelegation.min_time).getTime() -
-            new Date(copiedTransaction.time).getTime() ===
-            0
+          unbondingDelegation.creation_height ===
+            String(copiedTransaction.height)
         )
           copiedTransaction.unbondingDelegation = unbondingDelegation
       }

app/src/renderer/connectors/lcdClient.js

@@ -19,11 +19,6 @@ const Client = (axios, localLcdURL, remoteLcdURL) => {
   // to the path (/foo/{arg}/...)
   function argReq(method, prefix, suffix = ``, useRemote) {
     return function(args, data) {
-      // `args` can either be a single value or an array
-      if (Array.isArray(args)) {
-        args = args.join(`/`)
-      }
-
       return request(method, `${prefix}/${args}${suffix}`, data, useRemote)
     }
   }
@@ -60,6 +55,8 @@ const Client = (axios, localLcdURL, remoteLcdURL) => {
       return keys.values().then(() => true, () => false)
     },
 
+    nodeVersion: req(`GET`, `/node_version`),
+
     // tx
     postTx: req(`POST`, `/tx`),
 
@@ -91,8 +88,18 @@ const Client = (axios, localLcdURL, remoteLcdURL) => {
     /* ============ STAKE ============ */
 
     // Get all delegations information from a delegator
-    getDelegator: function(addr) {
-      return req(`GET`, `/stake/delegators/${addr}`, true)()
+    getDelegations: function(addr) {
+      return req(`GET`, `/stake/delegators/${addr}/delegations`, true)()
+    },
+    getUndelegations: function(addr) {
+      return req(
+        `GET`,
+        `/stake/delegators/${addr}/unbonding_delegations`,
+        true
+      )()
+    },
+    getRedelegations: function(addr) {
+      return req(`GET`, `/stake/delegators/${addr}/redelegations`, true)()
     },
     // Get all txs from a delegator
     getDelegatorTxs: function(addr, types) {
@@ -150,7 +157,7 @@ const Client = (axios, localLcdURL, remoteLcdURL) => {
     /* ============ Slashing ============ */
 
     queryValidatorSigningInfo: function(pubKey) {
-      return req(`GET`, `/slashing/signing_info/${pubKey}`, true)()
+      return req(`GET`, `/slashing/validators/${pubKey}/signing_info`, true)()
     },
 
     /* ============ Governance ============ */
@@ -175,16 +182,6 @@ const Client = (axios, localLcdURL, remoteLcdURL) => {
         true
       )()
     },
-    getGovernanceTxs: function(addr) {
-      return Promise.all([
-        req(
-          `GET`,
-          `/txs?tag=action='submit-proposal'&tag=proposer='${addr}'`,
-          true
-        )(),
-        req(`GET`, `/txs?tag=action='deposit'&tag=depositer='${addr}'`, true)()
-      ]).then(([proposalTxs, depositTxs]) => [].concat(proposalTxs, depositTxs))
-    },
     getGovDepositParameters: req(`GET`, `/gov/parameters/deposit`, true),
     getGovTallyingParameters: req(`GET`, `/gov/parameters/tallying`, true),
     getGovVotingParameters: req(`GET`, `/gov/parameters/voting`, true),
@@ -196,6 +193,22 @@ const Client = (axios, localLcdURL, remoteLcdURL) => {
     },
     submitProposalDeposit: function(proposalId, data) {
       return req(`POST`, `/gov/proposals/${proposalId}/deposits`, true)(data)
+    },
+    getGovernanceTxs: function(address) {
+      return Promise.all([
+        req(
+          `GET`,
+          `/txs?tag=action='submit-proposal'&tag=proposer='${address}'`,
+          true
+        )(),
+        req(
+          `GET`,
+          `/txs?tag=action='deposit'&tag=depositer='${address}'`,
+          true
+        )()
+      ]).then(([depositerTxs, proposerTxs]) =>
+        [].concat(depositerTxs, proposerTxs)
+      )
     }
   }
 }