Merge pull request #16 from standard-error/kawpow

Kawpow algo support
sphericale · May 12, 2020 · 6eaf002 · 6eaf002
2 parents edf2506 + 5a1b62d
commit 6eaf002
Show file tree

Hide file tree

Showing 11 changed files with 110,679 additions and 34 deletions.
diff --git a/RELEASE-NOTES-RVN b/RELEASE-NOTES-RVN
@@ -1,3 +1,6 @@
+# Release 3.3.8-rvn3 - (May, 2020)
+ * Support KAWPOW mining algo fork
+
 # Release 3.3.8-rvn2 - (Feb, 2020)
  * 'Checkpoints' file for DGW blocks - faster initial sync
  * Fix raven URI in payment requests

diff --git a/contrib/build-linux/appimage/Dockerfile b/contrib/build-linux/appimage/Dockerfile
@@ -4,8 +4,9 @@ ENV LC_ALL=C.UTF-8 LANG=C.UTF-8
 
 RUN apt-get update -q && \
     apt-get install -qy \
-        git=1:2.7.4-0ubuntu1.7 \
+        git=1:2.7.4-0ubuntu1.9 \
         wget=1.17.1-1ubuntu1.5 \
+        cmake=3.5.1-1ubuntu3 \
         make=4.1-6 \
         autotools-dev=20150820.1 \
         autoconf=2.69-9 \
@@ -15,12 +16,13 @@ RUN apt-get update -q && \
         zlib1g-dev=1:1.2.8.dfsg-2ubuntu4.3 \
         libffi-dev=3.2.1-4 \
         libncurses5-dev=6.0+20160213-1ubuntu1 \
-        libsqlite3-dev=3.11.0-1ubuntu1.3 \
+        libsqlite3-dev=3.11.0-1ubuntu1.4 \
         libusb-1.0-0-dev=2:1.0.20-1 \
-        libudev-dev=229-4ubuntu21.27 \
+        libudev-dev=229-4ubuntu21.28 \
         gettext=0.19.7-2ubuntu3.1 \
         libzbar0=0.10+doc-10ubuntu1  \
         libdbus-1-3=1.10.6-1ubuntu3.4 \
+        g++=4:5.3.1-1ubuntu1 \
         && \
     rm -rf /var/lib/apt/lists/* && \
     apt-get autoremove -y && \

diff --git a/contrib/build-wine/Dockerfile b/contrib/build-wine/Dockerfile
@@ -13,7 +13,7 @@ RUN dpkg --add-architecture i386 && \
 
 RUN apt-get update -q && \
         apt-get install -qy \
-        git=1:2.17.1-1ubuntu0.5 \
+        git=1:2.17.1-1ubuntu0.7 \
         p7zip-full=16.02+dfsg-6 \
         make=4.1-9.1ubuntu1 \
         mingw-w64=5.0.3-1 \

diff --git a/contrib/build-wine/build-electrum-git.sh b/contrib/build-wine/build-electrum-git.sh
@@ -41,7 +41,6 @@ popd
 find -exec touch -d '2000-11-11T11:11:11+00:00' {} +
 popd
 
-
 # Install frozen dependencies
 $PYTHON -m pip install --no-warn-script-location -r "$CONTRIB"/deterministic-build/requirements.txt
 

diff --git a/contrib/deterministic-build/requirements.txt b/contrib/deterministic-build/requirements.txt
@@ -116,6 +116,21 @@ x16rv2_hash==1.0 \
     --hash=sha256:0a919bc003454be47e58a71573a398915ad030dcff5be6d296cb6d1268c36713 \
     --hash=sha256:6cddfc97b83a07fc1bd78b3ddfcba7bcb4f21c889cad90c9ae670f89d9a849ef \
     --hash=sha256:cb07581659f5d51287c7876316e364c51ba982c601e2d411663312bcf5e6493d
+kawpow==0.9.4.4 \
+    --hash=sha256:1dbea4631b407f4c68426825b021d843d40d895ae84fc8ea34aac23298f197d6 \
+    --hash=sha256:071177b54aef75e54a30e74935259ba42b765842112ea781c7c6be25e8a65752 \
+    --hash=sha256:9804d8ed76d802aece568ecb70a517dedd4620bf1de271ab671bc330f47a2052 \
+    --hash=sha256:d266b18c1080d0cb736c8942d1f4e04469296562df3308259377af4d7148bc52 \
+    --hash=sha256:05c9bc442ba5a241f70e134bd47c1516fb979dc48c1b92514f5dbff09f671c94
+cffi==1.14.0 \
+    --hash=sha256:2d384f4a127a15ba701207f7639d94106693b6cd64173d6c8988e2c25f3ac2b6 \
+    --hash=sha256:337d448e5a725bba2d8293c48d9353fc68d0e9e4088d62a9571def317797522b \
+    --hash=sha256:cef128cb4d5e0b3493f058f10ce32365972c554572ff821e175dbc6f8ff6924f \
+    --hash=sha256:028a579fc9aed3af38f4892bdcc7390508adabc30c6af4a6e4f611b0c680e6ac \
+    --hash=sha256:95cd16d3dee553f882540c1ffe331d085c9e629499ceadfbda4d4fde635f4b7d
+pycparser==2.20 \
+    --hash=sha256:2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0 \
+    --hash=sha256:7582ad22678f0fcd81102833f60ef8d0e57288b6b5fb00323d101be910e35705
 QDarkStyle==2.6.8 \
     --hash=sha256:037a54bf0aa5153f8055b65b8b36ac0d0f7648f2fd906c011a4da22eb0f582a2 \
     --hash=sha256:fd1abae37d3a0a004089178da7c0b26ec5eb29f965b3e573853b8f280b614dea

diff --git a/contrib/requirements/requirements.txt b/contrib/requirements/requirements.txt
@@ -10,4 +10,5 @@ aiohttp>=3.3.0
 aiohttp_socks
 x16r_hash
 x16rv2_hash
+kawpow
 certifi