Develop -> Master ( release/2.6.x_3.2.x )

.gitignore

@@ -0,0 +1,2 @@
+bin/
+walletkey.ini

scripts/fio_launch.sh

@@ -19,7 +19,7 @@ echo $'\n\n                   Welcome to the Local Test Environment'
 
 restartneeded=0
 oldpath=$PWD/scripts
-basepath=$PWD/bin/baseContract/2.2.x
+basepath=$PWD/bin/baseContract/master
 export oldpath
 export basepath
 
@@ -41,14 +41,14 @@ fi
 
 if [ $mChoice == 2 ]; then
     echo Updating Current Base Contracts
-    cd ../fio.devtools/bin/baseContract/2.2.x/
-    git clone http://github.com/fioprotocol/fio.contracts -b release/2.2.x
+    cd ../fio.devtools/bin/baseContract/master/
+    git clone http://github.com/fioprotocol/fio.contracts
     cd fio.contracts/
     ./build.sh
     cp ./contracts/fio.fee/fio.fee.abi ./build/contracts/fio.fee/fio.fee.abi
     cp ./contracts/fio.address/fio.address.abi ./build/contracts/fio.address/fio.address.abi
     cp ./contracts/fio.request.obt/fio.request.obt.abi ./build/contracts/fio.request.obt/fio.request.obt.abi
-    cp ./contracts/fio.staking/fio.staking.abi ./build/contracts/fio.staking/fio.staking.abi
+    # cp ./contracts/fio.staking/fio.staking.abi ./build/contracts/fio.staking/fio.staking.abi
 
     echo Building Development Contracts
     cd ../../../../../fio.contracts
@@ -134,66 +134,73 @@ if [ $mChoice == 1 ]; then
     fi
 
     #FIO Base Directory Check
-    if [ -f bin/baseContract/2.2.x/fio.contracts/build/contracts/eosio.bios/eosio.bios.wasm ]; then
+    if [ -f bin/baseContract/master/fio.contracts/build/contracts/eosio.bios/eosio.bios.wasm ]; then
         eosio_bios_contract_base_path="$basepath/fio.contracts/build/contracts/eosio.bios"
     else
         echo 'No wasm file found at $PWD/build/contracts/eosio.bios'
     fi
 
-    if [ -f bin/baseContract/2.2.x/fio.contracts/build/contracts/fio.system/fio.system.wasm ]; then
+    if [ -f bin/baseContract/master/fio.contracts/build/contracts/fio.system/fio.system.wasm ]; then
         fio_system_contract_base_path="$basepath/fio.contracts/build/contracts/fio.system"
     else
         echo 'No wasm file found at $PWD/build/contracts/fio.system'
     fi
 
-    if [ -f bin/baseContract/2.2.x/fio.contracts/build/contracts/eosio.msig/eosio.msig.wasm ]; then
+    if [ -f bin/baseContract/master/fio.contracts/build/contracts/eosio.msig/eosio.msig.wasm ]; then
         eosio_msig_contract_base_path="$basepath/fio.contracts/build/contracts/eosio.msig"
     else
         echo 'No wasm file found at $PWD/build/contracts/eosio.msig'
     fi
 
-    if [ -f bin/baseContract/2.2.x/fio.contracts/build/contracts/fio.token/fio.token.wasm ]; then
+    if [ -f bin/baseContract/master/fio.contracts/build/contracts/fio.token/fio.token.wasm ]; then
         fio_token_contract_base_path="$basepath/fio.contracts/build/contracts/fio.token"
     else
         echo 'No wasm file found at $PWD/build/contracts/fio.token'
     fi
     #Fio Name Directory Check
-    if [ -f bin/baseContract/2.2.x/fio.contracts/build/contracts/fio.address/fio.address.wasm ]; then
+    if [ -f bin/baseContract/master/fio.contracts/build/contracts/fio.address/fio.address.wasm ]; then
         fio_contract_base_path="$basepath/fio.contracts/build/contracts/fio.address"
     else
         echo 'No wasm file found at $PWD/build/contracts/fio.address'
     fi
 
-    if [ -f bin/baseContract/2.2.x/fio.contracts/build/contracts/fio.fee/fio.fee.wasm ]; then
+    if [ -f bin/baseContract/master/fio.contracts/build/contracts/fio.fee/fio.fee.wasm ]; then
         fio_fee_base_path="$basepath/fio.contracts/build/contracts/fio.fee"
     else
         echo 'No wasm file found at $PWD/build/contracts/fio.fee'
     fi
 
-    if [ -f bin/baseContract/2.2.x/fio.contracts/build/contracts/fio.request.obt/fio.request.obt.wasm ]; then
+    if [ -f bin/baseContract/master/fio.contracts/build/contracts/fio.request.obt/fio.request.obt.wasm ]; then
             fio_reqobt_base_path="$basepath/fio.contracts/build/contracts/fio.request.obt"
         else
             echo 'No wasm file found at $PWD/build/contracts/fio.request.obt'
     fi
 
-    if [ -f bin/baseContract/2.2.x/fio.contracts/build/contracts/fio.tpid/fio.tpid.wasm ]; then
+    if [ -f bin/baseContract/master/fio.contracts/build/contracts/fio.tpid/fio.tpid.wasm ]; then
             fio_tpid_base_path="$basepath/fio.contracts/build/contracts/fio.tpid"
         else
             echo 'No wasm file found at $PWD/build/contracts/fio.tpid'
     fi
 
-    if [ -f bin/baseContract/2.2.x/fio.contracts/build/contracts/fio.treasury/fio.treasury.wasm ]; then
+    if [ -f bin/baseContract/master/fio.contracts/build/contracts/fio.treasury/fio.treasury.wasm ]; then
             fio_treasury_base_path="$basepath/fio.contracts/build/contracts/fio.treasury"
         else
             echo 'No wasm file found at $PWD/build/contracts/fio.treasury'
     fi
 
-    if [ -f bin/baseContract/2.2.x/fio.contracts/build/contracts/eosio.wrap/eosio.wrap.wasm ]; then
+    if [ -f bin/baseContract/master/fio.contracts/build/contracts/eosio.wrap/eosio.wrap.wasm ]; then
                eosio_wrap_base_path="$basepath/fio.contracts/build/contracts/eosio.wrap"
             else
                 echo 'No wasm file found at $PWD/build/contracts/eosio.wrap'
     fi
 
+    if [ -f bin/baseContract/master/fio.contracts/build/contracts/fio.staking/fio.staking.wasm ]; then
+            fio_staking_base_path="$basepath/fio.contracts/build/contracts/fio.staking"
+            else
+                echo 'No wasm file found at $PWD/build/contracts/fio.staking'
+    fi
+
+
     export eosio_bios_contract_name_path
     export fio_system_contract_name_path
     export eosio_msig_contract_name_path
@@ -216,6 +223,7 @@ if [ $mChoice == 1 ]; then
     export fio_tpid_base_path
     export fio_treasury_base_path
     export eosio_wrap_base_path
+    export fio_staking_base_path
     export vChoice
 
     sleep 1s

scripts/launch/03_start_test_nodes.sh

@@ -13,24 +13,52 @@ else
 	NODEOS_BIN=$(readlink -f nodeos)
 fi
 
+if [ -z "$1" ]; then
+	read -p $'\n1. Default 2. Increased Transaction Time\nChoose(#):' tChoice
+else
+    tChoice=$1
+fi
+
 #start the bios node, this starts up, and eventually goes into dormancy.
