Skip to content

sync beta#176

Merged
ca333 merged 112 commits intoGLEECBTC:betafrom
jl777:beta
Jun 10, 2019
Merged

sync beta#176
ca333 merged 112 commits intoGLEECBTC:betafrom
jl777:beta

Conversation

@ca333
Copy link
Copy Markdown

@ca333 ca333 commented Jun 10, 2019

No description provided.

ca333 and others added 30 commits April 29, 2019 07:14
add checked block zmq nofitication type to publish verified blocks
Give correct CLI asset name and RPC ports in RPC examples
- Fix activation on July 15th 2019 00:00
- Added oraclesfund tx to fund Oracles CC address of pubkey that will register, and spend it in register tx
- oraclessamples gets baton address as input instead of txid to show all data from publisher
Oracles pubkey spoofing in register tx fix
-change tests to use baton address instead of baton utxo
-update samples results reference index
-add test for oraclesfund
-modify test loop flow to avoid spent utxo errors.
Note: Successful test requires timestamp after July 15th 2019, or changing PUBKEY_SPOOFING_FIX_ACTIVATION value in oracles.cpp
Update cryptoconditions_oracles.py
this fixes the faulty OSX patch
this fixes the faulty OSX patch
jl777 and others added 28 commits June 9, 2019 21:33
Add oracles/faucet to KMDICE, add tokens to COQUI
Merge branch 'dev' into FSM
Change ccEnable/Disable to macro
bump version for the hardfork
Merge branch 'beta' into dev
…ain()

Co-authored-by: Daira Hopwood <daira@jacaranda.org>

Closes zcash#3495.
wallet: Skip transactions with no shielded data in CWallet::SetBestCh…
@ca333 ca333 merged commit 501f259 into GLEECBTC:beta Jun 10, 2019
who-biz pushed a commit to who-biz/komodo that referenced this pull request Nov 17, 2022
Set deprecation height and version
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants