Skip to content

Commit b3c9e75

Browse files
magic53magic53
committed
Merge branch '3.9.32-dev' into 3.10.1
2 parents 5a2a4df + 0b49c73 commit b3c9e75

File tree

93 files changed

+3659
-2996
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+3659
-2996
lines changed

‎.gitlab-ci.yml‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
before_script:
2+
- docker info
3+
4+
build_linux:
5+
stage: build
6+
script:
7+
- mkdir -p $CI_PROJECT_DIR/dist/linux
8+
- docker build -f Dockerfile-trusty --build-arg cores=16 -t blocknetdx/devbuilds:$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA-linux .
9+
- if [ ! -z "$(docker ps -qa -f name=$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA-linux)" ]; then docker rm $CI_COMMIT_REF_NAME-$CI_COMMIT_SHA-linux; fi
10+
- docker create --name=$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA-linux blocknetdx/devbuilds:$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA-linux
11+
- docker cp $CI_COMMIT_REF_NAME-$CI_COMMIT_SHA-linux:/opt/blocknetdx/dist/bin $CI_PROJECT_DIR/dist/linux
12+
- if [ ! -z "$(docker ps -qa -f name=$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA-linux)" ]; then docker rm $CI_COMMIT_REF_NAME-$CI_COMMIT_SHA-linux; fi
13+
artifacts:
14+
name: "BLOCKDX-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA-linux"
15+
paths:
16+
- dist/linux/bin
17+
18+
test_linux:
19+
stage: test
20+
script:
21+
- "[ -f \"$CI_PROJECT_DIR/dist/linux/bin/blocknetdx-cli\" ];"
22+
- "[ -f \"$CI_PROJECT_DIR/dist/linux/bin/blocknetdxd\" ];"
23+
- "[ -f \"$CI_PROJECT_DIR/dist/linux/bin/blocknetdx-qt\" ];"
24+
- "[ -f \"$CI_PROJECT_DIR/dist/linux/bin/blocknetdx-tx\" ];"
25+
- "[ -f \"$CI_PROJECT_DIR/dist/linux/bin/test_blocknetdx\" ];"
26+
- "[ -f \"$CI_PROJECT_DIR/dist/linux/bin/test_blocknetdx-qt\" ];"
27+
28+
build_win:
29+
stage: build
30+
script:
31+
- mkdir -p $CI_PROJECT_DIR/dist/win
32+
- docker build -f Dockerfile-win --build-arg cores=16 -t blocknetdx/devbuilds:$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA-win .
33+
- if [ ! -z "$(docker ps -qa -f name=$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA-win)" ]; then docker rm $CI_COMMIT_REF_NAME-$CI_COMMIT_SHA-win; fi
34+
- docker create --name=$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA-win blocknetdx/devbuilds:$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA-win
35+
- docker cp $CI_COMMIT_REF_NAME-$CI_COMMIT_SHA-win:/opt/blocknetdx/dist/bin $CI_PROJECT_DIR/dist/win
36+
- if [ ! -z "$(docker ps -qa -f name=$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA-win)" ]; then docker rm $CI_COMMIT_REF_NAME-$CI_COMMIT_SHA-win; fi
37+
artifacts:
38+
name: "BLOCKDX-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA-win"
39+
paths:
40+
- dist/win/bin
41+
42+
test_win:
43+
stage: test
44+
script:
45+
- "[ -f \"$CI_PROJECT_DIR/dist/win/bin/blocknetdx-cli.exe\" ];"
46+
- "[ -f \"$CI_PROJECT_DIR/dist/win/bin/blocknetdxd.exe\" ];"
47+
- "[ -f \"$CI_PROJECT_DIR/dist/win/bin/blocknetdx-qt.exe\" ];"
48+
- "[ -f \"$CI_PROJECT_DIR/dist/win/bin/blocknetdx-tx.exe\" ];"
49+
- "[ -f \"$CI_PROJECT_DIR/dist/win/bin/test_blocknetdx.exe\" ];"
50+
- "[ -f \"$CI_PROJECT_DIR/dist/win/bin/test_blocknetdx-qt.exe\" ];"

‎CONTRIBUTING.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
Contributing to BlocknetDX Core
1+
Contributing to Blocknet
22
============================
33

4-
The BlocknetDX Core project operates an open contributor model where anyone is
4+
The Blocknet project operates an open contributor model where anyone is
55
welcome to contribute towards development in the form of peer review, testing
66
and patches. This document explains the practical process and guidelines for
77
contributing.
@@ -157,10 +157,10 @@ where possible keep them short, un-complex and easy to verify.
157157
"Decision Making" Process
158158
-------------------------
159159

