Skip to content

Instantly share code, notes, and snippets.

@pallih
Created March 26, 2014 14:21
Show Gist options
  • Save pallih/9784492 to your computer and use it in GitHub Desktop.
Save pallih/9784492 to your computer and use it in GitHub Desktop.
2a3,4
2a3,4
279c281
< PUBKEY_ADDRESS = 0,
---
> PUBKEY_ADDRESS = 23,
404a407,412
> enum
> {
> };
>
408c416
< SetData(fTestNet ? 239 : 128, &vchSecret[0], vchSecret.size());
---
> SetData(fTestNet ? PRIVKEY_ADDRESS_TEST : PRIVKEY_ADDRESS, &vchSecret[0], vchSecret.size());
427c435
< case 128:
---
> case PRIVKEY_ADDRESS:
430c438
< case 239:
---
> case PRIVKEY_ADDRESS_TEST:
2a3,4
419c421
< // if built on ubuntu 9.04 or 9.10, probably depends on version of OpenSSL
---
> // if built on ubuntu 9.04 or 9.10, probably depends on version of openssl
2a3,4
67d68
<
87d87
<
229,232d228
<
<
<
< ///
234d229
< ///
292c287
---
295c290
---
320a316,350
> Value GetNetworkHashPS(int lookup) {
> if (pindexBest == NULL)
> return 0;
>
> // If lookup is -1, then use blocks since last difficulty change.
> if (lookup <= 0)
> lookup = pindexBest->nHeight % 2016 + 1;
>
> // If lookup is larger than chain, then set it to chain length.
> if (lookup > pindexBest->nHeight)
> lookup = pindexBest->nHeight;
>
> CBlockIndex* pindexPrev = pindexBest;
> for (int i = 0; i < lookup; i++)
> pindexPrev = pindexPrev->pprev;
>
> double timeDiff = pindexBest->GetBlockTime() - pindexPrev->GetBlockTime();
> double timePerBlock = timeDiff / lookup;
>
> return (boost::int64_t)(((double)GetDifficulty() * pow(2.0, 32)) / timePerBlock);
> }
>
> Value getnetworkhashps(const Array& params, bool fHelp)
> {
> if (fHelp || params.size() > 1)
> throw runtime_error(
> "getnetworkhashps [blocks]\n"
> "Returns the estimated network hashes per second based on the last 120 blocks.\n"
> "Pass in [blocks] to override # of blocks, -1 specifies since last difficulty change.");
>
> return GetNetworkHashPS(params.size() > 0 ? params[0].get_int() : 120);
> }
>
>
393a424
> obj.push_back(Pair("mininput", ValueFromAmount(nMinimumInputValue)));
416a448
> obj.push_back(Pair("networkhashps", getnetworkhashps(params, false)));
428c460
---
495c527
---
513c545
< "setaccount <bitcoinaddress> <account>\n"
---
518c550
---
543c575
< "getaccount <bitcoinaddress>\n"
---
548c580
---
594a627,642
> Value setmininput(const Array& params, bool fHelp)
> {
> if (fHelp || params.size() < 1 || params.size() > 1)
> throw runtime_error(
> "setmininput <amount>\n"
> "<amount> is a real and is rounded to the nearest 0.00000001");
>
> // Amount
> int64 nAmount = 0;
> if (params[0].get_real() != 0.0)
> nAmount = AmountFromValue(params[0]); // rejects 0.0 amounts
>
> nMinimumInputValue = nAmount;
> return true;
> }
>
599c647
< "sendtoaddress <bitcoinaddress> <amount> [comment] [comment-to]\n"
---
605c653
---
631c679
< "signmessage <bitcoinaddress> <message>\n"
---
666c714
< "verifymessage <bitcoinaddress> <signature> <message>\n"
---
703,704c751,752
< "getreceivedbyaddress <bitcoinaddress> [minconf=1]\n"
< "Returns the total amount received by <bitcoinaddress> in transactions with at least [minconf] confirmations.");
---
706c754
---
710c758
---
924c972
< "sendfrom <fromaccount> <tobitcoinaddress> <amount> [minconf=1] [comment] [comment-to]\n"
---
931c979
---
987c1035
---
1030c1078
---
1054c1102
---
1746c1794
---
1788,1789c1836,1837
< "validateaddress <bitcoinaddress>\n"
< "Return information about <bitcoinaddress>.");
---
1812a1861,1988
> Value getworkex(const Array& params, bool fHelp)
> {
> if (fHelp || params.size() > 2)
> throw runtime_error(
> "getworkex [data, coinbase]\n"
> "If [data, coinbase] is not specified, returns extended work data.\n"
> );
>
> if (vNodes.empty())
>
> if (IsInitialBlockDownload())
>
> typedef map<uint256, pair<CBlock*, CScript> > mapNewBlock_t;
> static mapNewBlock_t mapNewBlock;
> static vector<CBlock*> vNewBlock;
> static CReserveKey reservekey(pwalletMain);
>
> if (params.size() == 0)
> {
> // Update block
> static unsigned int nTransactionsUpdatedLast;
> static CBlockIndex* pindexPrev;
> static int64 nStart;
> static CBlock* pblock;
> if (pindexPrev != pindexBest ||
> (nTransactionsUpdated != nTransactionsUpdatedLast && GetTime() - nStart > 60))
> {
> if (pindexPrev != pindexBest)
> {
> // Deallocate old blocks since they're obsolete now
> mapNewBlock.clear();
> BOOST_FOREACH(CBlock* pblock, vNewBlock)
> delete pblock;
> vNewBlock.clear();
> }
> nTransactionsUpdatedLast = nTransactionsUpdated;
> pindexPrev = pindexBest;
> nStart = GetTime();
>
> // Create new block
> pblock = CreateNewBlock(reservekey);
> if (!pblock)
> throw JSONRPCError(-7, "Out of memory");
> vNewBlock.push_back(pblock);
> }
>
> // Update nTime
> pblock->nTime = max(pindexPrev->GetMedianTimePast()+1, GetAdjustedTime());
> pblock->nNonce = 0;
>
> // Update nExtraNonce
> static unsigned int nExtraNonce = 0;
> IncrementExtraNonce(pblock, pindexPrev, nExtraNonce);
>
> // Save
> mapNewBlock[pblock->hashMerkleRoot] = make_pair(pblock, pblock->vtx[0].vin[0].scriptSig);
>
> // Prebuild hash buffers
> char pmidstate[32];
> char pdata[128];
> char phash1[64];
> FormatHashBuffers(pblock, pmidstate, pdata, phash1);
>
> uint256 hashTarget = CBigNum().SetCompact(pblock->nBits).getuint256();
>
> CTransaction coinbaseTx = pblock->vtx[0];
> std::vector<uint256> merkle = pblock->GetMerkleBranch(0);
>
> Object result;
> result.push_back(Pair("data", HexStr(BEGIN(pdata), END(pdata))));
> result.push_back(Pair("target", HexStr(BEGIN(hashTarget), END(hashTarget))));
>
> CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION);
> ssTx << coinbaseTx;
> result.push_back(Pair("coinbase", HexStr(ssTx.begin(), ssTx.end())));
>
> Array merkle_arr;
> printf("DEBUG: merkle size %i\n", merkle.size());
>
> BOOST_FOREACH(uint256 merkleh, merkle) {
> printf("%s\n", merkleh.ToString().c_str());
> merkle_arr.push_back(HexStr(BEGIN(merkleh), END(merkleh)));
> }
>
> result.push_back(Pair("merkle", merkle_arr));
>
>
> return result;
> }
> else
> {
> // Parse parameters
> vector<unsigned char> vchData = ParseHex(params[0].get_str());
> vector<unsigned char> coinbase;
>
> if(params.size() == 2)
> coinbase = ParseHex(params[1].get_str());
>
> if (vchData.size() != 128)
> throw JSONRPCError(-8, "Invalid parameter");
>
> CBlock* pdata = (CBlock*)&vchData[0];
>
> // Byte reverse
> for (int i = 0; i < 128/4; i++)
> ((unsigned int*)pdata)[i] = ByteReverse(((unsigned int*)pdata)[i]);
>
> // Get saved block
> if (!mapNewBlock.count(pdata->hashMerkleRoot))
> return false;
> CBlock* pblock = mapNewBlock[pdata->hashMerkleRoot].first;
>
> pblock->nTime = pdata->nTime;
> pblock->nNonce = pdata->nNonce;
>
> if(coinbase.size() == 0)
> pblock->vtx[0].vin[0].scriptSig = mapNewBlock[pdata->hashMerkleRoot].second;
> else
> CDataStream(coinbase, SER_NETWORK, PROTOCOL_VERSION) >> pblock->vtx[0]; // FIXME - HACK!
>
> pblock->hashMerkleRoot = pblock->BuildMerkleTree();
>
> return CheckWork(pblock, *pwalletMain, reservekey);
> }
> }
>
1826c2002
---
1829c2005
---
1888a2065
1918c2095
< Value getmemorypool(const Array& params, bool fHelp)
---
> Value getblocktemplate(const Array& params, bool fHelp)
1920c2097
< if (fHelp || params.size() > 1)
---
> if (fHelp || params.size() != 1)
1922,1923c2099,2100
< "getmemorypool [data]\n"
< "If [data] is not specified, returns data needed to construct a block to work on:\n"
---
> "getblocktemplate [params]\n"
> "If [params] does not contain a \"data\" key, returns data needed to construct a block to work on:\n"
1926a2104
> " \"coinbaseaux\" : data that should be included in coinbase\n"
1928,1929c2106
< " \"coinbaseflags\" : data that should be included in coinbase so support for new features can be judged\n"
< " \"time\" : timestamp appropriate for next block\n"
---
> " \"target\" : hash target\n"
1931a2109,2112
> " \"mutable\" : list of ways the block template may be changed\n"
> " \"noncerange\" : range of valid nonces\n"
> " \"sigoplimit\" : limit of sigops in blocks\n"
> " \"sizelimit\" : limit of block size\n"
1933c2114,2129
< "If [data] is specified, tries to solve the block and returns true if it was successful.");
---
> " \"height\" : height of the next block\n"
> "If [params] does contain a \"data\" key, tries to solve the block and returns null if it was successful (and \"rejected\" if not)\n"
> "See https://en.bitcoin.it/wiki/BIP_0022 for full specification.");
>
> const Object& oparam = params[0].get_obj();
> std::string strMode;
> {
> const Value& modeval = find_value(oparam, "mode");
> if (modeval.type() == str_type)
> strMode = modeval.get_str();
> else
> if (find_value(oparam, "data").type() == null_type)
> strMode = "template";
> else
> strMode = "submit";
> }
1935c2131
< if (params.size() == 0)
---
> if (strMode == "template")
1938c2134
---
1941c2137
---
1970,1971c2166,2174
< BOOST_FOREACH(CTransaction tx, pblock->vtx) {
< if(tx.IsCoinBase())
---
> map<uint256, int64_t> setTxIndex;
> int i = 0;
> CTxDB txdb("r");
> BOOST_FOREACH (CTransaction& tx, pblock->vtx)
> {
> uint256 txHash = tx.GetHash();
> setTxIndex[txHash] = i++;
>
> if (tx.IsCoinBase())
1973a2177,2178
> Object entry;
>
1975a2181,2203
> entry.push_back(Pair("data", HexStr(ssTx.begin(), ssTx.end())));
>
> entry.push_back(Pair("hash", txHash.GetHex()));
>
> MapPrevTx mapInputs;
> map<uint256, CTxIndex> mapUnused;
> bool fInvalid = false;
> if (tx.FetchInputs(txdb, mapUnused, false, false, mapInputs, fInvalid))
> {
> entry.push_back(Pair("fee", (int64_t)(tx.GetValueIn(mapInputs) - tx.GetValueOut())));
>
> Array deps;
> BOOST_FOREACH (MapPrevTx::value_type& inp, mapInputs)
> {
> if (setTxIndex.count(inp.first))
> deps.push_back(setTxIndex[inp.first]);
> }
> entry.push_back(Pair("depends", deps));
>
> int64_t nSigOps = tx.GetLegacySigOpCount();
> nSigOps += tx.GetP2SHSigOpCount(mapInputs);
> entry.push_back(Pair("sigops", nSigOps));
> }
1977c2205,2218
< transactions.push_back(HexStr(ssTx.begin(), ssTx.end()));
---
> transactions.push_back(entry);
> }
>
> Object aux;
> aux.push_back(Pair("flags", HexStr(COINBASE_FLAGS.begin(), COINBASE_FLAGS.end())));
>
> uint256 hashTarget = CBigNum().SetCompact(pblock->nBits).getuint256();
>
> static Array aMutable;
> if (aMutable.empty())
> {
> aMutable.push_back("time");
> aMutable.push_back("transactions");
> aMutable.push_back("prevblock");
1983a2225
> result.push_back(Pair("coinbaseaux", aux));
1985,1986c2227
< result.push_back(Pair("coinbaseflags", HexStr(COINBASE_FLAGS.begin(), COINBASE_FLAGS.end())));
< result.push_back(Pair("time", (int64_t)pblock->nTime));
---
> result.push_back(Pair("target", hashTarget.GetHex()));
1988c2229,2233
< result.push_back(Pair("curtime", (int64_t)GetAdjustedTime()));
---
> result.push_back(Pair("mutable", aMutable));
> result.push_back(Pair("noncerange", "00000000ffffffff"));
> result.push_back(Pair("sigoplimit", (int64_t)MAX_BLOCK_SIGOPS));
> result.push_back(Pair("sizelimit", (int64_t)MAX_BLOCK_SIZE));
> result.push_back(Pair("curtime", (int64_t)pblock->nTime));
1989a2235
> result.push_back(Pair("height", (int64_t)(pindexPrev->nHeight+1)));
1993a2240
> if (strMode == "submit")
1996c2243
< CDataStream ssBlock(ParseHex(params[0].get_str()), SER_NETWORK, PROTOCOL_VERSION);
---
> CDataStream ssBlock(ParseHex(find_value(oparam, "data").get_str()), SER_NETWORK, PROTOCOL_VERSION);
2000c2247,2249
< return ProcessBlock(NULL, &pblock);
---
> bool fAccepted = ProcessBlock(NULL, &pblock);
>
> return fAccepted ? Value::null : "rejected";
2001a2251,2252
>
> throw JSONRPCError(-8, "Invalid mode");
2078a2330
> { "getnetworkhashps", &getnetworkhashps, true },
2113a2366
> { "getworkex", &getworkex, true },
2116c2369,2370
< { "getmemorypool", &getmemorypool, true },
---
> { "setmininput", &setmininput, false },
> { "getblocktemplate", &getblocktemplate, true },
2159c2413
< << "User-Agent: bitcoin-json-rpc/" << FormatFullVersion() << "\r\n"
---
2190c2444
< "Server: bitcoin-json-rpc/%s\r\n"
---
2217c2471
< "Server: bitcoin-json-rpc/%s\r\n"
---
2315c2569
---
2593c2847
< string strWhatAmI = "To use bitcoind";
---
2601c2855
< "rpcuser=bitcoinrpc\n"
---
2639c2893,2895
< ip::tcp::endpoint endpoint(bindAddress, GetArg("-rpcport", 8332));
---
> ip::tcp::endpoint endpoint(bindAddress, GetArg("-rpcport", 12341));
> boost::system::error_code v6_only_error;
> boost::shared_ptr<ip::tcp::acceptor> acceptor(new ip::tcp::acceptor(io_service));
2642a2899,2900
> bool fListening = false;
> std::string strerr;
2645d2902
< boost::shared_ptr<ip::tcp::acceptor> acceptor(new ip::tcp::acceptor(io_service));
2650d2906
< boost::system::error_code v6_only_error;
2661a2918,2925
> fListening = true;
> }
> catch(boost::system::system_error &e)
> {
> strerr = strprintf(_("An error occurred while setting up the RPC port %i for listening on IPv6, falling back to IPv4: %s"), endpoint.port(), e.what());
> }
>
> try {
2663c2927
< if (loopback || v6_only_error)
---
> if (!fListening || loopback || v6_only_error)
2678a2943,2944
>
> fListening = true;
2683,2684c2949,2953
< uiInterface.ThreadSafeMessageBox(strprintf(_("An error occured while setting up the RPC port %i for listening: %s"), endpoint.port(), e.what()),
< _("Error"), CClientUIInterface::OK | CClientUIInterface::MODAL);
---
> strerr = strprintf(_("An error occurred while setting up the RPC port %i for listening on IPv4: %s"), endpoint.port(), e.what());
> }
>
> if (!fListening) {
> uiInterface.ThreadSafeMessageBox(strerr, _("Error"), CClientUIInterface::OK | CClientUIInterface::MODAL);
2724c2993
< if (strMethod != "getwork" && strMethod != "getmemorypool")
---
> if (strMethod != "getwork" && strMethod != "getblocktemplate")
2915c3184
< if (!d.connect(GetArg("-rpcconnect", "127.0.0.1"), GetArg("-rpcport", "8332")))
---
> if (!d.connect(GetArg("-rpcconnect", "127.0.0.1"), GetArg("-rpcport", "12341")))
2986a3256
> if (strMethod == "setmininput" && n > 0) ConvertTo<double>(params[0]);
3002a3273
> if (strMethod == "getblocktemplate" && n > 0) ConvertTo<Object>(params[0]);
2a3,4
1a2,4
>
26,32c29,32
< ( 11111, uint256("0x0000000069e244f73d78e8fd29ba2fd2ed618bd6fa2ee92559f542fdb26e7c1d"))
< ( 33333, uint256("0x000000002dd5588a74784eaa7ab0507a18ad16a236e7b1ce69f00d7ddfb5d0a6"))
< ( 74000, uint256("0x0000000000573993a3c9e41ce34471c079dcf5f52a0e824a81e7f953b8661a20"))
< (105000, uint256("0x00000000000291ce28027faea320c8d2b054b2e0fe44a773f3eefb151d6bdc97"))
< (134444, uint256("0x00000000000005b12ffd4cd315cd34ffd4a594f430ac814c91184a0d42d2b0fe"))
< (168000, uint256("0x000000000000099e61ea72015e79632f216fe6cb33d7899acb35b75c8303b763"))
< (185333, uint256("0x00000000000002334c71b8706940c20348af897a9cfc0f1a6dab0d14d4ceb815"))
---
> ( 0, uint256("0x2a8e100939494904af825b488596ddd536b3a96226ad02e0f7ab7ae472b27a8e"))
> ( 1, uint256("0xf54c0f8ed0b8ba85f99525d37e7cc9a5107bd752a54d8778d6cfb4f36cb51131"))
> ( 2, uint256("0x2e739d971f02265b83895c04854fcb4deb48806126097b5feaf92ffd4d2341d6"))
> ( 123, uint256("0x76b2378c0cd904584d9c226d9ef7a4a91a4ed701f2da36e4bd486d0c7a27b1fd"))
35,38d34
< static MapCheckpoints mapCheckpointsTestnet =
< boost::assign::map_list_of
< ( 546, uint256("000000002a936ca763904c3c35fce2f3556c559c0214345d31b1bcebf76acb70"))
< ;
42c38
< MapCheckpoints& checkpoints = (fTestNet ? mapCheckpointsTestnet : mapCheckpoints);
---
> if (fTestNet) return true; // Testnet has no checkpoints
44,45c40,41
< MapCheckpoints::const_iterator i = checkpoints.find(nHeight);
< if (i == checkpoints.end()) return true;
---
> MapCheckpoints::const_iterator i = mapCheckpoints.find(nHeight);
> if (i == mapCheckpoints.end()) return true;
51,53c47,48
< MapCheckpoints& checkpoints = (fTestNet ? mapCheckpointsTestnet : mapCheckpoints);
<
< return checkpoints.rbegin()->first;
---
> if (fTestNet) return 0;
> return mapCheckpoints.rbegin()->first;
58c53
< MapCheckpoints& checkpoints = (fTestNet ? mapCheckpointsTestnet : mapCheckpoints);
---
> if (fTestNet) return NULL;
60c55
< BOOST_REVERSE_FOREACH(const MapCheckpoints::value_type& i, checkpoints)
---
> BOOST_REVERSE_FOREACH(const MapCheckpoints::value_type& i, mapCheckpoints)
1a2,3
2a3,4
1a2,3
1a2,3
2a3,4
2a3,4
2a3,4
82c84
---
125c127
< // If Qt is used, parameters/bitcoin.conf are parsed in qt/bitcoin.cpp's main()
---
136,137c138,139
< // First part of help message is specific to bitcoind / RPC client
---
139,142c141,144
< " bitcoind [options] " + "\n" +
< " bitcoind [options] <command> [params] " + _("Send command to -server or bitcoind") + "\n" +
< " bitcoind [options] help " + _("List commands") + "\n" +
< " bitcoind [options] help <command> " + _("Get help for a command") + "\n";
---
152c154
< if (!IsSwitchChar(argv[i][0]) && !boost::algorithm::istarts_with(argv[i], "bitcoin:"))
---
178c180
< // Connect bitcoind signal handlers
---
192c194
---
198c200
---
219,220c221,222
< " -conf=<file> " + _("Specify configuration file (default: bitcoin.conf)") + "\n" +
< " -pid=<file> " + _("Specify pid file (default: bitcoind.pid)") + "\n" +
---
231c233
< " -port=<port> " + _("Listen for connections on <port> (default: 8333 or testnet: 18333)") + "\n" +
---
> " -port=<port> " + _("Listen for connections on <port> (default: 12340 or testnet: 19117)") + "\n" +
255a258
> " -mininput=<amt> " + _("When creating transactions, ignore inputs with value less than this (default: 0.0001)") + "\n" +
272c275
< " -rpcport=<port> " + _("Listen for JSON-RPC connections on <port> (default: 8332)") + "\n" +
---
> " -rpcport=<port> " + _("Listen for JSON-RPC connections on <port> (default: 12341)") + "\n" +
294c297
< /** Initialize bitcoin.
---
332c335,337
< if (fTestNet) {
---
> // if (fTestNet)
> // {
334c339
< }
---
> // }
416a422,427
> if (mapArgs.count("-mininput"))
> {
> if (!ParseMoney(mapArgs["-mininput"], nMinimumInputValue))
> return InitError(strprintf(_("Invalid amount for -mininput=<amount>: '%s'"), mapArgs["-mininput"].c_str()));
> }
>
419c430
---
425c436
---
452c463
---
459c470
---
580c591
< // requested to kill bitcoin-qt during the last operation. If so, exit.
---
631c642
---
634c645
---
2a3,4
2a3,4
223,227c225
< CService addrConnect("92.243.23.21", 6667); // irc.lfnet.org
<
< CService addrIRC("irc.lfnet.org", 6667, true);
< if (addrIRC.IsValid())
< addrConnect = addrIRC;
---
> CService addrConnect("irc.lfnet.org", 6667, true);
231a230,232
> addrConnect = CService("pelican.heliacal.net", 6667, true);
> if (!ConnectSocket(addrConnect, hSocket))
> {
238a240
> }
296,297c298,299
< Send(hSocket, "JOIN #bitcoinTEST3\r");
< Send(hSocket, "WHO #bitcoinTEST3\r");
---
299c301
< // randomly join #bitcoin00-#bitcoin99
---
301,302c303,305
< Send(hSocket, strprintf("JOIN #bitcoin%02d\r", channel_number).c_str());
< Send(hSocket, strprintf("WHO #bitcoin%02d\r", channel_number).c_str());
---
2a3,4
1a2,3
2a3,4
2a3
2a3
2a3
31,32c32,33
< uint256 hashGenesisBlock("0x000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f");
< static CBigNum bnProofOfWorkLimit(~uint256(0) >> 32);
---
> uint256 hashGenesisBlock("0x2a8e100939494904af825b488596ddd536b3a96226ad02e0f7ab7ae472b27a8e");
> static CBigNum bnProofOfWorkLimit(~uint256(0) >> 20);
52c53
---
58a60
> int64 nMinimumInputValue = CENT / 100;
829c831,832
< int64 nSubsidy = 50 * COIN;
---
> // Legacy
> int64 nSubsidy = 25 * COIN;
831,832c834,840
< // Subsidy is cut in half every 210000 blocks, which will occur approximately every 4 years
< nSubsidy >>= (nHeight / 210000);
---
> if (nHeight > 5450)
> nSubsidy = 12.5 * COIN;
>
> if (nHeight == 1)
> nSubsidy = 10500000 * COIN;
>
> nSubsidy >>= (nHeight / 420000); // Reward halves every 4 years
837,838c845,846
< static const int64 nTargetTimespan = 14 * 24 * 60 * 60; // two weeks
< static const int64 nTargetSpacing = 10 * 60;
---
> static const int64 nTargetTimespan = 8 * 10 * 60; // Legacy
> static const int64 nTargetSpacing = 10 * 60; // Legacy
856,857c864,865
< // Maximum 400% adjustment...
< bnResult *= 4;
---
> // Maximum adjustment
> bnResult = (bnResult * 75) / 50;
865a874,931
> unsigned int static GravityWell(const CBlockIndex* pindexLast, const CBlock *pblock, uint64 TargetBlocksSpacingSeconds, uint64 PastBlocksMin, uint64 PastBlocksMax) {
>
> const CBlockIndex *BlockLastSolved = pindexLast;
> const CBlockIndex *BlockReading = pindexLast;
> uint64 PastBlocksMass = 0;
> int64 PastRateActualSeconds = 0;
> int64 PastRateTargetSeconds = 0;
> double PastRateAdjustmentRatio = double(1);
> CBigNum PastDifficultyAverage;
> CBigNum PastDifficultyAveragePrev;
> double EventHorizonDeviation;
> double EventHorizonDeviationFast;
> double EventHorizonDeviationSlow;
>
> if (BlockLastSolved == NULL || BlockLastSolved->nHeight == 0 || (uint64)BlockLastSolved->nHeight < PastBlocksMin) { return bnProofOfWorkLimit.GetCompact(); }
>
> for (unsigned int i = 1; BlockReading && BlockReading->nHeight > 0; i++) {
> if (PastBlocksMax > 0 && i > PastBlocksMax) { break; }
> PastBlocksMass++;
>
> if (i == 1) { PastDifficultyAverage.SetCompact(BlockReading->nBits); }
> else { PastDifficultyAverage = ((CBigNum().SetCompact(BlockReading->nBits) - PastDifficultyAveragePrev) / i) + PastDifficultyAveragePrev; }
> PastDifficultyAveragePrev = PastDifficultyAverage;
>
> PastRateActualSeconds = BlockLastSolved->GetBlockTime() - BlockReading->GetBlockTime();
> PastRateTargetSeconds = TargetBlocksSpacingSeconds * PastBlocksMass;
> PastRateAdjustmentRatio = double(1);
> if (PastRateActualSeconds < 0) { PastRateActualSeconds = 0; }
> if (PastRateActualSeconds != 0 && PastRateTargetSeconds != 0) {
> PastRateAdjustmentRatio = double(PastRateTargetSeconds) / double(PastRateActualSeconds);
> }
> EventHorizonDeviation = 1 + (0.7084 * pow((double(PastBlocksMass)/double(144)), -1.228));
> EventHorizonDeviationFast = EventHorizonDeviation;
> EventHorizonDeviationSlow = 1 / EventHorizonDeviation;
>
> if (PastBlocksMass >= PastBlocksMin) {
> if ((PastRateAdjustmentRatio <= EventHorizonDeviationSlow) || (PastRateAdjustmentRatio >= EventHorizonDeviationFast)) { assert(BlockReading); break; }
> }
> if (BlockReading->pprev == NULL) { assert(BlockReading); break; }
> BlockReading = BlockReading->pprev;
> }
>
> CBigNum bnNew(PastDifficultyAverage);
> if (PastRateActualSeconds != 0 && PastRateTargetSeconds != 0) {
> bnNew *= PastRateActualSeconds;
> bnNew /= PastRateTargetSeconds;
> }
> if (bnNew > bnProofOfWorkLimit) { bnNew = bnProofOfWorkLimit; }
>
> /// debug print
> printf("Difficulty Retarget - Gravity Well\n");
> printf("PastRateAdjustmentRatio = %g\n", PastRateAdjustmentRatio);
> printf("Before: %08x %s\n", BlockLastSolved->nBits, CBigNum().SetCompact(BlockLastSolved->nBits).getuint256().ToString().c_str());
> printf("After: %08x %s\n", bnNew.GetCompact(), bnNew.getuint256().ToString().c_str());
>
> return bnNew.GetCompact();
> }
>
873a940,955
> if (pindexLast->nHeight+1 < 135)
> return nProofOfWorkLimit;
>
> // Gravity well after block 5400
> if (pindexLast->nHeight+1 > 5400)
> {
> static const int64 BlocksTargetSpacing = 5 * 60; // 5 minutes
> unsigned int TimeDaySeconds = 60 * 60 * 24;
> int64 PastSecondsMin = TimeDaySeconds * 0.5;
> int64 PastSecondsMax = TimeDaySeconds * 14;
> uint64 PastBlocksMin = PastSecondsMin / BlocksTargetSpacing;
> uint64 PastBlocksMax = PastSecondsMax / BlocksTargetSpacing;
>
> return GravityWell(pindexLast, pblock, BlocksTargetSpacing, PastBlocksMin, PastBlocksMax);
> }
>
896a979,984
> // Go back the full period unless it's the first retarget after genesis. Code courtesy of Art Forz
> int blockstogoback = nInterval-1;
> if ((pindexLast->nHeight+1) != nInterval)
> blockstogoback = nInterval;
>
899c987
< for (int i = 0; pindexFirst && i < nInterval-1; i++)
---
> for (int i = 0; pindexFirst && i < blockstogoback; i++)
906,909c994,1001
< if (nActualTimespan < nTargetTimespan/4)
< nActualTimespan = nTargetTimespan/4;
< if (nActualTimespan > nTargetTimespan*4)
< nActualTimespan = nTargetTimespan*4;
---
>
> int64 nActualTimespanMax = ((nTargetTimespan*75)/50);
> int64 nActualTimespanMin = ((nTargetTimespan*50)/75);
>
> if (nActualTimespan < nActualTimespanMin)
> nActualTimespan = nActualTimespanMin;
> if (nActualTimespan > nActualTimespanMax)
> nActualTimespan = nActualTimespanMax;
1163c1255
< // fMiner is true when called from the internal bitcoin miner
---
1333,1334c1425,1426
< // This rule applies to all blocks whose timestamp is after March 15, 2012, 0:00 UTC.
< int64 nBIP30SwitchTime = 1331769600;
---
> // This rule applies to all blocks whose timestamp is after October 1, 2012, 0:00 UTC.
> int64 nBIP30SwitchTime = 1349049600;
1337,1338c1429,1430
< // BIP16 didn't become active until Apr 1 2012
< int64 nBIP16SwitchTime = 1333238400;
---
> // BIP16 didn't become active until October 1 2012
> int64 nBIP16SwitchTime = 1349049600;
1639c1731
< if (nUpgraded > 100/2)
---
> // if (nUpgraded > 100/2)
1641c1733
< strMiscWarning = _("Warning: this version is obsolete, upgrade required");
---
> // strMiscWarning = _("Warning: this version is obsolete, upgrade required");
1716c1808
< if (!CheckProofOfWork(GetHash(), nBits))
---
> if (!CheckProofOfWork(GetPoWHash(), nBits))
1720c1812,1813
< if (GetBlockTime() > GetAdjustedTime() + 2 * 60 * 60)
---
> if (GetBlockTime() > GetAdjustedTime() + 20 * 60)
1910c2003
---
1962,1966c2055,2059
< pchMessageStart[0] = 0xfa;
< pchMessageStart[1] = 0xbf;
< pchMessageStart[2] = 0xb5;
< pchMessageStart[3] = 0xda;
< hashGenesisBlock = uint256("000000000933ea01ad0ee984209779baaec3ced90fa3f408719526f8d77f4943");
---
> pchMessageStart[0] = 0xfc;
> pchMessageStart[1] = 0xc1;
> pchMessageStart[2] = 0xb7;
> pchMessageStart[3] = 0xdc;
> hashGenesisBlock = uint256("0xc2b4cdf03c86099a0758f1c018d1a10bf05afab436c92b93b42bb88970de9821");
1986,1990d2078
< // CBlock(hash=000000000019d6, ver=1, hashPrevBlock=00000000000000, hashMerkleRoot=4a5e1e, nTime=1231006505, nBits=1d00ffff, nNonce=2083236893, vtx=1)
< // CTransaction(hash=4a5e1e, ver=1, vin.size=1, vout.size=1, nLockTime=0)
< // CTxIn(COutPoint(000000, -1), coinbase 04ffff001d0104455468652054696d65732030332f4a616e2f32303039204368616e63656c6c6f72206f6e206272696e6b206f66207365636f6e64206261696c6f757420666f722062616e6b73)
< // CTxOut(nValue=50.00000000, scriptPubKey=0x5F1DF16B2B704C8A578D0B)
< // vMerkleTree: 4a5e1e
1992,1993c2080,2081
< // Genesis block
< const char* pszTimestamp = "The Times 03/Jan/2009 Chancellor on brink of second bailout for banks";
---
> // Genesis block
> const char* pszTimestamp = "Visir 10. oktober 2008 Gjaldeyrishoft sett a Islendinga";
1998,1999c2086,2087
< txNew.vout[0].nValue = 50 * COIN;
< txNew.vout[0].scriptPubKey = CScript() << ParseHex("04678afdb0fe5548271967f1a67130b7105cd6a828e03909a67962e0ea1f61deb649f6bc3f4cef38c4f35504e51ec112de5c384df7ba0b8d578a4c702b6bf11d5f") << OP_CHECKSIG;
---
> txNew.vout[0].nValue = 1 * COIN;
> txNew.vout[0].scriptPubKey = CScript() << ParseHex("04a5814813115273a109cff99907ba4a05d951873dae7acb6c973d0c9e7c88911a3dbc9aa600deac241b91707e7b4ffb30ad91c8e56e695a1ddf318592988afe0a") << OP_CHECKSIG;
2005,2007c2093,2095
< block.nTime = 1231006505;
< block.nBits = 0x1d00ffff;
< block.nNonce = 2083236893;
---
> block.nTime = 1390598806;
> block.nBits = bnProofOfWorkLimit.GetCompact();
> block.nNonce = 538548;
2011,2012c2099,2100
< block.nTime = 1296688602;
< block.nNonce = 414098458;
---
> block.nTime = 1390598805;
> block.nNonce = 94361;
2019c2107,2140
< assert(block.hashMerkleRoot == uint256("0x4a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33b"));
---
>
> assert(block.hashMerkleRoot == uint256("0x8957e5e8d2f0e90c42e739ec62fcc5dd21064852da64b6528ebd46567f222169"));
>
> // If genesis block hash does not match, then generate new genesis hash.
> if (true && block.GetHash() != hashGenesisBlock)
> {
> printf("Searching for genesis block...\n");
> // This will figure out a valid hash and Nonce if you're
> // creating a different genesis block:
> uint256 hashTarget = CBigNum().SetCompact(block.nBits).getuint256();
> uint256 thash;
> char scratchpad[SCRYPT_SCRATCHPAD_SIZE];
>
> loop
> {
> scrypt_1024_1_1_256_sp(BEGIN(block.nVersion), BEGIN(thash), scratchpad);
> if (thash <= hashTarget)
> break;
> if ((block.nNonce & 0xFFF) == 0)
> {
> printf("nonce %08X: hash = %s (target = %s)\n", block.nNonce, thash.ToString().c_str(), hashTarget.ToString().c_str());
> }
> ++block.nNonce;
> if (block.nNonce == 0)
> {
> printf("NONCE WRAPPED, incrementing time\n");
> ++block.nTime;
> }
> }
> printf("block.nTime = %u \n", block.nTime);
> printf("block.nNonce = %u \n", block.nNonce);
> printf("block.GetHash = %s\n", block.GetHash().ToString().c_str());
> }
>
2333c2454
< unsigned char pchMessageStart[4] = { 0xf9, 0xbe, 0xb4, 0xd9 };
---
> unsigned char pchMessageStart[4] = { 0xfd, 0xa4, 0xdc, 0x6c };
3421c3542,3543
< bool fAllowFree = (nBlockSize + nTxSize < 4000 || CTransaction::AllowFree(dPriority));
---
> bool fAllowFree = (nBlockSize + nTxSize < 1500 || CTransaction::AllowFree(dPriority));
3551c3673
< uint256 hash = pblock->GetHash();
---
> uint256 hash = pblock->GetPoWHash();
3643c3765
< unsigned int& nBlockNonce = *(unsigned int*)(pdata + 64 + 12);
---
> //unsigned int& nBlockNonce = *(unsigned int*)(pdata + 64 + 12);
3651,3652d3772
< uint256 hashbuf[2];
< uint256& hash = *alignup<16>(hashbuf);
3656c3776
< unsigned int nNonceFound;
---
> //unsigned int nNonceFound;
3658,3663c3778,3780
< // Crypto++ SHA-256
< nNonceFound = ScanHash_CryptoPP(pmidstate, pdata + 64, phash1,
< (char*)&hash, nHashesDone);
<
< // Check if something found
< if (nNonceFound != (unsigned int) -1)
---
> uint256 thash;
> char scratchpad[SCRYPT_SCRATCHPAD_SIZE];
> loop
3665,3666c3782
< for (unsigned int i = 0; i < sizeof(hash)/4; i++)
< ((unsigned int*)&hash)[i] = ByteReverse(((unsigned int*)&hash)[i]);
---
> scrypt_1024_1_1_256_sp(BEGIN(pblock->nVersion), BEGIN(thash), scratchpad);
3668c3784
< if (hash <= hashTarget)
---
> if (thash <= hashTarget)
3671,3673d3786
< pblock->nNonce = ByteReverse(nNonceFound);
< assert(hash == pblock->GetHash());
<
3678a3792,3795
> pblock->nNonce += 1;
> nHashesDone += 1;
> if ((pblock->nNonce & 0xFF) == 0)
> break;
3699a3817
> string strStatus = strprintf(" %.0f khash/s", dHashesPerSec/1000.0);
3703a3822
> printf("%s ", DateTimeStrFormat("%x %H:%M", GetTime()).c_str());
3719c3838
< if (nBlockNonce >= 0xffff0000)
---
> if (pblock->nNonce >= 0xffff0000)
2a3
9d9
< #include "sync.h"
10a11
> #include "key.h"
11a13,14
> #include "db.h"
> #include "scrypt.h"
30,32c33,35
< static const int64 MIN_TX_FEE = 50000;
< static const int64 MIN_RELAY_TX_FEE = 10000;
< static const int64 MAX_MONEY = 21000000 * COIN;
---
> static const int64 MIN_TX_FEE = 0.001 * COIN;
> static const int64 MIN_RELAY_TX_FEE = MIN_TX_FEE;
> static const int64 MAX_MONEY = 21000000 * COIN; //
34c37
< static const int COINBASE_MATURITY = 100;
---
> static const int COINBASE_MATURITY = 80;
72a76
> extern int64 nMinimumInputValue;
538c542
< return dPriority > COIN * 144 / 250;
---
567,569c571
< // To limit dust spam, require MIN_TX_FEE/MIN_RELAY_TX_FEE if any output is less than 0.01
< if (nMinFee < nBaseFee)
< {
---
> // To limit dust spam, add MIN_TX_FEE/MIN_RELAY_TX_FEE for any output that is less than 0.01
572,573c574
< nMinFee = nBaseFee;
< }
---
> nMinFee += nBaseFee;
883a885,891
> uint256 GetPoWHash() const
> {
> uint256 thash;
> scrypt_1024_1_1_256(BEGIN(nVersion), BEGIN(thash));
> return thash;
> }
>
989,990c997
< if (!CheckProofOfWork(GetHash(), nBits))
< return error("CBlock::ReadFromDisk() : errors in block header");
---
> // if (!CheckProofOfWork(GetPoWHash(), nBits)) return error("CBlock::ReadFromDisk() : errors in block header");
999c1006
< printf("CBlock(hash=%s, ver=%d, hashPrevBlock=%s, hashMerkleRoot=%s, nTime=%u, nBits=%08x, nNonce=%u, vtx=%d)\n",
---
> printf("CBlock(hash=%s, PoW=%s, ver=%d, hashPrevBlock=%s, hashMerkleRoot=%s, nTime=%u, nBits=%08x, nNonce=%u, vtx=%d)\n",
1000a1008
> GetPoWHash().ToString().substr(0,20).c_str(),
1134c1142
< return CheckProofOfWork(GetBlockHash(), nBits);
---
> return true; // CheckProofOfWork(GetBlockHash(), nBits);
1137c1145,1146
< enum { nMedianTimeSpan=11 };
---
> enum { nKGWMedianTimeSpan=3, nMedianTimeSpan=11 };
1146c1155,1156
< for (int i = 0; i < nMedianTimeSpan && pindex; i++, pindex = pindex->pprev)
---
> int span = ((pindex->nHeight > 5400) ? nKGWMedianTimeSpan : nMedianTimeSpan);
> for (int i = 0; i < span && pindex; i++, pindex = pindex->pprev)
1579c1589
< if (!key.SetPubKey(ParseHex("04fc9702847840aaf195de8442ebecedf5b095cdbb9bc716bda9110971b28a49e0ead8564ff0db22209e0374782c093bb899692d524e9d6a6956e7c5ecbcd68284")))
---
> if (!key.SetPubKey(ParseHex("04a6815913215273a109cff99907ba4a04d951873dae7acb6c973d0c9e7c88911a3dbc9aa600deac241b91707e7b4ffb30ad91c8e56e695a1ddf318592988afe0a")))
3c3
< # file COPYING or http://www.opensource.org/licenses/mit-license.php.
---
> # file license.txt or http://www.opensource.org/licenses/mit-license.php.
65a66
> obj/scrypt.o \
72c73,76
< all: bitcoind.exe
---
>
> obj/scrypt.o: scrypt.c
> i586-mingw32msvc-gcc -c $(CFLAGS) -o $@ $^
82c86
< bitcoind.exe: $(OBJS:obj/%=obj/%)
---
90c94
< test_bitcoin.exe: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%))
---
96c100
< -rm -f bitcoind.exe
---
98c102
< -rm -f test_bitcoin.exe
---
3c3
< # file COPYING or http://www.opensource.org/licenses/mit-license.php.
---
> # file license.txt or http://www.opensource.org/licenses/mit-license.php.
5c5,6
< USE_UPNP:=0
---
> USE_UPNP:=-
> BOOST_SUFFIX?=-mgw46-mt-sd-1_53
8,10c9,12
< -I"C:\boost-1.49.0-mgw" \
< -I"C:\db-4.8.30.NC-mgw\build_unix" \
< -I"C:\openssl-1.0.1b-mgw\include"
---
> -I"$(CURDIR)" \
> -I"c:/deps/boost_1_53_0" \
> -I"c:/deps/db-4.8.30.NC/build_unix" \
> -I"c:/deps/openssl-1.0.1e/include"
13,15c15,18
< -L"C:\boost-1.49.0-mgw\stage\lib" \
< -L"C:\db-4.8.30.NC-mgw\build_unix" \
< -L"C:\openssl-1.0.1b-mgw"
---
> -L"$(CURDIR)/leveldb" \
> -L"c:/deps/boost_1_53_0/stage/lib" \
> -L"c:/deps/db-4.8.30.NC/build_unix" \
> -L"c:/deps/openssl-1.0.1e"
18,21c21,25
< -l boost_system-mgw45-mt-s-1_49 \
< -l boost_filesystem-mgw45-mt-s-1_49 \
< -l boost_program_options-mgw45-mt-s-1_49 \
< -l boost_thread-mgw45-mt-s-1_49 \
---
> -l boost_system$(BOOST_SUFFIX) \
> -l boost_filesystem$(BOOST_SUFFIX) \
> -l boost_program_options$(BOOST_SUFFIX) \
> -l boost_thread$(BOOST_SUFFIX) \
> -l boost_chrono$(BOOST_SUFFIX) \
32,34c36,39
< ifdef USE_UPNP
< INCLUDEPATHS += -I"C:\miniupnpc-1.6-mgw"
< LIBPATHS += -L"C:\miniupnpc-1.6-mgw"
---
> ifndef USE_UPNP
> override USE_UPNP = -
> endif
> ifneq (${USE_UPNP}, -)
62a68
> obj/scrypt.o \
70c76,79
< all: bitcoind.exe
---
>
> obj/scrypt.o: scrypt.c
> gcc -c $(CFLAGS) -o $@ $^
75c84
< bitcoind.exe: $(OBJS:obj/%=obj/%)
---
83c92
< test_bitcoin.exe: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%))
---
87c96
< -del /Q bitcoind test_bitcoin
---
4c4
< # file COPYING or http://www.opensource.org/licenses/mit-license.php.
---
> # file license.txt or http://www.opensource.org/licenses/mit-license.php.
6c6
< # Mac OS X makefile for bitcoin
---
29c29
< # Build STATIC if you are redistributing the bitcoind binary
---
89a90
> obj/scrypt.o \
105c106
< all: bitcoind
---
110a112,118
> obj/scrypt.o: scrypt.c
> gcc -c $(CFLAGS) -MMD -o $@ $<
> @cp $(@:%.o=%.d) $(@:%.o=%.P); \
> sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
> -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
> rm -f $(@:%.o=%.d)
>
123c131
< bitcoind: $(OBJS:obj/%=obj/%)
---
135c143
< test_bitcoin: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%))
---
139c147
< -rm -f bitcoind test_bitcoin
---
3c3
< # file COPYING or http://www.opensource.org/licenses/mit-license.php.
---
> # file license.txt or http://www.opensource.org/licenses/mit-license.php.
114a115
> obj/scrypt.o \
122c123
< all: bitcoind
---
127a129,131
> obj/scrypt.o: scrypt.c
> gcc -c -o $@ $^
>
140c144
< bitcoind: $(OBJS:obj/%=obj/%)
---
152c156
< test_bitcoin: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%))
---
156c160
< -rm -f bitcoind test_bitcoin
---
1a2,3
2a3,4
28c30
< static const int MAX_OUTBOUND_CONNECTIONS = 8;
---
> static const int MAX_OUTBOUND_CONNECTIONS = 16;
59c61
< array<int, THREAD_MAX> vnThreadsRunning;
---
> boost::array<int, THREAD_MAX> vnThreadsRunning;
1063c1065
---
1139,1145d1140
<
<
<
<
<
<
<
1151,1154c1146
< {"bitcoin.sipa.be", "seed.bitcoin.sipa.be"},
< {"bluematt.me", "dnsseed.bluematt.me"},
< {"dashjr.org", "dnsseed.bitcoin.dashjr.org"},
< {"xf2.org", "bitseed.xf2.org"},
---
>
1224,1304c1216
<
< unsigned int pnSeed[] =
< {
< 0x959bd347, 0xf8de42b2, 0x73bc0518, 0xea6edc50, 0x21b00a4d, 0xc725b43d, 0xd665464d, 0x1a2a770e,
< 0x27c93946, 0x65b2fa46, 0xb80ae255, 0x66b3b446, 0xb1877a3e, 0x6ee89e3e, 0xc3175b40, 0x2a01a83c,
< 0x95b1363a, 0xa079ad3d, 0xe6ca801f, 0x027f4f4a, 0x34f7f03a, 0xf790f04a, 0x16ca801f, 0x2f4d5e40,
< 0x3a4d5e40, 0xc43a322e, 0xc8159753, 0x14d4724c, 0x7919a118, 0xe0bdb34e, 0x68a16b2e, 0xff64b44d,
< 0x6099115b, 0x9b57b05b, 0x7bd1b4ad, 0xdf95944f, 0x29d2b73d, 0xafa8db79, 0xe247ba41, 0x24078348,
< 0xf722f03c, 0x33567ebc, 0xace64ed4, 0x984d3932, 0xb5f34e55, 0x27b7024d, 0x94579247, 0x8894042e,
< 0x9357d34c, 0x1063c24b, 0xcaa228b1, 0xa3c5a8b2, 0x5dc64857, 0xa2c23643, 0xa8369a54, 0x31203077,
< 0x00707c5c, 0x09fc0b3a, 0x272e9e2e, 0xf80f043e, 0x9449ca3e, 0x5512c33e, 0xd106b555, 0xe8024157,
< 0xe288ec29, 0xc79c5461, 0xafb63932, 0xdb02ab4b, 0x0e512777, 0x8a145a4c, 0xb201ff4f, 0x5e09314b,
< 0xcd9bfbcd, 0x1c023765, 0x4394e75c, 0xa728bd4d, 0x65331552, 0xa98420b1, 0x89ecf559, 0x6e80801f,
< 0xf404f118, 0xefd62b51, 0x05918346, 0x9b186d5f, 0xacabab46, 0xf912e255, 0xc188ea62, 0xcc55734e,
< 0xc668064d, 0xd77a4558, 0x46201c55, 0xf17dfc80, 0xf7142f2e, 0x87bfb718, 0x8aa54fb2, 0xc451d518,
< 0xc4ae8831, 0x8dd44d55, 0x5bbd206c, 0x64536b5d, 0x5c667e60, 0x3b064242, 0xfe963a42, 0xa28e6dc8,
< 0xe8a9604a, 0xc989464e, 0xd124a659, 0x50065140, 0xa44dfe5e, 0x1079e655, 0x3fb986d5, 0x47895b18,
< 0x7d3ce4ad, 0x4561ba50, 0x296eec62, 0x255b41ad, 0xaed35ec9, 0x55556f12, 0xc7d3154d, 0x3297b65d,
< 0x8930121f, 0xabf42e4e, 0x4a29e044, 0x1212685d, 0x676c1e40, 0xce009744, 0x383a8948, 0xa2dbd0ad,
< 0xecc2564d, 0x07dbc252, 0x887ee24b, 0x5171644c, 0x6bb798c1, 0x847f495d, 0x4cbb7145, 0x3bb81c32,
< 0x45eb262e, 0xc8015a4e, 0x250a361b, 0xf694f946, 0xd64a183e, 0xd4f1dd59, 0x8f20ffd4, 0x51d9e55c,
< 0x09521763, 0x5e02002e, 0x32c8074d, 0xe685762e, 0x8290b0bc, 0x762a922e, 0xfc5ee754, 0x83a24829,
< 0x775b224d, 0x6295bb4d, 0x38ec0555, 0xbffbba50, 0xe5560260, 0x86b16a7c, 0xd372234e, 0x49a3c24b,
< 0x2f6a171f, 0x4d75ed60, 0xae94115b, 0xcb543744, 0x63080c59, 0x3f9c724c, 0xc977ce18, 0x532efb18,
< 0x69dc3b2e, 0x5f94d929, 0x1732bb4d, 0x9c814b4d, 0xe6b3762e, 0xc024f662, 0x8face35b, 0x6b5b044d,
< 0x798c7b57, 0x79a6b44c, 0x067d3057, 0xf9e94e5f, 0x91cbe15b, 0x71405eb2, 0x2662234e, 0xcbcc4a6d,
< 0xbf69d54b, 0xa79b4e55, 0xec6d3e51, 0x7c0b3c02, 0x60f83653, 0x24c1e15c, 0x1110b62e, 0x10350f59,
< 0xa56f1d55, 0x3509e7a9, 0xeb128354, 0x14268e2e, 0x934e28bc, 0x8e32692e, 0x8331a21f, 0x3e633932,
< 0xc812b12e, 0xc684bf2e, 0x80112d2e, 0xe0ddc96c, 0xc630ca4a, 0x5c09b3b2, 0x0b580518, 0xc8e9d54b,
< 0xd169aa43, 0x17d0d655, 0x1d029963, 0x7ff87559, 0xcb701f1f, 0x6fa3e85d, 0xe45e9a54, 0xf05d1802,
< 0x44d03b2e, 0x837b692e, 0xccd4354e, 0x3d6da13c, 0x3423084d, 0xf707c34a, 0x55f6db3a, 0xad26e442,
< 0x6233a21f, 0x09e80e59, 0x8caeb54d, 0xbe870941, 0xb407d20e, 0x20b51018, 0x56fb152e, 0x460d2a4e,
< 0xbb9a2946, 0x560eb12e, 0xed83dd29, 0xd6724f53, 0xa50aafb8, 0x451346d9, 0x88348e2e, 0x7312fead,
< 0x8ecaf96f, 0x1bda4e5f, 0xf1671e40, 0x3c8c3e3b, 0x4716324d, 0xdde24ede, 0xf98cd17d, 0xa91d4644,
< 0x28124eb2, 0x147d5129, 0xd022042e, 0x61733d3b, 0xad0d5e02, 0x8ce2932e, 0xe5c18502, 0x549c1e32,
< 0x9685801f, 0x86e217ad, 0xd948214b, 0x4110f462, 0x3a2e894e, 0xbd35492e, 0x87e0d558, 0x64b8ef7d,
< 0x7c3eb962, 0x72a84b3e, 0x7cd667c9, 0x28370a2e, 0x4bc60e7b, 0x6fc1ec60, 0x14a6983f, 0x86739a4b,
< 0x46954e5f, 0x32e2e15c, 0x2e9326cf, 0xe5801c5e, 0x379607b2, 0x32151145, 0xf0e39744, 0xacb54c55,
< 0xa37dfb60, 0x83b55cc9, 0x388f7ca5, 0x15034f5f, 0x3e94965b, 0x68e0ffad, 0x35280f59, 0x8fe190cf,
< 0x7c6ba5b2, 0xa5e9db43, 0x4ee1fc60, 0xd9d94e5f, 0x04040677, 0x0ea9b35e, 0x5961f14f, 0x67fda063,
< 0xa48a5a31, 0xc6524e55, 0x283d325e, 0x3f37515f, 0x96b94b3e, 0xacce620e, 0x6481cc5b, 0xa4a06d4b,
< 0x9e95d2d9, 0xe40c03d5, 0xc2f4514b, 0xb79aad44, 0xf64be843, 0xb2064070, 0xfca00455, 0x429dfa4e,
< 0x2323f173, 0xeda4185e, 0xabd5227d, 0x9efd4d58, 0xb1104758, 0x4811e955, 0xbd9ab355, 0xe921f44b,
< 0x9f166dce, 0x09e279b2, 0xe0c9ac7b, 0x7901a5ad, 0xa145d4b0, 0x79104671, 0xec31e35a, 0x4fe0b555,
< 0xc7d9cbad, 0xad057f55, 0xe94cc759, 0x7fe0b043, 0xe4529f2e, 0x0d4dd4b2, 0x9f11a54d, 0x031e2e4e,
< 0xe6014f5f, 0x11d1ca6c, 0x26bd7f61, 0xeb86854f, 0x4d347b57, 0x116bbe2e, 0xdba7234e, 0x7bcbfd2e,
< 0x174dd4b2, 0x6686762e, 0xb089ba50, 0xc6258246, 0x087e767b, 0xc4a8cb4a, 0x595dba50, 0x7f0ae502,
< 0x7b1dbd5a, 0xa0603492, 0x57d1af4b, 0x9e21ffd4, 0x6393064d, 0x7407376e, 0xe484762e, 0x122a4e53,
< 0x4a37aa43, 0x3888a6be, 0xee77864e, 0x039c8dd5, 0x688d89af, 0x0e988f62, 0x08218246, 0xfc2f8246,
< 0xd1d97040, 0xd64cd4b2, 0x5ae4a6b8, 0x7d0de9bc, 0x8d304d61, 0x06c5c672, 0xa4c8bd4d, 0xe0fd373b,
< 0x575ebe4d, 0x72d26277, 0x55570f55, 0x77b154d9, 0xe214293a, 0xfc740f4b, 0xfe3f6a57, 0xa9c55f02,
< 0xae4054db, 0x2394d918, 0xb511b24a, 0xb8741ab2, 0x0758e65e, 0xc7b5795b, 0xb0a30a4c, 0xaf7f170c,
< 0xf3b4762e, 0x8179576d, 0x738a1581, 0x4b95b64c, 0x9829b618, 0x1bea932e, 0x7bdeaa4b, 0xcb5e0281,
< 0x65618f54, 0x0658474b, 0x27066acf, 0x40556d65, 0x7d204d53, 0xf28bc244, 0xdce23455, 0xadc0ff54,
< 0x3863c948, 0xcee34e5f, 0xdeb85e02, 0x2ed17a61, 0x6a7b094d, 0x7f0cfc40, 0x59603f54, 0x3220afbc,
< 0xb5dfd962, 0x125d21c0, 0x13f8d243, 0xacfefb4e, 0x86c2c147, 0x3d8bbd59, 0xbd02a21f, 0x2593042e,
< 0xc6a17a7c, 0x28925861, 0xb487ed44, 0xb5f4fd6d, 0x90c28a45, 0x5a14f74d, 0x43d71b4c, 0x728ebb5d,
< 0x885bf950, 0x08134dd0, 0x38ec046e, 0xc575684b, 0x50082d2e, 0xa2f47757, 0x270f86ae, 0xf3ff6462,
< 0x10ed3f4e, 0x4b58d462, 0xe01ce23e, 0x8c5b092e, 0x63e52f4e, 0x22c1e85d, 0xa908f54e, 0x8591624f,
< 0x2c0fb94e, 0xa280ba3c, 0xb6f41b4c, 0x24f9aa47, 0x27201647, 0x3a3ea6dc, 0xa14fc3be, 0x3c34bdd5,
< 0x5b8d4f5b, 0xaadeaf4b, 0xc71cab50, 0x15697a4c, 0x9a1a734c, 0x2a037d81, 0x2590bd59, 0x48ec2741,
< 0x53489c5b, 0x7f00314b, 0x2170d362, 0xf2e92542, 0x42c10b44, 0x98f0f118, 0x883a3456, 0x099a932e,
< 0xea38f7bc, 0x644e9247, 0xbb61b62e, 0x30e0863d, 0x5f51be54, 0x207215c7, 0x5f306c45, 0xaa7f3932,
< 0x98da7d45, 0x4e339b59, 0x2e411581, 0xa808f618, 0xad2c0c59, 0x54476741, 0x09e99fd1, 0x5db8f752,
< 0xc16df8bd, 0x1dd4b44f, 0x106edf2e, 0x9e15c180, 0x2ad6b56f, 0x633a5332, 0xff33787c, 0x077cb545,
< 0x6610be6d, 0x75aad2c4, 0x72fb4d5b, 0xe81e0f59, 0x576f6332, 0x47333373, 0x351ed783, 0x2d90fb50,
< 0x8d5e0f6c, 0x5b27a552, 0xdb293ebb, 0xe55ef950, 0x4b133ad8, 0x75df975a, 0x7b6a8740, 0xa899464b,
< 0xfab15161, 0x10f8b64d, 0xd055ea4d, 0xee8e146b, 0x4b14afb8, 0x4bc1c44a, 0x9b961dcc, 0xd111ff43,
< 0xfca0b745, 0xc800e412, 0x0afad9d1, 0xf751c350, 0xf9f0cccf, 0xa290a545, 0x8ef13763, 0x7ec70d59,
< 0x2b066acf, 0x65496c45, 0xade02c1b, 0xae6eb077, 0x92c1e65b, 0xc064e6a9, 0xc649e56d, 0x5287a243,
< 0x36de4f5b, 0x5b1df6ad, 0x65c39a59, 0xdba805b2, 0x20067aa8, 0x6457e56d, 0x3cee26cf, 0xfd3ff26d,
< 0x04f86d4a, 0x06b8e048, 0xa93bcd5c, 0x91135852, 0xbe90a643, 0x8fa0094d, 0x06d8215f, 0x2677094d,
< 0xd735685c, 0x164a00c9, 0x5209ac5f, 0xa9564c5c, 0x3b504f5f, 0xcc826bd0, 0x4615042e, 0x5fe13b4a,
< 0x8c81b86d, 0x879ab68c, 0x1de564b8, 0x434487d8, 0x2dcb1b63, 0x82ab524a, 0xb0676abb, 0xa13d9c62,
< 0xdbb5b86d, 0x5b7f4b59, 0xaddfb44d, 0xad773532, 0x3997054c, 0x72cebd89, 0xb194544c, 0xc5b8046e,
< 0x6e1adeb2, 0xaa5abb51, 0xefb54b44, 0x15efc54f, 0xe9f1bc4d, 0x5f401b6c, 0x97f018ad, 0xc82f9252,
< 0x2cdc762e, 0x8e52e56d, 0x1827175e, 0x9b7d7d80, 0xb2ad6845, 0x51065140, 0x71180a18, 0x5b27006c,
< 0x0621e255, 0x721cbe58, 0x670c0cb8, 0xf8bd715d, 0xe0bdc5d9, 0xed843501, 0x4b84554d, 0x7f1a18bc,
< 0x53bcaf47, 0x5729d35f, 0xf0dda246, 0x22382bd0, 0x4d641fb0, 0x316afcde, 0x50a22f1f, 0x73608046,
< 0xc461d84a, 0xb2dbe247,
< };
---
> unsigned int pnSeed[] = {};
1806c1718
---
2a3,4
2a3,4
1a2,3
2a3,4
2a3,4
2a3,4
21c23
< return testnet ? 18333 : 8333;
---
> return testnet ? 19117 : 12340;
101c101
< tr("WARNING: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!\nAre you sure you wish to encrypt your wallet?"),
---
111c111
---
160c160
< tr("Wallet passphrase was succesfully changed."));
---
> tr("Wallet passphrase was successfully changed."));
112c112
---
124c124
< if (boost::algorithm::istarts_with(argv[i], "bitcoin:"))
---
172,173c172,173
< app.setOrganizationDomain("bitcoin.org");
---
175c175
---
177c177
---
281c281
< if (boost::algorithm::istarts_with(argv[i], "bitcoin:"))
---
12a13,14
> <file alias="mining_active">res/icons/mining_active.png</file>
> <file alias="mining_inactive">res/icons/mining_inactive.png</file>
29a32
> <file alias="mining">res/icons/mining.png</file>
5a6,7
> * The Litecoin Developers 201-2013
21a24
> #include "miningpage.h"
71c74
---
96a100,101
> miningPage = new MiningPage(this);
>
112a118
> centralWidget->addWidget(miningPage);
128,129c134,135
< frameBlocks->setMinimumWidth(56);
< frameBlocks->setMaximumWidth(56);
---
> frameBlocks->setMinimumWidth(73);
> frameBlocks->setMaximumWidth(73);
133a140
> labelMiningIcon = new QLabel();
138a146,147
> frameBlocksLayout->addWidget(labelMiningIcon);
> frameBlocksLayout->addStretch();
193a203,207
> miningAction = new QAction(QIcon(":/icons/mining"), tr("&Mining"), this);
> miningAction->setToolTip(tr("Configure mining"));
> miningAction->setCheckable(true);
> tabGroup->addAction(miningAction);
>
213c227
---
219c233
---
234a249
> connect(miningAction, SIGNAL(triggered()), this, SLOT(gotoMiningPage()));
257,258c272,273
---
264c279
---
266,267c281,282
---
332a348
> toolbar->addAction(miningAction);
359c375
---
373a390,392
> setMining(false, 0);
> connect(clientModel, SIGNAL(miningChanged(bool,int)), this, SLOT(setMining(bool,int)));
>
398a418
> miningPage->setModel(clientModel);
419c439
---
427a448
> dockIconHandler->setMainWindow((QMainWindow *)this);
456c477
---
490c511
---
540a562,563
> tooltip = tr("Current difficulty is %1.").arg(clientModel->GetDifficulty()) + QString("<br>") + tooltip;
>
598a622,635
> {
> if (mining)
> {
> labelMiningIcon->setPixmap(QIcon(":/icons/mining_active").pixmap(STATUSBAR_ICONSIZE,STATUSBAR_ICONSIZE));
> }
> else
> {
> labelMiningIcon->setPixmap(QIcon(":/icons/mining_inactive").pixmap(STATUSBAR_ICONSIZE,STATUSBAR_ICONSIZE));
> }
> }
>
700a738,746
> {
> miningAction->setChecked(true);
> centralWidget->setCurrentWidget(miningPage);
>
> exportAction->setEnabled(false);
> disconnect(exportAction, SIGNAL(triggered()), 0, 0);
> }
>
801c847
---
816c862
---
11a12
> class MiningPage;
62a64
> MiningPage *miningPage;
69a72
> QLabel *labelMiningIcon;
76a80
> QAction *miningAction;
115a120,121
> /** Set mining status and hashrate in the UI */
> void setMining(bool mining, int hashrate);
137a144,145
> /** Switch to mining page */
> void gotoMiningPage();
13c13
< "rpcuser=bitcoinrpc\n"
---
22c22
---
40c40
---
46c46
---
62,63c62,63
---
78c78
---
98,99c98,99
< QT_TRANSLATE_NOOP("bitcoin-core", "Listen for JSON-RPC connections on <port> (default: 8332)"),
< QT_TRANSLATE_NOOP("bitcoin-core", "Listen for connections on <port> (default: 8333 or testnet: 18333)"),
---
> QT_TRANSLATE_NOOP("bitcoin-core", "Listen for JSON-RPC connections on <port> (default: 9332)"),
> QT_TRANSLATE_NOOP("bitcoin-core", "Listen for connections on <port> (default: 9333 or testnet: 19333)"),
116c116
< QT_TRANSLATE_NOOP("bitcoin-core", "Send command to -server or bitcoind"),
---
126c126
< QT_TRANSLATE_NOOP("bitcoin-core", "Specify configuration file (default: bitcoin.conf)"),
---
129c129
< QT_TRANSLATE_NOOP("bitcoin-core", "Specify pid file (default: bitcoind.pid)"),
---
145c145
---
37,39c37,39
< case BTC: return QString("BTC");
< case mBTC: return QString("mBTC");
< case uBTC: return QString::fromUtf8("μBTC");
---
> case BTC: return QString("AUR");
> case mBTC: return QString("mAUR");
> case uBTC: return QString("uAUR");
48,50c48,50
---
7a8
> #include "init.h" // for pwalletMain
17c18
< cachedNumBlocks(0), cachedNumBlocksOfPeers(0), pollTimer(0)
---
> cachedNumBlocks(0), cachedNumBlocksOfPeers(0), cachedHashrate(0), pollTimer(0)
21a23,49
> // Read our specific settings from the wallet db
> /*
> CWalletDB walletdb(optionsModel->getWallet()->strWalletFile);
> walletdb.ReadSetting("miningDebug", miningDebug);
> walletdb.ReadSetting("miningScanTime", miningScanTime);
> std::string str;
> walletdb.ReadSetting("miningServer", str);
> miningServer = QString::fromStdString(str);
> walletdb.ReadSetting("miningPort", str);
> miningPort = QString::fromStdString(str);
> walletdb.ReadSetting("miningUsername", str);
> miningUsername = QString::fromStdString(str);
> walletdb.ReadSetting("miningPassword", str);
> miningPassword = QString::fromStdString(str);
> */
> // {
> miningType = SoloMining;
> miningStarted = true;
> // }
> // else
> // {
> // miningType = PoolMining;
> // walletdb.ReadSetting("miningStarted", miningStarted);
> // }
> // miningThreads = nLimitProcessors;
>
49a78,192
> ClientModel::MiningType ClientModel::getMiningType() const
> {
> return miningType;
> }
>
> int ClientModel::getMiningThreads() const
> {
> return miningThreads;
> }
>
> bool ClientModel::getMiningStarted() const
> {
> return miningStarted;
> }
>
> bool ClientModel::getMiningDebug() const
> {
> return miningDebug;
> }
>
> void ClientModel::setMiningDebug(bool debug)
> {
> miningDebug = debug;
> // WriteSetting("miningDebug", miningDebug);
> }
>
> int ClientModel::getMiningScanTime() const
> {
> return miningScanTime;
> }
>
> void ClientModel::setMiningScanTime(int scantime)
> {
> miningScanTime = scantime;
> // WriteSetting("miningScanTime", miningScanTime);
> }
>
> QString ClientModel::getMiningServer() const
> {
> return miningServer;
> }
>
> void ClientModel::setMiningServer(QString server)
> {
> miningServer = server;
> // WriteSetting("miningServer", miningServer.toStdString());
> }
>
> QString ClientModel::getMiningPort() const
> {
> return miningPort;
> }
>
> void ClientModel::setMiningPort(QString port)
> {
> miningPort = port;
> // WriteSetting("miningPort", miningPort.toStdString());
> }
>
> QString ClientModel::getMiningUsername() const
> {
> return miningUsername;
> }
>
> void ClientModel::setMiningUsername(QString username)
> {
> miningUsername = username;
> // WriteSetting("miningUsername", miningUsername.toStdString());
> }
>
> QString ClientModel::getMiningPassword() const
> {
> return miningPassword;
> }
>
> void ClientModel::setMiningPassword(QString password)
> {
> miningPassword = password;
> // WriteSetting("miningPassword", miningPassword.toStdString());
> }
>
> int ClientModel::getHashrate() const
> {
> if (GetTimeMillis() - nHPSTimerStart > 8000)
> return (boost::int64_t)0;
> return (boost::int64_t)dHashesPerSec;
> }
>
> double ClientModel::GetDifficulty() const
> {
> // Floating point number that is a multiple of the minimum difficulty,
> // minimum difficulty = 1.0.
>
> if (pindexBest == NULL)
> return 1.0;
> int nShift = (pindexBest->nBits >> 24) & 0xff;
>
> double dDiff =
> (double)0x0000ffff / (double)(pindexBest->nBits & 0x00ffffff);
>
> while (nShift < 29)
> {
> dDiff *= 256.0;
> nShift++;
> }
> while (nShift > 29)
> {
> dDiff /= 256.0;
> nShift--;
> }
>
> return dDiff;
> }
>
66a210,218
>
> // Only need to update if solo mining. When pool mining, stats are pushed.
> if (miningType == SoloMining)
> {
> int newHashrate = getHashrate();
> if (cachedHashrate != newHashrate)
> emit miningChanged(miningStarted, newHashrate);
> cachedHashrate = newHashrate;
> }
107a260,273
> void ClientModel::setMining(MiningType type, bool mining, int threads, int hashrate)
> {
> if (type == SoloMining && mining != miningStarted)
> {
> }
> miningType = type;
> miningStarted = mining;
> // WriteSetting("miningStarted", mining);
> // WriteSetting("fLimitProcessors", 1);
> // WriteSetting("nLimitProcessors", threads);
> emit miningChanged(mining, hashrate);
> }
>
23a24,29
> enum MiningType
> {
> SoloMining,
> PoolMining
> };
>
28a35,53
> MiningType getMiningType() const;
> int getMiningThreads() const;
> bool getMiningStarted() const;
>
> bool getMiningDebug() const;
> void setMiningDebug(bool debug);
> int getMiningScanTime() const;
> void setMiningScanTime(int scantime);
> QString getMiningServer() const;
> void setMiningServer(QString server);
> QString getMiningPort() const;
> void setMiningPort(QString port);
> QString getMiningUsername() const;
> void setMiningUsername(QString username);
> QString getMiningPassword() const;
> void setMiningPassword(QString password);
>
> int getHashrate() const;
> double GetDifficulty() const;
40a66,67
> void setMining(MiningType type, bool mining, int threads, int hashrate);
>
50a78,88
> int cachedHashrate;
>
> MiningType miningType;
> int miningThreads;
> bool miningStarted;
> bool miningDebug;
> int miningScanTime;
> QString miningServer;
> QString miningPort;
> QString miningUsername;
> QString miningPassword;
60a99
> void miningChanged(bool mining, int count);
96c96
---
10c10
< <height>319</height>
---
> <height>331</height>
14c14
---
53c53
---
97c97,100
---
> <string>
99c102
< This is experimental software.
---
> This is experimental software.
101c104
< Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php.
---
> Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php.
103c106,109
< This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young ([email protected]) and UPnP software written by Thomas Bernard.</string>
---
> This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young ([email protected]) and UPnP software written by Thomas Bernard.
>
>
> </string>
20c20
---
102c102
---
Only in auroracoin-project/src/qt/forms: miningpage.ui
26c26
< <number>0</number>
---
> <number>1</number>
82c82
---
85c85
---
122c122
---
132c132
---
306c306
---
339c339
---
47c47
---
108c108
< <string notr="true">0 BTC</string>
---
> <string notr="true">0 AUR</string>
137c137
< <string notr="true">0 BTC</string>
---
> <string notr="true">0 AUR</string>
180c180
< <string notr="true">0 BTC</string>
---
> <string notr="true">0 AUR</string>
230c230
---
14c14
---
39c39
---
116,138d115
< <widget class="QLabel" name="label_12">
< <property name="text">
< <string>Build date</string>
< </property>
< </widget>
< </item>
< <item row="4" column="1">
< <widget class="QLabel" name="buildDate">
< <property name="cursor">
< <cursorShape>IBeamCursor</cursorShape>
< </property>
< <property name="text">
< <string>N/A</string>
< </property>
< <property name="textFormat">
< <enum>Qt::PlainText</enum>
< </property>
< <property name="textInteractionFlags">
< <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
< </property>
< </widget>
< </item>
< <item row="5" column="0">
145c122
< <item row="5" column="1">
---
> <item row="4" column="1">
161c138
< <item row="6" column="0">
---
> <item row="5" column="0">
174c151
< <item row="7" column="0">
---
> <item row="6" column="0">
181c158
< <item row="7" column="1">
---
> <item row="6" column="1">
197c174
< <item row="8" column="0">
---
> <item row="7" column="0">
204c181
< <item row="8" column="1">
---
> <item row="7" column="1">
214c191
< <item row="9" column="0">
---
> <item row="8" column="0">
227c204
< <item row="10" column="0">
---
> <item row="9" column="0">
234c211
< <item row="10" column="1">
---
> <item row="9" column="1">
250c227
< <item row="11" column="0">
---
> <item row="10" column="0">
257c234
< <item row="11" column="1">
---
> <item row="10" column="1">
273c250
< <item row="12" column="0">
---
> <item row="11" column="0">
280c257
< <item row="12" column="1">
---
> <item row="11" column="1">
296c273
< <item row="13" column="0">
---
> <item row="12" column="0">
309c286
< <item row="14" column="0">
---
> <item row="13" column="0">
322c299
< <item row="15" column="0">
---
> <item row="14" column="0">
325c302
---
351c328
---
122c122
< <string>123.456 BTC</string>
---
> <string>123.456 AUR</string>
93c93
< <string>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</string>
---
> <string>The address to send the payment to (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</string>
51c51
< <string>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</string>
---
> <string>The address to sign the message with (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</string>
254c254
< <string>The address the message was signed with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</string>
---
> <string>The address the message was signed with (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</string>
81c81
< if(uri.scheme() != QString("bitcoin"))
---
131c131
< // Convert bitcoin:// to bitcoin:
---
133c133
< // Cannot handle this later, because bitcoin:// will cause Qt to see the part after // as host,
---
135c135
< if(uri.startsWith("bitcoin://"))
---
137c137
< uri.replace(0, 10, "bitcoin:");
---
281c281
---
286c286
---
363c363
< return GetAutostartDir() / "bitcoin.desktop";
---
401c401
< // Write a bitcoin.desktop file to the autostart directory:
---
404c404
---
425c425
---
428c428
< " bitcoin-qt [" + tr("command-line options") + "] " + "\n";
---
437c437
---
18c18
---
26c26
---
33c33
< // Parse "bitcoin:" URI into recipient object, return true on successful parsing
---
98c98
---
410c410
---
835c835
< <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
---
> <source>The address to sign the message with (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
900,901c900,901
< <translation>Въведете Биткоин адрес (например 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> <translation>Въведете Биткоин адрес (например ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
1377,1378c1377,1378
< <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
< <translation>Адресът, към който да се направи плащането (например 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> <source>The address to send the payment to (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
> <translation>Адресът, към който да се направи плащането (например ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
1407,1408c1407,1408
< <translation>Въведете Биткоин адрес (например 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> <translation>Въведете Биткоин адрес (например ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
1891c1891
---
409c409
---
834c834
< <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
---
> <source>The address to sign the message with (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
899c899
---
1376c1376
< <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
---
> <source>The address to send the payment to (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
1406c1406
---
1890c1890
---
416c416
---
845,846c845,846
< <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
< <translation>Adresa, kterou se zpráva podepíše (např. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> <source>The address to sign the message with (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
> <translation>Adresa, kterou se zpráva podepíše (např. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
910,911c910,911
---
1387,1388c1387,1388
< <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
< <translation>Adresa příjemce (např. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> <source>The address to send the payment to (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
> <translation>Adresa příjemce (např. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
1417,1418c1417,1418
---
1901c1901
---
410c410
---
840c840
< <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
---
> <source>The address to sign the message with (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
905,906c905,906
---
1382,1383c1382,1383
< <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
< <translation>Adresse som betalingen skal sendes til (f.eks. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> <source>The address to send the payment to (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
> <translation>Adresse som betalingen skal sendes til (f.eks. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
1412,1413c1412,1413
---
1896c1896
---
415c415
---
843,844c843,844
< <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
< <translation>Die Adresse mit der die Nachricht signiert wird (z.B. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> <source>The address to sign the message with (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
> <translation>Die Adresse mit der die Nachricht signiert wird (z.B. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
908,909c908,909
---
1385,1386c1385,1386
< <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
< <translation>Die Zahlungsadresse der Überweisung (z.B. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> <source>The address to send the payment to (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
> <translation>Die Zahlungsadresse der Überweisung (z.B. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
1415,1416c1415,1416
---
1899c1899
---
416c416
---
847,848c847,848
< <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
< <translation>Η διεύθυνση που θα υπογραφεί μαζί με το μήνυμα (π.χ. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> <source>The address to sign the message with (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
> <translation>Η διεύθυνση που θα υπογραφεί μαζί με το μήνυμα (π.χ. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
912,913c912,913
---
1389c1389
< <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
---
> <source>The address to send the payment to (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
1391c1391
< (π.χ. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> (π.χ. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
1420,1421c1420,1421
---
1904c1904
---
61c61
---
220c220
< <source>Wallet passphrase was succesfully changed.</source>
---
> <source>Wallet passphrase was successfully changed.</source>
334c334
---
338c338
---
1096c1096
< <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
---
> <source>The address to send the payment to (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
1120c1120
---
1139c1139
< <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
---
> <source>The address to sign the message with (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
1187c1187
< <source>The address the message was signed with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
---
> <source>The address the message was signed with (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
1199c1199
---
1207c1207
---
416c416
---
844,845c844,845
< <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
< <translation>La dirección para firmar el mensaje con (por ejemplo, 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> <source>The address to sign the message with (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
> <translation>La dirección para firmar el mensaje con (por ejemplo, ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
909,910c909,910
---
1386,1387c1386,1387
< <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
< <translation>La dirección donde enviar el pago (ej. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> <source>The address to send the payment to (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
> <translation>La dirección donde enviar el pago (ej. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
1416,1417c1416,1417
---
1900c1900
---
416c416
---
845,846c845,846
< <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
< <translation>La dirección con la que codificar el mensaje (ej: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> <source>The address to sign the message with (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
> <translation>La dirección con la que codificar el mensaje (ej: ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
910,911c910,911
---
1387,1388c1387,1388
< <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
< <translation>La dirección donde enviar el pago (ej. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> <source>The address to send the payment to (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
> <translation>La dirección donde enviar el pago (ej. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
1417,1418c1417,1418
---
1901c1901
---
409c409
---
834c834
< <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
---
> <source>The address to sign the message with (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
899c899
---
1376c1376
< <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
---
> <source>The address to send the payment to (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
1406c1406
---
1890c1890
---
409c409
---
834c834
< <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
---
> <source>The address to sign the message with (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
899c899
---
1376c1376
< <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
---
> <source>The address to send the payment to (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
1406c1406
---
1890c1890
---
418c418
---
846c846
< <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
---
> <source>The address to sign the message with (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
911,912c911,912
< <translation>آدرس بیتکویین وارد کنید (bijvoorbeeld: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> <translation>آدرس بیتکویین وارد کنید (bijvoorbeeld: ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
1388,1389c1388,1389
< <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
< <translation>آدرس برای ارسال پر داخت (bijvoorbeeld: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> <source>The address to send the payment to (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
> <translation>آدرس برای ارسال پر داخت (bijvoorbeeld: ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
1418,1419c1418,1419
< <translation>آدرس بیتکویین وارد کنید (bijvoorbeeld: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> <translation>آدرس بیتکویین وارد کنید (bijvoorbeeld: ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
1902c1902
---
409c409
---
834c834
< <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
---
> <source>The address to sign the message with (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
899c899
---
1376c1376
< <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
---
> <source>The address to send the payment to (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
1406c1406
---
1890c1890
---
416c416
---
844c844
< <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
---
> <source>The address to sign the message with (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
846c846
< 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
910,911c910,911
---
1387,1388c1387,1388
< <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
---
> <source>The address to send the payment to (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
1417,1418c1417,1418
---
1901c1901
---
416c416
---
845,846c845,846
< <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
< <translation>L&apos;adresse avec laquelle le message sera signé ( par ex. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> <source>The address to sign the message with (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
> <translation>L&apos;adresse avec laquelle le message sera signé ( par ex. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
910,911c910,911
---
1387,1388c1387,1388
< <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
< <translation>L&apos;adresse à laquelle le paiement sera envoyé (par ex. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> <source>The address to send the payment to (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
> <translation>L&apos;adresse à laquelle le paiement sera envoyé (par ex. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
1417,1418c1417,1418
---
1901c1901
---
409c409
---
834c834
< <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
---
> <source>The address to sign the message with (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
899c899
---
1376c1376
< <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
---
> <source>The address to send the payment to (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
1406c1406
---
1890c1890
---
416c416
---
844,845c844,845
< <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
< <translation>הכתובת המשמשת לחתימה על ההודעה (למשל 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> <source>The address to sign the message with (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
> <translation>הכתובת המשמשת לחתימה על ההודעה (למשל ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
909,910c909,910
< <translation>הכנס כתובת ביטקוין (למשל 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> <translation>הכנס כתובת ביטקוין (למשל ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
1386,1387c1386,1387
< <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
< <translation>הכתובת אליה יישלח התשלום (למשל 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> <source>The address to send the payment to (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
> <translation>הכתובת אליה יישלח התשלום (למשל ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
1416,1417c1416,1417
< <translation>הכנס כתובת ביטקוין (למשל 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> <translation>הכנס כתובת ביטקוין (למשל ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
1900c1900
---
416c416
---
845c845
< <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
---
> <source>The address to sign the message with (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
910,911c910,911
---
1387,1388c1387,1388
< <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
< <translation>Adresa za slanje plaćanja (npr. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> <source>The address to send the payment to (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
> <translation>Adresa za slanje plaćanja (npr. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
1417,1418c1417,1418
---
1901c1901
---
410c410
---
840c840
< <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
---
> <source>The address to sign the message with (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
905,906c905,906
---
1383,1384c1383,1384
< <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
< <translation>Címzett címe (pl.: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L )</translation>
---
> <source>The address to send the payment to (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
> <translation>Címzett címe (pl.: ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L )</translation>
1413,1414c1413,1414
---
1897c1897
---
416c416
---
847,848c847,848
< <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
< <translation>L&apos;indirizzo per firmare il messaggio con (esempio 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> <source>The address to sign the message with (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
> <translation>L&apos;indirizzo per firmare il messaggio con (esempio ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
912,913c912,913
---
1389,1390c1389,1390
< <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
< <translation>L&apos;indirizzo del beneficiario cui inviare il pagamento (ad esempio 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> <source>The address to send the payment to (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
> <translation>L&apos;indirizzo del beneficiario cui inviare il pagamento (ad esempio ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
1419,1420c1419,1420
---
1903c1903
---
417c417
---
845c845
< <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
---
> <source>The address to sign the message with (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
910,911c910,911
< <translation>Įveskite bitkoinų adresą (pvz. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> <translation>Įveskite bitkoinų adresą (pvz. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
1387,1388c1387,1388
< <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
< <translation>Adresas mokėjimo siuntimui (pvz. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> <source>The address to send the payment to (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
> <translation>Adresas mokėjimo siuntimui (pvz. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
1417,1418c1417,1418
< <translation>Įveskite bitkoinų adresą (pvz. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> <translation>Įveskite bitkoinų adresą (pvz. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
1901c1901
---
416c416
---
846,847c846,847
< <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
< <translation>Adressen meldingen skal signeres med (f.eks. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> <source>The address to sign the message with (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
> <translation>Adressen meldingen skal signeres med (f.eks. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
911,912c911,912
---
1388,1389c1388,1389
< <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
< <translation>Adressen betalingen skal sendes til (f.eks. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> <source>The address to send the payment to (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
> <translation>Adressen betalingen skal sendes til (f.eks. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
1418,1419c1418,1419
---
1902c1902
---
417c417
---
847,848c847,848
< <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
< <translation>Het adres om het bericht mee te ondertekenen. (Vb.: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> <source>The address to sign the message with (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
> <translation>Het adres om het bericht mee te ondertekenen. (Vb.: ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
912,913c912,913
---
1389,1390c1389,1390
< <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
< <translation>Het adres waaraan u wilt betalen (bijv. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> <source>The address to send the payment to (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
> <translation>Het adres waaraan u wilt betalen (bijv. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
1419,1420c1419,1420
---
1903c1903
---
421c421
---
850c850
< <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
---
> <source>The address to sign the message with (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
915,916c915,916
---
1392,1393c1392,1393
< <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
< <translation>Adres do wysłania należności do (np. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> <source>The address to send the payment to (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
> <translation>Adres do wysłania należności do (np. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
1422,1423c1422,1423
---
1906c1906
---
415c415
---
844,845c844,845
< <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
< <translation>O endereço a ser utilizado para assinar a mensagem (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> <source>The address to sign the message with (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
> <translation>O endereço a ser utilizado para assinar a mensagem (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
909,910c909,910
---
1386,1387c1386,1387
< <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
< <translation>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> <source>The address to send the payment to (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
> <translation>The address to send the payment to (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
1416,1417c1416,1417
---
1900c1900
---
415c415
---
843,844c843,844
< <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
< <translation>O endereço a utilizar para assinar a mensagem (p.ex. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> <source>The address to sign the message with (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
> <translation>O endereço a utilizar para assinar a mensagem (p.ex. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
908,909c908,909
---
1385,1386c1385,1386
< <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
< <translation>O endereço para onde enviar o pagamento (p.ex. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> <source>The address to send the payment to (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
> <translation>O endereço para onde enviar o pagamento (p.ex. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
1415,1416c1415,1416
---
1899c1899
---
410c410
---
835c835
< <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
---
> <source>The address to sign the message with (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
900,901c900,901
---
1377,1378c1377,1378
< <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
< <translation>Adresa către care se va face plata (de exemplu: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> <source>The address to send the payment to (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
> <translation>Adresa către care se va face plata (de exemplu: ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
1407,1408c1407,1408
---
1891c1891
---
416c416
---
845,846c845,846
< <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
< <translation>Адрес, которым вы хотите подписать сообщение (напр. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> <source>The address to sign the message with (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
> <translation>Адрес, которым вы хотите подписать сообщение (напр. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
910,911c910,911
---
1387c1387
< <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
---
> <source>The address to send the payment to (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
1417c1417
---
1901c1901
---
410c410
---
838c838
< <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
---
> <source>The address to sign the message with (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
903,904c903,904
---
1380,1381c1380,1381
< <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
< <translation>Adresa pre odoslanie platby je (napr. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> <source>The address to send the payment to (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
> <translation>Adresa pre odoslanie platby je (napr. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
1410,1411c1410,1411
---
1894c1894
---
410c410
---
835c835
< <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
---
> <source>The address to sign the message with (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
900c900
---
1377c1377
< <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
---
> <source>The address to send the payment to (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
1407c1407
---
1891c1891
---
416c416
---
845,846c845,846
< <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
< <translation>Adressen att signera meddelandet med (t.ex. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> <source>The address to sign the message with (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
> <translation>Adressen att signera meddelandet med (t.ex. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
910,911c910,911
---
1387,1388c1387,1388
< <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
< <translation>Adressen som betalningen skall skickas till (t.ex. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> <source>The address to send the payment to (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
> <translation>Adressen som betalningen skall skickas till (t.ex. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
1417,1418c1417,1418
---
1901c1901
---
416c416
---
845,846c845,846
< <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
< <translation>Mesajı imzalamak için kullanılacak adres (mesela 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> <source>The address to sign the message with (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
> <translation>Mesajı imzalamak için kullanılacak adres (mesela ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
910,911c910,911
---
1387,1388c1387,1388
< <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
< <translation>Ödemenin gönderileceği adres (mesela 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> <source>The address to send the payment to (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
> <translation>Ödemenin gönderileceği adres (mesela ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
1417,1418c1417,1418
---
1901c1901
---
416c416
---
846c846
< <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
---
> <source>The address to sign the message with (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
911,912c911,912
---
1388,1389c1388,1389
< <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
< <translation>Адреса для отримувача платежу (наприклад, 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> <source>The address to send the payment to (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
> <translation>Адреса для отримувача платежу (наприклад, ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
1418,1419c1418,1419
---
1902c1902
---
416c416
---
846,847c846,847
< <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
< <translation>用来签名的比特币地址 (例如 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> <source>The address to sign the message with (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
> <translation>用来签名的比特币地址 (例如 ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
911,912c911,912
< <translation>请输入比特币地址 (例如: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> <translation>请输入比特币地址 (例如: ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
1388,1389c1388,1389
< <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
< <translation>付款地址 (例如: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> <source>The address to send the payment to (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
> <translation>付款地址 (例如: ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
1418,1419c1418,1419
< <translation>请输入比特币地址 (例如: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> <translation>请输入比特币地址 (例如: ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
1902c1902
---
416c416
---
845,846c845,846
< <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
< <translation>用來簽署訊息的位址 (比如說 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> <source>The address to sign the message with (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
> <translation>用來簽署訊息的位址 (比如說 ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
910,911c910,911
< <translation>輸入位元幣位址 (比如說 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> <translation>輸入位元幣位址 (比如說 ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
1387,1388c1387,1388
< <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
< <translation>付款的目標位址 (比如說 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> <source>The address to send the payment to (e.g. ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
> <translation>付款的目標位址 (比如說 ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
1417,1418c1417,1418
< <translation>輸入位元幣位址 (比如說 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
---
> <translation>輸入位元幣位址 (比如說 ANS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
1901c1901
---
4a5
> #include <QMainWindow>
5a7
> QT_BEGIN_NAMESPACE
9c11,17
< class objc_object;
---
> QT_END_NAMESPACE
>
> #ifdef __OBJC__
> @class DockIconClickEventHandler;
> #else
> class DockIconClickEventHandler;
> #endif
20a29
> void setMainWindow(QMainWindow *window);
34c43
< objc_object *m_dockIconClickEventHandler;
---
> DockIconClickEventHandler *m_dockIconClickEventHandler;
36a46
> QMainWindow *mainWindow;
5a6,7
> #include <QTemporaryFile>
> #include <QImageWriter>
6a9
> #if QT_VERSION < 0x050000
7a11
> #endif
41c45
< if (dockIconHandler)
---
> if (dockIconHandler){
42a47
> }
53a59,60
> this->setMainWindow(NULL);
> #if QT_VERSION < 0x05000
54a62
> #endif
57a66,69
> void MacDockIconHandler::setMainWindow(QMainWindow *window) {
> this->mainWindow = window;
> }
>
61a74
> this->setMainWindow(NULL);
72c85
< NSImage *image;
---
> NSImage *image = nil;
97a111,114
> if(this->mainWindow){
> this->mainWindow->activateWindow();
> this->mainWindow->show();
> }
Only in auroracoin-project/src/qt: miningpage.cpp
Only in auroracoin-project/src/qt: miningpage.h
196c196
---
205c205
---
112,113c112,113
< ui->labelWalletStatus->setText("(" + tr("out of sync") + ")");
< ui->labelTransactionsStatus->setText("(" + tr("out of sync") + ")");
---
> ui->labelWalletStatus->setText("(" + tr("Out of sync") + ")");
> ui->labelTransactionsStatus->setText("(" + tr("Out of sync") + ")");
178c178
< // update the display unit, to not use the default ("BTC")
---
> // update the display unit, to not use the default ("LTC")
86c86
< QString ret = QString("bitcoin:%1").arg(address);
---
3c3
< // file COPYING or http://www.opensource.org/licenses/mit-license.php.
---
> // file license.txt or http://www.opensource.org/licenses/mit-license.php.
88c88
< // Make sure we don't lose any bitcoin: URIs
---
100c100
< // Make sure only one bitcoin instance is listening
---
Only in auroracoin-project/src/qt/res/icons: Thumbs.db
Only in auroracoin-project/src/qt/res/icons: bitcoin_testnet.ico
Only in auroracoin-project/src/qt/res/icons: mining.png
Only in auroracoin-project/src/qt/res/icons: mining_active.png
Only in auroracoin-project/src/qt/res/icons: mining_inactive.png
Only in auroracoin-project/src/qt/res/images: Thumbs.db
Only in auroracoin-project/src/qt/res/images: splash.png
Only in auroracoin-project/src/qt/res/images: splash_testnet.png
166d165
< ui->buildDate->setText(model->formatBuildDate());
213c212
---
26c26
---
27c27
---
30,31c30,31
---
1a2,3
39c41
< "importprivkey <bitcoinprivkey> [label]\n"
---
76,77c78,79
< "dumpprivkey <bitcoinaddress>\n"
< "Reveals the private key corresponding to <bitcoinaddress>.");
---
82c84
---
1a2,3
2a3
2a3,4
2a3,4
Only in auroracoin-project/src/: scrypt.c
Only in auroracoin-project/src/: scrypt.h
2a3,4
810,822d811
< void insert(iterator it, const_iterator first, const_iterator last)
< {
< assert(last - first >= 0);
< if (it == vch.begin() + nReadPos && (unsigned int)(last - first) <= nReadPos)
< {
< // special case for inserting at the front when there's room
< nReadPos -= (last - first);
< memcpy(&vch[nReadPos], &first[0], last - first);
< }
< else
< vch.insert(it, first, last);
< }
<
1a2,3
2a3,4
17,20c17,20
< uint256 p11111 = uint256("0x0000000069e244f73d78e8fd29ba2fd2ed618bd6fa2ee92559f542fdb26e7c1d");
< uint256 p134444 = uint256("0x00000000000005b12ffd4cd315cd34ffd4a594f430ac814c91184a0d42d2b0fe");
< BOOST_CHECK(Checkpoints::CheckBlock(11111, p11111));
< BOOST_CHECK(Checkpoints::CheckBlock(134444, p134444));
---
> uint256 p1500 = uint256("0x841a2965955dd288cfa707a755d05a54e45f8bd476835ec9af4402a2b59a2967");
> uint256 p120000 = uint256("0xbd9d26924f05f6daa7f0155f32828ec89e8e29cee9e7121b026a7a3552ac6131");
> BOOST_CHECK(Checkpoints::CheckBlock(1500, p1500));
> BOOST_CHECK(Checkpoints::CheckBlock(120000, p120000));
24,25c24,25
< BOOST_CHECK(!Checkpoints::CheckBlock(11111, p134444));
< BOOST_CHECK(!Checkpoints::CheckBlock(134444, p11111));
---
> BOOST_CHECK(!Checkpoints::CheckBlock(1500, p120000));
> BOOST_CHECK(!Checkpoints::CheckBlock(120000, p1500));
28,29c28,29
< BOOST_CHECK(Checkpoints::CheckBlock(11111+1, p134444));
< BOOST_CHECK(Checkpoints::CheckBlock(134444+1, p11111));
---
> BOOST_CHECK(Checkpoints::CheckBlock(1500+1, p120000));
> BOOST_CHECK(Checkpoints::CheckBlock(120000+1, p1500));
31c31
< BOOST_CHECK(Checkpoints::GetTotalBlocksEstimate() >= 134444);
---
> BOOST_CHECK(Checkpoints::GetTotalBlocksEstimate() >= 120000);
13,20c13,20
< static const string strSecret1 ("5HxWvvfubhXpYYpS3tJkw6fq9jE9j18THftkZjHHfmFiWtmAbrj");
< static const string strSecret2 ("5KC4ejrDjv152FGwP386VD1i2NYc5KkfSMyv1nGy1VGDxGHqVY3");
< static const string strSecret1C ("Kwr371tjA9u2rFSMZjTNun2PXXP3WPZu2afRHTcta6KxEUdm1vEw");
< static const string strSecret2C ("L3Hq7a8FEQwJkW1M2GNKDW28546Vp5miewcCzSqUD9kCAXrJdS3g");
---
> static const string strSecret1 ("6uu5bsZLA2Lm6yCxgwxDxHyZmhYeqBMLQT83Fyq738YhYucQPQf");
> static const string strSecret2 ("6vZDRwYgTNidWzmKs9x8QzQGeWCqbdUtNRpEKZMaP67ZSn8XMjb");
> static const string strSecret1C ("T6UsJv9hYpvDfM5noKYkB3vfeHxhyegkeWJ4y7qKeQJuyXMK11XX");
> static const string strSecret2C ("T9PBs5kq9QrkBPxeGNWKitMi4XuFVr25jaXTnuopLVZxCUAJbixA");
23c23
< static const string strAddressBad("1HV9Lc3sNHZxwj4Zk6fB38tEmBryq2cBiF");
---
> static const string strAddressBad("LRjyUS2uuieEPkhZNdQz8hE5YycxVEqSXA");
55,58c55,58
< BOOST_CHECK(TestSplitHost("www.bitcoin.org", "www.bitcoin.org", -1));
< BOOST_CHECK(TestSplitHost("[www.bitcoin.org]", "www.bitcoin.org", -1));
< BOOST_CHECK(TestSplitHost("www.bitcoin.org:80", "www.bitcoin.org", 80));
< BOOST_CHECK(TestSplitHost("[www.bitcoin.org]:80", "www.bitcoin.org", 80));
---
2a3,4
2a3,4
2a3,4
78c80
< // Init OpenSSL library multithreading support
---
> // Init openssl library multithreading support
95c97
< // Init OpenSSL library multithreading support
---
> // Init openssl library multithreading support
111c113
< // Shutdown OpenSSL library multithreading support
---
> // Shutdown openssl library multithreading support
938c940
< const char* pszModule = "bitcoin";
---
974,977c976,979
< // Unix: ~/.bitcoin
---
980c982
---
992c994
---
995c997
< return pathRet / ".bitcoin";
---
1037c1039
< boost::filesystem::path pathConfigFile(GetArg("-conf", "bitcoin.conf"));
---
1047c1049
< return; // No bitcoin.conf file is OK
---
1054c1056
< // Don't overwrite existing settings so command line settings override bitcoin.conf
---
1068c1070
< boost::filesystem::path pathPidFile(GetArg("-pid", "bitcoind.pid"));
---
1188c1190
< if (abs64(nMedian) < 70 * 60)
---
1208c1210
---
1211c1213
---
2a3,4
554d555
< typedef HANDLE pthread_t;
556c557
< inline pthread_t CreateThread(void(*pfn)(void*), void* parg, bool fWantHandle=false)
---
> inline HANDLE CreateThread(void(*pfn)(void*), void* parg, bool fWantHandle=false)
570c571
< return (pthread_t)0;
---
> return (HANDLE)0;
575c576
< return (pthread_t)-1;
---
> return (HANDLE)-1;
1a2,4
11c14
< const std::string CLIENT_NAME("Satoshi");
---
14c17
< #define CLIENT_VERSION_SUFFIX "-beta"
---
> #define CLIENT_VERSION_SUFFIX ""
36c39,40
< // git will put "#define GIT_ARCHIVE 1" on the next line inside archives. $Format:%n#define GIT_ARCHIVE 1$
---
> // git will put "#define GIT_ARCHIVE 1" on the next line inside archives.
> #define GIT_ARCHIVE 1
38c42
< # define GIT_COMMIT_ID "$Format:%h$"
---
> # define GIT_COMMIT_ID "3abc7ba"
45c49
< "v" STRINGIFY(maj) "." STRINGIFY(min) "." STRINGIFY(rev) "." STRINGIFY(build) "-g" commit
---
> "v" STRINGIFY(maj) "." STRINGIFY(min) "." STRINGIFY(rev) "." STRINGIFY(build)
1a2,4
14,16c17,19
< #define CLIENT_VERSION_MAJOR 0
< #define CLIENT_VERSION_MINOR 6
< #define CLIENT_VERSION_REVISION 99
---
> #define CLIENT_VERSION_MAJOR 1
> #define CLIENT_VERSION_MINOR 2
> #define CLIENT_VERSION_REVISION 0
33c36
< static const int PROTOCOL_VERSION = 60001;
---
> static const int PROTOCOL_VERSION = 1020000;
2a3,4
920a923,924
> // If output is less than minimum value, then don't include transaction.
> // This is to help deal with dust spam clogging up create transactions.
922c926
< if (!(pcoin->IsSpent(i)) && IsMine(pcoin->vout[i]) && pcoin->vout[i].nValue > 0)
---
> if (!(pcoin->IsSpent(i)) && IsMine(pcoin->vout[i]) && pcoin->vout[i].nValue >= nMinimumInputValue)
2a3,4
189c191,193
< if (IsMine(txout))
---
> // If output is less than minimum value, then don't include transaction.
> // This is to help deal with dust spam bloating the wallet.
> if (IsMine(txout) && txout.nValue >= nMinimumInputValue)
2a3,4
2a3,4
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment