Commit Graph

29553 Commits

Author SHA1 Message Date
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
Jonathan "Duke" Leto
ce2843810b Add snapshot json 2019-04-14 19:40:49 +02:00
phm87
35ad4a6bc3 init.cpp : move help message -whitelistaddress=
Move the help message of -whitelistaddress= to the section related to "Wallet options:"
2019-04-14 19:24:29 +02:00
phm87
f7e94b113e init.cpp : Help message for -whitelistaddress=
Few days ago, on discord, blackjok3r said that he hopes that somebody will add a help message for -whitelistaddress=
2019-04-14 18:29:28 +02:00
jl777
2b16669e64 Merge pull request #1415 from jl777/kolo
VOTE2019
2019-04-14 05:09:35 -11:00
Mihail Fedorov
4f3253fdc9 VOTE2019 2019-04-14 18:56:10 +03:00
Jonathan "Duke" Leto
8fe0e83aa6 Add snapshot of block 499958, just in case 2019-04-14 17:49:26 +02:00
Mihail Fedorov
914da1ba80 Merge remote-tracking branch 'origin/dev' into kolo 2019-04-14 18:48:25 +03:00
Jonathan "Duke" Leto
0395eb4c9e Add ac_cclib to make our future lives easier, as per jl777 2019-04-14 07:03:57 -07:00
jl777
edfaea0c64 Revert to exit 2019-04-14 02:45:06 -11:00
Jonathan "Duke" Leto
5ec7f56c22 Convert to HUSH3 asset name to prevent confusion about HUSH chainparams in iguana/etc 2019-04-14 06:33:43 -07:00
jl777
9d208da4b6 void StartShutdown() 2019-04-14 02:17:58 -11:00
jl777
aec1884070 StartShutdown(); instead of exit() 2019-04-14 02:16:03 -11:00
Jonathan "Duke" Leto
ce3abdcb60 This is the current value of HUSH mainnet supply, which could change via last minute xtns 2019-04-14 05:28:56 -07:00
Jonathan "Duke" Leto
eeb56cea95 This debug print is a bit noisy 2019-04-14 05:20:17 -07:00
jl777
a0136724b0 Merge pull request #1414 from blackjok3rtt/jl777
try wallet fix
2019-04-13 20:56:53 -11:00
blackjok3r
7c56d03474 try wallet fix 2019-04-14 15:51:26 +08:00
jl777
1ca7ee28e0 -) 2019-04-13 20:49:31 -11:00
jl777
8c27ef7372 Coin supply changes to include funds 2019-04-13 20:41:40 -11:00
jl777
9d0a39dbd7 coinsupply inflation calc 2019-04-13 19:19:00 -11:00
Jonathan "Duke" Leto
d2bec31a7a Update to production mainnet block reward values 2019-04-13 19:08:38 -07:00
Jonathan "Duke" Leto
95d29ee2af +x 2019-04-14 02:47:29 +02:00
Jonathan "Duke" Leto
5042c9b11a Add seed node to prod 2019-04-13 11:20:14 -07:00
Jonathan "Duke" Leto
6461e96682 add seed node to script to make it easier 2019-04-13 11:10:42 -07:00
Jonathan "Duke" Leto
964424b6d0 Merge branch 'duke' of https://github.com/MyHush/hush3 into duke 2019-04-13 09:12:57 -07:00
Jonathan "Duke" Leto
d5f46f25eb Add hush-cli-testnet 2019-04-13 09:12:50 -07:00