Bladeren bron

added checkpoints

psy 1 week geleden
bovenliggende
commit
46ea8386ac

+ 1 - 24
README.md

@@ -83,29 +83,6 @@ ECOin wallet is available in 10 languages:
 
 ECOin builds on GNU/Linux, Windows (MinGW), and macOS. See [INSTALL](./ecoin/INSTALL) for detailed instructions.
 
-### Quick Start (Debian/Ubuntu)
-
-```bash
-# Install dependencies
-sudo apt-get install build-essential libssl-dev libdb5.3-dev libdb5.3++-dev \
-  libleveldb-dev qt5-qmake qtbase5-dev
-
-# Clone
-git clone https://github.com/epsylon/ecoin
-cd ecoin/ecoin/
-
-# Build Wallet (GUI)
-qmake USE_UPNP=- USE_IPV6=-
-make
-./ecoin-qt
-
-# Build Daemon (headless server)
-cd src/
-make -f makefile.linux USE_UPNP=- USE_IPV6=-
-strip ecoind
-./ecoind
-```
-
 ### Pre-built Packages
 
 Pre-built `.deb` packages are available for:
@@ -152,7 +129,7 @@ Solo mining with the built-in CPU miner:
 
 ```bash
 # Terminal 1: Start wallet or daemon
-./ecoin-qt
+./ecoin-qt -server
 # or: ./ecoind -daemon
 
 # Terminal 2: Start miner

+ 22 - 30
ecoin/INSTALL

@@ -11,17 +11,12 @@ All of the commands should be executed in a shell:
 
 ===================================================
 
-=================
-+ Build Makefile:
-=================
-
-    cd ecoin/
-    /usr/lib/x86_64-linux-gnu/qt5/bin/qmake USE_UPNP=- USE_IPV6=- -o Makefile ecoin-qt.pro
-
 ===============
 + Build Wallet:
 ===============
 
+    sudo apt-get install qt5-qmake qtbase5-dev build-essential libssl-dev libssl3 libdb5.3-dev libdb5.3++-dev libboost-all-dev libleveldb-dev miniupnpc libminiupnpc-dev
+
     qmake USE_UPNP=- USE_IPV6=-
     make
 
@@ -33,6 +28,8 @@ All of the commands should be executed in a shell:
 + Build Daemon:
 ===============
 
+    sudo apt-get install build-essential libssl-dev libssl3 libdb5.3-dev libdb5.3++-dev libboost-all-dev libleveldb-dev miniupnpc libminiupnpc-dev
+    
     cd src/
     make -f makefile.linux USE_UPNP=- USE_IPV6=-
     strip ecoind
@@ -40,18 +37,16 @@ All of the commands should be executed in a shell:
     ./ecoind
     
 ===================================================
-        
+
 ===============
-+ Build Miner:
++ Packages:
 ===============
 
-See doc/MINING.txt for detailed instructions on running /ecoin-miner/ on different platforms.
+  cd packages/
+
+    - APK (wallet): ecoin-wallet-v0.7.5.7.apk
+    - AMD64 (wallet + daemon): sudo dpkg -i ecoin_0.0.4-1_amd64.deb
 
-    cd miner/
-    bash build.sh
-	
-    ./cpuminer
-    
 ===================================================
 
 =================================
@@ -99,23 +94,20 @@ See doc/MINING.txt for detailed instructions on running /ecoin-miner/ on differe
      
         cd tools
         bash set_config.sh
-     
-==========================
-+ Debugging (logs):
-==========================
-
-  + GNU/Linux:
-
-     tail -f /home/$USER/.ecoin/debug.log
-
-====================
-+ Ports (Listening):
-====================
-
-  + Default P2P Port: 7408
+        
+===================================================
+        
+===============
++ Build Miner:
+===============
 
-  + Default RPC Port (mainnet): 7474
+See doc/MINING.txt for detailed instructions on running /ecoin-miner/ on different platforms.
 
+    cd miner/
+    bash build.sh
+	
+    ./cpuminer
+     
 ===================================================
 
 ==========================

+ 2 - 2
ecoin/doc/build-linux.txt

@@ -33,7 +33,7 @@ All of the commands should be executed in a shell.
 
 (1.) Install dependencies:
 
-    sudo apt-get install build-essential libssl-dev libssl3 libdb5.3-dev libdb5.3++-dev libleveldb-dev miniupnpc libminiupnpc-dev
+    sudo apt-get install build-essential libssl-dev libssl3 libdb5.3-dev libdb5.3++-dev libboost-all-dev libleveldb-dev miniupnpc libminiupnpc-dev
 
         + Optionally install qrencode (and set USE_QRCODE=1):
 
@@ -61,7 +61,7 @@ All of the commands should be executed in a shell.
 
 (1.) First, make sure that the required packages for Qt5 development (an the others required for building the daemon) are installed:
 
-    sudo apt-get install qt5-qmake qtbase5-dev build-essential libssl-dev libssl3 libdb5.3-dev libdb5.3++-dev libleveldb-dev miniupnpc libminiupnpc-dev
+    sudo apt-get install qt5-qmake qtbase5-dev build-essential libssl-dev libssl3 libdb5.3-dev libdb5.3++-dev libboost-all-dev libleveldb-dev miniupnpc libminiupnpc-dev
         
         + Optionally install qrencode (and set USE_QRCODE=1):
 

BIN
ecoin/packages/ecoin-wallet-v0.7.5.7.apk


BIN
ecoin/packages/ecoin_0.0.4-1_amd64.deb


+ 4 - 0
ecoin/src/checkpoints.cpp

@@ -30,6 +30,10 @@ namespace Checkpoints
             uint256("0x0000006692c49a4edadc03502540c528bda927f58357a699603d42a131f5322a"),
             1771597438
         ) )
+        ( 2600, std::make_pair(
+            uint256("0x0000008fc75adbd309e4757c901572fda9699f4a34433ced95115d17f8e5585e"),
+            1772309777,
+        ) )
     ;
 
     static MapCheckpoints mapCheckpointsTestnet =

+ 0 - 33
ecoin/src/makefile.linux

@@ -54,39 +54,6 @@ LIBS+= \
    -l dl \
    -l pthread
 
-
-# Hardening
-# Make some classes of vulnerabilities unexploitable in case one is discovered.
-#
-    # This is a workaround for Ubuntu bug #691722, the default -fstack-protector causes
-    # -fstack-protector-all to be ignored unless -fno-stack-protector is used first.
-    # see: https://bugs.launchpad.net/ubuntu/+source/gcc-4.5/+bug/691722
-    HARDENING=-fno-stack-protector
-
-    # Stack Canaries
-    # Put numbers at the beginning of each stack frame and check that they are the same.
-    # If a stack buffer if overflowed, it writes over the canary number and then on return
-    # when that number is checked, it won't be the same and the program will exit with
-    # a "Stack smashing detected" error instead of being exploited.
-    HARDENING+=-fstack-protector-strong -Wstack-protector
-
-    # Make some important things such as the global offset table read only as soon as
-    # the dynamic linker is finished building it. This will prevent overwriting of addresses
-    # which would later be jumped to.
-    LDHARDENING+=-Wl,-z,relro -Wl,-z,now
-
-    # Build position independent code to take advantage of Address Space Layout Randomization
-    # offered by some kernels.
-    # see doc/build-unix.txt for more information.
-    HARDENING+=-fPIE
-    LDHARDENING+=-pie
-
-    # -D_FORTIFY_SOURCE=2 does some checking for potentially exploitable code patterns in
-    # the source such overflowing a statically defined buffer.
-    HARDENING+=-D_FORTIFY_SOURCE=2
-#
-
-
 DEBUGFLAGS=-g
 
 

BIN
ecoin/tools/bootstrap.dat