Commit Graph
100 Commits
Author SHA1 Message Date
jl777 2925c70483 Merge pull request #1715 from KomodoPlatform/dev
sync dev
2019-10-06 21:55:08 -11:00
jl777 3508d17707 Merge pull request #1712 from letolabs/memofix
Ignore exceptions when deserializing note plaintexts
2019-09-27 01:21:15 -11:00
jl777 346c332326 Merge pull request #1713 from Mixa84/FSM
Fix [cc]address RPCs
2019-09-26 00:55:06 -11:00
jl777 92f4e52f96 Merge pull request #1709 from letolabs/debian
Fix Debian package metadata
2019-09-11 19:43:17 -11:00
jl777 cb1c9e525d Merge pull request #1707 from jl777/FSM
FSM
2019-09-07 20:13:07 -11:00
jl777 c8e4ccb4c5 Merge pull request #1706 from jl777/jl777
Jl777
2019-09-07 20:12:37 -11:00
jl777 798f68a05c Merge pull request #1705 from jl777/nSPV
NSPV
2019-09-07 20:10:54 -11:00
jl777 bd9daad278 Merge pull request #1703 from Mixa84/CCnSPV
Use SetCCtxids optimized for nSPV on other CCs
2019-09-04 04:08:45 -11:00
jl777 873ae098c7 Merge pull request #1702 from Mixa84/FSM
Fix oracles pubkey spoofing
2019-09-03 04:11:05 -11:00
jl777 9c66e5251a Merge pull request #1697 from artemii235/dev
Apply chainparams_commandline to currently selected chain params.
2019-08-29 05:13:52 -11:00
jl777 5e44ab3988 Merge pull request #1701 from jl777/FSM
FSM
2019-08-28 22:06:41 -11:00
jl777 43ef31a367 Merge pull request #1700 from jl777/jl777
Jl777
2019-08-28 22:06:02 -11:00
jl777 fd1260d785 Merge pull request #1699 from jl777/nSPV
NSPV
2019-08-28 22:05:27 -11:00
jl777 02ec038298 Merge pull request #1698 from Mixa84/nSPV
Fix SetCCtxids for nSPV (#31)
2019-08-28 06:03:22 -11:00
jl777 43e2b5f124 Merge pull request #1696 from Mixa84/FSM
Add error message on return in gatewaysclaim tx
2019-08-26 23:35:41 -11:00
jl777 007af83260 Merge pull request #1695 from jl777/FSM
FSM
2019-08-26 02:35:39 -11:00
jl777 cea537ff95 Merge pull request #1694 from jl777/jl777
Merge branch 'FSM' into jl777
2019-08-26 02:34:58 -11:00
jl777 34f6908ae6 Merge pull request #1693 from jl777/nSPV
NSPV
2019-08-26 02:34:21 -11:00
jl777 6c8947b0b5 Merge pull request #1692 from letolabs/FSM
Fix os x build
2019-08-25 20:12:33 -11:00
jl777 e3bf886386 Merge pull request #1688 from jl777/FSM
FSM
2019-08-14 23:59:20 -11:00
jl777 ebc5339fe2 Merge pull request #1687 from jl777/jl777
Jl777
2019-08-14 23:58:55 -11:00
jl777 921dcafc2e Merge pull request #1686 from jl777/nSPV
NSPV
2019-08-14 23:58:25 -11:00
jl777 c257f7834b Merge pull request #1685 from letolabs/docs2
update dependency installation instructions
2019-08-13 04:17:48 -11:00
jl777 1b3e4d46d4 Merge pull request #1684 from Mixa84/nSPV
CC fixes for nSPV and others (#30)
2019-08-12 00:24:20 -11:00
jl777 d8ef27d7a8 Merge pull request #1683 from jl777/FSM
FSM
2019-08-12 00:15:43 -11:00
jl777 798d71b87f Merge pull request #1682 from jl777/jl777
Jl777
2019-08-12 00:15:14 -11:00
jl777 99148d485e Merge pull request #1681 from jl777/nSPV
NSPV
2019-08-12 00:14:42 -11:00
jl777 0638c7f079 Merge pull request #1680 from jl777/FSM
FSM
2019-08-10 00:46:22 -11:00
jl777 dded456a87 Merge pull request #1679 from jl777/jl777
Merge branch 'FSM' into jl777
2019-08-10 00:45:42 -11:00
jl777 3d15d269ad Merge pull request #1678 from jl777/nSPV
NSPV
2019-08-10 00:45:06 -11:00
jl777 eecce61457 Merge pull request #1677 from jl777/jl777
Jl777
2019-08-08 05:07:12 -11:00
jl777 2a0f117edd Merge pull request #1676 from jl777/nSPV
NSPV
2019-08-08 05:06:14 -11:00
jl777 6fafdbe559 Merge branch 'jl777' into nSPV 2019-08-08 05:05:19 -11:00
jl777 2974f1e80f Merge pull request #1675 from Alrighttt/jl777
proper opreturn burn rpc command
2019-08-07 02:39:08 -11:00
jl777 48064059c5 Merge pull request #1674 from jl777/FSM
zawy12
2019-08-03 07:55:48 -11:00
jl777 3d7a1ac1c9 Merge pull request #1673 from jl777/jl777
zawy12
2019-08-03 07:55:06 -11:00
jl777 496d2b7ad5 Merge pull request #1672 from jl777/nSPV
NSPV
2019-08-03 07:53:25 -11:00
jl777 2e50c2ebe7 Merge pull request #1671 from SirSevenG/jl777
nspv_client rpc tests updates
2019-08-03 07:52:48 -11:00
jl777 a76df00fe6 Merge pull request #1670 from jl777/FSM
FSM
2019-08-02 23:11:07 -11:00
jl777 194ea58f22 Merge pull request #1669 from jl777/jl777
https://medium.com/@jameslee777/evolution-of-adaptivepow-dfea220d343f
2019-08-02 23:10:22 -11:00
jl777 f9a3889961 Merge pull request #1668 from jl777/nSPV
NSPV
2019-08-02 23:09:28 -11:00
jl777 3e7609633d Merge pull request #1667 from jl777/kolo
Reverting binary path var
2019-08-02 19:54:11 -11:00
jl777 a7016ca5e9 Merge pull request #1666 from blackjok3rtt2/jl777
fix NSPV
2019-08-02 04:29:44 -11:00
jl777 0f26b91c0d Merge pull request #1663 from jl777/FSM
Fix crash
2019-08-01 11:06:07 -11:00
jl777 f2e4879c9f Merge pull request #1662 from jl777/jl777
Jl777
2019-08-01 11:05:52 -11:00
jl777 a9ff99ac4f Merge pull request #1664 from jl777/nSPV
NSPV
2019-08-01 11:05:18 -11:00
jl777 3295bc08ec Merge pull request #1661 from jl777/nSPV
NSPV
2019-08-01 10:04:37 -11:00
jl777 c5657390e2 Merge pull request #1660 from jl777/FSM
FSM
2019-08-01 09:22:19 -11:00
jl777 12976cf2d3 Merge pull request #1659 from jl777/jl777
Merge branch 'FSM' into jl777
2019-08-01 09:21:38 -11:00
jl777 21fe2ea17f Merge pull request #1658 from jl777/nSPV
NSPV
2019-08-01 09:20:20 -11:00
jl777 4bcd9a0b36 Merge pull request #1656 from jl777/FSM
Revert
2019-08-01 01:12:51 -11:00
jl777 9016ef63d8 Merge pull request #1655 from jl777/FSM
FSM
2019-08-01 01:02:45 -11:00
jl777 3a53571597 Merge pull request #1654 from jl777/jl777
Jl777
2019-08-01 00:58:56 -11:00
jl777 1a16dd90d2 Merge pull request #1653 from jl777/nSPV
bug fixes
2019-08-01 00:58:26 -11:00
jl777 1134711e2a Merge pull request #1652 from jl777/nSPV
fix getblocktemplate target for active adaptivepow
2019-07-31 21:24:22 -11:00
jl777 3695e84aba Merge pull request #1651 from jl777/FSM
FSM
2019-07-31 09:28:33 -11:00
jl777 61ea9e9dae Merge pull request #1650 from jl777/jl777
Fix zawys zcash issue 4021
2019-07-31 09:20:59 -11:00
jl777 02ebdc08b4 Merge pull request #1649 from jl777/nSPV
Merge branch 'jl777' into nSPV
2019-07-31 09:20:10 -11:00
jl777 9841b63fc7 Merge pull request #1647 from jl777/jl777
Jl777
2019-07-30 08:40:16 -11:00
jl777 3aebd74efe Merge pull request #1646 from jl777/nSPV
NSPV
2019-07-30 08:38:42 -11:00
jl777 95d63eebca Merge pull request #1645 from jl777/jl777
Jl777
2019-07-30 05:16:09 -11:00
jl777 6a2aa04785 Merge pull request #1644 from jl777/nSPV
NSPV
2019-07-30 05:15:27 -11:00
jl777 d4399190e7 Merge pull request #1641 from KomodoPlatform/dev
update RICK & MORTY
2019-07-30 01:53:31 -11:00
jl777 27836c1910 Merge pull request #1643 from jl777/jl777
-ac_adaptivepow
2019-07-30 01:51:51 -11:00
jl777 8e7709246d Merge pull request #1642 from jl777/nSPV
-ac_adaptivepow
2019-07-30 01:51:12 -11:00
jl777 ea5be5f1bf Merge pull request #1640 from jl777/jl777
Jl777
2019-07-28 09:41:47 -11:00
jl777 efd7bb637b Merge pull request #1639 from jl777/nSPV
NSPV
2019-07-28 09:41:07 -11:00
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 f353814f3b Merge pull request #1635 from Alrighttt/revert-1627-patch-payments-cc
Revert "payments cc fix"
2019-07-27 19:18:21 -11:00
jl777 d493f7d3f6 Merge pull request #1634 from Alrighttt/dev
Joker's payments CC fix
2019-07-27 19:17:52 -11:00
jl777 64f825c6bb Merge pull request #1636 from KomodoPlatform/dev
update logo
2019-07-27 19:17:19 -11:00
jl777 6eef5c4b5f Merge pull request #1633 from jl777/jl777
Jl777
2019-07-24 05:34:44 -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 fc85ce122d Merge pull request #1629 from jl777/jl777
Jl777
2019-07-22 07:24:16 -11:00
jl777 2ad296f1ac Merge pull request #1628 from jl777/nSPV
NSPV
2019-07-22 07:22:11 -11:00
jl777 28700b5c28 Merge pull request #1627 from DeckerSU/patch-payments-cc
payments cc fix
2019-07-21 18:22:04 -11:00
jl777 df2e311fb2 Merge pull request #1624 from jl777/jl777
Jl777
2019-07-18 07:01:45 -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