Merged in coinplugin/go-metadium (pull request #5)

Master

Approved-by: Uh Sado <[email protected]>

metadium/scripts/gmet.sh

@@ -93,7 +93,10 @@ function init ()
     [ $? = 0 ] || return $?
 
     echo "PORT=${PORT}" > $d/.rc
-    ${GMET} --datadir ${PWD} init $d/genesis.json
+    ${GMET} --datadir $d init $d/genesis.json
+    echo "Generating dags for epoch 0..."
+    ${GMET} makedag 0     $d/.ethash &
+    wait
 }
 
 function wipe ()
@@ -184,11 +187,22 @@ function start ()
     METADIUM_OPTS="--consensusmethod ${CONSENSUS_METHOD} --fixedgaslimit ${FIXED_GAS_LIMIT} --maxidleblockinterval ${MAX_IDLE_BLOCK_INTERVAL} --blocksperturn ${BLOCKS_PER_TURN} --metadiumabi ${METADIUM_ABI}"
 
     cd $d
-    $GMET --datadir ${PWD} --ethash.dagdir ${PWD}/.ethash --nodiscover    \
-        ${CHAIN_ID_OPT} ${MINE_OPT} --metrics ${PORT_OPT} ${RPC_PORT_OPT} \
-        ${TXPOOL_OPTS} ${TARGET_GAS_LIMIT_OPT}	${METADIUM_OPTS}          \
-        --gasprice ${GAS_PRICE} ${RCJS} 2>&1 \
-	| ${LOGROT} ${d}/logs/log 10M 5 &
+    if [ ! "$2" = "inner" ]; then
+	$GMET --datadir ${PWD} --ethash.dagdir ${PWD}/.ethash		\
+	      --nodiscover ${CHAIN_ID_OPT} ${MINE_OPT} --metrics	\
+	      ${PORT_OPT} ${RPC_PORT_OPT} ${TXPOOL_OPTS}		\
+	      ${TARGET_GAS_LIMIT_OPT} ${METADIUM_OPTS}			\
+	      --gasprice ${GAS_PRICE} ${RCJS} 2>&1			\
+	    | ${LOGROT} ${d}/logs/log 10M 5 &
+    else
+	exec > >(${LOGROT} ${d}/logs/log 10M 5)
+	exec 2>&1
+	exec $GMET --datadir ${PWD} --ethash.dagdir ${PWD}/.ethash	\
+	      --nodiscover ${CHAIN_ID_OPT} ${MINE_OPT} --metrics	\
+	      ${PORT_OPT} ${RPC_PORT_OPT} ${TXPOOL_OPTS}		\
+	      ${TARGET_GAS_LIMIT_OPT} ${METADIUM_OPTS}			\
+	      --gasprice ${GAS_PRICE} ${RCJS}
+    fi
 }
 
 function start_all ()
@@ -281,6 +295,14 @@ case "$1" in
     fi
     ;;
 
+"start-inner")
+    if [ "$2" = "" ]; then
+	usage;
+    else
+        start $2 inner
+    fi
+    ;;
+
 "restart")
     if [ ! "$2" = "" ]; then
 	$0 stop $2