Change State Defaults & Clear pending chain on importBlk

getcanoe · Mar 3, 2019 · 7d0ecfb · 7d0ecfb
1 parent 84d1268
commit 7d0ecfb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/Block.js b/Block.js
@@ -5,7 +5,7 @@ var MAIN_NET_WORK_THRESHOLD = 'ffffffc000000000'
 var STATE_BLOCK_PREAMBLE = '0000000000000000000000000000000000000000000000000000000000000006'
 var STATE_BLOCK_ZERO = '0000000000000000000000000000000000000000000000000000000000000000'
 
-module.exports = function (isState = false) {
+module.exports = function (isState = true) {
   var api = {} // public methods
   var type // block type
   var state = isState // if this is a state block

diff --git a/Wallet.js b/Wallet.js
@@ -761,8 +761,9 @@ module.exports = function (password) {
   api.lastBlockIsState = function () {
     if (lastBlock) {
       return api.getBlockFromHash(lastBlock).isState()
+    } else {
+      throw new Error('There is no previous block synced!')
     }
-    return false
   }
 
   api.getBlockFromHash = function (blockHash) {
@@ -1123,14 +1124,7 @@ module.exports = function (password) {
     lastPendingBlock = blk.getHash(true)
     keys[current].lastPendingBlock = blk.getHash(true)
 
-    // check if there is a conflicting block pending
-    for (var i in pendingBlocks) {
-      if (pendingBlocks[i].getPrevious() === blk.getPrevious()) {
-        // conflict
-        priv.fixPreviousChange(blk.getPrevious(), blk.getHash(true), acc)
-      }
-    }
-
+    pendingBlocks = []
     pendingBlocks.push(blk)
     walletPendingBlocks.push(blk)
     priv.save()

diff --git a/src/js/services/nanoService.js b/src/js/services/nanoService.js
@@ -9,7 +9,7 @@ angular.module('canoeApp.services')
       defaultRepresentative: null,
       servermessage: null, // { title: 'Hey', body: 'Rock on', link: 'http://getcanoe.io' }
       stateblocks: {
-        enable: false
+        enable: true
       }
     }