Cambios para reutilizar los scripts con testnet

bin/admin.sh

@@ -71,7 +71,7 @@ function    admin_syncmode
                 done
             fi
             rm -fr ${BFANODEDIR}/geth/chainstate ${BFANODEDIR}/geth/lightchainstate
-            geth --cache 0 --datadir ${BFANODEDIR} init ${BFAHOME}/src/genesis.json
+            geth --cache 0 --datadir ${BFANODEDIR} init ${BFAHOME}/config/${BFANETWORKID}/genesis.json
             test $killed -eq 1 &&
                 echo &&
                 echo "The startup.sh should restart your geth shortly."

bin/env.testnet

+export BFAHOME=${HOME}/bfa-dev
+export BFANETWORKID=5445
+export BFANETWORKDIR="${BFAHOME}/network"
+PATH=${PATH}:${BFAHOME}/bin:${HOME}/bin

bin/libbfa.sh

@@ -194,7 +194,7 @@ test    -n "$BFANODEDIR"        ||  BFANODEDIR="${BFANETWORKDIR}/node"
 if [ ! -d "${BFANODEDIR}" -o ! -d "${BFANODEDIR}/geth/chaindata" ]
 then
     echo "Node is not initialised. Initialising with BFA genesis."
-    geth --cache 0 --datadir "${BFANODEDIR}" init "${BFAHOME}/src/genesis.json"
+    geth --cache 0 --datadir "${BFANODEDIR}" init "${BFAHOME}/config/${BFANETWORKID}/genesis.json"
 fi
 #
 # netport

bin/start.sh

@@ -3,16 +3,9 @@
 if [ -z "${BFAHOME}" ]; then echo "\$BFAHOME not set. Did you source bfa/bin/env ?" >&2; exit 1; fi
 source ${BFAHOME}/bin/libbfa.sh || exit 1
 
-enodeARIU="7ec4dd9d5e1a2b29d6b60aa9f95677c0c3a5f9306e73d65dd3bcbfda3737a8c509b02d1eab763ce39f18cfe96423df7ee544d6c36191ec17f59ade75bc99d358"
-bootARIUv4="enode://${enodeARIU}@[170.210.45.179]:30301"
-bootARIUv6="enode://${enodeARIU}@[2800:110:44:6300::aad2:2db3]:30301"
+source ${BFAHOME}/config/${BFANETWORKID}/bootnodes || exit 1
 
-enodeUNC="82b66b13d7addcf9ffe1e4e972a105f6ccf50557161c4a0978a5d9ce595ababde609ea8a49897ae89b1d41e90551cb2e9241363238593e950ca68bd5af7c24d6"
-bootUNCv4="enode://${enodeUNC}@[200.16.28.28]:30301"
 
-enodeDGSI="59ae768ecdee632e0daceccb6f71b215392eba89230d626573f2fb4e9c0786c9a661027ab7343820ca63d96fe48ffd81ed1bf6e4d512f0ba50ec072c9efd9e4e"
-bootDGSIv4="enode://${enodeDGSI}@[200.108.146.100]:30301"
-bootnodes="${bootARIUv6},${bootARIUv4},${bootUNCv4},${bootDGSIv4}"
 
 # touch the "miner" file if you are authorized to mine
 # If you don't want to restart after touching the file,

config/47525974938/bootnodes

+enodeARIU="7ec4dd9d5e1a2b29d6b60aa9f95677c0c3a5f9306e73d65dd3bcbfda3737a8c509b02d1eab763ce39f18cfe96423df7ee544d6c36191ec17f59ade75bc99d358"
+bootARIUv4="enode://${enodeARIU}@[170.210.45.179]:30301"
+bootARIUv6="enode://${enodeARIU}@[2800:110:44:6300::aad2:2db3]:30301"
+
+enodeUNC="82b66b13d7addcf9ffe1e4e972a105f6ccf50557161c4a0978a5d9ce595ababde609ea8a49897ae89b1d41e90551cb2e9241363238593e950ca68bd5af7c24d6"
+bootUNCv4="enode://${enodeUNC}@[200.16.28.28]:30301"
+
+enodeDGSI="59ae768ecdee632e0daceccb6f71b215392eba89230d626573f2fb4e9c0786c9a661027ab7343820ca63d96fe48ffd81ed1bf6e4d512f0ba50ec072c9efd9e4e"
+bootDGSIv4="enode://${enodeDGSI}@[200.108.146.100]:30301"
+bootnodes="${bootARIUv6},${bootARIUv4},${bootUNCv4},${bootDGSIv4}"

