Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upstream updates to chips-core from @barrystyle #4

Merged
merged 60 commits into from
Oct 8, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
fa051d3
doc: Remove unused section from release process
Jun 28, 2021
692b787
Merge bitcoin/bitcoin#22360: doc: Remove unused section from release …
fanquake Jul 7, 2021
ddfc8d5
port retarget based parameters across
barrystyle Jun 18, 2021
f40557d
port genesis parameters, komodo components, cc and cryptoconditions
barrystyle Jun 18, 2021
72ecc61
emulate inconsistent segwit deployment
barrystyle Jun 20, 2021
8899efb
reimplement getinfo with identical legacy output
barrystyle Jun 20, 2021
db2587c
rebrand codebase as chips via automake
barrystyle Jun 20, 2021
a91d947
correct some erroneous includes/linkage problems
barrystyle Jun 20, 2021
41b305f
misc:
barrystyle Jun 20, 2021
20b42f3
continue porting komodo code adhoc
barrystyle Jun 20, 2021
c5a66dd
update README.md
barrystyle Jun 20, 2021
d5f629e
port txMoMproof, calc_MoM and height_MoM function calls
barrystyle Jun 21, 2021
8920ce7
amend getinfo with the notarized parameters
barrystyle Jun 21, 2021
706ee67
changes required from 0.21->master
barrystyle Jun 22, 2021
cfa0351
dont build the parts we arent using
barrystyle Jun 22, 2021
5b0bef1
migrate getinfo to the new rpc definition style
barrystyle Jun 23, 2021
634cb62
quick bitcoin.conf style generator
barrystyle Jun 25, 2021
8924b4e
update new static seeds
barrystyle Jun 25, 2021
94eaab2
remove cryptoconditions/cc and all linkages
barrystyle Jul 3, 2021
28ef069
manually set taproot via block height
barrystyle Jul 4, 2021
dd3ad8c
setup temporary testnet
barrystyle Jul 4, 2021
be5b0fa
actually accept the testnet chain
barrystyle Jul 4, 2021
1be1f96
correct issue with qt progress bar/headers
barrystyle Jul 7, 2021
f00c57e
correct erroneous include
barrystyle Jul 7, 2021
8356c19
Fix broken balance display in getinfo
who-biz Jul 14, 2021
566a456
Add notarization data to 'getblockchaininfo'
who-biz Jul 19, 2021
36ce9a0
Always consider segwit txs when mining
who-biz Jul 19, 2021
57a1f87
Typo fix for Chips-Qt units
who-biz Jul 19, 2021
db34e4d
Merge pull request #6 from who-biz/qt-units-typo
satindergrewal Jul 20, 2021
ce47b5b
Merge pull request #5 from who-biz/blocktemplate-quickfix
satindergrewal Jul 20, 2021
05d7d20
Merge pull request #4 from who-biz/getbcinfo-ntzdata
satindergrewal Jul 20, 2021
3fad487
Merge pull request #3 from who-biz/getinfo-fix
satindergrewal Jul 20, 2021
e85ff3c
Fix broken calc_MoM RPC
who-biz Aug 4, 2021
2a7cc15
Fix broken height_MoM method
who-biz Aug 4, 2021
89accb7
Rebranding of help text, port change
who-biz Aug 4, 2021
518705c
Merge pull request #8 from who-biz/calcMoM
satindergrewal Aug 5, 2021
8808b39
Merge pull request #9 from who-biz/heightMoM
satindergrewal Aug 5, 2021
236023f
Merge pull request #10 from who-biz/help-text-branding
satindergrewal Aug 5, 2021
2c9a8d7
Fix fatal crash on 'getchaintips' call
who-biz Aug 10, 2021
e4f45a0
Set an abritrary default txfee
who-biz Aug 23, 2021
bfb3247
Merge pull request #13 from who-biz/getchaintips-fix
satindergrewal Aug 25, 2021
3797c58
Merge pull request #14 from who-biz/default-txfee
satindergrewal Aug 25, 2021
30ca883
Fix 'pushKV ambiguous' error in compilation
who-biz Aug 30, 2021
758e5d2
Merge pull request #15 from who-biz/pushKV-fix-mac
satindergrewal Aug 30, 2021
9237475
Add komodo_(dis)connect_block() function calls
who-biz Aug 30, 2021
ab875f2
Add definitions for ImportAddress, uncomment in kmd_validation015.h
who-biz Aug 30, 2021
a815f54
Merge pull request #16 from who-biz/kmd-conn-disconn-block
satindergrewal Aug 30, 2021
64579b6
Merge pull request #17 from who-biz/importaddress
satindergrewal Aug 30, 2021
52c9d8e
Set flat txfee of 10k sats
who-biz Sep 7, 2021
3f43930
Use CHIPS legacy code for creating genesis block
who-biz Sep 9, 2021
b7861a8
Merge pull request #18 from who-biz/change-flatfee
satindergrewal Sep 10, 2021
19a276c
Merge pull request #19 from who-biz/genesis-block
satindergrewal Sep 10, 2021
d2d4f19
reuse the standard bitcoin genesis creation code with chips params
barrystyle Sep 17, 2021
0e34a3d
match max op_return relay policy from legacy chips codebase
barrystyle Sep 17, 2021
d94c40b
Merge pull request #21 from barrystyle/adapt-genesis
satindergrewal Sep 19, 2021
c0279fd
Merge pull request #22 from barrystyle/opreturn-limits
satindergrewal Sep 19, 2021
aa9642e
Fix validateaddress RPC, move into 'wallet' category
who-biz Oct 7, 2021
4906845
Use KMD-style addresses on testnet, for easier testing
who-biz Oct 7, 2021
386cf73
Merge pull request #23 from who-biz/validateaddress-fix
satindergrewal Oct 8, 2021
39681c8
Merge pull request #24 from who-biz/testnet-R-addrs
satindergrewal Oct 8, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
22 changes: 11 additions & 11 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@

*.exe
*.pdb
src/bitcoin
src/bitcoind
src/bitcoin-cli
src/bitcoin-gui
src/bitcoin-node
src/bitcoin-tx
src/bitcoin-util
src/bitcoin-wallet
src/chips
src/chipsd
src/chips-cli
src/chips-gui
src/chips-node
src/chips-tx
src/chips-util
src/chips-wallet
src/test/fuzz/fuzz
src/test/test_bitcoin
src/qt/test/test_bitcoin-qt
src/test/test_chips
src/qt/test/test_chips-qt

# autoreconf
Makefile.in
Expand Down Expand Up @@ -93,7 +93,7 @@ src/qt/bitcoin-qt.includes
*.qm
Makefile
!depends/Makefile
src/qt/bitcoin-qt
src/qt/chips-qt
Bitcoin-Qt.app
background.tiff*

Expand Down
93 changes: 27 additions & 66 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,82 +1,43 @@
Bitcoin Core integration/staging tree
=====================================
Chips integration/staging tree
==============================

https://bitcoincore.org

For an immediately usable, binary version of the Bitcoin Core software, see
https://bitcoincore.org/en/download/.
What is CHIPS?
--------------

Further information about Bitcoin Core is available in the [doc folder](/doc).
CHIPS is a digital crypto currency which is used across all the gaming platforms designed and developed using the pangea protocol. CHIPS is a BTC fork with an apow(adoptive proof of work) integration with a block time adjusted to less than 10 seconds to suits to the needs of the betting in real time using CHIPS. Like BTC, CHIPS uses peer-to-peer technology to operate with no central authority: managing transactions and issuing money are carried out collectively by the network. CHIPS Core is the name of open source software which enables the use of this currency.

