Merge branch 'dev' into jl777

README.md

@@ -231,3 +231,4 @@ Instead of generating 1 secret address, generate 100 and make a script file with
 And make sure to delete all traces of this when the JUMBLR is finished. You will end up with 100 addresses that have an average of 1000 KMD each. So as long as you are careful and dont do a 10,000 KMD transaction (that will link 10 of your secret addresses together), you can appear as 100 different people each with 1000 KMD.
 
 
+

depends/packages/librustzcash.mk

@@ -7,7 +7,6 @@ $(package)_sha256_hash=a5760a90d4a1045c8944204f29fa2a3cf2f800afee400f88bf89bbfe2
 $(package)_git_commit=91348647a86201a9482ad4ad68398152dc3d635e
 $(package)_dependencies=rust
 
-
 ifeq ($(host_os),mingw32)
 define $(package)_build_cmds
  ~/.cargo/bin/cargo build --release --target=x86_64-pc-windows-gnu --verbose

src/ac/dsec

@@ -0,0 +1,2 @@
+#!/bin/bash
+./komodo-cli -ac_name=DSEC $1 $2 $3 $4 $5 $6

src/assetchains

@@ -21,7 +21,7 @@ function komodo_asset ()
         supply=" "
     fi
 
-    $komodo_binary -pubkey=$pubkey -ac_name=$1 $supply -addnode=$seed_ip $gen $args &
+    $komodo_binary -ac_name=$1 $gen $supply $args -pubkey=$pubkey -addnode=$seed_ip &
     sleep $delay
 }
 
@@ -47,7 +47,6 @@ komodo_asset MNZ 257142858
 komodo_asset AXO 200000000
 komodo_asset ETOMIC 100000000
 komodo_asset BTCH 20998641
-komodo_asset VOTE2018 600000000
 komodo_asset PIZZA 100000000
 komodo_asset BEER 100000000
 komodo_asset NINJA 100000000
@@ -55,3 +54,4 @@ komodo_asset OOT 216000000
 komodo_asset BNTN 500000000
 komodo_asset CHAIN 999999
 komodo_asset PRLPAY 500000000
+komodo_asset DSEC 7000000

src/assetchains.old

@@ -24,7 +24,6 @@ echo $pubkey
 ./komodod -pubkey=$pubkey -ac_name=AXO -ac_supply=200000000 -addnode=78.47.196.146 &
 ./komodod -pubkey=$pubkey -ac_name=ETOMIC -ac_supply=100000000 -addnode=78.47.196.146 &
 ./komodod -pubkey=$pubkey -ac_name=BTCH -ac_supply=20998641 -addnode=78.47.196.146 &
-./komodod -pubkey=$pubkey -ac_name=VOTE2018 -ac_supply=600000000 -addnode=78.47.196.146 &
 ./komodod -pubkey=$pubkey -ac_name=BEER -ac_supply=100000000 -addnode=78.47.196.146 &
 ./komodod -pubkey=$pubkey -ac_name=PIZZA -ac_supply=100000000 -addnode=78.47.196.146 &
 ./komodod -pubkey=$pubkey -ac_name=NINJA -ac_supply=100000000 -addnode=78.47.196.146 &
@@ -32,6 +31,7 @@ echo $pubkey
 ./komodod -pubkey=$pubkey -ac_name=BNTN -ac_supply=500000000 -addnode=94.130.169.205 &
 ./komodod -pubkey=$pubkey -ac_name=CHAIN -ac_supply=999999 -addnode=78.47.146.222 &
 ./komodod -pubkey=$pubkey -ac_name=PRLPAY -ac_supply=500000000 -addnode=13.250.226.125 &
+./komodod -pubkey=$pubkey -ac_name=DSEC -ac_supply=7000000 -addnode=185.148.147.30 &
 #sleep $delay
 
 #./komodod -pubkey=$pubkey -ac_name=USD -addnode=78.47.196.146 $1  &

src/assetchains_stop

@@ -30,7 +30,6 @@ komodo_stop MNZ
 komodo_stop AXO
 komodo_stop ETOMIC
 komodo_stop BTCH
-komodo_stop VOTE2018
 komodo_stop PIZZA
 komodo_stop BEER
 komodo_stop NINJA
@@ -38,3 +37,4 @@ komodo_stop OOT
 komodo_stop BNTN
 komodo_stop CHAIN
 komodo_stop PRLPAY
+komodo_stop DSEC

src/dpowassets

@@ -26,11 +26,11 @@ curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dp
 curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"ETOMIC\",\"pubkey\":\"$pubkey\"}"
 curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"BTCH\",\"pubkey\":\"$pubkey\"}"
 curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"CHAIN\",\"pubkey\":\"$pubkey\"}"
-curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"VOTE2018\",\"pubkey\":\"$pubkey\"}"
 curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"NINJA\",\"pubkey\":\"$pubkey\"}"
 curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"OOT\",\"pubkey\":\"$pubkey\"}"
 curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"BNTN\",\"pubkey\":\"$pubkey\"}"
 curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"PRLPAY\",\"pubkey\":\"$pubkey\"}"
+curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"DSEC\",\"pubkey\":\"$pubkey\"}"
 
 curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"CHIPS\",\"pubkey\":\"$pubkey\"}"
 #curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"GAME\",\"freq\":10,\"pubkey\":\"$pubkey\"}"

src/fiat-cli

@@ -22,9 +22,9 @@ echo etomic; fiat/etomic $1 $2 $3 $4
 echo btch; fiat/btch $1 $2 $3 $4
 echo pizza; fiat/pizza $1 $2 $3 $4
 echo beer; fiat/beer $1 $2 $3 $4
-echo vote2018; fiat/vote2018 $1 $2 $3 $4
 echo ninja; fiat/ninja $1 $2 $3 $4
 echo oot; fiat/oot $1 $2 $3 $4
 echo bntn; fiat/bntn $1 $2 $3 $4
 echo chain; fiat/chain $1 $2 $3 $4
 echo prlpay; fiat/prlpay $1 $2 $3 $4
+echo dsec; fiat/dsec $1 $2 $3 $4

src/fiat/dsec

@@ -0,0 +1,2 @@
+#!/bin/bash
+./komodo-cli -ac_name=DSEC $1 $2 $3 $4 $5 $6

src/fiat/vote2018

@@ -1,2 +0,0 @@
-#!/bin/bash
-./komodo-cli -ac_name=VOTE2018 $1 $2 $3 $4 $5 $6