Parcourir la source

added checkpoints

psy il y a 20 heures
Parent
commit
6e876f79b7

+ 3 - 2
README.md

@@ -131,6 +131,7 @@ noirc=1
 listen=1
 server=1
 daemon=1
+staking=1
 addnode=46.163.118.220
 ```
 
@@ -156,7 +157,7 @@ Solo mining with the built-in CPU miner:
 
 # Terminal 2: Start miner
 cd miner/ && sh build.sh
-./cpuminer -o http://127.0.0.1:7474 -O ecoinrpc:<password> --coinbase-addr=<YOUR_ECOIN_ADDRESS>
+./cpuminer -o http://127.0.0.1:7474 -O ecoinrpc:<password> --coinbase-addr=<YOUR_ECOIN_ADDRESS> -a scrypt
 ```
 
 See [MINING](./ecoin/doc/MINING.txt) and [REWARDS](./ecoin/doc/REWARDS.txt) for details.
@@ -217,4 +218,4 @@ ECOin is free software released under the [GNU General Public License v3.0](http
 | Currency | Address |
 | -------- | ------- |
 | Bitcoin | `19aXfJtoYJUoXEZtjNwsah2JKN9CK5Pcjw` |
-| ECOin | `ETsRCBzaMawx3isvb5svX7tAukLdUFHKze` |
+| ECOin | `EUrsdYnwfCcmtTVyiMruo31PD7zWUtgdft` |

+ 13 - 10
ecoin/INSTALL

@@ -60,7 +60,12 @@ See doc/MINING.txt for detailed instructions on running /ecoin-miner/ on differe
 
   Download bootstrap.dat for faster initial sync:
 
-    wget https://ecoin.03c8.net/ecoin/bootstrap.dat -P /home/$USER/.ecoin/
+    - File: wget https://ecoin.03c8.net/ecoin/bootstrap.dat -P /home/$USER/.ecoin/
+    
+    - Tools:
+    
+        cd tools
+        bash load_bootstrap.sh
 
   The file will be automatically imported and renamed to bootstrap.dat.old on first start.
 
@@ -87,15 +92,13 @@ See doc/MINING.txt for detailed instructions on running /ecoin-miner/ on differe
         daemon=1
         staking=1
         addnode=46.163.118.220
-        addnode=193.180.212.80
-        addnode=82.223.99.61
-        addnode=79.112.28.209
-        addnode=79.112.91.131
-        addnode=193.180.212.112
-        addnode=193.180.212.105
-        addnode=193.180.212.108
-
-    ./ecoind -conf=/home/$USER/.ecoin/ecoin.conf 
+
+    ./ecoind -conf=/home/$USER/.ecoin/ecoin.conf    
+    
+     - Tools: 
+     
+        cd tools
+        bash set_config.sh
      
 ==========================
 + Debugging (logs):

+ 29 - 28
ecoin/doc/AUTHOR.txt

@@ -17,33 +17,34 @@
 
  software/projects:
 
- - Anarcha-Pragmatism: Intellectual model (and movement) based on the culture of the "action/reaction".
- - AnonTwi: Tool for OAuth2 applications (such as: GNUSocial, Twitter) that provides different layers of privacy/encryption.
- - BrAInStocker: Tool to predict (using Linear Regression) the next number within a series of random numbers.
- - Bordercheck: Tool to visualize 'real-time' on a world map the geolocation of data when surfing the web.
- - CIntruder: Tool to bypass captchas using OCR (Optical Character Recognition) bruteforcing methods.
- - Collatz: Tool to simulate the Collatz's conjeture.
- - DiaNA: Tool for the search and recognition of patterns in DNA sequences.
- - DieKunstDerFuge: Video on different topics related to hacktivism recorded during 2013 from an intimate narrative perspective.
- - ECOin: Crypto-currency with the goal of providing a long-term energy-efficient digital economy strategy.
- - Euler-Bricks: Tool to simulate the Euler's conjeture.
- - FuzzSSH: Tool to detect SSH (protocol) vulnerabilities.
- - Goldbach: Tool to simulate the Goldbach's conjeture.
- - Lorea: Social networking autonomous project to build a distributed, encrypted and federated network.
- - Neuralia: Neural Network that tries to learn and reply the correct answer.
- - NoINIW-2051: Shell-based CyberPunk m-RPG videogame.
- - Orb: Tool for massive footprinting.
- - PandeMaths: Tool that simulates a mathematical model of pandemics.
- - pArAnoIA-Browser: Tool designed to surf the Internet using some "paranoic" methods.
- - Prommetrix: Tool to obtain relevant information from the instances of 'Node Exporter' executed by 'Prometheus'.
- - Propagare: Tool for extraction, organization and semantic analysis of newspapers.
- - PyAISnake: Tool to train AI models on solve spatial problems through the classic video game "snake".
- - PyDog4Apache: Tool to sneak logs from Apache web server.
- - Smuggler: Tool to detect and exploit HTTP Smuggling vulnerabilities.
- - SolarNET.HuB: A sustainable multilayer tool-artifact for data privacy and project networking.
- - TheHackerStyle: A weekly video broadcast related to technology and "hacker culture".
- - UFONet: Denial of Service [DDoS & DoS attacks] Toolkit (a botnet of botnets).
- - XSSer: Automatic -framework- to detect, exploit and report XSS vulnerabilities.
+- Anarcha-Pragmatism: Intellectual model (and movement) based on the culture of the "action/reaction".
+- AnonTwi: Tool for OAuth2 applications (such as: GNUSocial, Twitter) that provides different layers of privacy/encryption.
+- BrAInStocker: Tool to predict (using Linear Regression) the next number within a series of random numbers.
+- Bordercheck: Tool to visualize 'real-time' on a world map the geolocation of data when surfing the web.
+- CIntruder: Tool to bypass captchas using OCR (Optical Character Recognition) bruteforcing methods.
+- Collatz: Tool to simulate the Collatz's conjeture.
+- DiaNA: Tool for the search and recognition of patterns in DNA sequences.
+- DieKunstDerFuge: Video on different topics related to hacktivism recorded during 2013 from an intimate narrative perspective.
+- ECOin: Crypto-currency with the goal of providing a long-term energy-efficient digital economy strategy.
+- Euler-Bricks: Tool to simulate the Euler's conjeture.
+- FuzzSSH: Tool to detect SSH (protocol) vulnerabilities.
+- Goldbach: Tool to simulate the Goldbach's conjeture.
+- Lorea: Social networking autonomous project to build a distributed, encrypted and federated network.
+- Neuralia: Neural Network that tries to learn and reply the correct answer.
+- NoINIW-2051: Shell-based CyberPunk m-RPG videogame.
+- OASIS: Libre, open-source, encrypted, peer-to-peer, distributed (not decentralized!) & federated... project networking application.
+- Orb: Tool for massive footprinting.
+- PandeMaths: Tool that simulates a mathematical model of pandemics.
+- pArAnoIA-Browser: Tool designed to surf the Internet using some "paranoic" methods.
+- Prommetrix: Tool to obtain relevant information from the instances of 'Node Exporter' executed by 'Prometheus'.
+- Propagare: Tool for extraction, organization and semantic analysis of newspapers.
+- PyAISnake: Tool to train AI models on solve spatial problems through the classic video game "snake".
+- PyDog4Apache: Tool to sneak logs from Apache web server.
+- Smuggler: Tool to detect and exploit HTTP Smuggling vulnerabilities.
+- SolarNET.HuB: A sustainable multilayer tool-artifact for data privacy and project networking.
+- TheHackerStyle: A weekly video broadcast related to technology and "hacker culture".
+- UFONet: Denial of Service [DDoS & DoS attacks] Toolkit (a botnet of botnets).
+- XSSer: Automatic -framework- to detect, exploit and report XSS vulnerabilities.
 
 =======================
 
@@ -53,7 +54,7 @@
   
  ECOin:
  
-  ETsRCBzaMawx3isvb5svX7tAukLdUFHKze
+  EUrsdYnwfCcmtTVyiMruo31PD7zWUtgdft
 
 ========================
 

+ 2 - 2
ecoin/doc/MINING.txt

@@ -10,8 +10,8 @@ ECOin - Copyright (c) - 2014/2026 - GPLv3 - epsylon@riseup.net (https://03c8.net
       cd miner/
       sh build.sh
 
-         1) ./ecoin-qt
-         2) ./cpuminer -o http://0.0.0.0:7474 -O <rpcuser>:<rpcpassword> --coinbase-addr=<YOUR_ECOIN_ADDRESS>
+         1) ./ecoin-qt -server
+         2) ./cpuminer -o http://0.0.0.0:7474 -O <rpcuser>:<rpcpassword> --coinbase-addr=<YOUR_ECOIN_ADDRESS> -a scrypt
 
 ===================================================
 

+ 2 - 2
ecoin/miner/cpu-miner.c

@@ -3451,10 +3451,10 @@ static void show_credits()
 {
 	printf("** cpuminer (ECOIN) by psy (03c8.net): **\n");
 	printf("BTC donation address: 19aXfJtoYJUoXEZtjNwsah2JKN9CK5Pcjw (psy)\n");
-	printf("ECO donation address: ETsRCBzaMawx3isvb5svX7tAukLdUFHKze (ECOin)\n\n");
+	printf("ECO donation address: EUrsdYnwfCcmtTVyiMruo31PD7zWUtgdft (ECOin)\n\n");
 	printf("** usage: **\n");
 	printf("1) ./ecoin-qt -server\n");
-	printf("2) ./cpuminer -o http://0.0.0.0:7474 -O <rpcuser>:<rpcpassword> --coinbase-addr=<YOUR_ECOIN_ADDRESS>\n\n");
+	printf("2) ./cpuminer -o http://0.0.0.0:7474 -O <rpcuser>:<rpcpassword> --coinbase-addr=<YOUR_ECOIN_ADDRESS> -a scrypt\n\n");
 }
 
 void get_defconfig_path(char *out, size_t bufsize, char *argv0);

+ 4 - 0
ecoin/src/checkpoints.cpp

@@ -18,6 +18,10 @@ namespace Checkpoints
             uint256("0x0000005dbe2d5ea1c2ed5285f8bba06aba72a61c23904d647d5181d0f77e7a2a"),
             1771330772
         ) )
+        ( 400, std::make_pair(
+            uint256("0x000000421df98ce281d0beb2601a597818579bb049037cadb04640906c88d912"),
+            1771355708
+        ) )
     ;
 
     static MapCheckpoints mapCheckpointsTestnet =

+ 1 - 1
ecoin/src/main.cpp

@@ -1658,7 +1658,7 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex, bool fJustCheck)
 	if (vtx[0].vout.size() > 1 && fDebug)
 	    printf("ACCEPTED: proof-of-transaction block at height %d\n", pindex->pprev->nHeight+1);
 
-    if (pindex->pprev->nHeight+1 > 57000 && !pindex->IsProofOfStake() && !pindex->pprev->IsProofOfStake() && vtx.size() <= 20) // epsylon
+    if (pindex->pprev->nHeight+1 > 57000 && !pindex->IsProofOfStake() && !pindex->pprev->IsProofOfStake() && vtx.size() <= 20)
     {
         std::vector < boost::tuple<unsigned int, int64, CEcoinAddress> > vTrans;
 	    for(unsigned int i = 0; i < vtx[0].vout.size(); i++)

+ 6 - 10
ecoin/src/qt/ecoingui.cpp

@@ -502,7 +502,7 @@ void EcoinGUI::setNumBlocks(int count, int nTotalBlocks)
             progressBar->setVisible(true);
         }
 
-        tooltip = tr("Downloaded %1 of %2 blocks of transaction history (%3% done).").arg(count).arg(nTotalBlocks).arg(nPercentageDone, 0, 'f', 2);
+        tooltip = tr("Downloaded %1 of %2 blocks of transaction history (%3% done)...").arg(count).arg(nTotalBlocks).arg(nPercentageDone, 0, 'f', 2);
     }
     else
     {
@@ -510,7 +510,7 @@ void EcoinGUI::setNumBlocks(int count, int nTotalBlocks)
             progressBarLabel->setVisible(false);
 
         progressBar->setVisible(false);
-        tooltip = tr("Downloaded %1 blocks of transaction history.").arg(count);
+        tooltip = tr("Downloaded %1 blocks of transaction history...").arg(count);
     }
 
     // Override progressBarLabel text and hide progress bar, when we have warnings to display
