Merge branch 'release/v0.1.2'

.travis.yml

@@ -38,9 +38,8 @@ env:
     PACKAGES="python3 nsis g++-mingw-w64-x86-64 wine1.7 bc" GOAL="install" MOTION_CONFIG="--enable-gui
     --enable-reduce-exports" MAKEJOBS="-j4" WINE=true GOAL="deploy"
   - HOST=x86_64-unknown-linux-gnu PPA="ppa:bitcoin/bitcoin" PACKAGES="bc python3-zmq"
-    DEP_OPTS="NO_QT=1 NO_UPNP=1 DEBUG=1" GOAL="install" MOTION_CONFIG="--enable-zmq
-    --enable-glibc-back-compat --enable-reduce-exports" CPPFLAGS="-DDEBUG_LOCKORDER
-    -DENABLE_MOTION_DEBUG" PYZMQ=true
+    DEP_OPTS="NO_QT=1 NO_UPNP=1 DEBUG=0" GOAL="install" MOTION_CONFIG="--enable-zmq
+    --enable-glibc-back-compat --enable-reduce-exports" PYZMQ=true
   - HOST=x86_64-apple-darwin11 PPA="ppa:bitcoin/bitcoin" PACKAGES="cmake imagemagick
     libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python-dev" MOTION_CONFIG="--enable-gui
     --enable-reduce-exports" OSX_SDK=10.9 GOAL="deploy"

COPYING

@@ -2,6 +2,9 @@ The MIT License (MIT)
 
 Copyright (c) 2009-2016 The Bitcoin Core developers
 Copyright (c) 2014-2017 The Dash Core developers
+Copyright (c) 2017-2018 The Galactrum Core developers
+Copyright (c) 2017-2018 The Raven Core developers
+Copyright (c) 2017-2018 The Motion Core developers
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,4 +1,4 @@
-Motion Core 0.1.0
+Motion Core 0.1.2
 ===============================
 
 

configure.ac

@@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 0)
 define(_CLIENT_VERSION_MINOR, 1)
-define(_CLIENT_VERSION_REVISION, 1)
+define(_CLIENT_VERSION_REVISION, 2)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2018)
 AC_INIT([Motion Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/motioncrypto/motion/issues],[motioncore])

contrib/spendfrom/setup.py

@@ -1,5 +1,5 @@
 from distutils.core import setup
-setup(name='MTNspendfrom',
+setup(name='XMNspendfrom',
       version='1.0',
       description='Command-line utility for motion "coin control"',
       author='Gavin Andresen',

contrib/spendfrom/spendfrom.py

@@ -26,7 +26,7 @@
 BASE_FEE=Decimal("0.001")
 
 def check_json_precision():
-    """Make sure json library being used does not lose precision converting MTN values"""
+    """Make sure json library being used does not lose precision converting XMN values"""
     n = Decimal("20000000.00000003")
     satoshis = int(json.loads(json.dumps(float(n)))*1.0e8)
     if satoshis != 2000000000000003:
@@ -152,7 +152,7 @@ def create_tx(motiond, fromaddresses, toaddress, amount, fee):
         total_available += all_coins[addr]["total"]
 
     if total_available < needed:
-        sys.stderr.write("Error, only %f MTN available, need %f\n"%(total_available, needed));
+        sys.stderr.write("Error, only %f XMN available, need %f\n"%(total_available, needed));
         sys.exit(1)
 
     #

doc/gitian-building.md

@@ -446,10 +446,10 @@ Then when building, override the remote URLs that gbuild would otherwise pull fr
 cd /some/root/path/
 git clone https://github.com/motioncrypto/motion-detached-sigs.git
 
-MTNPATH=/some/root/path/motion.git
+XMNPATH=/some/root/path/motion.git
 SIGPATH=/some/root/path/motion-detached-sigs.git
 
-./bin/gbuild --url motion=${MTNPATH},signature=${SIGPATH} ../motion/contrib/gitian-descriptors/gitian-win-signer.yml
+./bin/gbuild --url motion=${XMNPATH},signature=${SIGPATH} ../motion/contrib/gitian-descriptors/gitian-win-signer.yml
 ```
 
 Signing externally

qa/rpc-tests/abandonconflict.py

@@ -37,13 +37,13 @@ def run_test(self):
         url = urlparse.urlparse(self.nodes[1].url)
         self.nodes[0].disconnectnode(url.hostname+":"+str(p2p_port(1)))
 
-        # Identify the 10MTN outputs
+        # Identify the 10XMN outputs
         nA = next(i for i, vout in enumerate(self.nodes[0].getrawtransaction(txA, 1)["vout"]) if vout["value"] == Decimal("10"))
         nB = next(i for i, vout in enumerate(self.nodes[0].getrawtransaction(txB, 1)["vout"]) if vout["value"] == Decimal("10"))
         nC = next(i for i, vout in enumerate(self.nodes[0].getrawtransaction(txC, 1)["vout"]) if vout["value"] == Decimal("10"))
 
         inputs =[]
-        # spend 10MTN outputs from txA and txB
+        # spend 10XMN outputs from txA and txB
         inputs.append({"txid":txA, "vout":nA})
         inputs.append({"txid":txB, "vout":nB})
         outputs = {}
@@ -53,7 +53,7 @@ def run_test(self):
         signed = self.nodes[0].signrawtransaction(self.nodes[0].createrawtransaction(inputs, outputs))
         txAB1 = self.nodes[0].sendrawtransaction(signed["hex"])
 
-        # Identify the 14.99998MTN output
+        # Identify the 14.99998XMN output
         nAB = next(i for i, vout in enumerate(self.nodes[0].getrawtransaction(txAB1, 1)["vout"]) if vout["value"] == Decimal("14.99998"))
 
         #Create a child tx spending AB1 and C
@@ -140,13 +140,13 @@ def run_test(self):
         connect_nodes(self.nodes[0], 1)
         sync_blocks(self.nodes)
 
-        # Verify that B and C's 10 MTN outputs are available for spending again because AB1 is now conflicted
+        # Verify that B and C's 10 XMN outputs are available for spending again because AB1 is now conflicted
         newbalance = self.nodes[0].getbalance()
         assert(newbalance == balance + Decimal("20"))
         balance = newbalance
 
         # There is currently a minor bug around this and so this test doesn't work.  See Issue #7315
-        # Invalidate the block with the double spend and B's 10 MTN output should no longer be available
+        # Invalidate the block with the double spend and B's 10 XMN output should no longer be available
         # Don't think C's should either
         self.nodes[0].invalidateblock(self.nodes[0].getbestblockhash())
         newbalance = self.nodes[0].getbalance()

qa/rpc-tests/bip68-sequence.py

@@ -63,7 +63,7 @@ def run_test(self):
     def test_disable_flag(self):
         # Create some unconfirmed inputs
         new_addr = self.nodes[0].getnewaddress()
-        self.nodes[0].sendtoaddress(new_addr, 2) # send 2 MTN
+        self.nodes[0].sendtoaddress(new_addr, 2) # send 2 XMN
 
         utxos = self.nodes[0].listunspent(0, 0)
         assert(len(utxos) > 0)

qa/rpc-tests/rawtransactions.py

@@ -80,7 +80,7 @@ def run_test(self):
         #use balance deltas instead of absolute values
         bal = self.nodes[2].getbalance()
 
-        # send 1.2 MTN to msig adr
+        # send 1.2 XMN to msig adr
         txId = self.nodes[0].sendtoaddress(mSigObj, 1.2)
         self.sync_all()
         self.nodes[0].generate(1)

qa/rpc-tests/replace-by-fee.py

@@ -134,7 +134,7 @@ def test_simple_doublespend(self):
         else:
             assert(False)
 
-        # Extra 0.1 MTN fee
+        # Extra 0.1 XMN fee
         tx1b = CTransaction()
         tx1b.vin = [CTxIn(tx0_outpoint, nSequence=0)]
         tx1b.vout = [CTxOut(int(0.9*COIN), CScript([b'b']))]
@@ -168,7 +168,7 @@ def test_doublespend_chain(self):
             prevout = COutPoint(int(txid, 16), 0)
 
         # Whether the double-spend is allowed is evaluated by including all
-        # child fees - 40 MTN - so this attempt is rejected.
+        # child fees - 40 XMN - so this attempt is rejected.
         dbl_tx = CTransaction()
         dbl_tx.vin = [CTxIn(tx0_outpoint, nSequence=0)]
         dbl_tx.vout = [CTxOut(initial_nValue - 30*COIN, CScript([1]))]
@@ -246,7 +246,7 @@ def branch(prevout, initial_value, max_txs, tree_width=5, fee=0.0001*COIN, _tota
         else:
             assert(False)
 
-        # 1 MTN fee is enough
+        # 1 XMN fee is enough
         dbl_tx = CTransaction()
         dbl_tx.vin = [CTxIn(tx0_outpoint, nSequence=0)]
         dbl_tx.vout = [CTxOut(initial_nValue - fee*n - 1*COIN, CScript([1]))]

qa/rpc-tests/test_framework/mininode.py

@@ -41,7 +41,7 @@
 MAX_INV_SZ = 50000
 MAX_BLOCK_SIZE = 1000000
 
-COIN = 100000000L # 1 MTN in satoshis
+COIN = 100000000L # 1 XMN in satoshis
 
 # Keep our own socket map for asyncore, so that we can track disconnects
 # ourselves (to workaround an issue with closing an asyncore socket when 

qa/rpc-tests/test_framework/util.py

@@ -96,7 +96,7 @@ def rpc_port(n):
     return 12000 + n + os.getpid()%999
 
 def check_json_precision():
-    """Make sure json library being used does not lose precision converting MTN values"""
+    """Make sure json library being used does not lose precision converting XMN values"""
     n = Decimal("20000000.00000003")
     satoshis = int(json.loads(json.dumps(float(n)))*1.0e8)
     if satoshis != 2000000000000003:

src/amount.h

@@ -21,7 +21,7 @@ extern const std::string CURRENCY_UNIT;
 /** No amount larger than this (in satoshi) is valid.
  *
  * Note that this constant is *not* the total money supply, which in Motion
- * currently happens to be less than 21,000,000 MTN for various reasons, but
+ * currently happens to be less than 21,000,000 XMN for various reasons, but
  * rather a sanity check. As this sanity check is used by consensus-critical
  * validation code, the exact value of the MAX_MONEY constant is consensus
  * critical; in unusual circumstances like a(nother) overflow bug that allowed

src/clientversion.h

@@ -16,7 +16,7 @@
 //! These need to be macros, as clientversion.cpp's and motion*-res.rc's voodoo requires it
 #define CLIENT_VERSION_MAJOR 0
 #define CLIENT_VERSION_MINOR 1
-#define CLIENT_VERSION_REVISION 1
+#define CLIENT_VERSION_REVISION 2
 
 //! Set to true for release, false for prerelease or test build
 #define CLIENT_VERSION_IS_RELEASE true

src/policy/fees.cpp

@@ -368,7 +368,7 @@ void CBlockPolicyEstimator::processTransaction(const CTxMemPoolEntry& entry, boo
         return;
     }
 
-    // Fees are stored and reported as MTN-per-kb:
+    // Fees are stored and reported as XMN-per-kb:
     CFeeRate feeRate(entry.GetFee(), entry.GetTxSize());
 
     // Want the priority of the tx at confirmation. However we don't know
@@ -414,7 +414,7 @@ void CBlockPolicyEstimator::processBlockTx(unsigned int nBlockHeight, const CTxM
         return;
     }
 
-    // Fees are stored and reported as MTN-per-kb:
+    // Fees are stored and reported as XMN-per-kb:
     CFeeRate feeRate(entry.GetFee(), entry.GetTxSize());
 
     // Want the priority of the tx at confirmation.  The priority when it

src/pow.cpp

@@ -113,10 +113,6 @@ unsigned int GetNextWorkRequired(const CBlockIndex* pindexLast, const CBlockHead
        return DarkGravityWave(pindexLast, params);
     }
 
-    if (pindexLast->nHeight <= 100) {
-        return 1; // to mature premine
-    }
-
     return LwmaGetNextWorkRequired(pindexLast, pblock, params);
 }
 

src/qt/coincontroldialog.cpp

@@ -625,7 +625,7 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog)
     }
 
     // actually update labels
-    int nDisplayUnit = MotionUnits::MTN;
+    int nDisplayUnit = MotionUnits::XMN;
     if (model && model->getOptionsModel())
         nDisplayUnit = model->getOptionsModel()->getDisplayUnit();
 

src/qt/forms/overviewpage.ui

@@ -115,7 +115,7 @@
                                                         <string>Your current spendable balance</string>
                                                     </property>
                                                     <property name="text">
-                                                        <string notr="true">0.000 000 00 MTN</string>
+                                                        <string notr="true">0.000 000 00 XMN</string>
                                                     </property>
                                                     <property name="alignment">
                                                         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -153,7 +153,7 @@
                                                         <string>Your current balance in watch-only addresses</string>
                                                     </property>
                                                     <property name="text">
-                                                        <string notr="true">0.000 000 00 MTN</string>
+                                                        <string notr="true">0.000 000 00 XMN</string>
                                                     </property>
                                                     <property name="alignment">
                                                         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -185,7 +185,7 @@
                                                         <string>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</string>
                                                     </property>
                                                     <property name="text">
-                                                        <string notr="true">0.000 000 00 MTN</string>
+                                                        <string notr="true">0.000 000 00 XMN</string>
                                                     </property>
                                                     <property name="alignment">
                                                         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -210,7 +210,7 @@
                                                         <string>Unconfirmed transactions to watch-only addresses</string>
                                                     </property>
                                                     <property name="text">
-                                                        <string notr="true">0.000 000 00 MTN</string>
+                                                        <string notr="true">0.000 000 00 XMN</string>
                                                     </property>
                                                     <property name="alignment">
                                                         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -255,7 +255,7 @@
                                                         <string>Mined balance that has not yet matured</string>
                                                     </property>
                                                     <property name="text">
-                                                        <string notr="true">0.000 000 00 MTN</string>
+                                                        <string notr="true">0.000 000 00 XMN</string>
                                                     </property>
                                                     <property name="alignment">
                                                         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -280,7 +280,7 @@
                                                         <string>Mined balance in watch-only addresses that has not yet matured</string>
                                                     </property>
                                                     <property name="text">
-                                                        <string notr="true">0.000 000 00 MTN</string>
+                                                        <string notr="true">0.000 000 00 XMN</string>
                                                     </property>
                                                     <property name="alignment">
                                                         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -338,7 +338,7 @@
                                                         <string>Your current total balance</string>
                                                     </property>
                                                     <property name="text">
-                                                        <string notr="true">0.000 000 00 MTN</string>
+                                                        <string notr="true">0.000 000 00 XMN</string>
                                                     </property>
                                                     <property name="alignment">
                                                         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -363,7 +363,7 @@
                                                         <string>Current total balance in watch-only addresses</string>
                                                     </property>
                                                     <property name="text">
-                                                        <string notr="true">0.000 000 00 MTN</string>
+                                                        <string notr="true">0.000 000 00 XMN</string>
                                                     </property>
                                                     <property name="alignment">
                                                         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -651,7 +651,7 @@
                                                         </font>
                                                     </property>
                                                     <property name="text">
-                                                        <string notr="true">0 MTN</string>
+                                                        <string notr="true">0 XMN</string>
                                                     </property>
 
                                                 </widget>
@@ -706,7 +706,7 @@
                                 <item row="3" column="1">
                                     <widget class="QLabel" name="labelAmountRounds">
                                         <property name="text">
-                                            <string>0 MTN / 0 Rounds</string>
+                                            <string>0 XMN / 0 Rounds</string>
                                         </property>
                                     </widget>
                                 </item>

src/qt/forms/settingspage.ui

@@ -1033,7 +1033,7 @@
                                                             <string notr="true"/>
                                                         </property>
                                                         <property name="text">
-                                                            <string>Amount of MTN to keep anonymized</string>
+                                                            <string>Amount of XMN to keep anonymized</string>
                                                         </property>
                                                     </widget>
                                                 </item>

src/qt/guiutil.cpp

@@ -184,7 +184,7 @@ bool parseMotionURI(const QUrl &uri, SendCoinsRecipient *out)
         {
             if(!i->second.isEmpty())
             {
-                if(!MotionUnits::parse(MotionUnits::MTN, i->second, &rv.amount))
+                if(!MotionUnits::parse(MotionUnits::XMN, i->second, &rv.amount))
                 {
                     return false;
                 }
@@ -223,7 +223,7 @@ QString formatMotionURI(const SendCoinsRecipient &info)
 
     if (info.amount)
     {
-        ret += QString("?amount=%1").arg(MotionUnits::format(MotionUnits::MTN, info.amount, false, MotionUnits::separatorNever));
+        ret += QString("?amount=%1").arg(MotionUnits::format(MotionUnits::XMN, info.amount, false, MotionUnits::separatorNever));
         paramCount++;
     }
 

src/qt/locale/motion_en.ts

@@ -3447,7 +3447,7 @@ https://www.transifex.com/projects/p/motion/</translation>
     <message>
         <location line="+20"/>
         <source>Inputs...</source>
-        <translation>MTN Inputs...</translation>
+        <translation>XMN Inputs...</translation>
     </message>
     <message>
         <location line="+10"/>

src/qt/locale/motion_es.ts

@@ -2209,7 +2209,7 @@ https://www.transifex.com/projects/p/motion/</translation>
     </message>
     <message>
         <source>Inputs...</source>
-        <translation>Entradas de MTN...</translation>
+        <translation>Entradas de XMN...</translation>
     </message>
     <message>
         <source>automatically selected</source>