fix: update ethereum-adapter, don't die on balance check fail

tradle · Feb 22, 2018 · 58de2f1 · 58de2f1
1 parent bb298b8
commit 58de2f1
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 18 deletions.
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/src/blockchain.ts b/src/blockchain.ts
@@ -191,12 +191,18 @@ export default class Blockchain {
     this.start()
     this.logger.debug(`sealing ${link}`)
     if (typeof balance === 'undefined') {
-      balance = await this.balance()
+      try {
+        balance = await this.balance()
+      } catch (err) {
+        this.logger.error('failed to get balance', err)
+      }
     }
 
     const amount = this.getTxAmount()
-    if (compareBalance(balance, amount) === -1) {
-      throw new Errors.LowFunds(`have ${balance}, need at least ${amount}`)
+    if (typeof balance !== 'undefined') {
+      if (compareBalance(balance, amount) === -1) {
+        throw new Errors.LowFunds(`have ${balance}, need at least ${amount}`)
+      }
     }
 
     try {

diff --git a/src/seals.ts b/src/seals.ts
@@ -256,7 +256,15 @@ export default class Seals {
     this.logger.info(`found ${pending.length} pending seals`)
     let aborted
     // TODO: update balance after every tx
-    const balance = this.blockchain.balance ? await this.blockchain.balance() : undefined
+    let balance
+    if (this.blockchain.balance) {
+      try {
+        balance = await this.blockchain.balance()
+      } catch (err) {
+        this.logger.error('failed to get balance', err)
+      }
+    }
+
     const results = await seriesMap(pending, async (sealInfo: Seal) => {
       if (aborted) return