6385 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
vertoe	3cdb0d474a	Update translation source.	2015-02-08 22:37:44 +01:00
vertoe	a121f12612	Fix typo in instantx string.	2015-02-08 22:36:08 +01:00
vertoe	825a430c7a	merge downstream 0.11.1	2015-02-08 22:26:11 +01:00
Evan Duffield	dd48c4a352	enable IX when fork detected	2015-02-08 11:59:09 -07:00
Evan Duffield	5e34edef4c	set checkpoint	2015-02-08 09:22:12 -07:00
Evan Duffield	f9d6ba25fa	Merge branch 'v0.11.1.x' of https://github.com/darkcoin/darkcoin into v0.11.1.x	2015-02-08 08:46:48 -07:00
Evan Duffield	1b6be50f5d	restarting testnet	2015-02-08 08:46:30 -07:00
evan82	a7d5594d8c	Merge pull request #168 from UdjinM6/v0.11.1.x_tx_types_cleanup ... V0.11.1.x tx types cleanup	2015-02-08 08:38:51 -07:00
Evan Duffield	86dd29058f	disable rejecting blocks / version bump	2015-02-08 08:05:53 -07:00
UdjinM6	c1d946bc0a	use wallet db ds flag in rpc	2015-02-08 17:10:44 +03:00
UdjinM6	3a64318bd2	update tx types in UI / fix tx decomposition / use wallet db ds flag in UI	2015-02-08 17:10:01 +03:00
UdjinM6	c8c14effff	use wallet db to save ds flag / debug	2015-02-08 17:03:39 +03:00
UdjinM6	562b844819	use AvailableCoinsType instead of string in walletmodel	2015-02-08 17:00:23 +03:00
Evan Duffield	ddc31b0ff7	fixed issues with ix signature propagation	2015-02-07 20:54:36 -07:00
Evan Duffield	0d8ae6fc16	version/proto/min version bump	2015-02-07 20:23:43 -07:00
Evan Duffield	e4b5b6c5f6	Merge branch 'v0.11.1.x' of https://github.com/darkcoin/darkcoin into v0.11.1.x	2015-02-07 20:04:43 -07:00
Evan Duffield	2f56ecb10a	protocol version	2015-02-07 20:04:08 -07:00
evan82	01356fca76	Merge pull request #167 from UdjinM6/v0.11.1.x_fix_SelectCoins_best_sub_loops ... optimize SelectCoinsMinConf best subset loops	2015-02-07 13:12:30 -07:00
Evan Duffield	e3dcc84415	added debuging for fork detection	2015-02-07 13:05:10 -07:00
evan82	77452b6b86	Merge pull request #166 from UdjinM6/v0.11.1.x_fix_MakeCollateralAmounts ... fix: MakeCollateralAmounts stuck sometimes	2015-02-07 13:02:43 -07:00
evan82	c187e8288c	Merge pull request #164 from UdjinM6/v0.11.1.x_optimize_notifytxchanges_call ... call NotifyTransactionChanged for the same prevout tx hash only once per tx commit	2015-02-07 13:01:34 -07:00
evan82	37680d0fe1	Merge pull request #163 from UdjinM6/v0.11.1.x_fix_sendcoinsdialog_mess_on_mac ... fix checkbox mess on mac / get rid of line in sendcoinsdialog	2015-02-07 13:00:06 -07:00
evan82	78c0258306	Merge pull request #162 from UdjinM6/v0.11.1.x_fix_balances ... v0.11.1.x fix balances calculations when there are conflicted coins / slight optimizations	2015-02-07 12:59:45 -07:00
Evan Duffield	0a077975c7	fixed calcscore	2015-02-07 12:58:43 -07:00
Evan Duffield	a49cc8f5d5	debug	2015-02-07 12:35:33 -07:00
Evan Duffield	4ec5370317	added aux2 data for calcscore	2015-02-07 12:07:08 -07:00
Evan Duffield	ef2b9ef223	debugging	2015-02-07 11:31:15 -07:00
Evan Duffield	ee37d4622e	proto bump	2015-02-07 10:47:44 -07:00
Evan Duffield	3a263ed1bf	fixed platform issues with calcscore / better re-converge after fork	2015-02-07 10:30:16 -07:00
vertoe	a2ae4c900e	merge downstream 0.11.1	2015-02-07 16:22:17 +01:00
UdjinM6	ab28751bbe	fix	2015-02-07 08:19:02 +03:00
UdjinM6	a30b439259	optimize SelectCoins best subset debug output	2015-02-07 07:39:25 +03:00
UdjinM6	fdbeedfa96	fix MakeCollateralAmounts - cleaned more unneeded calculations	2015-02-07 05:26:59 +03:00
UdjinM6	fd7992dc61	fix MakeCollateralAmounts stuck sometimes and wouldn't let denominating further	2015-02-07 05:18:37 +03:00
Evan Duffield	3a72da77ac	clean up tx lock votes on expiration	2015-02-06 13:19:22 -07:00
Evan Duffield	3b35672bb8	version/proto bump	2015-02-06 12:53:31 -07:00
Evan Duffield	c56a54d211	enforce mn port on mainnet only	2015-02-06 12:41:39 -07:00
Evan Duffield	012f0e5660	Implemented inventory system for IX messages	2015-02-06 12:07:22 -07:00
Pieter Wuille	3230b329ea	Raise version of created blocks, and enforce DERSIG in mempool	2015-02-06 10:42:01 -08:00
Evan Duffield	dfb3da5ec3	version/protocol bump/min protocol	2015-02-06 09:03:50 -07:00
Evan Duffield	b65d718cf5	debugging	2015-02-06 08:54:39 -07:00
vertoe	165dbbba6d	Add icelandic.	2015-02-06 15:07:50 +01:00
vertoe	e9296dcf0b	Pull translations from transifex.	2015-02-06 15:04:57 +01:00
vertoe	0f177393b8	Update locale strings.	2015-02-06 15:03:29 +01:00
vertoe	06c7aa1e6e	merge downstream 0.11.1	2015-02-06 15:00:12 +01:00
Pieter Wuille	989d49921b	Backport of some of BIP66's tests	2015-02-05 21:26:15 -08:00
Pieter Wuille	ab03660824	Implement BIP 66 validation rules and switchover logic	2015-02-05 20:56:10 -08:00
Evan Duffield	76e36bfbea	only vote when in the top X nodes	2015-02-05 21:41:17 -07:00
UdjinM6	dc19605ec7	call NotifyTransactionChanged for the same prevout tx hash only once per tx commit	2015-02-06 07:25:46 +03:00
UdjinM6	7a43249d56	fix checkbox mess on mac / get rid of line in sendcoinsdialog	2015-02-06 07:09:40 +03:00