jl777
|
0ba2e30b2d
|
Merge remote-tracking branch 'origin/jl777' into jl777
|
2019-04-16 20:12:33 -11:00 |
|
jl777
|
1e4648e509
|
Merge branch 'FSM' into jl777
|
2019-04-16 20:12:27 -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 |
|
blackjok3r
|
78162cf103
|
Add height param to importprivkey
|
2019-04-17 15:00:47 +08:00 |
|
blackjok3rtt
|
f2666b3293
|
Merge pull request #67 from jl777/FSM
Fsm
|
2019-04-17 14:36:14 +08:00 |
|
jl777
|
ec780ae3ba
|
Merge pull request #1432 from blackjok3rtt/ac_nk
Add assetchains_nk
|
2019-04-16 19:09:54 -11:00 |
|
blackjok3r
|
18854e2af7
|
ac_nk params
|
2019-04-17 13:42:02 +08:00 |
|
blackjok3rtt
|
c2c425d855
|
Merge pull request #66 from jl777/jl777
Jl777
|
2019-04-17 10:38:18 +08:00 |
|
Duke Leto
|
2b019cee0a
|
fix testchain asset name
|
2019-04-16 08:39:24 -07:00 |
|
Jonathan "Duke" Leto
|
a3da29e994
|
Update testchain params to mimic mainnet, since our production supply curve is hardcoded and CLI args must match it
|
2019-04-16 17:29:51 +02:00 |
|
jl777
|
527f1ff90e
|
Merge pull request #1429 from blackjok3rtt/CCparams_test
cccustom changed to use CCopret
|
2019-04-16 02:20:34 -11:00 |
|
blackjok3r
|
87ebcc3b2b
|
revert createrawtransaction
|
2019-04-16 21:11:06 +08:00 |
|
blackjok3r
|
660c8dc26c
|
fix has_opret function
|
2019-04-16 21:08:39 +08:00 |
|
blackjok3r
|
997f9ce5fc
|
initial commit to use CCopt for custom CC
|
2019-04-16 20:59:15 +08:00 |
|
jl777
|
81aa1908d9
|
Deprecate prices_extract
|
2019-04-15 23:31:59 -11:00 |
|
jl777
|
094f72afb4
|
Smoothed
|
2019-04-15 23:27:20 -11:00 |
|
jl777
|
ece9e468bc
|
#define PRICES_MAXDATAPOINTS 8
|
2019-04-15 23:14:50 -11:00 |
|
blackjok3rtt
|
7f89532c03
|
Merge pull request #64 from blackjok3rtt/jl777
fix wallet code. Force daemon close and reccomend zapwallettxns for n…
|
2019-04-16 16:08:41 +08: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 |
|
blackjok3r
|
0bb8c5be22
|
fix wallet code. Force daemon close and reccomend zapwallettxns for non staking chains.
|
2019-04-16 13:14:04 +08:00 |
|
blackjok3r
|
c3a9d0fa0c
|
test
|
2019-04-16 12:28:27 +08:00 |
|
Jonathan "Duke" Leto
|
a4fcce1b9c
|
testnet airdrop script, because lets be sure
|
2019-04-15 21:22:55 -07:00 |
|
blackjok3rtt
|
4049f9f6be
|
Merge pull request #63 from jl777/jl777
Jl777
|
2019-04-16 11:52:45 +08:00 |
|
Jonathan "Duke" Leto
|
7e5fd654a3
|
Initial airdrop script to disperse funds to HUSH3 chain
|
2019-04-15 20:52:27 -07: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
|
5ee99e866a
|
Merge branch 'FSM' into jl777
|
2019-04-15 04:03:17 -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 |
|
Mihailo Milenkovic
|
f087f49c4d
|
Fix looking for wrong type marker in Oracles CC
|
2019-04-15 16:00:03 +02:00 |
|
Jonathan "Duke" Leto
|
1ce6ddbf1e
|
Merge branch 'duke' into dev
|
2019-04-15 06:20:42 -07:00 |
|
Luke Childs
|
e0d64f45c7
|
Fix hushd to work when called via symlink
|
2019-04-15 06:20:25 -07:00 |
|
Duke Leto
|
6b5958224e
|
Merge pull request #4 from lukechilds/patch-7
Fix hushd to work when called via symlink
|
2019-04-15 05:45:03 -07:00 |
|
Luke Childs
|
9e7c323d6d
|
Fix hushd to work when called via symlink
|
2019-04-15 19:12:01 +07:00 |
|
blackjok3r
|
2e727de8ee
|
fix wallet crash
|
2019-04-15 19:58:13 +08:00 |
|
jl777
|
8e47705d50
|
Merge pull request #1419 from jl777/dev
Dev
|
2019-04-14 18:21:35 -11:00 |
|
jl777
|
c07f43dd6e
|
Merge branch 'beta' into dev
|
2019-04-14 18:20:25 -11:00 |
|
jl777
|
201f1e86c0
|
Merge pull request #1418 from jl777/FSM
FSM
|
2019-04-14 18:20:02 -11:00 |
|
jl777
|
25c603c717
|
Merge branch 'dev' into FSM
|
2019-04-14 18:19:18 -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
|
a667d6a596
|
Merge branch 'FSM' into jl777
|
2019-04-14 18:17:12 -11:00 |
|
jl777
|
31eb126876
|
Merge pull request #1417 from blackjok3rtt/jl777
revert miner change
|
2019-04-14 18:16:47 -11:00 |
|
blackjok3rtt
|
0666dc7cd8
|
Merge pull request #62 from jl777/dev
Dev
|
2019-04-15 13:07:42 +08:00 |
|
blackjok3rtt
|
47e290017f
|
Merge pull request #61 from blackjok3rtt/jl777
Jl777
|
2019-04-15 13:06:25 +08:00 |
|
blackjok3r
|
c9f395f241
|
revert miner change. Causes crash when staking.
|
2019-04-15 12:08:58 +08:00 |
|
blackjok3rtt
|
741f5b7d58
|
Merge pull request #60 from jl777/jl777
Jl777
|
2019-04-15 12:02:19 +08: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 |
|