Fabo/sdk 0.26.1-rc1

app/src/main/index.js

@@ -3,11 +3,14 @@
 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`)
+const userHome = require(`user-home`)
 
 let pkg = require(`../../../package.json`)
 let addMenu = require(`./menu.js`)
@@ -203,6 +206,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}`)
@@ -256,7 +270,6 @@ async function startLCD(home, nodeURL) {
     log(`startLCD`, home)
     let child = startProcess(LCD_BINARY_NAME, [
       `rest-server`,
-      `--insecure`,
       `--laddr`,
       `tcp://localhost:${LCD_PORT}`,
       `--home`,
@@ -270,27 +283,19 @@ 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 })
+    })
+
+    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)
   })
 }
 
@@ -434,20 +439,9 @@ 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 nodeVersion = (await client.nodeVersion()).split(`-`)[0]
   let semverDiff = semver.diff(nodeVersion, expectedGaiaVersion)
   if (semverDiff === `patch` || semverDiff === null) {
     return { compatible: true, nodeVersion }
@@ -456,20 +450,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
   }
 
+  const axiosInstance = axios.create({
+    httpsAgent: new https.Agent({ ca: gaiaLite.ca })
+  })
+
   let compatible, nodeVersion
   try {
-    const out = await testNodeVersion(config.node_lcd, expectedGaiaCliVersion)
+    const out = await testNodeVersion(
+      LcdClient(axiosInstance, config.node_lcd),
+      expectedGaiaCliVersion
+    )
+
     compatible = out.compatible
     nodeVersion = out.nodeVersion
   } catch (err) {
@@ -491,27 +513,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() {
@@ -582,6 +604,63 @@ const checkGaiaCompatibility = async gaiacliVersionPath => {
   }
 }
 
+const initLCD = async lcdHome => {
+  log(`initialising the LCD config dir`)
+  await new Promise((resolve, reject) => {
+    const NODE_BINARY_NAME = WIN ? `gaiad.exe` : `gaiad`
+    const tempNodeDir = join(lcdHome, `.temp_node_home`)
+
+    const child = startProcess(NODE_BINARY_NAME, [
+      `init`,
+      `--home`,
+      tempNodeDir,
+      `--home-client`,
+      lcdHome,
+      `--name`,
+      `default`
+    ])
+
+    child.stdin.write(`1234567890\n`)
+
+    child.on(`exit`, code => {
+      if (code === 0) {
+        resolve()
+      } else {
+        reject()
+      }
+
+      fs.remove(tempNodeDir)
+    })
+  })
+
+  log(`deleting forced default account`)
+  // initLCD always needs to create one key, we don't want to confuse
+  // the user with this key, so we throw it away
+  await deleteKey(`default`, `1234567890`, lcdHome)
+}
+
+const deleteKey = (name, password, lcdHome) => {
+  return new Promise((resolve, reject) => {
+    const child = startProcess(LCD_BINARY_NAME, [
+      `keys`,
+      `delete`,
+      name,
+      `--home`,
+      lcdHome
+    ])
+
+    child.stdin.write(`${password}\n`)
+
+    child.on(`exit`, code => {
+      if (code === 0) {
+        resolve()
+      } else {
+        reject()
+      }
+    })
+  })
+}
+
 async function main() {
   // we only enable error collection after users opted in
   Raven.config(``, { captureUnhandledRejections: false }).install()
@@ -642,6 +721,10 @@ async function main() {
     fs.writeFileSync(appVersionPath, pkg.version)
   }
 
+  if (!fs.existsSync(lcdHome)) {
+    await initLCD(lcdHome)
+  }
+
   await checkGaiaCompatibility(gaiacliVersionPath)
 
   // read chainId from genesis.json

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

@@ -111,12 +111,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

@@ -3,7 +3,7 @@
 const Client = (axios, localLcdURL, remoteLcdURL) => {
   async function request(method, path, data, useRemote) {
     const url = useRemote ? remoteLcdURL : localLcdURL
-    return (await axios[method.toLowerCase()](url + path, data)).data
+    return (await axios({ data, method, url: url + path })).data
   }
 
   // returns an async function which makes a request for the given
@@ -23,9 +23,7 @@ const Client = (axios, localLcdURL, remoteLcdURL) => {
       if (Array.isArray(args)) {
         args = args.join(`/`)
       }
-      if (method === `DELETE`) {
-        data = { data }
-      }
+
       return request(method, `${prefix}/${args}${suffix}`, data, useRemote)
     }
   }
@@ -64,6 +62,8 @@ const Client = (axios, localLcdURL, remoteLcdURL) => {
       return keys.values().then(() => true, () => false)
     },
 
+    nodeVersion: req(`GET`, `/node_version`),
+
     // tx
     postTx: req(`POST`, `/tx`),
 
@@ -95,8 +95,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) {
@@ -154,7 +164,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 ============ */