160-
The following applies to code changes to the BlocknetDX Core project, and is not to be
160+
The following applies to code changes to the Blocknet project, and is not to be
161161
confused with overall BlocknetDX Network Protocol consensus changes.
162162

163-
Whether a pull request is merged into BlocknetDX Core rests with the project merge
163+
Whether a pull request is merged into Blocknet rests with the project merge
164164
maintainers and ultimately the project lead.
165165

166166
Maintainers will take into consideration if a patch is in line with the general
@@ -254,7 +254,7 @@ about:
254254
Release Policy
255255
--------------
256256

257-
The project leader is the release manager for each BlocknetDX Core release.
257+
The project leader is the release manager for each Blocknet release.
258258

259259
Copyright
260260
---------

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Sample build via docker cli:
2-
# docker build --build-arg cores=4 -t blocknetdx/devbuilds:3.9.10 .
2+
# docker build --build-arg cores=4 -t blocknetdx/devbuilds:3.9.22 .
33
FROM ubuntu:trusty
44

55
ARG cores=32

‎Dockerfile-trusty‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
FROM ubuntu:trusty
2+
3+
ARG cores=8
4+
ENV ecores=$cores
5+
6+
RUN apt update \
7+
&& apt install -y --no-install-recommends \
8+
software-properties-common \
9+
ca-certificates \
10+
wget curl git python vim \
11+
&& apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
12+
13+
RUN add-apt-repository ppa:bitcoin/bitcoin \
14+
&& apt update \
15+
&& apt install -y --no-install-recommends \
16+
build-essential libtool autotools-dev bsdmainutils \
17+
libevent-dev autoconf automake pkg-config libssl-dev \
18+
libdb4.8-dev libdb4.8++-dev \
19+
&& apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
20+
21+
ENV PROJECTDIR=/opt/blocknetdx/BlockDX
22+
ENV BASEPREFIX=$PROJECTDIR/depends
23+
ENV DISTDIR=/opt/blocknetdx/dist
24+
ENV HOST=x86_64-pc-linux-gnu
25+
26+
# Copy source files
27+
#RUN mkdir -p /opt/blocknetdx \
28+
# && cd /opt/blocknetdx \
29+
# && git clone --depth 1 --branch v3.9.22 https://github.com/BlocknetDX/BlockDX.git
30+
COPY . /opt/blocknetdx/BlockDX/
31+
RUN cd $PROJECTDIR \
32+
&& wget -nv https://s3.amazonaws.com/blockdxbuilds/devbuilds/depends-3.9.32-dev-trusty.tar.gz \
33+
&& [ "$(printf '509741f256bac5431e5d73bb85826af45e4e5d40490735c11fce1668387b62dc depends-3.9.32-dev-trusty.tar.gz' | sha256sum -c)" = "depends-3.9.32-dev-trusty.tar.gz: OK" ] || $(echo "depends checksum failed"; exit 1) \
34+
&& rm -r $BASEPREFIX \
35+
&& tar xzvf depends-3.9.32-dev-trusty.tar.gz
36+
37+
# Build source
38+
RUN mkdir -p $DISTDIR \
39+
&& cd $PROJECTDIR \
40+
&& chmod +x ./autogen.sh; sync \
41+
&& ./autogen.sh \
42+
&& CONFIG_SITE=$BASEPREFIX/$HOST/share/config.site ./configure --with-gui=qt5 --enable-debug --prefix=/ \
43+
&& echo "Building with cores: $ecores" \
44+
&& make -j$ecores \
45+
&& make install DESTDIR=$DISTDIR \
46+
&& make clean
47+
48+
WORKDIR /opt/blocknetdx/dist
49+
50+
# Port, RPC, Test Port, Test RPC
51+
EXPOSE 41412 41414 41474 41419

