Commit Graph
100 Commits
Author SHA1 Message Date
jl777 c3034d6085 Merge pull request #1638 from blackjok3rtt2/jl777
fix other notarizations
2019-07-28 09:34:00 -11:00
jl777 363ad2eda7 Merge pull request #1637 from blackjok3rtt2/jl777
add timestamp to getinfo notarization for identifying kmd_seaon on ACs
2019-07-28 06:09:29 -11:00
jl777 2a7ad5fb35 Merge pull request #1631 from jl777/nSPV
more CC support, including nSPV protocol change
2019-07-24 05:32:55 -11:00
jl777 9a1881cf8f Merge pull request #1630 from Mixa84/nSPV
nSPV modifications for CC and other fixes (#29)
2019-07-24 03:36:28 -11:00
jl777 2ad296f1ac Merge pull request #1628 from jl777/nSPV
NSPV
2019-07-22 07:22:11 -11:00
jl777 fa94f378f7 Merge pull request #1623 from jl777/nSPV
NSPV
2019-07-18 06:59:33 -11:00
jl777 d2f4ef0519 Merge pull request #1622 from DeckerSU/patch-createrawtransaction
createrawtransaction enchancement
2019-07-17 19:03:35 -11:00
jl777 6656270d0b Merge pull request #1617 from smk762/patch-6
update to COQUICASH, remove VOTE2019
2019-07-13 21:58:09 -11:00
jl777 7eef2ba3d7 Merge pull request #1615 from dwygit/beta
fixed ac.json
2019-07-13 07:16:59 -11:00
jl777 f069d86a68 Merge pull request #1614 from smk762/patch-4
Create ac.json
2019-07-13 06:28:52 -11:00
jl777 3f8485e4fa Merge pull request #1613 from jl777/dev
Revert to coquicash magic, fix disable bits setting
2019-07-13 03:31:09 -11:00
jl777 bd1fdc15af Merge pull request #1612 from jl777/jl777
Jl777
2019-07-12 22:35:07 -11:00
jl777 137586f463 Merge pull request #1611 from jl777/nSPV
NSPV
2019-07-12 22:34:27 -11:00
jl777 88b5480924 Merge pull request #1608 from jl777/dev
-const in CBlockIndexWorkComparator
2019-07-12 17:53:19 -11:00
jl777 b018d0dda0 Merge pull request #1610 from letolabs/hushsupply2
Upstream Hush Supply Curve
2019-07-12 07:26:40 -11:00
jl777 8c4362ed0e Merge pull request #1607 from Alrighttt/beta
ac_cbmaturity and paymentsrelease op_return fix
2019-07-11 15:00:21 -11:00
jl777 ad7aeaccb8 Merge pull request #1605 from jl777/jl777
Jl777
2019-07-10 03:06:22 -11:00
jl777 368d284062 Merge pull request #1604 from jl777/nSPV
basic caching for single thread superlite
2019-07-10 03:05:42 -11:00
jl777 1072bb2cc8 Merge pull request #1603 from jl777/jl777
Jl777
2019-07-10 00:15:21 -11:00
jl777 23ba2908c1 Merge pull request #1602 from jl777/nSPV
NSPV
2019-07-10 00:12:34 -11:00
jl777 52eec3ed0c Merge pull request #1601 from jl777/jl777
Jl777
2019-07-09 23:45:36 -11:00
jl777 bf92d78717 Merge pull request #1600 from jl777/nSPV
NSPV
2019-07-09 23:44:18 -11:00
jl777 bc60137259 Merge pull request #1599 from jl777/jl777
Jl777
2019-07-09 19:54:04 -11:00
jl777 52bec46cdb Merge pull request #1598 from Alrighttt/jl777
joker's payment fix and safer magic for ac_cbmaturity
2019-07-09 19:52:20 -11:00
jl777 faac6630e4 Merge pull request #1597 from Mixa84/FSM
EARLYTXID fixes
2019-07-09 05:00:47 -11:00
jl777 a4db7985cf Merge pull request #1596 from jl777/jl777
Jl777
2019-07-09 02:09:49 -11:00
jl777 92c577f425 Merge pull request #1595 from jl777/nSPV
NSPV
2019-07-09 02:09:10 -11:00
jl777 86b195665f Merge pull request #1594 from jl777/jl777
Support presapling notarisations
2019-07-08 23:52:14 -11:00
jl777 252aff3d4a Merge pull request #1593 from jl777/nSPV
NSPV
2019-07-08 23:51:50 -11:00
jl777 919d785bcc Merge pull request #1592 from jl777/jl777
Jl777
2019-07-08 23:36:50 -11:00
jl777 b46ad2ad3c Merge pull request #1591 from jl777/nSPV
fast local notarization validation
2019-07-08 23:36:04 -11:00
jl777 a7fe381748 Merge pull request #1590 from jl777/jl777
Jl777
2019-07-08 19:01:34 -11:00
jl777 9ff7d415b1 Merge pull request #1589 from jl777/nSPV
NSPV
2019-07-08 18:57:38 -11:00
jl777 c90e4cfde0 Merge pull request #1588 from jl777/jl777
Jl777
2019-07-08 17:57:51 -11:00
jl777 70347bebd6 Merge pull request #1587 from jl777/nSPV
nSPV beta release for reference cli
2019-07-08 17:55:50 -11:00
jl777 cb99bc2961 Merge branch 'jl777' into nSPV 2019-07-08 17:55:28 -11:00
jl777 f929a85510 Merge pull request #1586 from jl777/dev
Dev
2019-07-08 01:51:03 -11:00
jl777 fe0c1d39e6 Merge pull request #1585 from tonymorony/patch-5
nspv client rpc calls unittest
2019-07-06 22:06:43 -11:00
jl777 5285f1123e Merge pull request #1583 from Alrighttt/jl777
add ac_cbmaturity
2019-07-05 19:58:02 -11:00
jl777 d57dd00c8b Merge pull request #1582 from Mixa84/FSM
Fixes for KOMDO_EARLYTXID and Tokens test vouts
2019-07-04 22:32:37 -11:00
jl777 1841071a12 Merge pull request #1581 from Mixa84/FSM
Initial PegsCC implementation
2019-07-03 22:36:13 -11:00
jl777 71e80ccf28 Merge pull request #1580 from jl777/FSM
Merge branch 'dev' into FSM
2019-07-02 08:09:48 -11:00
jl777 eaf6c6182e Merge pull request #1579 from jl777/jl777
Jl777
2019-07-02 08:09:15 -11:00
jl777 7937138085 Merge pull request #1578 from Alrighttt/jl777
change max ac_eras to 7
2019-07-02 08:07:12 -11:00
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 fc18cda522 Merge pull request #1574 from jl777/dev
Dev
2019-07-01 03:11:28 -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 6ec800b58a Merge pull request #1562 from Metaphilibert/beta
Cosmetics for legacy view
2019-06-16 19:59:30 -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