Skip to content

Commit

Permalink
Merge pull request #16 from cakedefi/epic-anchor
Browse files Browse the repository at this point in the history
Epic branch for BTC anchoring
  • Loading branch information
uzyn authored Mar 24, 2020
2 parents 5af034f + 776770c commit 12b18c6
Show file tree
Hide file tree
Showing 854 changed files with 36,689 additions and 9,315 deletions.
2 changes: 1 addition & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ before_build:
- ps: Start-Process clcache-server
- ps: fsutil behavior set disablelastaccess 0 # Enable Access time feature on Windows (for clcache)
build_script:
- cmd: msbuild /p:TrackFileAccess=false /p:CLToolExe=clcache.exe build_msvc\bitcoin.sln /m /v:n /nologo
- cmd: msbuild /p:TrackFileAccess=false /p:CLToolExe=clcache.exe build_msvc\defi.sln /m /v:n /nologo
after_build:
- ps: fsutil behavior set disablelastaccess 1 # Disable Access time feature on Windows (better performance)
- ps: clcache -z
Expand Down
40 changes: 20 additions & 20 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

*.exe
*.pdb
src/bitcoin
src/bitcoind
src/bitcoin-cli
src/bitcoin-tx
src/bitcoin-wallet
src/test/test_bitcoin
src/test/test_bitcoin_fuzzy
src/qt/test/test_bitcoin-qt
src/defi
src/defid
src/defi-cli
src/defi-tx
src/defi-wallet
src/test/test_defi
src/test/test_defi_fuzzy
src/qt/test/test_defi-qt

# autoreconf
Makefile.in
Expand All @@ -32,8 +32,8 @@ config.log
config.status
configure
libtool
src/config/bitcoin-config.h
src/config/bitcoin-config.h.in
src/config/defi-config.h
src/config/defi-config.h.in
src/config/stamp-h1
src/obj
share/setup.nsi
Expand All @@ -47,11 +47,11 @@ src/qt/forms/ui_*.h

src/qt/test/moc*.cpp

src/qt/bitcoin-qt.config
src/qt/bitcoin-qt.creator
src/qt/bitcoin-qt.creator.user
src/qt/bitcoin-qt.files
src/qt/bitcoin-qt.includes
src/qt/defi-qt.config
src/qt/defi-qt.creator
src/qt/defi-qt.creator.user
src/qt/defi-qt.files
src/qt/defi-qt.includes

.deps
.dirstamp
Expand Down Expand Up @@ -88,16 +88,16 @@ src/qt/bitcoin-qt.includes
*.qm
Makefile
!depends/Makefile
bitcoin-qt
Bitcoin-Qt.app
defi-qt
Defi-Qt.app
background.tiff*

# Qt Creator
Makefile.am.user

# Unit-tests
Makefile.test
bitcoin-qt_test
defi-qt_test

# Resources cpp
qrc_*.cpp
Expand All @@ -110,7 +110,7 @@ build
*.gcno
*.gcda
/*.info
test_bitcoin.coverage/
test_defi.coverage/
total.coverage/
coverage_percent.txt

Expand All @@ -125,7 +125,7 @@ test/cache/*

/doc/doxygen/

libbitcoinconsensus.pc
libdeficonsensus.pc
contrib/devtools/split-debug.sh

# Output from running db4 installation
Expand Down
6 changes: 3 additions & 3 deletions .tx/config
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[main]
host = https://www.transifex.com

[bitcoin.qt-translation-018x]
file_filter = src/qt/locale/bitcoin_<lang>.ts
source_file = src/qt/locale/bitcoin_en.ts
[defi.qt-translation-018x]
file_filter = src/qt/locale/defi_<lang>.ts
source_file = src/qt/locale/defi_en.ts
source_lang = en
22 changes: 11 additions & 11 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Contributing to Bitcoin Core
Contributing to Defi Core
============================

The Bitcoin Core project operates an open contributor model where anyone is
The Defi Core project operates an open contributor model where anyone is
welcome to contribute towards development in the form of peer review, testing
and patches. This document explains the practical process and guidelines for
contributing.
Expand All @@ -21,7 +21,7 @@ list.
Communication Channels
----------------------

Most communication about Bitcoin Core development happens on IRC, in the
Most communication about Defi Core development happens on IRC, in the
#bitcoin-core-dev channel on Freenode. The easiest way to participate on IRC is
with the web client, [webchat.freenode.net](https://webchat.freenode.net/). Chat
history logs can be found
Expand Down Expand Up @@ -81,14 +81,14 @@ the pull request affects. Valid areas as:

- `consensus` for changes to consensus critical code
- `doc` for changes to the documentation
- `qt` or `gui` for changes to bitcoin-qt
- `qt` or `gui` for changes to defi-qt
- `log` for changes to log messages
- `mining` for changes to the mining code
- `net` or `p2p` for changes to the peer-to-peer network code
- `refactor` for structural changes that do not change behavior
- `rpc`, `rest` or `zmq` for changes to the RPC, REST or ZMQ APIs
- `script` for changes to the scripts and tools
- `test` for changes to the bitcoin unit tests or QA tests
- `test` for changes to the defi unit tests or QA tests
- `util` or `lib` for changes to the utils or libraries
- `wallet` for changes to the wallet code
- `build` for changes to the GNU Autotools, reproducible builds or CI code
Expand Down Expand Up @@ -194,11 +194,11 @@ workload on reviewing.
"Decision Making" Process
-------------------------

The following applies to code changes to the Bitcoin Core project (and related
projects such as libsecp256k1), and is not to be confused with overall Bitcoin
The following applies to code changes to the Defi Core project (and related
projects such as libsecp256k1), and is not to be confused with overall Defi
Network Protocol consensus changes.

Whether a pull request is merged into Bitcoin Core rests with the project merge
Whether a pull request is merged into Defi Core rests with the project merge
maintainers and ultimately the project lead.

Maintainers will take into consideration if a patch is in line with the general
Expand All @@ -217,7 +217,7 @@ In general, all pull requests must:
demonstrating the bug and also proving the fix. This helps prevent regression.
- Change relevant comments and documentation when behaviour of code changes.

Patches that change Bitcoin consensus rules are considerably more involved than
Patches that change Defi consensus rules are considerably more involved than
normal because they affect the entire ecosystem and so must be preceded by
extensive mailing list discussions and have a numbered BIP. While each case will
be different, one should be prepared to expend more time and effort than for
Expand Down Expand Up @@ -272,7 +272,7 @@ higher in terms of discussion and peer review requirements, keeping in mind that
mistakes could be very costly to the wider community. This includes refactoring
of consensus critical code.

Where a patch set proposes to change the Bitcoin consensus, it must have been
Where a patch set proposes to change the Defi consensus, it must have been
discussed extensively on the mailing list and IRC, be accompanied by a widely
discussed BIP and have a generally widely perceived technical consensus of being
a worthwhile change based on the judgement of the maintainers.
Expand Down Expand Up @@ -312,7 +312,7 @@ about:
Release Policy
--------------

The project leader is the release manager for each Bitcoin Core release.
The project leader is the release manager for each Defi Core release.

Copyright
---------
Expand Down
4 changes: 2 additions & 2 deletions INSTALL.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Building Bitcoin
Building Defi
================

See doc/build-*.md for instructions on building the various
elements of the Bitcoin Core reference implementation of Bitcoin.
elements of the Defi Core reference implementation of Defi.
Loading

0 comments on commit 12b18c6

Please sign in to comment.