Add file for functions

eosdac · Oct 22, 2018 · 7900933 · 7900933
1 parent 488db75
commit 7900933
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 64 deletions.
diff --git a/eosdac-testnet/boot.sh b/eosdac-testnet/boot.sh
@@ -5,24 +5,12 @@ reset=`tput sgr0`
 
 source ./conf_private.sh
 source ./conf.sh
+source ./functions.sh
 
 
 
 echo -e "\n\n----------------- BOOT SEQUENCE -------------------\n\n";
 
-run_cmd() {
-        cmd="$1";
-        echo -e "\n\n >> ${green} Next command: $1 \n\n ${reset}";
-        #wait;
-        #read -p "Press enter to continue ${reset}";
-        eval "cleos --wallet-url $WALLET_URL -u $API_URL $1";
-}
-
-create_act() {
-  act="$1"
-  key="$2"
-  eval "cleos --wallet-url $WALLET_URL -u $API_URL system newaccount --stake-cpu \"10.0000 EOS\" --stake-net \"10.0000 EOS\" --transfer --buy-ram-kbytes 1024 eosio $act $key"
-}
 
 
 run_cmd "set contract eosio "$CONTRACTS/eosio.bios" -p eosio";

diff --git a/eosdac-testnet/build.sh b/eosdac-testnet/build.sh
@@ -6,14 +6,7 @@ reset=`tput sgr0`
 source ./conf_private.sh
 source ./conf_dac.sh
 source ./conf.sh
-
-run_cmd() {
-        cmd="$1";
-        echo -e "\n\n >> ${green} Next command: $1 \n\n ${reset}";
-        #wait;
-        #read -p "Press enter to continue ${reset}";
-        eval "cleos --wallet-url $WALLET_URL -u $API_URL $1";
-}
+source ./functions.sh
 
 echo -e "\n\n----------------- BUILDING CONTRACTS -------------------\n\n";
 

diff --git a/eosdac-testnet/change_config.sh b/eosdac-testnet/change_config.sh
@@ -6,21 +6,15 @@ reset=`tput sgr0`
 source ./conf_private.sh
 source ./conf_dac.sh
 source ./conf.sh
+source ./functions.sh
 
 
 
 echo -e "\n\n----------------- UPDATING CONFIG -------------------\n\n";
 
-run_cmd() {
-        cmd="$1";
-        echo -e "\n\n >> ${green} Next command: $1 \n\n ${reset}";
-        #wait;
-        #read -p "Press enter to continue ${reset}";
-        eval "cleos --wallet-url $WALLET_URL -u $API_URL $1";
-}
-
 ./msig/gen_requested_permissions.py
 
+run
 run_cmd "push action -s -d -j daccustodian updateconfig dac_config2.json -p dacauthority@high > updateconfig.trx"
 run_cmd "multisig cancel eosdaccustab updconfig eosdaccustab"
 run_cmd "multisig propose_trx updconfig ./requested_perms.json updateconfig.trx eosdaccustab"

diff --git a/eosdac-testnet/fire.sh b/eosdac-testnet/fire.sh
@@ -6,18 +6,12 @@ reset=`tput sgr0`
 source ./conf_private.sh
 source ./conf_dac.sh
 source ./conf.sh
+source ./functions.sh
 
 
 
 echo -e "\n\n----------------- FIRING CUSTODIAN -------------------\n\n";
 
-run_cmd() {
-        cmd="$1";
-        echo -e "\n\n >> ${green} Next command: $1 \n\n ${reset}";
-        #wait;
-        #read -p "Press enter to continue ${reset}";
-        eval "cleos --wallet-url $WALLET_URL -u $API_URL $1";
-}
 
 ./msig/gen_requested_permissions.py
 

diff --git a/eosdac-testnet/functions.sh b/eosdac-testnet/functions.sh
@@ -0,0 +1,15 @@
+
+
+run_cmd() {
+        cmd="$1";
+        echo -e "\n\n >> ${green} Next command: $1 \n\n ${reset}";
+        #wait;
+        #read -p "Press enter to continue ${reset}";
+        eval "cleos --wallet-url $WALLET_URL -u $API_URL $1";
+}
+
+create_act() {
+  act="$1"
+  key="$2"
+  eval "cleos --wallet-url $WALLET_URL -u $API_URL system newaccount --stake-cpu \"10.0000 EOS\" --stake-net \"10.0000 EOS\" --transfer --buy-ram-kbytes 1024 eosio $act $key"
+}
diff --git a/eosdac-testnet/permissions.sh b/eosdac-testnet/permissions.sh
@@ -6,6 +6,7 @@ reset=`tput sgr0`
 source ./conf_private.sh
 source ./conf_dac.sh
 source ./conf.sh
+source ./functions.sh
 
 
 

diff --git a/eosdac-testnet/populate.sh b/eosdac-testnet/populate.sh
@@ -6,24 +6,13 @@ reset=`tput sgr0`
 source ./conf_private.sh
 source ./conf_dac.sh
 source ./conf.sh
+source ./functions.sh
 
 
 
 echo -e "\n\n----------------- POPULATING DAC -------------------\n\n";
 
-run_cmd() {
-        cmd="$1";
-        echo -e "\n\n >> ${green} Next command: $1 \n\n ${reset}";
-        #wait;
-        #read -p "Press enter to continue ${reset}";
-        eval "cleos --wallet-url $WALLET_URL -u $API_URL $1";
-}
 
-create_act() {
-  act="$1"
-  key="$2"
-  eval "cleos --wallet-url $WALLET_URL -u $API_URL system newaccount --stake-cpu \"10.0000 EOS\" --stake-net \"10.0000 EOS\" --transfer --buy-ram-kbytes 1024 eosio $act $key"
-}
 
 
 dacaccounts="$dacextra $dacowner $dactokens $dacauthority $daccustodian"

diff --git a/eosdac-testnet/resign.sh b/eosdac-testnet/resign.sh
@@ -7,15 +7,7 @@ reset=`tput sgr0`
 source ./conf_private.sh
 source ./conf_dac.sh
 source ./conf.sh
-
-
-run_cmd() {
-        cmd="$1";
-        echo -e "\n\n >> ${green} Next command: $1 \n\n ${reset}";
-        #wait;
-        #read -p "Press enter to continue ${reset}";
-        eval "cleos --wallet-url $WALLET_URL -u $API_URL $1";
-}
+source ./functions.sh
 
 
 echo -e "\n\n----------------- RESIGNING -------------------\n\n";

diff --git a/eosdac-testnet/transfer_raw.sh b/eosdac-testnet/transfer_raw.sh
@@ -6,18 +6,12 @@ reset=`tput sgr0`
 source ./conf_private.sh
 source ./conf_dac.sh
 source ./conf.sh
+source ./functions.sh
 
 
 
 echo -e "\n\n----------------- TRANSFER TOKENS -------------------\n\n";
 
-run_cmd() {
-        cmd="$1";
-        echo -e "\n\n >> ${green} Next command: $1 \n\n ${reset}";
-        #wait;
-        #read -p "Press enter to continue ${reset}";
-        eval "cleos --wallet-url $WALLET_URL -u $API_URL $1";
-}
 
 ./msig/gen_requested_permissions.py