@@ -550,14 +550,14 @@ void EcoinGUI::setNumBlocks(int count, int nTotalBlocks)
     // Set icon state: spinning if catching up, tick otherwise
     if(secs < 90*60 && count >= nTotalBlocks)
     {
-        tooltip = tr("Up to date") + QString(".<br>") + tooltip;
+        tooltip = tr("Up to date... ") + tooltip;
         labelBlocksIcon->setPixmap(QIcon(":/icons/synced").pixmap(STATUSBAR_ICONSIZE, STATUSBAR_ICONSIZE));
 
         overviewPage->showOutOfSyncWarning(false);
     }
     else
     {
-        tooltip = tr("Catching up...") + QString("<br>") + tooltip;
+        tooltip = tr("Catching up... ") + tooltip;
         labelBlocksIcon->setMovie(syncIconMovie);
         syncIconMovie->start();
 
@@ -566,13 +566,9 @@ void EcoinGUI::setNumBlocks(int count, int nTotalBlocks)
 
     if(!text.isEmpty())
     {
-        tooltip += QString("<br>");
-        tooltip += tr("Last received block was generated %1.").arg(text);
+        tooltip += tr(" Last received block was generated %1.").arg(text);
     }
 
-    // Don't word-wrap this (fixed-width) tooltip
-    tooltip = QString("<nobr>") + tooltip + QString("</nobr>");
-
     labelBlocksIcon->setToolTip(tooltip);
     progressBarLabel->setToolTip(tooltip);
     progressBar->setToolTip(tooltip);
@@ -911,7 +907,7 @@ void EcoinGUI::updateStakingIcon()
         }
 
         labelStakingIcon->setPixmap(QIcon(":/icons/staking_on").pixmap(STATUSBAR_ICONSIZE,STATUSBAR_ICONSIZE));
-        labelStakingIcon->setToolTip(tr("Staking.<br>Your weight is %1<br>Network weight is %2<br>Expected time to earn reward is %3").arg(nWeight).arg(nNetworkWeight).arg(text));
+        labelStakingIcon->setToolTip(tr("Staking.Your weight is %1.Network weight is %2.Expected time to earn reward is %3").arg(nWeight).arg(nNetworkWeight).arg(text));
     }
     else
     {

+ 4 - 4
ecoin/src/qt/signverifymessagedialog.cpp

@@ -143,12 +143,12 @@ void SignVerifyMessageDialog::on_signMessageButton_SM_clicked()
     if (!key.SignCompact(Hash(ss.begin(), ss.end()), vchSig))
     {
         ui->statusLabel_SM->setStyleSheet("QLabel { color: red; }");
-        ui->statusLabel_SM->setText(QString("<nobr>") + tr("Message signing failed.") + QString("</nobr>"));
+        ui->statusLabel_SM->setText(tr("Message signing failed."));
         return;
     }
 
     ui->statusLabel_SM->setStyleSheet("QLabel { color: green; }");
-    ui->statusLabel_SM->setText(QString("<nobr>") + tr("Message signed.") + QString("</nobr>"));
+    ui->statusLabel_SM->setText(QString(tr("Message signed.")));
 
     ui->signatureOut_SM->setText(QString::fromStdString(EncodeBase64(&vchSig[0], vchSig.size())));
 }
@@ -227,12 +227,12 @@ void SignVerifyMessageDialog::on_verifyMessageButton_VM_clicked()
     if (!(CEcoinAddress(key.GetPubKey().GetID()) == addr))
     {
         ui->statusLabel_VM->setStyleSheet("QLabel { color: red; }");
-        ui->statusLabel_VM->setText(QString("<nobr>") + tr("Message verification failed.") + QString("</nobr>"));
+        ui->statusLabel_VM->setText(tr("Message verification failed."));
         return;
     }
 
     ui->statusLabel_VM->setStyleSheet("QLabel { color: green; }");
-    ui->statusLabel_VM->setText(QString("<nobr>") + tr("Message verified.") + QString("</nobr>"));
+    ui->statusLabel_VM->setText(tr("Message verified."));
 }
 
 void SignVerifyMessageDialog::on_clearButton_VM_clicked()

BIN
ecoin/tools/bootstrap.dat


+ 7 - 0
ecoin/tools/clean_blockchain.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+rm ~/.ecoin/blk0001.dat
+rm ~/.ecoin/db.log
+rm ~/.ecoin/debug.log
+rm ~/.ecoin/peers.dat
+rm -r ~/.ecoin/txleveldb
+rm -r ~/.ecoin/database

+ 10 - 0
ecoin/tools/ecoin.conf

@@ -0,0 +1,10 @@
+rpcuser=ecoinrpc
+rpcpassword=ecoinrpc
+rpcallowip=127.0.0.1
+noirc=1
+listen=1
+server=1
+daemon=1
+testnet=0
+staking=1
+addnode=46.163.118.220 # turina

+ 2 - 0
ecoin/tools/load_bootstrap.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+cp bootstrap.dat ~/.ecoin/

+ 2 - 0
ecoin/tools/set_config.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+cp ecoin.conf ~/.ecoin/