 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
|
68fd571656
|
Merge pull request #906 from Mixa84/channelCCFSM
Channel CC
|
2018-10-09 03:50:34 -11:00 |
|
|
jl777
|
35cb5f61d9
|
Merge pull request #903 from Mixa84/channelCCFSM
Updated channel CC docs
|
2018-10-02 02:35:52 -11:00 |
|
|
jl777
|
ae6574ee79
|
Merge pull request #902 from Mixa84/channelCCFSM
Channel CC
|
2018-10-01 06:01:06 -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
|
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
|
49dc9075d9
|
Merge pull request #855 from tonymorony/dev
Added more Dice CC tests
|
2018-08-28 00:29:57 -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
|
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
|
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
|
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
|
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
|
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 |
|
|
jl777
|
632f085fb3
|
Merge pull request #827 from jl777/dev
Update KMDversion to 0.2.0
|
2018-08-24 00:54:42 -11:00 |
|
|
jl777
|
6e6d793fb8
|
Merge pull request #826 from jl777/jl777
Update KMDversion to 0.2.0
|
2018-08-24 00:54:04 -11:00 |
|
|
jl777
|
5959b6f5f9
|
Merge pull request #822 from tonymorony/master
Added more Token CC tests, faucet tests disabled for now
|
2018-08-24 00:43:42 -11:00 |
|
|
jl777
|
292ca01f22
|
Merge branch 'master' into master
|
2018-08-24 00:43:24 -11:00 |
|
|
jl777
|
d6b9f7f610
|
Merge pull request #825 from jl777/beta
1 million height Release Candidate 2
|
2018-08-24 00:39:37 -11:00 |
|
|
jl777
|
6e37694c2c
|
Merge pull request #824 from jl777/dev
1 million height Release Candidate 2
|
2018-08-24 00:39:08 -11:00 |
|
|
jl777
|
772093a6a6
|
Merge pull request #823 from jl777/jl777
1 million height Release Candidate 2
|
2018-08-24 00:38:41 -11:00 |
|
|
jl777
|
4a6cad3a52
|
Merge pull request #820 from letolabs/cctests
cctests sync
|
2018-08-22 04:18:59 -11:00 |
|
|
jl777
|
3d120f0231
|
Merge pull request #819 from jl777/beta
Height 1 million Release Candidate
|
2018-08-20 21:47:39 -11:00 |
|
|
jl777
|
f1e9e61e07
|
Merge pull request #818 from jl777/jl777
fix CC bugs
|
2018-08-20 21:43:54 -11:00 |
|
|
jl777
|
5f13b373ec
|
Merge pull request #817 from jl777/dev
Dev
|
2018-08-18 03:32:29 -11:00 |
|
|
jl777
|
8538a310e9
|
Merge pull request #816 from jl777/jl777
weekly update
|
2018-08-18 03:28:13 -11:00 |
|
|
jl777
|
2703f76b3e
|
Merge pull request #814 from libscott/fixCrash1OSX
Fix crash1 osx
|
2018-08-17 05:28:43 -11:00 |
|
|
jl777
|
5a80480ebc
|
Merge pull request #813 from letolabs/cctests
WIP More CC tests
|
2018-08-16 04:54:01 -11:00 |
|
|
jl777
|
79fc22cff4
|
Merge pull request #812 from jl777/jl777
Jl777
|
2018-08-12 23:09:08 -11:00 |
|
|
jl777
|
3dfd10cc1a
|
Merge pull request #811 from jl777/jl777
Jl777
|
2018-08-11 08:37:42 -11:00 |
|
|
jl777
|
cf18d2df9d
|
Merge pull request #810 from letolabs/cctests
First cryptoconditions sync
|
2018-08-11 07:38:16 -11:00 |
|
|
jl777
|
844fd9e5b5
|
Merge pull request #809 from jl777/dev
Dev
|
2018-08-10 20:26:16 -11:00 |
|
|
jl777
|
f319b61363
|
Merge pull request #808 from jl777/jl777
Jl777
|
2018-08-10 20:25:41 -11:00 |
|
|
jl777
|
bf109a68b6
|
Merge pull request #807 from jl777/dev
sync branches
|
2018-08-07 03:22:46 -11:00 |
|
|
jl777
|
9d76231a95
|
Merge pull request #806 from jl777/jl777
sync branches
|
2018-08-07 03:21:52 -11:00 |
|
|
jl777
|
a8cd6416d9
|
Merge pull request #805 from letolabs/issue_template
Update Github issue template
|
2018-08-05 20:44:32 -11:00 |
|
|
jl777
|
70218bdb82
|
Merge pull request #804 from KomodoPlatform/dev
merge komodoplatform:dev -> jl777:dev
|
2018-08-04 20:47:44 -11:00 |
|
|
jl777
|
3c8b821fd6
|
Merge pull request #803 from jl777/dev
Dev
|
2018-08-04 06:24:17 -11:00 |
|
|
jl777
|
407085fddb
|
Merge pull request #802 from jl777/jl777
Combat/endian.h
|
2018-08-04 06:23:39 -11:00 |
|
|
jl777
|
bd156ec4aa
|
Merge pull request #801 from jl777/dev
sync branches
|
2018-08-03 07:02:42 -11:00 |
|
|
jl777
|
d3a712920e
|
Merge pull request #800 from jl777/jl777
sync branches
|
2018-08-03 07:01:58 -11:00 |
|
|
jl777
|
2911cd8048
|
Merge pull request #791 from jl777/dev
Get current CC to a stable release:
disable asset swap
implement dice timeout claims
Tokens, faucet, rewards and dice now have no reproducible bugs
|
2018-08-03 00:15:29 -11:00 |
|
|
jl777
|
035095bc5a
|
Merge pull request #799 from jl777/jl777
Get current CC to a stable release:
disable asset swap
implement dice timeout claims
Tokens, faucet, rewards and dice now have no reproducible bugs
|
2018-08-03 00:12:12 -11:00 |
|
|
jl777
|
d84c86336e
|
Merge pull request #798 from jl777/jl777
initial stable dice CC
|
2018-08-02 22:07:16 -11:00 |
|
|
jl777
|
f804f24dbb
|
Merge pull request #797 from lukechilds/patch-6
Add -ac_cc=333 to SEC in assetchains.json
|
2018-08-01 00:11:09 -11:00 |
|
|
jl777
|
cbd0560df3
|
Merge pull request #796 from letolabs/coinsupply
Docs for coinsupply RPC and improved error-checking on block height
|
2018-07-30 22:47:53 -11:00 |
|
|
jl777
|
a4cbb9d6b2
|
Merge pull request #795 from lukechilds/patch-5
Don't exit fiat-cli on error
|
2018-07-29 23:54:51 -11:00 |
|
|
jl777
|
cb5f1c00c4
|
Merge pull request #794 from jl777/jl777
@jl777
Put process block's check block call inside lock
|
2018-07-29 21:39:07 -11:00 |
|
|
jl777
|
6850e9858e
|
Merge pull request #793 from jl777/jl777
Parameterize KOMODO_FIRSTFUNGIBLEID to 100
|
2018-07-29 00:41:33 -11:00 |
|
|
jl777
|
9fce9d679c
|
Merge pull request #792 from jl777/jl777
Code complete token, faucet and rewards CC contracts
Improve PoW diff adjustment for PoS/PoW mode (breaks backward compatibility)
|
2018-07-28 01:11:05 -11:00 |
|
|
jl777
|
4261f53f91
|
Merge pull request #790 from libscott/non-fungible-chains
ac_cc under 1000 is not fungible
|
2018-07-26 08:07:40 -11:00 |
|
|
jl777
|
203eccbd02
|
Merge pull request #705 from lukechilds/assetchain-conf
[WIP] Assetchain conf
|
2018-07-25 21:53:59 -11:00 |
|
|
jl777
|
99ddfea13d
|
Merge pull request #788 from letolabs/dev_fixes
Fix compiler error: call of overloaded 'Pair(const char [9], time_t)'…
|
2018-07-25 21:05:14 -11:00 |
|