Use variable names for accounts

eosdac · Nov 6, 2018 · 3983245 · 3983245
1 parent a7276da
commit 3983245
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/eosdac-testnet/build.sh b/eosdac-testnet/build.sh
@@ -18,8 +18,14 @@ git pull
 cd eosdactoken/
 $EOSIOCPP -o eosdactoken.wasm eosdactoken.cpp
 
+cd $DACCONTRACTS/dacservice/
+git pull
+$EOSIOCPP -DTRANSFER_DELAY=60 -o dacservice.wasm dacservice.cpp
+
 cd $PWD
 
-run_cmd "set contract "$dactokens" "$DACCONTRACTS/eosdactoken/eosdactoken" -p eosdactokens"
+run_cmd "set contract "$dactokens" "$DACCONTRACTS/eosdactoken/eosdactoken" -p $dactokens"
+
+run_cmd "set contract "$daccustodian" "$DACCONTRACTS/daccustodian" -p $daccustodian"
 
-run_cmd "set contract "$daccustodian" "$DACCONTRACTS/daccustodian" -p daccustodian"
+run_cmd "set contract "$dacservice" "$DACCONTRACTS/dacservice" -p $dacservice"
diff --git a/eosdac-testnet/populate.sh b/eosdac-testnet/populate.sh
@@ -13,7 +13,7 @@ echo -e "\n\n----------------- POPULATING DAC -------------------\n\n";
 
 
 
-dacaccounts="$dacextra $dacowner $dactokens $dacauthority $daccustodian"
+dacaccounts="$dacextra $dacowner $dactokens $dacauthority $daccustodian $dacservice"
 
 for act in $dacaccounts
 do
@@ -36,16 +36,20 @@ rm -f token_config.json
 cleos --wallet-url $WALLET_URL -u $API_URL push action $dactokens create '["eosdactokens", "10000000000.0000 EOSDAC", 0]' -p $dactokens
 cleos --wallet-url $WALLET_URL -u $API_URL push action $dactokens issue '["eosdactokens", "1000000000.0000 EOSDAC", "Issue"]' -p $dactokens
 
-run_cmd "set contract $daccustodian "$DACCONTRACTS/daccustodian" -p daccustodian"
+run_cmd "set contract $daccustodian "$DACCONTRACTS/daccustodian" -p $daccustodian"
 run_cmd "get code $daccustodian"
 
 run_cmd "get table $daccustodian daccustodian config"
 
-run_cmd "push action $daccustodian updateconfig dac_config.json -p $dacauthority"
+run_cmd "push action $daccustodian updateconfig dac_config.json -p $daccustodian"
 
 run_cmd "get table $daccustodian $daccustodian config"
 
 
+run_cmd "set contract $dacservice "$DACCONTRACTS/dacservice" -p $dacservice"
+run_cmd "get code $dacservice"
+
+
 # Developer accounts
 create_devs() {
   create_act evilmikehere EOS54NkNpEt9aotyBvEZVfj54NuFAebaDLnyg2GtJ6pyvBoxxg9Aw