 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
|
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
|
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
|
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
|
c41090127f
|
Merge pull request #1491 from chainmakers/dev
add K64
|
2019-05-19 23:29:28 -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
|
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 |
|
|
jl777
|
5c45ee8c73
|
Merge pull request #1468 from blackjok3rtt/jl777
major update to paymentsCC
|
2019-05-05 21:25:31 -11:00 |
|
|
jl777
|
da82dfb798
|
Merge pull request #1466 from himu007/patch-1
Added HUSH3 start params
|
2019-05-04 05:14:08 -11:00 |
|
|
jl777
|
aee9f1f1b5
|
Merge pull request #1465 from dimxy/token-migration-fix
added check for non-fungible data in tokencreate (return error if can't parse)
|
2019-05-02 07:34:46 -11:00 |
|
|
jl777
|
d6da76d293
|
Merge pull request #1464 from blackjok3rtt/jl777
payments update, fix bug with op_ret burn
|
2019-05-02 05:22:06 -11:00 |
|
|
jl777
|
92ff3ff07c
|
Merge pull request #1463 from blackjok3rtt/jl777
PaymentsCC update.
|
2019-04-29 04:05:46 -11:00 |
|
|
jl777
|
07fdce999e
|
Merge pull request #1462 from dimxy/token-migration-fix
fix decoderawtransaction for importcoin
|
2019-04-28 21:06:20 -11:00 |
|
|
jl777
|
cb6bfed655
|
Merge pull request #1461 from jl777/dev
Dev
|
2019-04-28 18:41:40 -11:00 |
|
|
jl777
|
566d101d31
|
Merge pull request #1460 from blackjok3rtt/dev
fix wallet bug
|
2019-04-28 18:39:02 -11:00 |
|
|
jl777
|
e4d7b9f616
|
Merge pull request #1459 from blackjok3rtt/dev
add extr print for new fix
|
2019-04-27 01:39:26 -11:00 |
|
|
jl777
|
1b3bb3a0a0
|
Merge pull request #1458 from jl777/dev
Dev
|
2019-04-26 22:52:24 -11:00 |
|
|
jl777
|
b2c8247e76
|
Merge pull request #1457 from blackjok3rtt/dev
Fix possible not being able to sync after node crashes, add dpow to BEER
|
2019-04-26 22:51:19 -11:00 |
|
|
jl777
|
5b14394e0c
|
Merge pull request #1456 from jl777/jl777
Jl777
|
2019-04-25 03:51:09 -11:00 |
|
|
jl777
|
ea5a5c46fc
|
Merge pull request #1455 from DeckerSU/patch-curl
build-mac.sh fix on latest libcurl changes
|
2019-04-25 00:28:18 -11:00 |
|
|
jl777
|
3d0ee82288
|
Merge pull request #1454 from Mixa84/FSM
Corrected ChannelsCC validation.
|
2019-04-24 04:34:43 -11:00 |
|
|
jl777
|
4c6dbb4352
|
Merge pull request #1453 from Mixa84/FSM
Defragmenting utxos in Gateways deposit address (#24)
|
2019-04-24 00:16:50 -11:00 |
|
|
jl777
|
84e4635be2
|
Merge pull request #1451 from radix42/FSM
Add support for importing and exporting sapling ivk
|
2019-04-22 18:14:14 -11:00 |
|
|
jl777
|
f1690fcb7d
|
Merge pull request #1450 from jl777/jl777
deprecate evil send_curl, thanks decker!
|
2019-04-22 07:13:12 -11:00 |
|
|
jl777
|
49f9276e8a
|
Merge pull request #1449 from DeckerSU/patch-curl
[Linux] fix libcurl HTTPS connections
|
2019-04-22 07:01:55 -11:00 |
|
|
jl777
|
e8771704e0
|
Merge pull request #1448 from letolabs/stdoutspam
Reduce unnecessary warnings to STDOUT
|
2019-04-21 04:49:21 -11:00 |
|
|
jl777
|
25cd593f95
|
Merge pull request #1447 from jl777/jl777
Jl777
|
2019-04-21 02:42:37 -11:00 |
|
|
jl777
|
6058c87f3f
|
Merge pull request #1446 from jl777/jl777
Jl777
|
2019-04-21 02:18:19 -11:00 |
|
|
jl777
|
db2cf15b85
|
Merge pull request #1445 from blackjok3rtt/jl777
fix two bugs for Alright
|
2019-04-20 18:49:08 -11:00 |
|
|
jl777
|
ce876219e7
|
Merge pull request #1443 from blackjok3rtt/jl777
add last of paymentsCC valdiation
|
2019-04-20 00:32:19 -11:00 |
|
|
jl777
|
ad480a67dd
|
Merge pull request #1442 from dimxy/token-migration
Token crosschain migration support in fungible chain cluster
|
2019-04-19 07:25:35 -11:00 |
|
|
jl777
|
a3380794dd
|
Merge pull request #1441 from Mixa84/FSM
Add -earlytxid param and check -ac_end,-ac_supply and -ac_perc. (#23)
|
2019-04-19 05:48:55 -11:00 |
|
|
jl777
|
34b615de35
|
Merge pull request #1440 from Mixa84/FSM
Fix oracleslist on SetCCtxids
|
2019-04-18 22:24:59 -11:00 |
|
|
jl777
|
fe3386f6a7
|
Merge pull request #1439 from jl777/dev
Dev
|
2019-04-18 21:19:15 -11:00 |
|
|
jl777
|
c8fe029487
|
Merge pull request #1438 from KomodoPlatform/dev
[add] KOIN
|
2019-04-18 17:51:08 -11:00 |
|
|
jl777
|
4096d8edf2
|
Merge pull request #1437 from Mixa84/FSM
Adding validation for importgateway CC
|
2019-04-18 01:39:15 -11:00 |
|
|
jl777
|
f5b1645de9
|
Merge pull request #1436 from radix42/FSM
add checked block zmq notification type to send verified blocks
|
2019-04-17 03:05:44 -11:00 |
|
|
jl777
|
cb0043115d
|
Merge branch 'FSM' into FSM
|
2019-04-17 03:05:14 -11:00 |
|
|
jl777
|
3523faadae
|
Merge pull request #1428 from jl777/jl777
Jl777
|
2019-04-16 21:34:18 -11:00 |
|
|
jl777
|
a67b6e918a
|
Merge pull request #1435 from blackjok3rtt/FSM
Few small changes from LABS.
|
2019-04-16 21:33:04 -11:00 |
|
|
jl777
|
3652d41e97
|
Merge pull request #1434 from blackjok3rtt/FSM
Port of MoMoM changes from LABS.
|
2019-04-16 20:45:29 -11:00 |
|
|
jl777
|
d89a3ad6b7
|
Merge pull request #1433 from blackjok3rtt/FSM
Add optional height pram to importprivkey
|
2019-04-16 20:12:21 -11:00 |
|
|
jl777
|
ec780ae3ba
|
Merge pull request #1432 from blackjok3rtt/ac_nk
Add assetchains_nk
|
2019-04-16 19:09:54 -11:00 |
|
|
jl777
|
527f1ff90e
|
Merge pull request #1429 from blackjok3rtt/CCparams_test
cccustom changed to use CCopret
|
2019-04-16 02:20:34 -11:00 |
|
|
jl777
|
15377f2fea
|
Merge pull request #1427 from jl777/dev
Dev
|
2019-04-15 18:28:24 -11:00 |
|
|
jl777
|
c6a58be7f2
|
Merge pull request #1426 from jl777/jl777
fixin staking wallet issue
|
2019-04-15 18:26:39 -11:00 |
|
|
jl777
|
d341e1670c
|
Merge pull request #1425 from blackjok3rtt/jl777
wallet code fix
|
2019-04-15 18:23:49 -11:00 |
|
|
jl777
|
c5e89091a6
|
Merge pull request #1424 from jl777/dev
Dev
|
2019-04-15 04:08:49 -11:00 |
|
|
jl777
|
189355399a
|
Merge pull request #1423 from jl777/FSM
FSM
|
2019-04-15 04:04:07 -11:00 |
|
|
jl777
|
9b76745f12
|
Merge pull request #1422 from jl777/jl777
Jl777
|
2019-04-15 04:03:12 -11:00 |
|
|
jl777
|
4219408809
|
Merge pull request #1421 from blackjok3rtt/jl777
fix wallet crash
|
2019-04-15 03:52:30 -11:00 |
|
|
jl777
|
74125f9cf3
|
Merge pull request #1420 from Mixa84/FSM
Fix looking for wrong type marker in Oracles CC
|
2019-04-15 03:14:12 -11:00 |
|
|
jl777
|
8e47705d50
|
Merge pull request #1419 from jl777/dev
Dev
|
2019-04-14 18:21:35 -11:00 |
|
|
jl777
|
201f1e86c0
|
Merge pull request #1418 from jl777/FSM
FSM
|
2019-04-14 18:20:02 -11:00 |
|
|
jl777
|
65b6cf85bc
|
Merge pull request #1413 from jl777/jl777
automatically rejoin a prices chain after being stranded
fix OUR staking
|
2019-04-14 18:18:46 -11:00 |
|
|
jl777
|
31eb126876
|
Merge pull request #1417 from blackjok3rtt/jl777
revert miner change
|
2019-04-14 18:16:47 -11:00 |
|
|
jl777
|
35c7165a02
|
Merge pull request #1416 from phm87/patch-1
init.cpp : Help message for -whitelistaddress=
|
2019-04-14 06:48:45 -11:00 |
|
|
jl777
|
2b16669e64
|
Merge pull request #1415 from jl777/kolo
VOTE2019
|
2019-04-14 05:09:35 -11:00 |
|
|
jl777
|
a0136724b0
|
Merge pull request #1414 from blackjok3rtt/jl777
try wallet fix
|
2019-04-13 20:56:53 -11:00 |
|
|
jl777
|
bd4a51154d
|
Merge pull request #1412 from jl777/jl777
Dont fetch ahead if cbopret chain, yes it will slow it down
|
2019-04-11 23:06:55 -11:00 |
|
|
jl777
|
73ce7cda24
|
Merge pull request #1411 from blackjok3rtt/jl777
fix RPC calls
|
2019-04-11 23:06:16 -11:00 |
|
|
jl777
|
e985b6eede
|
Merge pull request #1410 from jl777/dev
Dev
|
2019-04-11 22:42:56 -11:00 |
|
|
jl777
|
3fb8cba0b5
|
Merge pull request #1409 from jl777/FSM
FSM
|
2019-04-11 22:42:21 -11:00 |
|
|
jl777
|
993f91fbd4
|
Merge pull request #1408 from jl777/jl777
fix CCaddress calcs
|
2019-04-11 22:41:17 -11:00 |
|
|
jl777
|
79db859357
|
Merge pull request #1407 from blackjok3rtt/jl777
fix address type
|
2019-04-11 22:39:35 -11:00 |
|
|
jl777
|
db3b3de75d
|
Merge pull request #1406 from jl777/dev
Dev
|
2019-04-11 20:06:30 -11:00 |
|
|
jl777
|
3069976877
|
Merge pull request #1405 from jl777/FSM
FSM
|
2019-04-11 20:06:02 -11:00 |
|
|
jl777
|
8a17bc9dd9
|
Merge pull request #1404 from jl777/jl777
revert qsort changes
|
2019-04-11 20:05:29 -11:00 |
|
|
jl777
|
cf6dd0a8f9
|
Merge pull request #1403 from jl777/dev
Dev
|
2019-04-11 19:05:51 -11:00 |
|
|
jl777
|
27a06b1cc1
|
Merge branch 'beta' into dev
|
2019-04-11 19:05:43 -11:00 |
|
|
jl777
|
5cb4297219
|
Merge pull request #1402 from jl777/FSM
FSM
|
2019-04-11 19:04:48 -11:00 |
|
|
jl777
|
11cc404050
|
Merge branch 'dev' into FSM
|
2019-04-11 19:04:36 -11:00 |
|
|
jl777
|
0a898c31b5
|
Merge pull request #1401 from jl777/jl777
Jl777
|
2019-04-11 19:03:14 -11:00 |
|
|
jl777
|
2a31c4558a
|
Merge pull request #1400 from blackjok3rtt/jl777
fix bug with dpow update
|
2019-04-11 19:02:37 -11:00 |
|
|
jl777
|
d73d1fd6ff
|
Merge pull request #1399 from jl777/jl777
Jl777
|
2019-04-11 08:12:00 -11:00 |
|
|
jl777
|
e8c49b0157
|
Merge pull request #1398 from jl777/dev
Dev
|
2019-04-11 03:05:53 -11:00 |
|