Add license header entries for "The Zcash developers" as changes are rebased #2
Comments
|
Thanks for dropping by - any omission of headers currently is unintentional (they are already there in files that were unique to zcash for example https://github.com/BTCPrivate/BTCP-Rebase/blob/master/src/asyncrpcoperation.cpp). We'll make best efforts to add as we go along as per your suggestion and then do a final go through towards the end of the process to patch anything we've missed. BTW - if you think you might find any of the work we're doing here useful - we're eager to help or upstream changes - just let us know. P.S. only reason commit history wasn't preserved is because it made a bit more sense to go module by module rather than commit by commit - and we're trying to restructure a bit to more cleanly separate the zk related stuff in the consensus layer to the extent it can be. If there's an easy way to get the commit history in - even if just the logs - lmk? Would definitely be useful to have. |
ch4ot1c
pushed a commit
to ch4ot1c/BTCP-Rebase
that referenced
this issue
Oct 2, 2018
6f53edb Acquire cs_main before ATMP call in block_assemble bench (James O'Beirne) Pull request description: Calling `bench_bitcoin` currently fails due to calling ATMP without acquiring cs_main first in the recently added block_assemble bench (bitcoin/bitcoin#13219). ``` $ cat <(uname -a) <(gcc --version) Linux james 4.4.0-119-generic #143+jamesob SMP Mon Apr 16 21:47:24 EDT 2018 x86_64 x86_64 x86_64 GNU/Linux gcc (Ubuntu 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609 $ ./src/bench/bench_bitcoin WARNING: This is a debug build - may result in slower benchmarks. # Benchmark, evals, iterations, total, min, max, median Assertion failed: lock cs_main not held in validation.cpp:566; locks held: [1] 19323 abort (core dumped) ./src/bench/bench_bitcoin ``` ``` (gdb) bt #0 0x00007fbdc9cf5428 in __GI_raise (sig=sig@entry=6) at ../sysdeps/unix/sysv/linux/raise.c:54 BTCPrivate#1 0x00007fbdc9cf702a in __GI_abort () at abort.c:89 BTCPrivate#2 0x0000555a19580dc5 in AssertLockHeldInternal (pszName=pszName@entry=0x555a19834549 "cs_main", pszFile=pszFile@entry=0x555a1988a001 "validation.cpp", nLine=nLine@entry=566, cs=cs@entry=0x555a19ba55c0 <cs_main>) at sync.cpp:157 BTCPrivate#3 0x0000555a194b395f in AcceptToMemoryPoolWorker (chainparams=..., pool=..., state=..., ptx=std::shared_ptr (count 1, weak 0) 0x555a1bb819b0, pfMissingInputs=pfMissingInputs@entry=0x0, nAcceptTime=1532964079, plTxnReplaced=0x0, bypass_limits=false, nAbsurdFee=@0x7ffcbc1719d8: 0, coins_to_uncache=std::vector of length 0, capacity 0, test_accept=false) at validation.cpp:566 BTCPrivate#4 0x0000555a194ba661 in AcceptToMemoryPoolWithTime (chainparams=..., pool=..., state=..., tx=std::shared_ptr (count 1, weak 0) 0x555a1bb819b0, pfMissingInputs=pfMissingInputs@entry=0x0, nAcceptTime=<optimized out>, plTxnReplaced=0x0, bypass_limits=false, nAbsurdFee=0, test_accept=false) at validation.cpp:998 BTCPrivate#5 0x0000555a194ba7ce in AcceptToMemoryPool (pool=..., state=..., tx=std::shared_ptr (count 1, weak 0) 0x555a1bb819b0, pfMissingInputs=pfMissingInputs@entry=0x0, plTxnReplaced=plTxnReplaced@entry=0x0, bypass_limits=bypass_limits@entry=false, nAbsurdFee=0, test_accept=false) at validation.cpp:1014 BTCPrivate#6 0x0000555a19363fbe in AssembleBlock (state=...) at bench/block_assemble.cpp:102 BTCPrivate#7 0x0000555a193654d3 in std::_Function_handler<void (benchmark::State&), void (*)(benchmark::State&)>::_M_invoke(std::_Any_data const&, benchmark::State&) (__functor=..., __args#0=...) at /usr/include/c++/5/functional:1871 BTCPrivate#8 0x0000555a193501d7 in std::function<void (benchmark::State&)>::operator()(benchmark::State&) const (this=this@entry=0x555a1ba2cda0, __args#0=...) at /usr/include/c++/5/functional:2267 BTCPrivate#9 0x0000555a1934ec4c in benchmark::BenchRunner::RunAll (printer=..., num_evals=5, scaling=<optimized out>, filter=..., is_list_only=false) at bench/bench.cpp:121 BTCPrivate#10 0x0000555a1934ade9 in main (argc=<optimized out>, argv=<optimized out>) at bench/bench_bitcoin.cpp:92 ``` Tree-SHA512: fdd7b28ff123ccea7a4f334d53f735d0c0f94aa9cc52520c2dd34dca45d78c691af64efcd32366fc472fedffbd79591d2be2bb3bfc4a5186e8712b6b452d64e3
ch4ot1c
pushed a commit
to ch4ot1c/BTCP-Rebase
that referenced
this issue
Oct 2, 2018
…eprecated zeromq api functions f1bd03e [depends, zmq, doc] upgrade zeromq to 4.2.5 and avoid deprecated zeromq api functions (mruddy) Pull request description: Upgrade the ZeroMQ dependency from version 4.2.3 to the latest stable version 4.2.5. This PR Follows the lead of bitcoin/bitcoin#11986. I upgraded both patch files to correspond to the version `4.2.5` libzmq files. I assume doing so is still necessary and correct. Without updating the patch line numbers, things appear to work, but you get extra log messages while building `depends` because things don't exactly match, e.g.: ``` /bitcoin/depends> make zeromq Extracting zeromq... /bitcoin/depends/sources/zeromq-4.2.5.tar.gz: OK Preprocessing zeromq... patching file src/windows.hpp Hunk BTCPrivate#1 succeeded at 58 (offset 3 lines). patching file src/thread.cpp Hunk BTCPrivate#1 succeeded at 307 with fuzz 2 (offset 87 lines). Hunk BTCPrivate#2 succeeded at 323 with fuzz 2 (offset 90 lines). ``` Updating the patches seemed cleaner, so I did it. Note that libzmq had some whitespace changes, so that's why the updated patches do too. More info: https://github.com/zeromq/libzmq/releases/tag/v4.2.5 tags: libzmq, zmq, 0mq Tree-SHA512: 78659dd276b5311e40634b1bbebb802ddd6b69662ba3c84995ef1e3795c49a78b1635112c7fd72a405ea36e2cc3bdeb84e6d00d4e491a349bba1dafff50e2fa5
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
One task that's been pending on the Zcash to-do list is to go through and update the license header entries of the various Bitcoin Core files we added code to (zcash/zcash#2887). Given that you are rebasing the Zcash changes (and in particular, are not preserving the original commits), and it would likely be a lot more work to pull in our eventual license header updates, it would be a good idea to add the following header line as you go (since all the code you pull in will be non-Bitcoin Core code, it should be obvious where to apply it):
At a minimum, this notification must be preserved in
COPYING,contrib/debian/copyright, andsrc/clientversion.h, as well as any Zcash-specific files it's already in, in order to satisfy the MIT license.Want to back this issue? Post a bounty on it! We accept bounties via Bountysource.
The text was updated successfully, but these errors were encountered: