Feature/circleci token update

.circleci/config.yml

@@ -9,9 +9,10 @@ jobs:
     docker:
       # specify the version you desire here
       # use `-browsers` prefix for selenium tests, e.g. `3.6.1-browsers`
-      - image: bcelebci/ore-protocol
+      - image: bcelebci/ore-protocol:tokenupdate
         environment:
           PIPENV_VENV_IN_PROJECT: true
+
 
     steps:
       - checkout
@@ -35,10 +36,16 @@ jobs:
       - run:
           name: run tests
           command: |
-            tests/prepare_test.sh
-            python3 tests/rights_registry.py
-            python3 tests/instrument.py
-            python3 tests/usage_log.py
+            contracts/build.sh
+            cd tests/genesis
+            ./genesis_start.sh
+            cd ../producer1/
+            ./genesis_start.sh
+            cd ../
+            ./1.all_start.sh
+            ./setupProduction.sh
+            ./updateProduction.sh
+            ./runTests.sh
 
       - store_artifacts:
           path: test-reports

tests/0.stop_and_clean.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+cd genesis
+./stop.sh
+./clean.sh
+
+cd ../producer1
+./stop.sh
+./clean.sh

tests/1.all_start.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+cleos wallet create -n oretest -f ~/walletpw.txt
+
+cleos wallet import -n oretest --private-key 5KQwrPbwdL6PhXujxW37FSSQZ1JiwsST4cqQzDeyXtP79zkvFD3
+cleos wallet import -n oretest --private-key 5JUzsJi7rARZy2rT5eHhcdUKTyVPvaksnEKtNWzyiBbifJA1dUW
+cleos wallet import -n oretest --private-key 5HrMPq41QRVWbQhWvtcxBKLAS5RkksP71q4MumAt2Pdk5SrPpDG
+cleos wallet import -n oretest --private-key 5HyUCyaSAHM9FSomwidgDVcoeBFVs6d3EKF5VZy1fPTFGJXFAZN

tests/chain-setup/2.create_accounts.sh

@@ -0,0 +1,84 @@
+#!/bin/bash
+
+cleos=$1
+eosio_contracts=$2
+
+$cleos wallet unlock -n development --password $(cat ~/walletpw.txt)
+
+sleep 3s
+
+$cleos create account eosio eosio.bpay EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn
+$cleos create account eosio eosio.msig EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn
+$cleos create account eosio eosio.names EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn
+$cleos create account eosio eosio.ram EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn
+$cleos create account eosio eosio.ramfee EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn
+$cleos create account eosio eosio.saving EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn
+$cleos create account eosio eosio.stake EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn
+$cleos create account eosio eosio.token EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn
+$cleos create account eosio eosio.vpay EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn
+$cleos create account eosio eosio.rex EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn
+$cleos create account eosio eosio.wrap EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn
+
+
+# $cleos create account eosio eosio.jpay EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn
+# $cleos create account eosio testest EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn
+
+
+
+
+#sleep 5s
+$cleos set contract eosio $eosio_contracts/eosio.bios/
+
+sleep 1s
+$cleos set contract eosio.token $eosio_contracts/eosio.token/
+
+sleep 1s
+$cleos set contract eosio.msig $eosio_contracts/eosio.msig/
+
+sleep 1s
+$cleos set contract eosio.wrap $eosio_contracts/eosio.wrap/
+
+curl -X POST http://127.0.0.1:8888/v1/producer/schedule_protocol_feature_activations -d '{"protocol_features_to_activate": ["0ec7e080177b2c02b278d5088611686b49d739925a92d9bfcacd7fc6b74053bd"]}'
+
+
+
+sleep 3s
+$cleos set contract eosio $eosio_contracts/eosio.system/
+sleep 3s
+$cleos set contract eosio $eosio_contracts/eosio.system/
+
+
+
+sleep 3s
+$cleos push action eosio.token create '[ "eosio", "10000000000.0000 SYS" ]' -p eosio.token@active
+
+sleep 1s
+$cleos push action eosio.token create '[ "eosio", "10000000000.0000 ORE" ]' -p eosio.token@active
+
+sleep 1s
+$cleos push action eosio.token issue '[ "eosio", "1000000000.0000 SYS", "memo" ]' -p eosio@active
+
+sleep 1s
+$cleos push action eosio.token issue '[ "eosio", "1000000000.0000 ORE", "memo" ]' -p eosio@active
+
+sleep 3s
+$cleos push action eosio init '[0, "4,SYS"]' -p eosio@active
+
+# sleep 3s
+$cleos push action eosio setpriv '["eosio.msig", 1]' -p eosio@active
+
+$cleos system newaccount eosio --transfer producer1 EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn --stake-net "100000000.0000 SYS" --stake-cpu "100000000.0000 SYS" --buy-ram-kbytes 8192
+
+$cleos system newaccount eosio --transfer producer2 EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn --stake-net "100000000.0000 SYS" --stake-cpu "100000000.0000 SYS" --buy-ram-kbytes 8192
+
+$cleos system newaccount eosio --transfer producer3 EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn --stake-net "100000000.0000 SYS" --stake-cpu "100000000.0000 SYS" --buy-ram-kbytes 8192
+$cleos system newaccount eosio --transfer ore EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn --stake-net "100000000.0000 SYS" --stake-cpu "100000000.0000 SYS" --buy-ram-kbytes 8192
+
+$cleos system newaccount eosio --transfer funds.ore EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn --stake-net "10000.0000 SYS" --stake-cpu "10000.0000 SYS" --buy-ram-kbytes 8192
+
+sleep 3
+
+$cleos system regproducer producer1 EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn https://accountnum11.com
+$cleos system regproducer producer2 EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn https://accountnum11.com
+$cleos system regproducer producer3 EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn https://accountnum11.com
+

tests/chain-setup/3.vote.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+cleos=$1
+
+$cleos system voteproducer prods producer1 producer1
+$cleos system voteproducer prods producer2 producer1
+$cleos system voteproducer prods producer3 producer1

tests/chain-setup/4.oresystem.sh

@@ -0,0 +1,58 @@
+#!/bin/bash
+cleos=$1
+
+ore_contracts=$2
+
+$cleos wallet unlock -n development --password $(cat ~/walletpw.txt)
+
+$cleos transfer eosio ore "10000000.0000 SYS" "test.com,50,10" -p eosio@active
+sleep 1s
+$cleos system newaccount ore --transfer system.ore EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn --stake-net "10000.0000 SYS" --stake-cpu "10000.0000 SYS" --buy-ram-kbytes 8192 -p ore
+$cleos system newaccount ore --transfer lock.ore EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn --stake-net "10000.0000 SYS" --stake-cpu "10000.0000 SYS" --buy-ram-kbytes 8192 -p ore
+
+# sleep 3s
+$cleos set contract system.ore $ore_contracts/ore.system/ ore.system.wasm ore.system.abi
+
+$cleos set account permission system.ore active '{"threshold": 1,"keys": [{"key": "EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn","weight": 1}],"accounts": [{"permission":{"actor":"system.ore","permission":"eosio.code"},"weight":1}]}' owner -p system.ore@owner
+$cleos set account permission lock.ore active '{"threshold": 1,"keys": [{"key": "EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn","weight": 1}],"accounts": [{"permission":{"actor":"system.ore","permission":"eosio.code"},"weight":1}]}' owner -p lock.ore@owner
+
+$cleos transfer eosio producer1 "10000000.0000 ORE" "test.com,50,10" -p eosio@active
+$cleos transfer eosio producer1 "10000000.0000 SYS" "test.com,50,10" -p eosio@active
+$cleos transfer eosio system.ore "10000000.0000 ORE" "test.com,50,10" -p eosio@active
+$cleos transfer eosio system.ore "10000000.0000 SYS" "test.com,50,10" -p eosio@active
+
+
+sleep 3s
+$cleos push action system.ore setprice '[ "200.0000 ORE", 10000, "100.0000 ORE", "100.0000 ORE", 10]' -p system.ore
+
+$cleos push action system.ore setprice '[ "4.0000 ORE", 3048, "0.1000 ORE", "0.1000 ORE", 1]' -p system.ore
+
+$cleos push action system.ore setprice '[ "5.0000 ORE", 4075, "1.0000 ORE", "1.0000 ORE", 2]' -p system.ore
+
+$cleos push action system.ore setprice '[ "6.0000 ORE", 5098, "1.1000 ORE", "1.1000 ORE", 3]' -p system.ore
+
+$cleos push action system.ore setprice '[ "50.0000 ORE", 9000, "20.0000 ORE", "80.000 ORE", 4]' -p system.ore
+
+$cleos push action system.ore setprice '[ "1000000.0000 ORE", 30000, "1000.0000 ORE", "1000.0000 ORE", 100]' -p system.ore
+$cleos push action system.ore setprice '[ "1000010.0000 ORE", 30100, "1010.0000 ORE", "1010.0000 ORE", 101]' -p system.ore
+
+#$cleos push action system.ore changetier '["test11111111", 2]' -p test11111111
+#cleos transfer eosio test11111113 "100.0000 ORE" "test.com,50,10" -p eosio@active
+
+$cleos set account permission producer1 active '{"threshold": 1,"keys": [{"key": "EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn","weight": 1}],"accounts": [{"permission":{"actor":"system.ore","permission":"eosio.code"},"weight":1}]}' owner -p producer1@owner
+
+sleep 3s
+$cleos push action system.ore createoreacc '[ "producer1", "neworeacct11", "EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn", "EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn", 1, "producer1"]' -p producer1
+$cleos push action system.ore createoreacc '[ "producer1", "neworeacct12", "EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn", "EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn", 1, "producer1"]' -p producer1
+$cleos push action system.ore createoreacc '[ "producer1", "test11111111", "EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn", "EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn", 10, "producer1"]' -p producer1
+$cleos push action system.ore createoreacc '[ "producer1", "test11111112", "EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn", "EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn", 100, "producer1"]' -p producer1
+
+#cleos set account permission test11111113 active '{"threshold": 1,"keys": [{"key": "EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn","weight": 1}],"accounts": [{"permission":{"actor":"system.ore","permission":"eosio.code"},"weight":1}]}' owner -p test11111113@owner
+
+# cleos push action system.ore createoreacc '[ "app.oreid", "eleveneleven", "EOS8WXmxBZkHXZJ4BcWyQp9J7jMgeKLQuXvuNE58SuDYbwkQ35sEC", "EOS88eSdGafNxaUg72vrXua6Y2MvwPxH8hmr8bm4Rka8kwjtWx5Pa", 1, "app.oreid"]' -p app.oreid
+
+# Private key: 5K719KnRR6LQUz9UsrT2um8XeJ3Gk65nf6WZk6HTGfysHVaHNFd
+# Public key: EOS8WXmxBZkHXZJ4BcWyQp9J7jMgeKLQuXvuNE58SuDYbwkQ35sEC
+# Basarcans-MacBook-Pro:ore.system basarcancelebci$ cleos create key --to-console
+# Private key: 5JgKdxGZpw8BHRb5aSkLr1GgMqLEDJJmQYqYoTgQXYfJPUnnBas
+# Public key: EOS88eSdGafNxaUg72vrXua6Y2MvwPxH8hmr8bm4Rka8kwjtWx5Pa

tests/chain-setup/5.createescrow.sh

@@ -0,0 +1,33 @@
+#!/bin/bash
+CHAIN_SYMBOL=${3:-ORE}
+SYMBOL_PRECISION=${4:-4}
+
+cleos=$1
+
+createescrow_path=$2
+
+$cleos wallet unlock -n development --password $(cat ~/walletpw.txt)
+
+$cleos system newaccount eosio --transfer createescrow EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn --stake-net "10000.0000 SYS" --stake-cpu "10000.0000 SYS" --buy-ram-kbytes 8192
+
+# sleep 3s
+$cleos set contract createescrow $createescrow_path/ createescrow.wasm createescrow.abi
+
+$cleos set account permission createescrow active \
+'{"threshold": 1,"keys": [{"key": "EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn","weight": 1}],"accounts": [{"permission":{"actor":"createescrow","permission":"eosio.code"},"weight":1}, {"permission":{"actor":"system.ore","permission":"eosio.code"},"weight":1}]}' owner
+
+#$cleos set account permission system.ore active '{"threshold": 1,"keys": [{"key": "EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn","weight": 1}],"accounts": [{"permission":{"actor":"createescrow","permission":"eosio.code"},"weight":1}]}' owner -p system.ore@owner
+
+sleep 3s
+$cleos push action createescrow init '["'$SYMBOL_PRECISION','$CHAIN_SYMBOL'","system.ore","createoreacc", 0]' -p createescrow
+#$cleos push action createescrow init '["4,ORE","system.ore","createoreacc", 0]' -p createescrow
+AIRDROP_JSON='{"contract":"", "balance":"0 ORE", "amount":"0 ORE"}'
+REX_JSON='{"net_loan_payment":"0.0000 ORE","net_loan_fund":"0.0000 ORE","cpu_loan_payment":"0.0000 ORE","cpu_loan_fund":"0.0000 ORE"}'
+PARAMS_JSON='{"owner":"system.ore", "dapp":"test.com", "ram_bytes":"0", "net":"0.0001 ORE", "cpu":"0.0001 ORE", "airdrop":'$AIRDROP_JSON', "pricekey":1, "use_rex": false, "rex":'$REX_JSON'}'
+sleep 3s
+$cleos push action createescrow define "$PARAMS_JSON" -p system.ore
+sleep 3s
+$cleos transfer system.ore createescrow "100.0000 ORE" "test.com,50,10" -p system.ore
+
+sleep 3s
+$cleos push action createescrow create '["system.ore","producer4231","EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn","EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn","test.com","producer1"]' -p system.ore

