Skip to content

Commit 5b71917

Browse files
ca333ca333
authored
Merge pull request #1 from jl777/master
update komodo master
2 parents b24a01b + 703fee7 commit 5b71917

File tree

464 files changed

+72284
-5376
lines changed

Some content is hidden

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

464 files changed

+72284
-5376
lines changed

Diff for: ‎.github/ISSUE_TEMPLATE.md

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<!--- Remove text and sections that do not apply -->
2+
3+
This issue tracker is only for technical issues related to zcashd.
4+
5+
General Zcash questions and/or support requests and are best directed to the [Zcash Forums](https://forum.z.cash) or [Community Rocket.Chat](https://chat.zcashcommunity.com).
6+
7+
For reporting security vulnerabilities or for sensitive discussions with our security team, please contact [[email protected]](mailto:[email protected]). You can use the [GPG key](https://z.cash/gpg-pubkeys/security.asc) (fingerprint: `AF85 0445 546C 18B7 86F9 2C62 88FB 8B86 D8B5 A68C`) to send an encrypted message. The key and fingerprint are duplicated on our [Public Keys page](https://z.cash/support/pubkeys.html).
8+
9+
### Describe the issue
10+
Please provide a general summary of the issue you're experiencing
11+
12+
### Can you reliably reproduce the issue?
13+
#### If so, please list the steps to reproduce below:
14+
1.
15+
2.
16+
3.
17+
18+
### Expected behaviour
19+
Tell us what should happen
20+
21+
### Actual behaviour + errors
22+
Tell us what happens instead including any noticable error output (any messages displayed on-screen when e.g. a crash occurred)
23+
24+
### The version of Zcash you were using:
25+
Run `zcashd --version` to find out
26+
27+
### Machine specs:
28+
- OS name + version:
29+
- CPU:
30+
- RAM:
31+
- Disk size:
32+
- Disk Type (HD/SDD):
33+
- Linux kernel version (uname -a):
34+
- Compiler version (gcc -version):
35+
36+
### Any extra information that might be useful in the debugging process.
37+
This includes the relevant contents of `~/.zcash/debug.log`. You can paste raw text, attach the file directly in the issue or link to the text via a pastebin type site.
38+
Please also include any non-standard things you did during compilation (extra flags, dependency version changes etc.) if applicable.
39+
40+
### Do you have a back up of `~/.zcash` directory and/or take a VM snapshot?
41+
- Backing up / making a copy of the `~/.zcash` directory might help make the problem reproducible. Please redact appropriately.
42+
- Taking a VM snapshot is really helpful for interactively testing fixes

Diff for: ‎.gitignore

+9-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
*.tar.gz
2-
2+
*.deb
33
*.exe
44
src/bitcoin
55
src/zcashd
66
src/zcash-cli
77
src/zcash-gtest
8-
src/bitcoin-tx
8+
src/zcash-tx
99
src/test/test_bitcoin
1010
src/qt/test/test_bitcoin-qt
1111

1212
# Zcash utilities
1313
src/zcash/GenerateParams
14+
src/zcash/CreateJoinSplit
1415

1516
*zcashTest.pk
1617
*zcashTest.vk
@@ -61,11 +62,11 @@ src/qt/test/moc*.cpp
6162
*.pyc
6263
*.o
6364
*.o-*
64-
*.patch
6565
.zcash
6666
*.a
6767
*.pb.cc
6868
*.pb.h
69+
.vscode
6970

7071
*.log
7172
*.trs
@@ -121,4 +122,8 @@ qa/pull-tester/test.*/*
121122

122123
/doc/doxygen/
123124

124-
libbitcoinconsensus.pc
125+
libzcashconsensus.pc
126+
127+
src/fiat/-usd
128+
contrib/debian/files
129+
contrib/debian/substvars

Diff for: ‎COPYING

+21-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2016 The Zcash Core developers
1+
Copyright (c) 2016 The Zcash developers
22
Copyright (c) 2009-2015 The Bitcoin Core developers
33

44
Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -18,3 +18,23 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1818
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
1919
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2020
THE SOFTWARE.
21+
22+
23+
The MIT software license (http://www.opensource.org/licenses/mit-license.php)
24+
above applies to the code directly included in this source distribution, with
25+
the exception of certain files under the 'src/qt/' and 'scripts/img/' directories
26+
which are distributed under the LGPL or GPL licenses. Dependencies downloaded
27+
as part of the build process may be covered by other open source licenses.
28+
For further details see 'contrib/DEBIAN/copyright'.
29+
30+
31+
This product includes software developed by the OpenSSL Project for use in the
32+
[OpenSSL Toolkit](https://www.openssl.org/). This product includes cryptographic
33+
software written by Eric Young ([[email protected]](mailto:[email protected])),
34+
and UPnP software written by Thomas Bernard.
35+
36+
37+
Although almost all of the Zcash code is licensed under "permissive" open source
38+
licenses, users and distributors should note that when built using the default
39+
build options, Zcash depends on Oracle Berkeley DB 6.2.x, which is licensed
40+
under the GNU Affero General Public License.

Diff for: ‎Dockerfile

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
FROM kolobus/ubuntu:komodo
2+
MAINTAINER Mihail Fedorov <[email protected]>
3+
4+
ADD ./ /komodo
5+
ENV HOME /komodo
6+
WORKDIR /komodo
7+
8+
# configure || true or it WILL halt
9+
RUN cd /komodo && \
10+
./autogen.sh && \
11+
./configure --with-incompatible-bdb --with-gui || true && \
12+
./zcutil/build.sh -j$(nproc)
13+
14+
# Unknown stuff goes here
15+
16+
RUN ln -sf /komodo/src/komodod /usr/bin/komodod && \
17+
ln -sf /komodo/zcutil/docker-entrypoint.sh /usr/bin/entrypoint && \
18+
ln -sf /komodo/zcutil/docker-komodo-cli.sh /usr/bin/komodo-cli
19+
20+
CMD ["entrypoint"]

Diff for: ‎INSTALL

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Building Zcash
22

3-
See doc/build-*.md for instructions on building zcashd,
3+
See the Zcash github wiki (https://github.com/zcash/zcash/wiki) for instructions on building zcashd,
44
the intended-for-services, no-graphical-interface, reference
55
implementation of Zcash.

Diff for: ‎Makefile.am

+78-26
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ GZIP_ENV="-9n"
66

77
if BUILD_BITCOIN_LIBS
88
pkgconfigdir = $(libdir)/pkgconfig
9-
pkgconfig_DATA = libbitcoinconsensus.pc
9+
pkgconfig_DATA = libzcashconsensus.pc
1010
endif
1111

1212
BITCOIND_BIN=$(top_builddir)/src/zcashd$(EXEEXT)
@@ -31,20 +31,28 @@ BIN_CHECKS=$(top_srcdir)/contrib/devtools/symbol-check.py \
3131

3232
WINDOWS_PACKAGING = $(top_srcdir)/share/pixmaps/bitcoin.ico \
3333
$(top_srcdir)/share/pixmaps/nsis-header.bmp \
34-
$(top_srcdir)/share/pixmaps/nsis-wizard.bmp \
35-
$(top_srcdir)/doc/README_windows.txt
34+
$(top_srcdir)/share/pixmaps/nsis-wizard.bmp
3635

3736
OSX_PACKAGING = $(OSX_DEPLOY_SCRIPT) $(OSX_FANCY_PLIST) $(OSX_INSTALLER_ICONS) $(OSX_BASE_LPROJ_DIR) \
3837
$(top_srcdir)/contrib/macdeploy/$(OSX_BACKGROUND_IMAGE) \
3938
$(top_srcdir)/contrib/macdeploy/DS_Store \
4039
$(top_srcdir)/contrib/macdeploy/detached-sig-apply.sh \
4140
$(top_srcdir)/contrib/macdeploy/detached-sig-create.sh
4241

42+
43+
if BUILD_DARWIN
44+
COVERAGE_INFO = baseline_filtered_combined.info baseline.info block_test.info \
45+
leveldb_baseline.info test_bitcoin_filtered.info total_coverage.info \
46+
baseline_filtered.info block_test_filtered.info \
47+
leveldb_baseline_filtered.info test_bitcoin_coverage.info test_bitcoin.info
48+
# zcash-gtest.info zcash-gtest_filtered.info zcash-gtest_coverage.info
49+
else
4350
COVERAGE_INFO = baseline_filtered_combined.info baseline.info block_test.info \
4451
leveldb_baseline.info test_bitcoin_filtered.info total_coverage.info \
4552
baseline_filtered.info block_test_filtered.info \
4653
leveldb_baseline_filtered.info test_bitcoin_coverage.info test_bitcoin.info \
4754
zcash-gtest.info zcash-gtest_filtered.info zcash-gtest_coverage.info
55+
endif
4856

4957
dist-hook:
5058
-$(MAKE) -C $(top_distdir)/src/leveldb clean
@@ -151,6 +159,15 @@ if USE_LCOV
151159
baseline.info:
152160
$(LCOV) -c -i -d $(abs_builddir)/src -o $@
153161

162+
if BUILD_DARWIN
163+
baseline_filtered.info: baseline.info
164+
$(LCOV) -r $< "/usr/include/*" \
165+
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \
166+
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \
167+
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gmock/*" \
168+
"$(abs_builddir)/src/test/*" \
169+
-o $@
170+
else
154171
baseline_filtered.info: baseline.info
155172
$(LCOV) -r $< "/usr/include/*" \
156173
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \
@@ -159,11 +176,23 @@ baseline_filtered.info: baseline.info
159176
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gtest/*" \
160177
"$(abs_builddir)/src/gtest/*" \
161178
"$(abs_builddir)/src/test/*" \
179+
"$(abs_builddir)/src/wallet/gtest/*" \
180+
"$(abs_builddir)/src/wallet/test/*" \
162181
-o $@
182+
endif
163183

164184
leveldb_baseline.info: baseline_filtered.info
165185
$(LCOV) -c -i -d $(abs_builddir)/src/leveldb -b $(abs_builddir)/src/leveldb -o $@
166186

187+
if BUILD_DARWIN
188+
leveldb_baseline_filtered.info: leveldb_baseline.info
189+
$(LCOV) -r $< "/usr/include/*" \
190+
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \
191+
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \
192+
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gmock/*" \
193+
"$(abs_builddir)/src/test/*" \
194+
-o $@
195+
else
167196
leveldb_baseline_filtered.info: leveldb_baseline.info
168197
$(LCOV) -r $< "/usr/include/*" \
169198
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \
@@ -172,7 +201,10 @@ leveldb_baseline_filtered.info: leveldb_baseline.info
172201
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gtest/*" \
173202
"$(abs_builddir)/src/gtest/*" \
174203
"$(abs_builddir)/src/test/*" \
204+
"$(abs_builddir)/src/wallet/gtest/*" \
205+
"$(abs_builddir)/src/wallet/test/*" \
175206
-o $@
207+
endif
176208

177209
baseline_filtered_combined.info: leveldb_baseline_filtered.info baseline_filtered.info
178210
$(LCOV) -a leveldb_baseline_filtered.info -a baseline_filtered.info -o $@
@@ -183,31 +215,29 @@ test_bitcoin.info: baseline_filtered_combined.info
183215
$(LCOV) -z -d $(abs_builddir)/src
184216
$(LCOV) -z -d $(abs_builddir)/src/leveldb
185217

218+
if BUILD_DARWIN
186219
test_bitcoin_filtered.info: test_bitcoin.info
187220
$(LCOV) -r $< "/usr/include/*" \
188221
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \
189222
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \
190223
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gmock/*" \
191-
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gtest/*" \
192-
"$(abs_builddir)/src/gtest/*" \
193224
"$(abs_builddir)/src/test/*" \
225+
"$(abs_builddir)/src/wallet/gtest/*" \
226+
"$(abs_builddir)/src/wallet/test/*" \
194227
-o $@
195-
196-
zcash-gtest.info: baseline_filtered_combined.info
197-
$(MAKE) -C src/ zcash-gtest_check
198-
$(LCOV) -c -d $(abs_builddir)/src -t zcash-gtest -o $@
199-
$(LCOV) -z -d $(abs_builddir)/src
200-
$(LCOV) -z -d $(abs_builddir)/src/leveldb
201-
202-
zcash-gtest_filtered.info: zcash-gtest.info
228+
else
229+
test_bitcoin_filtered.info: test_bitcoin.info
203230
$(LCOV) -r $< "/usr/include/*" \
204231
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \
205232
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \
206233
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gmock/*" \
207234
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gtest/*" \
208235
"$(abs_builddir)/src/gtest/*" \
209236
"$(abs_builddir)/src/test/*" \
237+
"$(abs_builddir)/src/wallet/gtest/*" \
238+
"$(abs_builddir)/src/wallet/test/*" \
210239
-o $@
240+
endif
211241

212242
block_test.info: test_bitcoin_filtered.info
213243
$(MKDIR_P) qa/tmp
@@ -216,6 +246,15 @@ block_test.info: test_bitcoin_filtered.info
216246
$(LCOV) -z -d $(abs_builddir)/src
217247
$(LCOV) -z -d $(abs_builddir)/src/leveldb
218248

249+
if BUILD_DARWIN
250+
block_test_filtered.info: block_test.info
251+
$(LCOV) -r $< "/usr/include/*" \
252+
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \
253+
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \
254+
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gmock/*" \
255+
"$(abs_builddir)/src/test/*" \
256+
-o $@
257+
else
219258
block_test_filtered.info: block_test.info
220259
$(LCOV) -r $< "/usr/include/*" \
221260
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \
@@ -224,32 +263,41 @@ block_test_filtered.info: block_test.info
224263
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gtest/*" \
225264
"$(abs_builddir)/src/gtest/*" \
226265
"$(abs_builddir)/src/test/*" \
266+
"$(abs_builddir)/src/wallet/gtest/*" \
267+
"$(abs_builddir)/src/wallet/test/*" \
227268
-o $@
269+
endif
228270

229271
test_bitcoin_coverage.info: baseline_filtered_combined.info test_bitcoin_filtered.info
230-
$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoin_filtered.info -o $@
272+
$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoin_filtered.info -o $@
231273

274+
if ! BUILD_DARWIN
232275
zcash-gtest_coverage.info: baseline_filtered_combined.info zcash-gtest_filtered.info
233276
$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a zcash-gtest_filtered.info -o $@
277+
endif
234278

279+
if BUILD_DARWIN
280+
total_coverage.info: baseline_filtered_combined.info test_bitcoin_filtered.info block_test_filtered.info
281+
$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoin_filtered.info -a block_test_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt
282+
else
235283
total_coverage.info: baseline_filtered_combined.info test_bitcoin_filtered.info zcash-gtest_filtered.info block_test_filtered.info
236284
$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoin_filtered.info -a zcash-gtest_filtered.info -a block_test_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt
285+
endif
237286

238-
test_bitcoin.coverage/.dirstamp: test_bitcoin_coverage.info
239-
$(GENHTML) -s $< -o $(@D)
240-
@touch $@
241-
242-
zcash-gtest.coverage/.dirstamp: zcash-gtest_coverage.info
243-
$(GENHTML) -s $< -o $(@D)
244-
@touch $@
245287

246-
cov-zcash: zcash-gtest.coverage/.dirstamp
288+
test_bitcoin.coverage/.dirstamp: test_bitcoin_coverage.info
289+
$(GENHTML) -s $< -o $(@D)
290+
@touch $@
247291

248292
total.coverage/.dirstamp: total_coverage.info
249-
$(GENHTML) -s $< -o $(@D)
250-
@touch $@
293+
$(GENHTML) -s $< -o $(@D)
294+
@touch $@
251295

296+
if BUILD_DARWIN
297+
cov: test_bitcoin.coverage/.dirstamp total.coverage/.dirstamp
298+
else
252299
cov: test_bitcoin.coverage/.dirstamp cov-zcash total.coverage/.dirstamp
300+
endif
253301

254302
endif
255303

@@ -259,9 +307,13 @@ check-local:
259307
@qa/pull-tester/run-bitcoind-for-test.sh $(JAVA) -jar $(JAVA_COMPARISON_TOOL) qa/tmp/compTool $(COMPARISON_TOOL_REORG_TESTS) 2>&1
260308
endif
261309

262-
dist_noinst_SCRIPTS = autogen.sh
310+
dist_bin_SCRIPTS = zcutil/fetch-params.sh
311+
dist_noinst_SCRIPTS = autogen.sh zcutil/build-debian-package.sh zcutil/build.sh
312+
313+
EXTRA_DIST = $(top_srcdir)/share/genbuild.sh qa/pull-tester/rpc-tests.sh qa/pull-tester/run-bitcoin-cli qa/rpc-tests qa/zcash $(DIST_DOCS) $(BIN_CHECKS)
263314

264-
EXTRA_DIST = $(top_srcdir)/share/genbuild.sh qa/pull-tester/rpc-tests.sh qa/pull-tester/run-bitcoin-cli qa/rpc-tests qa/zcash $(DIST_DOCS) $(WINDOWS_PACKAGING) $(OSX_PACKAGING) $(BIN_CHECKS)
315+
install-exec-hook:
316+
mv $(DESTDIR)$(bindir)/fetch-params.sh $(DESTDIR)$(bindir)/zcash-fetch-params
265317

266318
CLEANFILES = $(OSX_DMG) $(BITCOIN_WIN_INSTALLER)
267319

0 commit comments

Comments
 (0)