Updating branch (#108)

DragonX/hush3

Fork 0

Browse Source

* Fix

* -print

* Filter null outputs

* Rewards cc

* Fix

* Linker

* Fix

* KOMODO_LONGESTCHAIN

* Mining_height

* Fix dropped assetoshis

* Error null CCvin

* Test

* Fix sell

* Fix order book prints

* )

* Test

* Fix order display

* Fix oops

* Fix duplicate vin

* Remove dust check

* Fix silly bug

* Test

* Fix

* Test

* Fix compiler error: call of overloaded 'Pair(const char [9], time_t)' is ambiguous

* Correctly parse optional top parameter to getsnapshot

* Fix token orders crash

* Add SEC to assetchains.json

* Split amounts/validation: bid, ask, swap

* Fixes

* Test

* +print

* Test

* SMALLVAL

* Test

* Properly handle multiple vins funding fills

* Test

* Fix ask fill dest

* Test

* Rewards functions

* Fix

* Test

* Params to rewardscalc

* Create funding, addfunding, lock

* Test

* +print

* tokenswapask

* Test

* Swap functions

* ac_cc under 1000 is not fungible

* Allow to cancel invalid orders

* Prevent negative numbers in assets tx

* Uint64 -> int64

* Fix oops

* Prevent bid for nonexistent assetid

* Error check bidding for assetid that is txid but not asset creation

* Fix

* Add pause if scriptcheckqueue isn't idle

* Fix

* -> -> .

* Fix

* Test

* VOBJ

* Tokeninfo rpc

* Asset list

* Test

* strcpy(cp->normaladdr,AssetsNormaladdr);

* Fix

* Rewardslist rewardsinfo

* Fix

* Vent

* fix

* Int64

* Fix createfunding

* Fix false positive error

* sbits = stringbits(planstr);

* Fix maxmoney

* Fix funding name

* Test

* Print

* CCutoxvalue

* Fix rewardslock utxo selection

* New PoW diff calc

* tst

* Test

* Oldflag for PoW calc

* Test

* tst

* Test

* Filter locked utxo

* Test

* Fix PoW recalc

* Test min seconds

* int64_t CCduration(uint256 txid)

* Test

* Test one day

* Test

* Prevent inputs of CC inputs

* Test

* tst

* Test

* New rewards address

* Fix mask

* Test

* Teest

* Stricter vin/vout checks for assets

* Token swap ready for testing

* Fix rewards unlock

* Fix

* Test

* Validate rewards

* Test

* Trim funding input

* Test

* Activate CCduration constraint

* Parameterize KOMODO_FIRSTFUNGIBLEID to 100

* +print

* Test

* Fix c script

* Test

* Initial dice morph from rewards.cpp

* Fix

* Test

* Fix

* Test

* Diceaddfunds

* Fix

* Dice list and dice info

* dicefund

* Dice bet

* Test

* Put process block's check block call inside lock, revert mining testblockvalidity outside lock

* Don't exit fiat-cli on error

* Docs for coinsupply RPC and improved error-checking on block height

* Version to 0.3.12-beta.

* Change version to 0.3.12 for gilab CI.

* Put undefines for _cpuid back.

* Network decentralizatoin and bug fixes

* Remove unnecessary staking delay

* Staking and mining timeing improvements

* Put staking readout once per staking loop so people know it's staking

* Fail on get_chainactive before lock if checks fail

* Fix check for stake transaction after Komodo merge

* Portable dev (#105)

* Force portable code

* Switch to old MMX instructions, avoiding SSE & SSE2 instructions.

* Less agressive, leave verus code (which checks for it) using advanced instructions.

* Compiling only for windows

* Update .gitlab-ci.yml

* Try -march=native for C++ code generation.

* Tweaking machine architecture settings.

* Try native alone.

* Also get LIBCRYPTOCONDITIONS to -march=native

* Switch other lib to native as well.

* Try switching back further for CPU architecture.

* Even lower end settings.

* Turn on symbols.

* Use sse2,3 and 4 capable x64.

* Once again let verus lib use advances instructioins since it checjs via CPUID at run time.

* Modify a few more makefile entries.

* Switch to AMD model similar to our test system.

* Get snark makefile to k8 too.

* Yet another -march to modify to k8, or two of them.

* Brute force k8 settings, comment non-portable code out.

* Put the condition on cpuid back.

* Put non-portable advenced instruction code back

* Enable instructions.

* Add lib for separate settings.

* Update .gitlab-ci.yml

* replacing k8-sse3 specific flags to x86-84

* updating versions

* Get verus-cli verusd updated (#106)

* Force portable code

* Switch to old MMX instructions, avoiding SSE & SSE2 instructions.

* Less agressive, leave verus code (which checks for it) using advanced instructions.

* Compiling only for windows

* Update .gitlab-ci.yml

* Try -march=native for C++ code generation.

* Tweaking machine architecture settings.

* Try native alone.

* Also get LIBCRYPTOCONDITIONS to -march=native

* Switch other lib to native as well.

* Try switching back further for CPU architecture.

* Even lower end settings.

* Turn on symbols.

* Use sse2,3 and 4 capable x64.

* Once again let verus lib use advances instructioins since it checjs via CPUID at run time.

* Modify a few more makefile entries.

* Switch to AMD model similar to our test system.

* Get snark makefile to k8 too.

* Yet another -march to modify to k8, or two of them.

* Brute force k8 settings, comment non-portable code out.

* Put the condition on cpuid back.

* Put non-portable advenced instruction code back

* Enable instructions.

* Add lib for separate settings.

* Update .gitlab-ci.yml

* replacing k8-sse3 specific flags to x86-84

* updating versions

* Propagate verusd changes.

This commit is contained in:

Asher Dawes

2018-08-11 13:43:52 -07:00

committed by

GitHub

parent b1a8ac9db0

commit 5f48c77923

171 changed files with 10548 additions and 3201 deletions

									
										12

src/bitcoind.cpp
									
												View File
												
				@@ -144,21 +144,21 @@ bool AppInit(int argc, char* argv[])

				            ReadConfigFile(mapArgs, mapMultiArgs);

				        } catch (const missing_zcash_conf& e) {

				            fprintf(stderr,

				                (_("Before starting zcashd, you need to create a configuration file:\n"

				                (_("Before starting komodod, you need to create a configuration file:\n"

				                   "%s\n"

				                   "It can be completely empty! That indicates you are happy with the default\n"

				                   "configuration of zcashd. But requiring a configuration file to start ensures\n"

				                   "that zcashd won't accidentally compromise your privacy if there was a default\n"

				                   "configuration of komodod. But requiring a configuration file to start ensures\n"

				                   "that komodod won't accidentally compromise your privacy if there was a default\n"

				                   "option you needed to change.\n"

				                   "\n"

				                   "You can look at the example configuration file for suggestions of default\n"

				                   "options that you may want to change. It should be in one of these locations,\n"

				                   "depending on how you installed Zcash:\n") +

				                   "depending on how you installed Komodo:\n") +

				                 _("- Source code:  %s\n"

				                   "- .deb package: %s\n")).c_str(),

				                GetConfigFile().string().c_str(),

				                "contrib/debian/examples/zcash.conf",

				                "/usr/share/doc/zcash/examples/zcash.conf");

				                "contrib/debian/examples/komodo.conf",

				                "/usr/share/doc/komodo/examples/komodo.conf");

				            return false;

				        } catch (const std::exception& e) {

				            fprintf(stderr,"Error reading configuration file: %s\n", e.what());

Updating branch (#108)

12 src/bitcoind.cpp Unescape Escape View File

12

src/bitcoind.cpp

View File