enable SW on mainnet

bump version
goatpig · Aug 27, 2017 · a6d366f · a6d366f · bendelo · Aug 30, 2017
1 parent 79e196d
commit a6d366f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/armoryengine/ArmoryUtils.py b/armoryengine/ArmoryUtils.py
@@ -68,7 +68,7 @@
 LEVELDB_HEADERS = 'leveldb_headers'
 
 # Version Numbers
-BTCARMORY_VERSION    = (0, 96,  1, 2)  # (Major, Minor, Bugfix, AutoIncrement)
+BTCARMORY_VERSION    = (0, 96,  2, 0)  # (Major, Minor, Bugfix, AutoIncrement)
 PYBTCWALLET_VERSION  = (1, 35,  0, 0)  # (Major, Minor, Bugfix, AutoIncrement)
 
 # ARMORY_DONATION_ADDR = '1ArmoryXcfq7TnCSuZa9fQjRYwJ4bkRKfv'

diff --git a/cppForSwig/BitcoinP2P.cpp b/cppForSwig/BitcoinP2P.cpp
@@ -936,7 +936,7 @@ void BitcoinP2P::connectLoop(void)
          version.setVersionHeaderIPv4(70012, services, timestamp,
             node_addr_, clientsocketaddr);
 
-         version.userAgent_ = "Armory:0.96.1.2";
+         version.userAgent_ = "Armory:0.96.2";
          version.startHeight_ = -1;
 
          sendMessage(move(version));
@@ -1105,8 +1105,7 @@ void BitcoinP2P::checkServices(unique_ptr<Payload> payload)
    auto mwInt = (uint32_t*)mainnetMW.getPtr();
 
    //Hardcode disabling SW for mainnet until BIP9 rule detection is implemented
-   if(pver->vheader_.services_ & NODE_WITNESS && 
-      magic_word_ != *mwInt)
+   if(pver->vheader_.services_ & NODE_WITNESS)
       PEER_USES_WITNESS = true;
    else
       PEER_USES_WITNESS = false;