‎Dockerfile-win‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
FROM ubuntu:bionic
2+
3+
ARG cores=8
4+
ENV ecores=$cores
5+
6+
RUN apt update \
7+
&& apt install -y --no-install-recommends \
8+
software-properties-common \
9+
ca-certificates \
10+
wget curl git python vim \
11+
&& apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
12+
13+
RUN add-apt-repository ppa:bitcoin/bitcoin \
14+
&& apt update \
15+
&& apt install -y --no-install-recommends \
16+
build-essential libtool autotools-dev bsdmainutils \
17+
libevent-dev autoconf automake pkg-config libssl-dev \
18+
libdb4.8-dev libdb4.8++-dev \
19+
&& apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
20+
21+
# mingw
22+
RUN apt update \
23+
&& apt install -y --no-install-recommends \
24+
g++ mingw-w64 g++-mingw-w64 nsis zip \
25+
&& apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
26+
27+
ENV PROJECTDIR=/opt/blocknetdx/BlockDX
28+
ENV BASEPREFIX=$PROJECTDIR/depends
29+
ENV DISTDIR=/opt/blocknetdx/dist
30+
ENV HOST=x86_64-w64-mingw32
31+
32+
# Copy source files
33+
#RUN mkdir -p /opt/blocknetdx \
34+
# && cd /opt/blocknetdx \
35+
# && git clone --depth 1 --branch v3.9.22 https://github.com/BlocknetDX/BlockDX.git
36+
COPY . /opt/blocknetdx/BlockDX/
37+
RUN cd $PROJECTDIR \
38+
&& wget -nv https://s3.amazonaws.com/blockdxbuilds/devbuilds/depends-3.9.32-dev-win.tar.gz \
39+
&& [ "$(printf '05c1dacb7b59cebd1448ace67562539a34b2ac98a8c42f5de4f77d5ba8f20587 depends-3.9.32-dev-win.tar.gz' | sha256sum -c)" = "depends-3.9.32-dev-win.tar.gz: OK" ] || $(echo "depends checksum failed"; exit 1) \
40+
&& rm -r $BASEPREFIX \
41+
&& tar xzvf depends-3.9.32-dev-win.tar.gz
42+
43+
# Build source
44+
RUN mkdir -p $DISTDIR \
45+
&& cd $PROJECTDIR \
46+
&& chmod +x ./autogen.sh; sync \
47+
&& ./autogen.sh \
48+
&& CONFIG_SITE=$BASEPREFIX/$HOST/share/config.site ./configure CXXFLAGS='-Wno-deprecated' --enable-reduce-exports --disable-bench --disable-ccache --disable-maintainer-mode --disable-dependency-tracking --with-gui=qt5 --prefix=/ \
49+
&& echo "Building with cores: $ecores" \
50+
&& make -j$ecores \
51+
&& make install DESTDIR=$DISTDIR \
52+
&& make clean
53+
54+
WORKDIR /opt/blocknetdx/dist
55+
56+
# Port, RPC, Test Port, Test RPC
57+
EXPOSE 41412 41414 41474 41419