config/47525974938/genesis.json

+{
+  "config": {
+    "chainId": 200941592,
+    "homesteadBlock": 0, "eip150Block": 0, "eip155Block": 0, "eip158Block": 0, "byzantiumBlock": 4,
+    "eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "clique": { "period": 5, "epoch": 30000 }
+  },
+  "nonce": "0x0000000000000000",
+  "timestamp": "0x5baa5baa",
+  "extraData": "0x426c6f636b636861696e204665646572616c20417267656e74696e61204e494319fe7b9b3a1bebde77c5374c8e13c623e3d1b5b2342e1d075d820ed3f9d9a05967ec4055ab23fa1e46991ada2a2544468eb3673524641bf293f23ccc91c055c6478bd0ad6d19bcb58f5e7ca7b04e67f10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "gasLimit": "0xffeeddcc", "difficulty": "0x1", "number": "0x0", "gasUsed": "0x0",
+  "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "coinbase": "0x0000000000000000000000000000000000000000",
+  "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "alloc": {
+    "bfa02a9639318f5ed1291e2cee387aa9f9d68f98": { "balance": "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" },
+    "bfa1c42c7381a4ad32e13ce3263b639a0e0488f2": { "balance": "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" },
+    "bfa2c97c3f59cc929e8feb1aee2aca0b38235d18": { "balance": "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" },
+    "bfa3eb31f6526a5b29ae2302508bb6b1400d1fd1": { "balance": "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" },
+    "bfa846ddd1fb18af693f24d316c12d8e88f4b79f": { "balance": "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" },
+    "bfa8b1acfb51da0975274c6ebd46704c6c670a07": { "balance": "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" },
+    "bfab583022c5c18fec70965d63985b86f96c5657": { "balance": "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" },
+    "bfae9512c1cf4d9ce549333725c02ee8b3e5f049": { "balance": "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" }
+  }
+}

config/5445/bootnodes

+bootnodeid=6c81b38551fec2f1142b58ed65137cc1b7dfdc7b35bc556ef26604c41e30fcdeb12212b3c19913584f71dc7bf87d76cd67fa523e96996c0f148390fb76fdc5f7
+bootnodev6=2800:40:1:6::135
+bootnodev4=200.68.65.135
+bootnodeport=5445
+bootnodes="enode://${bootnodeid}@[$bootnodev6]:${bootnodeport},enode://${bootnodeid}@[$bootnodev4]:${bootnodeport}"
+

config/5445/genesis.json

+{
+  "config": {
+    "chainId": 5445,
+    "homesteadBlock": 0, "eip150Block": 0, "eip155Block": 0, "eip158Block": 0, "byzantiumBlock": 4,
+    "eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "clique": { "period": 15, "epoch": 30000 }
+  },
+  "nonce": "0x0000000000000000",
+  "timestamp": "0x5b293735",
+  "extraData": "0x426c6f636b636861696e204665646572616c20417267656e74696e61204e49432fd693d1204907ae7d97b5d7d2e93ef877ef2c7d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "gasLimit": "0xffeeddcc", "difficulty": "0x1", "number": "0x0", "gasUsed": "0x0",
+  "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "coinbase": "0x0000000000000000000000000000000000000000",
+  "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "alloc": { "2fd693d1204907ae7d97b5d7d2e93ef877ef2c7d": { "balance": "0x200000000000000000000000000000000000000000000000000000000000000" } }
+}