tests/chain-setup/6.changetier.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+cleos=$1
+eosio_contracts=$2
+ore_eosio_contracts=$3
+
+$cleos wallet unlock -n development --password $(cat ~/walletpw.txt)
+
+$cleos transfer system.ore test11111111 "100.0000 ORE" "test.com,50,10" -p system.ore
+
+sleep 1s
+
+$cleos push action system.ore chgacctier '["producer1", "test11111111", 1]' -p producer1
+
+sleep 1s
+$cleos push action system.ore chgacctier '["test11111111", "test11111111", 1]' -p test11111111
+
+sleep 1s
+$cleos push action system.ore chgacctier '["system.ore", "test11111111", 3]' -p system.ore
+

tests/emergency.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+
+cleos=$1
+
+$cleos wallet unlock -n development --password $(cat ~/walletpw.txt)
+
+$cleos push action system.ore createoreacc '[ "producer1", "test11111122", "EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn", "EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn", 1, "producer1"]' -p producer1
+
+$cleos get table eosio.token ORE stakestats
+$cleos get table eosio.token producer1 reserves
+$cleos get table eosio.token test11111122 stakeinfo
+
+$cleos push action system.ore settier '[ 100, 1000000000, 20320875724 , "1.0000 ORE", "1.0000 ORE"]' -p system.ore
+
+$cleos push action system.ore settier '[ 20, 30000, 2320875724 , "1.0000 ORE", "1.0000 ORE"]' -p system.ore
+
+$cleos push action system.ore settier '[ 10, 30000, 220875724 , "1.0000 ORE", "1.0000 ORE"]' -p system.ore
+
+$cleos push action system.ore createoreacc '[ "eosio", "test11111124", "EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn", "EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn", 100, ""]' -p eosio
+$cleos push action system.ore createoreacc '[ "eosio", "test11111125", "EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn", "EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn", 100, ""]' -p eosio
+$cleos push action system.ore createoreacc '[ "eosio", "test11111131", "EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn", "EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn", 100, ""]' -p eosio
+$cleos push action system.ore createoreacc '[ "eosio", "test11111132", "EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn", "EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn", 100, ""]' -p eosio
+$cleos push action system.ore createoreacc '[ "eosio", "test11111133", "EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn", "EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn", 20, ""]' -p eosio
+$cleos push action system.ore createoreacc '[ "eosio", "test11111134", "EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn", "EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn", 20, ""]' -p eosio
+$cleos push action system.ore createoreacc '[ "eosio", "test11111135", "EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn", "EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn", 10, ""]' -p eosio
+$cleos push action system.ore createoreacc '[ "eosio", "test11111141", "EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn", "EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn", 10, ""]' -p eosio
+
+$cleos get table eosio eosio global
+
+$cleos push action system.ore createoreacc '[ "eosio", "test11111151", "EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn", "EOS6H2tjbrS6zm8d3tX6yeHorEoihP23Ny9c9wFRHGfJp4vtD42rn", 1, ""]' -p eosio
+