 jl777
|
db8e9dde5c
|
Merge pull request #971 from letolabs/ac_private_tests
Tests for ac_private=1
|
2018-11-23 20:22:37 -11:00 |
|
|
jl777
|
e4d6a53cd0
|
Merge pull request #970 from letolabs/verushash
Tests for -ac_algo=verushash
|
2018-11-23 10:51:59 -11:00 |
|
|
jl777
|
4458e675a2
|
Merge pull request #969 from tonymorony/FSM
CC auto-tests changes
|
2018-11-22 23:01:56 -11:00 |
|
|
jl777
|
9b80571a2d
|
Merge pull request #967 from miketout/dev-komodo
Fix index db iterators
|
2018-11-21 21:22:41 -11:00 |
|
|
jl777
|
ab3ae964e1
|
Merge pull request #966 from letolabs/ccerrors
Add various error checking to gateway + oracle RPCs
|
2018-11-20 21:48:24 -11:00 |
|
|
jl777
|
f5c0b2039e
|
Merge pull request #965 from letolabs/fsm-fix
Get dice CC compiling again
|
2018-11-20 21:40:42 -11:00 |
|
|
jl777
|
7dfae3293b
|
Merge pull request #964 from miketout/dev-komodo
Fix bug in oracles for KMDICE and others
|
2018-11-18 22:31:18 -11:00 |
|
|
jl777
|
065756bdc2
|
Merge pull request #963 from miketout/dev-komodo
Latest fixes from testing
|
2018-11-18 21:13:28 -11:00 |
|
|
jl777
|
a187da04b3
|
Merge pull request #962 from miketout/dev-komodo
Fix for chains with coinbase_maturity under 100
|
2018-11-18 05:43:20 -11:00 |
|
|
jl777
|
2a5fc9cd81
|
Merge pull request #958 from miketout/dev-komodo
Support for all Verus parameters, VerusHash, Coinbase Timelocks, Sapling, and 50/50 VerusPoS/PoW, not VerusPoP
|
2018-11-17 22:01:47 -11:00 |
|
|
jl777
|
a46640a43e
|
Merge pull request #950 from blackjok3rtt/disable_coinbase_option
use external pubkey fix
|
2018-11-14 10:05:01 -11:00 |
|
|
jl777
|
45ac89ca0f
|
Merge pull request #949 from blackjok3rtt/disable_coinbase_option
Disable coinbase option
|
2018-11-14 08:49:03 -11:00 |
|
|
jl777
|
4652afb57a
|
Merge pull request #948 from Mixa84/FSM
Oracle Fix
|
2018-11-14 05:15:23 -11:00 |
|
|
jl777
|
bd17261194
|
Merge branch 'jl777' into FSM
|
2018-11-11 00:20:48 -11:00 |
|
|
jl777
|
e68fb20926
|
Merge pull request #929 from letolabs/CCerror
Clean up dicebet/dicestatus error handling
|
2018-11-07 10:42:24 -11:00 |
|
|
jl777
|
612bfb3500
|
Merge pull request #927 from letolabs/jsindex
Add jsindex to z_listreceivedbyaddress to uniquely identify
|
2018-11-01 07:13:46 -11:00 |
|
|
jl777
|
dde9e773ce
|
Merge pull request #926 from blackjok3rtt/FSM
Dice mempool fix to ignore Z-txs
|
2018-11-01 04:32:25 -11:00 |
|
|
jl777
|
19d614c834
|
Merge pull request #924 from Mixa84/gatewaysCC
Multi signature gateways fix
|
2018-10-31 05:23:46 -11:00 |
|
|
jl777
|
17919f0887
|
Merge pull request #923 from blackjok3rtt/DICE_mempoolfix
Dice mempoolfix, needs more testing to be sure.
|
2018-10-29 06:48:55 -11:00 |
|
|
jl777
|
7c3e764a6a
|
Merge pull request #922 from blackjok3rtt/DICE_fix
Dice fix - this seems to work ok.
|
2018-10-29 01:45:54 -11:00 |
|
|
jl777
|
43aba7ea8f
|
Merge pull request #920 from blackjok3rtt/FSM
random utxo
|
2018-10-28 05:24:43 -11:00 |
|
|
jl777
|
b3ff3d6370
|
Merge pull request #919 from blackjok3rtt/FSM
fix for dice
|
2018-10-28 04:03:19 -11:00 |
|
|
jl777
|
d79f9f650a
|
Merge pull request #918 from blackjok3rtt/FSM
Dice bet/status error messages, and possible fix for fork issue.
|
2018-10-27 21:14:34 -11:00 |
|
|
jl777
|
de490a4695
|
Merge pull request #917 from blackjok3rtt/FSM
Add entropy txs to dice info
|
2018-10-27 10:52:49 -11:00 |
|
|
jl777
|
22c41c6d95
|
Merge pull request #916 from Alrighttt/FSM
FSM
|
2018-10-27 10:08:09 -11:00 |
|
|
jl777
|
27ca539872
|
Merge pull request #915 from blackjok3rtt/setpubkey_RPC
Setpubkey rpc
|
2018-10-23 22:36:05 -11:00 |
|
|
jl777
|
c6cec39e8d
|
Merge pull request #914 from tonymorony/FSM
Oracles creation RPC checks and tests
|
2018-10-19 06:30:15 -11:00 |
|
|
jl777
|
80d71f2c9c
|
Merge pull request #911 from tonymorony/FSM
this space made tests failing
|
2018-10-17 22:49:25 -11:00 |
|
|
jl777
|
7d9588e07a
|
Merge pull request #908 from Mixa84/gatewaysCC
Fix oraclesinfo
|
2018-10-16 22:00:34 -11:00 |
|
|
jl777
|
01ba6d10d3
|
Merge pull request #907 from jl777/kolo
PGT
|
2018-10-11 23:54:35 -11:00 |
|
|
jl777
|
68fd571656
|
Merge pull request #906 from Mixa84/channelCCFSM
Channel CC
|
2018-10-09 03:50:34 -11:00 |
|
|
jl777
|
ad0e6b93b8
|
Merge pull request #905 from DeckerSU/dev
+ freq:5 for EMC2
|
2018-10-07 03:07:19 -11:00 |
|
|
jl777
|
35cb5f61d9
|
Merge pull request #903 from Mixa84/channelCCFSM
Updated channel CC docs
|
2018-10-02 02:35:52 -11:00 |
|
|
jl777
|
cc2cd73ae0
|
Merge pull request #904 from himu007/patch-7
Update dpowassets
|
2018-10-02 02:14:27 -11:00 |
|
|
jl777
|
ae6574ee79
|
Merge pull request #902 from Mixa84/channelCCFSM
Channel CC
|
2018-10-01 06:01:06 -11:00 |
|
|
jl777
|
d72ad91424
|
Merge pull request #901 from himu007/patch-6
Update README.md
|
2018-10-01 00:35:23 -11:00 |
|
|
jl777
|
5441476fab
|
Merge pull request #898 from himu007/patch-3
Update README.md
|
2018-09-30 08:42:19 -11:00 |
|
|
jl777
|
1513c37f65
|
Merge pull request #894 from jl777/jl777
+print
|
2018-09-24 05:54:55 -11:00 |
|
|
jl777
|
2ee7b69b7a
|
Merge pull request #895 from jl777/FSM
FSM
|
2018-09-24 05:54:37 -11:00 |
|
|
jl777
|
a5a8968a32
|
Merge branch 'beta' into dev
|
2018-09-24 05:49:30 -11:00 |
|
|
jl777
|
49adb58081
|
Merge branch 'master' into beta
|
2018-09-24 05:09:14 -11:00 |
|
|
jl777
|
17b55502e5
|
Merge pull request #891 from chainmakers/dev
add MGNX
|
2018-09-24 03:50:53 -11:00 |
|
|
jl777
|
23acb025c3
|
Merge pull request #890 from himu007/dev
add PIRATE
|
2018-09-23 09:57:32 -11:00 |
|
|
jl777
|
3ee3764a75
|
Merge pull request #889 from jl777/jl777
support for PIRATE notarizations
|
2018-09-23 07:40:48 -11:00 |
|
|
jl777
|
88d23947d3
|
Merge pull request #888 from jl777/FSM
PIRATE notarization support
|
2018-09-23 07:39:40 -11:00 |
|
|
jl777
|
aa58ccefa2
|
Merge pull request #887 from letolabs/dev
Add Hush to dpowassets
|
2018-09-23 07:20:00 -11:00 |
|
|
jl777
|
bc3e246ab9
|
Merge pull request #886 from jl777/FSM
PRATE halving 5x
|
2018-09-22 00:44:17 -11:00 |
|
|
jl777
|
6e6a0b89f3
|
Merge pull request #885 from jl777/FSM
Allow crypto777 pub key
|
2018-09-21 23:40:47 -11:00 |
|
|
jl777
|
627f4df6bb
|
Merge pull request #884 from jl777/FSM
ac_private to allow notary p2pk vouts
|
2018-09-21 23:35:16 -11:00 |
|
|
jl777
|
34bc8189ff
|
Merge pull request #882 from jl777/FSM
prepare for gateways multisig and add notarization check to disconnect tip
|
2018-09-15 21:50:18 -11:00 |
|
|
jl777
|
167794e0dd
|
Merge pull request #881 from Alrighttt/dev
build error, fix typo
|
2018-09-14 05:09:50 -11:00 |
|
|
jl777
|
e29657a397
|
Merge pull request #880 from jl777/FSM
FSM
|
2018-09-13 03:56:00 -11:00 |
|
|
jl777
|
4f17a3b394
|
Merge pull request #879 from tonymorony/jl777
deprecated oraclefeed compilation script
|
2018-09-13 03:55:48 -11:00 |
|
|
jl777
|
8dc419675a
|
Merge pull request #878 from jl777/FSM
FSM
|
2018-09-12 08:55:26 -11:00 |
|
|
jl777
|
ac903b5e7e
|
Merge pull request #877 from jl777/FSM
10 block setback
|
2018-09-12 01:58:57 -11:00 |
|
|
jl777
|
4147936c2c
|
Merge pull request #876 from jl777/FSM
FSM
|
2018-09-12 01:50:37 -11:00 |
|
|
jl777
|
cd73120659
|
Merge pull request #875 from jl777/FSM
FSM
|
2018-09-12 01:33:13 -11:00 |
|
|
jl777
|
eff2e09461
|
Merge pull request #874 from jl777/FSM
FSM
|
2018-09-12 00:19:38 -11:00 |
|
|
jl777
|
c02faa1a61
|
Merge pull request #873 from Alrighttt/dev
fix help examples
|
2018-09-11 19:14:50 -11:00 |
|
|
jl777
|
826aa58b3b
|
Merge pull request #870 from jl777/FSM
FSM
|
2018-09-11 05:36:40 -11:00 |
|
|
jl777
|
411e1d024b
|
Merge pull request #869 from jl777/FSM
FSM
|
2018-09-11 04:19:37 -11:00 |
|
|
jl777
|
9b3a193642
|
Merge pull request #868 from jl777/FSM
FSM
|
2018-09-10 03:01:04 -11:00 |
|
|
jl777
|
d6cf5a9fa6
|
Merge pull request #866 from jl777/dev
Dev
|
2018-09-07 03:57:28 -11:00 |
|
|
jl777
|
ddfa9168e7
|
Merge pull request #864 from lukechilds/fix-ccl-params
Fix CCL assetchain params
|
2018-09-07 03:53:03 -11:00 |
|
|
jl777
|
ce513fa8a4
|
Merge pull request #865 from siulynot/dev
Added new parameter to COQUI
|
2018-09-07 03:47:25 -11:00 |
|
|
jl777
|
53c71059f2
|
Merge pull request #863 from tonymorony/FSM
added dapp setup script
|
2018-09-07 01:54:13 -11:00 |
|
|
jl777
|
65a3bd5292
|
Merge pull request #862 from jl777/FSM
FSM
|
2018-09-05 20:34:15 -11:00 |
|
|
jl777
|
374897c90e
|
Merge pull request #861 from libscott/migrate_fixes
Migrate fixes
|
2018-09-05 20:33:21 -11:00 |
|
|
jl777
|
9ac7919431
|
Merge pull request #860 from jl777/FSM
second wave of CC
|
2018-09-05 06:10:26 -11:00 |
|
|
jl777
|
cb0dc392b5
|
Merge pull request #859 from capital-technologies/dev
[Fix] RPC Asset Chain - getblockchaininfo
|
2018-09-05 05:25:39 -11:00 |
|
|
jl777
|
8d7b1beed9
|
Merge pull request #858 from tonymorony/dev
Added more rewards CC tests
|
2018-08-31 21:20:39 -11:00 |
|
|
jl777
|
7fe2cd8324
|
Merge pull request #856 from letolabs/cctests2
Add some helpful error messages for when Diceinit fails
|
2018-08-29 21:58:43 -11:00 |
|
|
jl777
|
49dc9075d9
|
Merge pull request #855 from tonymorony/dev
Added more Dice CC tests
|
2018-08-28 00:29:57 -11:00 |
|
|
jl777
|
a768bb6d0c
|
Merge pull request #854 from jl777/beta
Beta
|
2018-08-27 09:55:41 -11:00 |
|
|
jl777
|
b721586dd5
|
Merge pull request #853 from jl777/dev
Dev
|
2018-08-27 09:54:40 -11:00 |
|
|
jl777
|
5fda0f8eb6
|
Merge pull request #852 from jl777/jl777
Jl777
|
2018-08-27 09:53:52 -11:00 |
|
|
jl777
|
e82a8acee9
|
Merge pull request #851 from jl777/beta
Beta
|
2018-08-27 09:36:55 -11:00 |
|
|
jl777
|
bca43f0215
|
Merge pull request #850 from jl777/dev
Dev
|
2018-08-27 09:36:28 -11:00 |
|
|
jl777
|
56df2214da
|
Merge pull request #849 from letolabs/cctests2
Improve cc error checking
|
2018-08-26 20:16:45 -11:00 |
|
|
jl777
|
144c599ea0
|
Merge pull request #848 from libscott/rpcScanNotarisationsDB
RPC methods to scan notarisations DB
|
2018-08-25 21:54:19 -11:00 |
|
|
jl777
|
7a794c59f3
|
Merge pull request #846 from jl777/beta
Beta
|
2018-08-25 10:07:28 -11:00 |
|
|
jl777
|
9bcc458ddf
|
Merge pull request #845 from jl777/dev
Dev
|
2018-08-25 10:06:43 -11:00 |
|
|
jl777
|
470f3b4e17
|
Merge pull request #844 from jl777/jl777
Jl777
|
2018-08-25 10:05:20 -11:00 |
|
|
jl777
|
2b3344ae03
|
Merge pull request #843 from jl777/beta
Beta
|
2018-08-25 09:05:24 -11:00 |
|
|
jl777
|
eb9e13acee
|
Merge pull request #842 from jl777/dev
Dev
|
2018-08-25 09:04:35 -11:00 |
|
|
jl777
|
e6701338dc
|
Merge pull request #841 from jl777/jl777
Jl777
|
2018-08-25 09:03:23 -11:00 |
|
|
jl777
|
8010774526
|
Merge pull request #840 from jl777/dev
Dev
|
2018-08-25 03:34:24 -11:00 |
|
|
jl777
|
8a3c440ea4
|
Merge pull request #839 from jl777/kolo
CCL
|
2018-08-24 14:20:15 -11:00 |
|
|
jl777
|
6375be3326
|
Merge pull request #838 from tonymorony/dev
Errors printout define moved to wallet.h
|
2018-08-24 14:01:05 -11:00 |
|
|
jl777
|
b4ed6a08ea
|
Merge pull request #837 from jl777/beta
Beta
|
2018-08-24 11:24:28 -11:00 |
|
|
jl777
|
603845b5db
|
Merge pull request #836 from jl777/dev
Dev
|
2018-08-24 11:23:39 -11:00 |
|
|
jl777
|
da11a577b6
|
Merge pull request #835 from jl777/jl777
-print
|
2018-08-24 11:23:14 -11:00 |
|
|
jl777
|
6206088760
|
Merge pull request #833 from jl777/beta
Beta
|
2018-08-24 09:01:03 -11:00 |
|
|
jl777
|
d0102c55fa
|
Merge branch 'master' into beta
|
2018-08-24 09:00:53 -11:00 |
|
|
jl777
|
ca55a65ed6
|
Merge pull request #832 from jl777/dev
Dev
|
2018-08-24 08:59:01 -11:00 |
|
|
jl777
|
bac7b7174a
|
Merge pull request #831 from jl777/jl777
Jl777
|
2018-08-24 08:58:19 -11:00 |
|
|
jl777
|
4ec7d5def6
|
Merge pull request #830 from letolabs/cctests
cctests sync
|
2018-08-24 05:40:40 -11:00 |
|
|
jl777
|
58e39188c8
|
Merge pull request #829 from tonymorony/dev
Added more Token CC tests
|
2018-08-24 01:59:17 -11:00 |
|
|
jl777
|
84e970ad43
|
Merge branch 'dev' into dev
|
2018-08-24 01:59:07 -11:00 |
|
|
jl777
|
651cc7598a
|
Merge pull request #828 from jl777/beta
Update KMDversion to 0.2.0
|
2018-08-24 00:55:18 -11:00 |
|