What is Bitcoin?
----------------
For more information, read the [original whitepaper](https://cdn.discordapp.com/attachments/455737840668770315/456036359870611457/Unsolicited_PANGEA_WP.pdf). <br/>
The first post about CHIPS by jl777 in [bitcointalk](https://bitcointalk.org/index.php?topic=2078449.0).

Bitcoin is an experimental digital currency that enables instant payments to
anyone, anywhere in the world. Bitcoin uses peer-to-peer technology to operate
with no central authority: managing transactions and issuing money are carried
out collectively by the network. Bitcoin Core is the name of open source
software which enables the use of this currency.

For more information read the original Bitcoin whitepaper.
How do I build the software?
----------------------------

License
-------
The most troublefree and reproducable method of building the repository is via the depends method:

Bitcoin Core is released under the terms of the MIT license. See [COPYING](COPYING) for more
information or see https://opensource.org/licenses/MIT.
git clone https://github.com/barrystyle/chips
cd chips/depends
make HOST=x86_64-linux-gnu -j6
cd ..
./autogen.sh
CONFIG_SITE=$PWD/depends/x86_64-linux-gnu/share/config.site ./configure
make

Development Process
-------------------
Each step must be done in order (particularly autogen.sh after depends).

The `master` branch is regularly built (see `doc/build-*.md` for instructions) and tested, but it is not guaranteed to be
completely stable. [Tags](https://github.com/bitcoin/bitcoin/tags) are created
regularly from release branches to indicate new official, stable release versions of Bitcoin Core.

The https://github.com/bitcoin-core/gui repository is used exclusively for the
development of the GUI. Its master branch is identical in all monotree
repositories. Release branches and tags do not exist, so please do not fork
that repository unless it is for development reasons.
What is Pangea Protocol?
------------------------

The contribution workflow is described in [CONTRIBUTING.md](CONTRIBUTING.md)
and useful hints for developers can be found in [doc/developer-notes.md](doc/developer-notes.md).
You can find more details and implementation of Pangea protocol in the [bet repo](https://github.com/chips-blockchain/bet.git).
A fully dencentralized privacy preserving poker game is developed using the Pangea protocol and that uses CHIPS crypto currency for
real time betting and to play the game. The backend implementation of the poker game is been developing in the `bet repo` and front end
development is happening in the [pangea-poker repo](https://github.com/chips-blockchain/pangea-poker).

Testing
-------

Testing and code review is the bottleneck for development; we get more pull
requests than we can review and test on short notice. Please be patient and help out by testing
other people's pull requests, and remember this is a security-critical project where any mistake might cost people
lots of money.
CHIPS Community - Discord
-------------------------

### Automated Testing
We have an active [discord channel](https://discord.gg/tV7ADNE) where you can get to know more about CHIPS.

Developers are strongly encouraged to write [unit tests](src/test/README.md) for new code, and to
submit new unit tests for old code. Unit tests can be compiled and run
(assuming they weren't disabled in configure) with: `make check`. Further details on running
and extending unit tests can be found in [/src/test/README.md](/src/test/README.md).

There are also [regression and integration tests](/test), written
in Python.
These tests can be run (if the [test dependencies](/test) are installed) with: `test/functional/test_runner.py`

The CI (Continuous Integration) systems make sure that every pull request is built for Windows, Linux, and macOS,
and that unit/sanity tests are run automatically.

### Manual Quality Assurance (QA) Testing

Changes should be tested by somebody other than the developer who wrote the
code. This is especially important for large or high-risk changes. It is useful
to add a test plan to the pull request description if testing the changes is
not straightforward.

Translations
------------

Changes to translations as well as new translations can be submitted to
[Bitcoin Core's Transifex page](https://www.transifex.com/bitcoin/bitcoin/).

Translations are periodically pulled from Transifex and merged into the git repository. See the
[translation process](doc/translation_process.md) for details on how this works.

**Important**: We do not accept translation changes as GitHub pull requests because the next
pull from Transifex would automatically overwrite them again.
2 changes: 1 addition & 1 deletion ci/test/06_script_a.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ DOCKER_EXEC "${BASE_ROOT_DIR}/configure" --cache-file=config.cache $BITCOIN_CONF

DOCKER_EXEC make distdir VERSION=$HOST

export P_CI_DIR="${BASE_BUILD_DIR}/bitcoin-$HOST"
export P_CI_DIR="${BASE_BUILD_DIR}/chips-$HOST"

DOCKER_EXEC ./configure --cache-file=../config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( (DOCKER_EXEC cat config.log) && false)

Expand Down
28 changes: 14 additions & 14 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ define(_CLIENT_VERSION_IS_RELEASE, false)
define(_COPYRIGHT_YEAR, 2021)
define(_COPYRIGHT_HOLDERS,[The %s developers])
define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Bitcoin Core]])
AC_INIT([Bitcoin Core],m4_join([.], _CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MINOR, _CLIENT_VERSION_BUILD)m4_if(_CLIENT_VERSION_RC, [0], [], [rc]_CLIENT_VERSION_RC),[https://github.com/bitcoin/bitcoin/issues],[bitcoin],[https://bitcoincore.org/])
AC_INIT([Chips Core],m4_join([.], _CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MINOR, _CLIENT_VERSION_BUILD)m4_if(_CLIENT_VERSION_RC, [0], [], [rc]_CLIENT_VERSION_RC),[https://github.com/chips-blockchain/chips/issues],[bitcoin],[https://chips.cash/])
AC_CONFIG_SRCDIR([src/validation.cpp])
AC_CONFIG_HEADERS([src/config/bitcoin-config.h])
AC_CONFIG_AUX_DIR([build-aux])
Expand All @@ -19,15 +19,15 @@ if test "x$PKG_CONFIG" = x; then
AC_MSG_ERROR([pkg-config not found])
fi

BITCOIN_DAEMON_NAME=bitcoind
BITCOIN_GUI_NAME=bitcoin-qt
BITCOIN_CLI_NAME=bitcoin-cli
BITCOIN_TX_NAME=bitcoin-tx
BITCOIN_UTIL_NAME=bitcoin-util
BITCOIN_WALLET_TOOL_NAME=bitcoin-wallet
BITCOIN_DAEMON_NAME=chipsd
BITCOIN_GUI_NAME=chips-qt
BITCOIN_CLI_NAME=chips-cli
BITCOIN_TX_NAME=chips-tx
BITCOIN_UTIL_NAME=chips-util
BITCOIN_WALLET_TOOL_NAME=chips-wallet
dnl Multi Process
BITCOIN_MP_NODE_NAME=bitcoin-node
BITCOIN_MP_GUI_NAME=bitcoin-gui
BITCOIN_MP_NODE_NAME=chips-node
BITCOIN_MP_GUI_NAME=chips-gui

dnl Unless the user specified ARFLAGS, force it to be cr
AC_ARG_VAR(ARFLAGS, [Flags for the archiver, defaults to <cr> if not set])
Expand Down Expand Up @@ -192,7 +192,7 @@ AC_ARG_ENABLE([fuzz-binary],
AS_HELP_STRING([--enable-fuzz-binary],
[enable building of fuzz binary (default yes).]),
[enable_fuzz_binary=$enableval],
[enable_fuzz_binary=yes])
[enable_fuzz_binary=no])

AC_ARG_WITH([qrencode],
[AS_HELP_STRING([--with-qrencode],
Expand Down Expand Up @@ -1582,15 +1582,15 @@ AM_CONDITIONAL([BUILD_BITCOIN_TX], [test x$build_bitcoin_tx = xyes])
AC_MSG_RESULT($build_bitcoin_tx)

AC_MSG_CHECKING([whether to build bitcoin-wallet])
AM_CONDITIONAL([BUILD_BITCOIN_WALLET], [test x$build_bitcoin_wallet = xyes])
AM_CONDITIONAL([BUILD_BITCOIN_WALLET], [test x$build_bitcoin_wallet = xno])
AC_MSG_RESULT($build_bitcoin_wallet)

AC_MSG_CHECKING([whether to build bitcoin-util])
AM_CONDITIONAL([BUILD_BITCOIN_UTIL], [test x$build_bitcoin_util = xyes])
AM_CONDITIONAL([BUILD_BITCOIN_UTIL], [test x$build_bitcoin_util = xno])
AC_MSG_RESULT($build_bitcoin_util)

AC_MSG_CHECKING([whether to build libraries])
AM_CONDITIONAL([BUILD_BITCOIN_LIBS], [test x$build_bitcoin_libs = xyes])
AM_CONDITIONAL([BUILD_BITCOIN_LIBS], [test x$build_bitcoin_libs = xno])
if test x$build_bitcoin_libs = xyes; then
AC_DEFINE(HAVE_CONSENSUS_LIB, 1, [Define this symbol if the consensus lib has been built])
AC_CONFIG_FILES([libbitcoinconsensus.pc:libbitcoinconsensus.pc.in])
Expand Down Expand Up @@ -1893,7 +1893,7 @@ if test x$need_bundled_univalue = xyes; then
fi

ac_configure_args="${ac_configure_args} --disable-shared --with-pic --enable-benchmark=no --enable-module-recovery --enable-module-schnorrsig --enable-experimental"
AC_CONFIG_SUBDIRS([src/secp256k1])
AC_CONFIG_SUBDIRS([src/secp256k1 src/test-komodo/googletest/googletest])

AC_OUTPUT

Expand Down
23 changes: 4 additions & 19 deletions doc/release-process.md
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ The `*-debug*` files generated by the gitian build contain debug symbols
for troubleshooting by developers. It is assumed that anyone that is interested
in debugging can run gitian to generate the files for themselves. To avoid
end-user confusion about which file to pick, as well as save storage
space *do not upload these to the bitcoin.org server, nor put them in the torrent*.
space *do not upload these to the bitcoincore.org server, nor put them in the torrent*.

- GPG-sign it, delete the unsigned file:
```
Expand All @@ -288,32 +288,17 @@ rm SHA256SUMS
(the digest algorithm is forced to sha256 to avoid confusion of the `Hash:` header that GPG adds with the SHA256 used for the files)
Note: check that SHA256SUMS itself doesn't end up in SHA256SUMS, which is a spurious/nonsensical entry.

- Upload zips and installers, as well as `SHA256SUMS.asc` from last step, to the bitcoin.org server
- Upload zips and installers, as well as `SHA256SUMS.asc` from last step, to the bitcoincore.org server
into `/var/www/bin/bitcoin-core-${VERSION}`

- A `.torrent` will appear in the directory after a few minutes. Optionally help seed this torrent. To get the `magnet:` URI use:
```bash
transmission-show -m <torrent file>
```
Insert the magnet URI into the announcement sent to mailing lists. This permits
people without access to `bitcoin.org` to download the binary distribution.
people without access to `bitcoincore.org` to download the binary distribution.
Also put it into the `optional_magnetlink:` slot in the YAML file for
bitcoin.org (see below for bitcoin.org update instructions).

- Update bitcoin.org version

- First, check to see if the Bitcoin.org maintainers have prepared a
release: https://github.com/bitcoin-dot-org/bitcoin.org/labels/Core

- If they have, it will have previously failed their CI
checks because the final release files weren't uploaded.
Trigger a CI rebuild---if it passes, merge.

- If they have not prepared a release, follow the Bitcoin.org release
instructions: https://github.com/bitcoin-dot-org/bitcoin.org/blob/master/docs/adding-events-release-notes-and-alerts.md#release-notes

- After the pull request is merged, the website will automatically show the newest version within 15 minutes, as well
as update the OS download links.
bitcoincore.org.

- Update other repositories and websites for new version

Expand Down
Loading