 jl777
|
49cacbf990
|
Merge pull request #1577 from jl777/kolo
ip
|
2019-07-01 18:35:32 -11:00 |
|
|
jl777
|
a1dc16fb24
|
Merge pull request #1576 from Alrighttt/jl777
typo, sorry
|
2019-07-01 08:47:12 -11:00 |
|
|
jl777
|
3e891b6ab1
|
Merge pull request #1575 from Alrighttt/jl777
Add the ability to import different WIF formats
|
2019-07-01 08:31:26 -11:00 |
|
|
jl777
|
c52ee6219a
|
Merge pull request #1573 from jl777/FSM
FSM
|
2019-07-01 03:10:54 -11:00 |
|
|
jl777
|
11a40506a1
|
Merge pull request #1572 from Alrighttt/jl777
fix createrawtransaction curl example
|
2019-06-30 03:09:36 -11:00 |
|
|
jl777
|
11e2928114
|
Merge pull request #1571 from DeckerSU/patch-convertpassphrase
add convertpassphrase RPC method (convert Agama passphrases to WIF)
|
2019-06-24 02:13:37 -11:00 |
|
|
jl777
|
67d4841e1e
|
Merge pull request #1569 from jl777/FSM
FSM
|
2019-06-18 22:46:35 -11:00 |
|
|
jl777
|
65a92e20bf
|
Merge pull request #1568 from blackjok3rtt/FSM
various bug fixes
|
2019-06-18 04:26:50 -11:00 |
|
|
jl777
|
15c7241f33
|
Merge pull request #1567 from dimxy/cclib-rpc-json-parse-fix
support for passing json param as object in cclib rpc
|
2019-06-16 19:59:11 -11:00 |
|
|
jl777
|
2a4c7cab14
|
Merge pull request #1566 from DeckerSU/patch-loadblockindexdb
LoadBlockIndexDB speed-up for non-LWMAPOS chains (x5 perfomance boost)
|
2019-06-15 22:15:19 -11:00 |
|
|
jl777
|
21882605e1
|
Merge pull request #1565 from Mixa84/FSM
Add oraclessample rpc to get data for txid.
|
2019-06-15 20:59:44 -11:00 |
|
|
jl777
|
0d0fd8f068
|
Merge pull request #1564 from Alrighttt/beta
add heir CC to CCL exception
|
2019-06-14 02:09:27 -11:00 |
|
|
jl777
|
5bf69b173f
|
Merge pull request #1561 from jl777/dev
undo constraint
|
2019-06-12 14:53:34 -11:00 |
|
|
jl777
|
96f4c3ac2f
|
Merge pull request #1559 from jl777/dev
Dev
|
2019-06-12 01:59:01 -11:00 |
|
|
jl777
|
494e6d26d7
|
Merge branch 'beta' into dev
|
2019-06-12 01:57:20 -11:00 |
|
|
jl777
|
b8382256eb
|
Merge pull request #1558 from jl777/FSM
FSM
|
2019-06-12 01:54:25 -11:00 |
|
|
jl777
|
5fcd794959
|
Merge pull request #1557 from jl777/jl777
Jl777
|
2019-06-12 01:53:37 -11:00 |
|
|
jl777
|
83df0ac891
|
Merge pull request #1556 from jl777/kolo-jl
dev
|
2019-06-12 01:52:55 -11:00 |
|
|
jl777
|
be8d76f793
|
Merge pull request #1555 from pungotoken/beta
pungocloud: new pubkeys for AR&SH NNs
|
2019-06-11 22:48:25 -11:00 |
|
|
jl777
|
1dbac16cac
|
Merge pull request #1552 from blackjok3rtt/beta
change blackjok3r_SH pubkeys
|
2019-06-11 18:31:18 -11:00 |
|
|
jl777
|
f66d97ee6d
|
Merge pull request #1551 from jl777/dev
Dev
|
2019-06-11 00:35:08 -11:00 |
|
|
jl777
|
8ffc8a34da
|
Merge pull request #1550 from jl777/FSM
FSM
|
2019-06-11 00:28:57 -11:00 |
|
|
jl777
|
6492296778
|
Merge pull request #1549 from jl777/jl777
Jl777
|
2019-06-11 00:28:33 -11:00 |
|
|
jl777
|
ee0a8ded42
|
Merge pull request #1548 from jl777/dev
Dev
|
2019-06-10 20:15:00 -11:00 |
|
|
jl777
|
c65c69fd13
|
Merge pull request #1547 from KomodoPlatform/dev
fix multi OS build
|
2019-06-10 20:14:32 -11:00 |
|
|
jl777
|
4bd0cb81c1
|
Merge pull request #1546 from jl777/dev
Merge branch 'beta' into dev
|
2019-06-10 19:05:18 -11:00 |
|
|
jl777
|
05011900b7
|
Merge pull request #1545 from jl777/FSM
FSM
|
2019-06-10 19:04:52 -11:00 |
|
|
jl777
|
206ae31734
|
Merge pull request #1544 from jl777/jl777
Jl777
|
2019-06-10 19:04:25 -11:00 |
|
|
jl777
|
8906371a9b
|
Merge pull request #1543 from jl777/kolo-jl
dev
|
2019-06-10 19:02:48 -11:00 |
|
|
jl777
|
818072e5cb
|
Merge pull request #1542 from blackjok3rtt/beta
wallet: Skip transactions with no shielded data in CWallet::SetBestCh…
|
2019-06-10 05:50:25 -11:00 |
|
|
jl777
|
a593da86b9
|
Merge pull request #1541 from jl777/dev
Merge branch 'beta' into dev
|
2019-06-10 05:34:20 -11:00 |
|
|
jl777
|
02bad9d99e
|
Merge pull request #1540 from jl777/FSM
FSM
|
2019-06-10 05:33:47 -11:00 |
|
|
jl777
|
f9c9b2ed90
|
Merge pull request #1539 from ca333/patch-5
bump version
|
2019-06-10 05:31:02 -11:00 |
|
|
jl777
|
61a9b85974
|
Merge pull request #1538 from blackjok3rtt/beta
Change ccEnable/Disable to macro
|
2019-06-10 05:05:35 -11:00 |
|
|
jl777
|
1f523d4162
|
Merge pull request #1537 from jl777/dev
Dev
|
2019-06-10 00:56:23 -11:00 |
|
|
jl777
|
a7b9ee5150
|
Merge pull request #1536 from jl777/FSM
Merge branch 'dev' into FSM
|
2019-06-10 00:55:41 -11:00 |
|
|
jl777
|
5a44f04d8b
|
Merge pull request #1535 from Alrighttt/FSM
Add oracles/faucet to KMDICE, add tokens to COQUI
|
2019-06-10 00:54:55 -11:00 |
|
|
jl777
|
c53064c938
|
Merge pull request #1534 from jl777/dev
Dev
|
2019-06-09 21:46:43 -11:00 |
|
|
jl777
|
929990301e
|
Merge pull request #1533 from KomodoPlatform/dev
fix multi OS build
|
2019-06-09 21:46:14 -11:00 |
|
|
jl777
|
e028fc8a6e
|
Merge pull request #1532 from jl777/dev
Dev
|
2019-06-09 21:37:29 -11:00 |
|
|
jl777
|
350b8e85e0
|
Merge pull request #1531 from jl777/FSM
FSM
|
2019-06-09 21:35:30 -11:00 |
|
|
jl777
|
98b1189c4b
|
Merge pull request #1530 from jl777/jl777
Jl777
|
2019-06-09 21:34:21 -11:00 |
|
|
jl777
|
dea44a0b20
|
Merge pull request #1529 from jl777/kolo-jl
dev
|
2019-06-09 21:33:18 -11:00 |
|
|
jl777
|
6d9ccdc858
|
Merge pull request #1528 from KomodoPlatform/FSM
add contribution guideline and security info
|
2019-06-08 22:19:06 -11:00 |
|
|
jl777
|
3ca198ac20
|
Merge pull request #1527 from jl777/FSM
FSM
|
2019-06-07 22:55:25 -11:00 |
|
|
jl777
|
127d1485dc
|
Merge pull request #1526 from jl777/jl777
Jl777
|
2019-06-07 22:54:57 -11:00 |
|
|
jl777
|
81562f0459
|
Merge pull request #1525 from blackjok3rtt/beta
Disable ALL CCs on all CC activated chains.
|
2019-06-07 19:16:32 -11:00 |
|
|
jl777
|
89e1414c6b
|
Merge pull request #1524 from KMDLabs/master
merge changes for gcharang
|
2019-06-03 23:05:06 -11:00 |
|
|
jl777
|
d2b906160e
|
Merge pull request #1523 from jl777/dev
Dev
|
2019-06-03 21:15:53 -11:00 |
|
|
jl777
|
166fdd7c8b
|
Merge pull request #1522 from jl777/FSM
FSM
|
2019-06-03 21:14:44 -11:00 |
|
|
jl777
|
3f2a0584e8
|
Merge pull request #1521 from jl777/jl777
Jl777
|
2019-06-03 21:14:11 -11:00 |
|
|
jl777
|
2dde049863
|
Merge pull request #1520 from blackjok3rtt/beta
sorry messed it up this works, have tested it.
|
2019-06-03 19:22:26 -11:00 |
|
|
jl777
|
cf4c055f99
|
Merge pull request #1519 from blackjok3rtt/beta
fix PIRATE wallet forcing rescan
|
2019-06-03 18:51:57 -11:00 |
|
|
jl777
|
a38a0b2031
|
Merge pull request #1518 from jl777/kolo-jl
Notaries
|
2019-06-03 03:38:24 -11:00 |
|
|
jl777
|
2a3dffbb5d
|
Merge pull request #1516 from MyHush/zdupes2
Allow duplicate receivers in z_sendmany
|
2019-05-30 22:13:23 -11:00 |
|
|
jl777
|
06e60194dc
|
Merge pull request #1515 from ca333/patch-4
fix OSX
|
2019-05-30 19:26:32 -11:00 |
|
|
jl777
|
ed2406172c
|
Merge pull request #1514 from ca333/patch-3
fix OSX
|
2019-05-30 19:26:21 -11:00 |
|
|
jl777
|
5c7d67962a
|
Merge pull request #1513 from ca333/patch-2
fix OSX
|
2019-05-30 19:26:08 -11:00 |
|
|
jl777
|
6a7a7e3a2d
|
Merge pull request #1512 from ca333/patch-1
fix OSX
|
2019-05-30 19:25:55 -11:00 |
|
|
jl777
|
e032898c39
|
Merge pull request #1511 from DeckerSU/patch-fsm-gcc8
fix fsm build gcc8
|
2019-05-29 23:11:54 -07:00 |
|
|
jl777
|
5ad8d9310c
|
Merge pull request #1509 from smk762/patch-3
Update cryptoconditions_oracles.py
|
2019-05-29 08:05:32 -07:00 |
|
|
jl777
|
9fa0d914cf
|
Merge pull request #1507 from Mixa84/FSM
Oracles pubkey spoofing in register tx fix
|
2019-05-28 02:46:35 -11:00 |
|
|
jl777
|
034746aa82
|
Merge pull request #1506 from MyHush/helpdocs2
Give correct CLI asset name and RPC ports in RPC examples
|
2019-05-27 22:18:36 -11:00 |
|
|
jl777
|
93a3c1e9cf
|
Merge pull request #1505 from jl777/dev
Dev
|
2019-05-27 04:23:06 -11:00 |
|
|
jl777
|
bd1408c795
|
Merge pull request #1504 from jl777/FSM
FSM
|
2019-05-27 04:22:21 -11:00 |
|
|
jl777
|
eb20b33718
|
Merge pull request #1503 from DeckerSU/patch-osx-gcc8-static
Patch osx gcc8 static
|
2019-05-27 04:19:17 -11:00 |
|
|
jl777
|
3070b90746
|
Merge branch 'FSM' into patch-osx-gcc8-static
|
2019-05-27 04:18:27 -11:00 |
|
|
jl777
|
e36488682e
|
Merge pull request #1502 from jl777/dev
Dev
|
2019-05-25 22:02:06 -11:00 |
|
|
jl777
|
47636ebb57
|
Merge pull request #1501 from jl777/FSM
FSM
|
2019-05-25 22:00:54 -11:00 |
|
|
jl777
|
dd2ab01c82
|
Merge pull request #1500 from jl777/jl777
Jl777
|
2019-05-25 21:59:49 -11:00 |
|
|
jl777
|
3925dd94ea
|
Merge pull request #1499 from KMDLabs/master
LABS to jl777
|
2019-05-25 21:42:58 -11:00 |
|
|
jl777
|
dc00d329ed
|
Merge pull request #1498 from dimxy/prices-rpc
Prices rpc initial version
|
2019-05-23 05:02:06 -11:00 |
|
|
jl777
|
12a3d56205
|
Merge branch 'master' into beta
|
2019-05-22 22:05:20 -11:00 |
|
|
jl777
|
128ee4edaa
|
Merge pull request #1495 from jl777/jl777
Jl777
|
2019-05-21 19:39:42 -11:00 |
|
|
jl777
|
5225f98fc3
|
Merge pull request #1494 from blackjok3rtt/jl777
KMD hardfork code and bug fixes.
|
2019-05-20 19:33:16 -11:00 |
|
|
jl777
|
e08b8de209
|
Merge pull request #1493 from MyHush/zsync3
Wait to look at KOMODO_INSYNC until we hold cs_main lock
|
2019-05-20 03:01:49 -11:00 |
|
|
jl777
|
fbda899304
|
Merge pull request #1492 from jl777/dev
Dev
|
2019-05-19 23:31:14 -11:00 |
|
|
jl777
|
c41090127f
|
Merge pull request #1491 from chainmakers/dev
add K64
|
2019-05-19 23:29:28 -11:00 |
|
|
jl777
|
08743db95e
|
Merge pull request #1490 from chainmakers/beta
add K64
|
2019-05-19 23:29:05 -11:00 |
|
|
jl777
|
1ea6df970b
|
Merge pull request #1489 from Alrighttt/FSM
change oraclessamples output to obj
|
2019-05-19 16:33:11 -11:00 |
|
|
jl777
|
8eb4baf3ff
|
Merge pull request #1488 from himu007/patch-2
Update README.md
|
2019-05-17 06:30:46 -11:00 |
|
|
jl777
|
c7f0f89c94
|
Merge pull request #1487 from blackjok3rtt/beta
bug fixes
|
2019-05-16 02:39:35 -11:00 |
|
|
jl777
|
35d34e6bc6
|
Merge pull request #1486 from MyHush/zsync2
Prevent creation of shielded transactions when chain is not synced up
|
2019-05-16 02:38:58 -11:00 |
|
|
jl777
|
31c8388abe
|
Merge pull request #1485 from jl777/kolo
remove MGNX coin
|
2019-05-15 17:09:09 -11:00 |
|
|
jl777
|
d9db048074
|
Merge pull request #1484 from jl777/jl777
Jl777
|
2019-05-15 06:55:15 -11:00 |
|
|
jl777
|
4b47cd338d
|
Merge pull request #1483 from blackjok3rtt/jl777
payments merge bug fix
|
2019-05-15 06:15:41 -11:00 |
|
|
jl777
|
46f062eec3
|
Merge pull request #1482 from jl777/jl777
Jl777
|
2019-05-15 05:37:41 -11:00 |
|
|
jl777
|
69450cc680
|
Merge pull request #1481 from blackjok3rtt/jl777
fix payments balance
|
2019-05-15 05:31:21 -11:00 |
|
|
jl777
|
63280409a1
|
Merge pull request #1480 from jl777/jl777
Jl777
|
2019-05-14 07:45:46 -11:00 |
|
|
jl777
|
0df3d518dd
|
Merge pull request #1479 from dimxy/migration-getwalletburntx-fix
Migration getwalletburntx fix
|
2019-05-14 06:29:08 -11:00 |
|
|
jl777
|
fa4992e303
|
Merge pull request #1478 from blackjok3rtt/jl777
rework paymentsCC
|
2019-05-13 15:01:50 -11:00 |
|
|
jl777
|
1e7e0e4fd1
|
Merge pull request #1477 from jl777/dev
Dev
|
2019-05-13 07:55:12 -11:00 |
|
|
jl777
|
29c5b8936a
|
Merge pull request #1476 from Alrighttt/dev
remove ZEX, add ZEXO
|
2019-05-13 07:02:16 -11:00 |
|
|
jl777
|
72944d8da2
|
Merge pull request #1474 from blackjok3rtt/jl777
fixes, prepare for tokens airdrop support.
|
2019-05-09 04:22:27 -11:00 |
|
|
jl777
|
b924e3f3f9
|
Merge pull request #1473 from jl777/jl777
Jl777
|
2019-05-08 21:58:15 -11:00 |
|
|
jl777
|
646501f5b6
|
Merge pull request #1472 from blackjok3rtt/jl777
finish payments airdrop RPCs
|
2019-05-08 21:57:21 -11:00 |
|
|
jl777
|
eb324358ea
|
Merge pull request #1471 from jl777/jl777
Jl777
|
2019-05-08 07:11:29 -11:00 |
|
|
jl777
|
4bfdf5f7a4
|
Merge pull request #1470 from blackjok3rtt/prices
Prices
|
2019-05-08 06:42:41 -11:00 |
|
|
jl777
|
d4ad5dd3b8
|
Merge pull request #1467 from Alrighttt/jl777
Change oraclessamples rpc to show txid for each
|
2019-05-07 03:57:26 -11:00 |
|
|
jl777
|
1a4f660c70
|
Merge pull request #1469 from blackjok3rtt/jl777
revert undo file size
|
2019-05-05 21:39:25 -11:00 |
|