‎README.md‎

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,29 @@
1-
BlocknetDX repository
1+
Welcome to the Blocknet repository. Despite the repository name, this repo is for the Blocknet protocol. The repository for Block DX can be found [here](https://github.com/BlocknetDX/blockdx-ui).
22

3-
BlocknetDX is an open source community driven project building a blockchain based P2P atomic swap exchange using BIP65 capable chains
3+
Join the community on [Discord](https://discord.gg/2e6s7H8).
44

5-
Join the community on slack
5+
#### Blocknet
6+
Started in 2014, Blocknet is a decentralized, community-governed, self-funded, open-source project that serves as a connector between different blockchains, markets, and communities.
67

7-
Contributors are welcome
8+
#### The Blocknet Protocol
9+
The Blocknet protocol enables decentralized communication and exchange between different blockchains in a permissionless and trustless manner through the use of P2P atomic swaps using BIP65 and a DHT overlay network(Service Nodes).
810

9-
BlocknetDX Specs:
10-
- 1 Minute Block Time
11-
- 5k for servicenodes
12-
- Diff. adjustment per block
13-
- Supports Fast Transactions w/ SwiftTX
14-
- Supports Decentralized voting/funding
11+
#### Block DX
12+
Block DX is a completely decentralized and trustless exchange built on the Blocknet protocol that mimics a centralized exchange experience and enables traders to conduct exchanges directly from the wallets of the coins being traded. View Repo: [https://github.com/BlocknetDX/blockdx-ui]
1513

14+
[Contributors are welcome!](https://github.com/BlocknetDX/BlockDX/blob/master/CONTRIBUTING.md)
1615

17-
## BlocknetDX
18-
-- Decentralized Atomic Swap algo summary
16+
#### Blocknet Specifications:
17+
- Block Time: 1 Minute
18+
- Algo: Quark
19+
- Difficulty: Adjusted Per Block
20+
- Block Reward: 1.0 BLOCK (30% to stakers, 70% to Service Nodes)
21+
- Service Node Requirement: 5000 BLOCK
22+
- Staking Requirement: No Minimum
23+
- Governance: Decentralized Voting/Funding With Superblocks
24+
25+
26+
#### Decentralized Atomic Swap Algo Summary
1927

2028
```Step1.
2129
Initiator creates secret X, and hashes it to create H(X). Initiator also creates public private key pair (pubkey i1,i2 / privkey i2,i2). Responder creates public private key pair (pubkey r1,r2 / privkey r1,r2).

‎blocknetdx-qt.pro‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -284,10 +284,7 @@ SOURCES += \
284284
src/bip38.cpp \
285285
src/s3downloader.cpp \
286286
src/coinvalidator.cpp \
287-
src/xbridge/xkey.cpp \
288-
src/xbridge/xpubkey.cpp \
289287
src/xbridge/xbitcoinaddress.cpp \
290-
src/xbridge/xbitcoinsecret.cpp \
291288
src/qt/xbridgeui/xbridgeaddressbookmodel.cpp \
292289
src/qt/xbridgeui/xbridgeaddressbookview.cpp \
293290
src/qt/xbridgeui/xbridgetransactiondialog.cpp \
@@ -298,10 +295,11 @@ SOURCES += \
298295
src/xbridge/util/xbridgeerror.cpp \
299296
src/xbridge/xbridgewalletconnector.cpp \
300297
src/xbridge/xbridgewalletconnectorbtc.cpp \
301-
src/xbridge/xbridgewalletconnectorbcc.cpp \
302-
src/xbridge/xbridgewalletconnectorsys.cpp \
303298
src/xbridge/xbridgewalletconnectordgb.cpp \
299+
src/xbridge/xbridgewalletconnectorbch.cpp \
300+
src/xbridge/xbridgecryptoproviderbtc.cpp
304301
src/xbridge/xbridgepacket.cpp
302+
src/xbridge/xbridgeservicespacket.cpp
305303

306304
#protobuf generated
307305
SOURCES += \
@@ -562,6 +560,7 @@ HEADERS += \
562560
src/xbridge/xbridgeapp.h \
563561
src/xbridge/xbridgeexchange.h \
564562
src/xbridge/xbridgepacket.h \
563+
src/xbridge/xbridgeservicespacket.h \
565564
src/xbridge/xbridgesession.h \
566565
src/xbridge/xbridgetransaction.h \
567566
src/xbridge/xbridgetransactiondescr.h \
@@ -589,10 +588,10 @@ HEADERS += \
589588
src/validationstate.h \
590589
src/xbridge/xbridgewalletconnector.h \
591590
src/xbridge/xbridgewalletconnectorbtc.h \
592-
src/xbridge/xbridgewalletconnectorbcc.h \
593-
src/xbridge/xbridgewalletconnectorsys.h \
594591
src/xbridge/xbridgewalletconnectordgb.h \
595-
src/xbridge/xbridgedef.h
592+
src/xbridge/xbridgewalletconnectorbch.h \
593+
src/xbridge/xbridgedef.h \
594+
src/xbridge/xbridgecryptoproviderbtc.h
596595

597596
#ENABLE_ZMQ
598597
# src/zmq/zmqabstractnotifier.h \

‎configure.ac‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ define(_CLIENT_VERSION_MINOR, 10)
55
define(_CLIENT_VERSION_REVISION, 1)
66
define(_CLIENT_VERSION_BUILD, 0)
77
define(_CLIENT_VERSION_IS_RELEASE, true)
8-
define(_COPYRIGHT_YEAR, 2017)
8+
define(_COPYRIGHT_YEAR, 2018)
99
AC_INIT([Blocknetdx Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[www.blocknet.co],[blocknetdx])
1010
AC_CONFIG_SRCDIR([src/main.cpp])
1111
AC_CONFIG_HEADERS([src/config/blocknetdx-config.h])

‎doc/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
BlocknetDX Core
1+
Blocknet
22
=====================
33

44
Setup
55
---------------------
6-
[BlocknetDX Core](https://github.com/BlocknetDX/BlockDX/releases/tag/v3.7.36) is the original BlocknetDX client and it builds the backbone of the network. However, it downloads and stores the entire history of BlocknetDX transactions; depending on the speed of your computer and network connection, the synchronization process can take anywhere from a few hours to a day or more. Thankfully you only have to do this once.
6+
[Blocknet](https://github.com/BlocknetDX/BlockDX/releases/tag/v3.9.22) is the original BlocknetDX client and it builds the backbone of the network. However, it downloads and stores the entire history of BlocknetDX transactions; depending on the speed of your computer and network connection, the synchronization process can take anywhere from a few hours to a day or more. Thankfully you only have to do this once.
77

88
Running
99
---------------------

‎doc/README_windows.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
BlocknetDX Core
1+
Blocknet
22
=====================
33

44
Intro
@@ -13,7 +13,7 @@ Setup
1313
-----
1414
Unpack the files into a directory and run blocknetdx-qt.exe.
1515

16-
BlocknetDX Core is the original BlocknetDX client and it builds the backbone of the network.
16+
Blocknet is the original BlocknetDX client and it builds the backbone of the network.
1717
However, it downloads and stores the entire history of BlocknetDX transactions;
1818
depending on the speed of your computer and network connection, the synchronization
1919
process can take anywhere from a few hours to a day or more.

0 commit comments

Comments
 (0)