-mkdir -p $HOME/node1
-pushd $HOME/node1 >/dev/null
-"${NODEOS_BIN}" --http-server-address localhost:8879 --p2p-listen-endpoint 0.0.0.0:9876 --config-dir=$HOME/node1 --http-validate-host=0 --logconf=$oldpath/launch/logging.json --enable-stale-production --producer-name eosio --plugin eosio::chain_api_plugin --plugin eosio::net_api_plugin  --contracts-console 2> $oldpath/../node1.txt &
-sleep 1.5s
-popd >/dev/null
-
-#start the first BP node
-mkdir -p $HOME/node2
-pushd $HOME/node2 >/dev/null
-"${NODEOS_BIN}" --producer-name 3ddowwxs11ss --producer-name wttywsmdmfew --plugin eosio::chain_api_plugin --plugin eosio::db_size_api_plugin --logconf=$oldpath/launch/logging.json --plugin eosio::net_api_plugin --http-server-address 0.0.0.0:8889 --http-validate-host=0  --p2p-listen-endpoint 0.0.0.0:9877 --p2p-peer-address localhost:9876 --config-dir $HOME/node2 --data-dir $HOME/node2  --private-key [\"FIO6ruJ5qLeaa6VtYVpkcU4AeWVaL2QvViyQqjxjpAWYRFsYaSbBN\",\"5KLxezoCEw5Ca97FHq3HPyrzkmZQT6Wqw9DmKaJ6inE6fiN1ijT\"] --private-key [\"FIO6oa5UV9ghWgYH9en8Cv8dFcAxnZg2i9z9gKbnHahciuKNRPyHc\",\"5JvmPVxPxypQEKPwFZQW4Vx7EC8cDYzorVhSWZvuYVFMccfi5mU\"]  --contracts-console 2> $oldpath/../node2.txt &
-popd >/dev/null
-sleep 1.5s
-
-#start the second BP node
-mkdir -p $HOME/node3
-pushd $HOME/node3 >/dev/null
-"${NODEOS_BIN}" --producer-name qbxn5zhw2ypw --producer-name hfdg2qumuvlc  --plugin eosio::chain_api_plugin --plugin eosio::net_api_plugin --http-server-address 0.0.0.0:8890 --http-validate-host=0 --logconf=$oldpath/launch/logging.json --p2p-listen-endpoint 0.0.0.0:9878 --p2p-peer-address localhost:9877 --config-dir $HOME/node3 --data-dir $HOME/node3 --private-key [\"FIO7jVQXMNLzSncm7kxwg9gk7XUBYQeJPk8b6QfaK5NVNkh3QZrRr\",\"5KQ6f9ZgUtagD3LZ4wcMKhhvK9qy4BuwL3L1pkm6E2v62HCne2R\"] --private-key [\"FIO7uTisye5w2hgrCSE1pJhBKHfqDzhvqDJJ4U3vN9mbYWzataS2b\",\"5JnhMxfnLhZeRCRvCUsaHbrvPSxaqjkQAgw4ZFodx4xXyhZbC9P\"] --contracts-console 2> $oldpath/../node3.txt &
-sleep 2s
-popd >/dev/null
+if [ $tChoice == 1 ]; then
+    mkdir -p $HOME/node1
+    pushd $HOME/node1 >/dev/null
+    "${NODEOS_BIN}" --http-server-address localhost:8879 --p2p-listen-endpoint 0.0.0.0:9876 --config-dir=$HOME/node1 --http-validate-host=0 --logconf=$oldpath/launch/logging.json --enable-stale-production --producer-name eosio --plugin eosio::chain_api_plugin --plugin eosio::net_api_plugin  --contracts-console 2> $oldpath/../node1.txt &
+    sleep 1.5s
+    popd >/dev/null
+
+    #start the first BP node
+    mkdir -p $HOME/node2
+    pushd $HOME/node2 >/dev/null
+    "${NODEOS_BIN}" --producer-name 3ddowwxs11ss --producer-name wttywsmdmfew --plugin eosio::chain_api_plugin --plugin eosio::db_size_api_plugin --logconf=$oldpath/launch/logging.json --plugin eosio::net_api_plugin --http-server-address 0.0.0.0:8889 --http-validate-host=0  --p2p-listen-endpoint 0.0.0.0:9877 --p2p-peer-address localhost:9876 --config-dir $HOME/node2 --data-dir $HOME/node2  --private-key [\"FIO6ruJ5qLeaa6VtYVpkcU4AeWVaL2QvViyQqjxjpAWYRFsYaSbBN\",\"5KLxezoCEw5Ca97FHq3HPyrzkmZQT6Wqw9DmKaJ6inE6fiN1ijT\"] --private-key [\"FIO6oa5UV9ghWgYH9en8Cv8dFcAxnZg2i9z9gKbnHahciuKNRPyHc\",\"5JvmPVxPxypQEKPwFZQW4Vx7EC8cDYzorVhSWZvuYVFMccfi5mU\"]  --contracts-console 2> $oldpath/../node2.txt &
+    popd >/dev/null
+    sleep 1.5s
 
+    #start the second BP node
+    mkdir -p $HOME/node3
+    pushd $HOME/node3 >/dev/null
+    "${NODEOS_BIN}" --producer-name qbxn5zhw2ypw --producer-name hfdg2qumuvlc  --plugin eosio::chain_api_plugin --plugin eosio::net_api_plugin --http-server-address 0.0.0.0:8890 --http-validate-host=0 --logconf=$oldpath/launch/logging.json --p2p-listen-endpoint 0.0.0.0:9878 --p2p-peer-address localhost:9877 --config-dir $HOME/node3 --data-dir $HOME/node3 --private-key [\"FIO7jVQXMNLzSncm7kxwg9gk7XUBYQeJPk8b6QfaK5NVNkh3QZrRr\",\"5KQ6f9ZgUtagD3LZ4wcMKhhvK9qy4BuwL3L1pkm6E2v62HCne2R\"] --private-key [\"FIO7uTisye5w2hgrCSE1pJhBKHfqDzhvqDJJ4U3vN9mbYWzataS2b\",\"5JnhMxfnLhZeRCRvCUsaHbrvPSxaqjkQAgw4ZFodx4xXyhZbC9P\"] --contracts-console 2> $oldpath/../node3.txt &
+    sleep 2s
+    popd >/dev/null
+fi
+if [ $tChoice == 2 ]; then
+    mkdir -p $HOME/node1
+    pushd $HOME/node1 >/dev/null
+    "${NODEOS_BIN}" --max-transaction-time=6000 --http-server-address localhost:8879 --p2p-listen-endpoint 0.0.0.0:9876 --config-dir=$HOME/node1 --http-validate-host=0 --logconf=$oldpath/launch/logging.json --enable-stale-production --producer-name eosio --plugin eosio::chain_api_plugin --plugin eosio::net_api_plugin  --contracts-console 2> $oldpath/../node1.txt &
+    sleep 1.5s
+    popd >/dev/null
+
+    #start the first BP node
+    mkdir -p $HOME/node2
+    pushd $HOME/node2 >/dev/null
+    "${NODEOS_BIN}" --max-transaction-time=6000 --producer-name 3ddowwxs11ss --producer-name wttywsmdmfew --plugin eosio::chain_api_plugin --plugin eosio::db_size_api_plugin --logconf=$oldpath/launch/logging.json --plugin eosio::net_api_plugin --http-server-address 0.0.0.0:8889 --http-validate-host=0  --p2p-listen-endpoint 0.0.0.0:9877 --p2p-peer-address localhost:9876 --config-dir $HOME/node2 --data-dir $HOME/node2  --private-key [\"FIO6ruJ5qLeaa6VtYVpkcU4AeWVaL2QvViyQqjxjpAWYRFsYaSbBN\",\"5KLxezoCEw5Ca97FHq3HPyrzkmZQT6Wqw9DmKaJ6inE6fiN1ijT\"] --private-key [\"FIO6oa5UV9ghWgYH9en8Cv8dFcAxnZg2i9z9gKbnHahciuKNRPyHc\",\"5JvmPVxPxypQEKPwFZQW4Vx7EC8cDYzorVhSWZvuYVFMccfi5mU\"]  --contracts-console 2> $oldpath/../node2.txt &
+    popd >/dev/null
+    sleep 1.5s
+
+    #start the second BP node
+    mkdir -p $HOME/node3
+    pushd $HOME/node3 >/dev/null
+    "${NODEOS_BIN}" --max-transaction-time=6000 --producer-name qbxn5zhw2ypw --producer-name hfdg2qumuvlc  --plugin eosio::chain_api_plugin --plugin eosio::net_api_plugin --http-server-address 0.0.0.0:8890 --http-validate-host=0 --logconf=$oldpath/launch/logging.json --p2p-listen-endpoint 0.0.0.0:9878 --p2p-peer-address localhost:9877 --config-dir $HOME/node3 --data-dir $HOME/node3 --private-key [\"FIO7jVQXMNLzSncm7kxwg9gk7XUBYQeJPk8b6QfaK5NVNkh3QZrRr\",\"5KQ6f9ZgUtagD3LZ4wcMKhhvK9qy4BuwL3L1pkm6E2v62HCne2R\"] --private-key [\"FIO7uTisye5w2hgrCSE1pJhBKHfqDzhvqDJJ4U3vN9mbYWzataS2b\",\"5JnhMxfnLhZeRCRvCUsaHbrvPSxaqjkQAgw4ZFodx4xXyhZbC9P\"] --contracts-console 2> $oldpath/../node3.txt &
+    sleep 2s
+    popd >/dev/null
+fi

scripts/launch/05_bind_contracts.sh

@@ -16,3 +16,5 @@ sleep 1.5s
 sleep 1.5s
 ./clio -u http://localhost:8889 set contract -j eosio.wrap $eosio_wrap_base_path eosio.wrap.wasm eosio.wrap.abi --permission eosio.wrap@active
 sleep 1.5s
+./clio -u http://localhost:8889 set contract -j eosio.staking $fio_staking_base_path eosio.staking.wasm eosio.staking.abi --permission eosio.staking@active
+sleep 1.5s

scripts/queries/hashes.sh

@@ -158,3 +158,20 @@ echo Mainnet
 echo -n $'\e[0;39m'
 ./bin/clio -u https://fio.greymass.com get code fio.treasury
 
+echo -n $'\e[0;34m'
+echo fio.staking - Local WASM:
+echo -n $'\e[0;39m'
+openssl sha256 < ../fio.contracts/build/contracts/fio.staking/fio.staking.wasm
+echo -n $'\E[0;31m'
+echo Local
+echo -n $'\e[0;39m'
+./bin/clio -u http://localhost:8889 get code fio.staking
+echo -n $'\E[0;31m'
+echo Testnet
+echo -n $'\e[0;39m'
+./bin/clio -u http://testnet.fioprotocol.io get code fio.staking
+echo -n $'\E[0;31m'
+echo Mainnet
+echo -n $'\e[0;39m'
+./bin/clio -u https://fio.greymass.com get code fio.staking
+