fix python scripts

localnet/initialize_rewards.py

@@ -1,5 +1,6 @@
 import argparse
-from utils import cmd_devnull
+import time
+from utils import cmd
 
 parser = argparse.ArgumentParser(description='Initialize the rewards on SPN for the testnet')
 parser.add_argument('--last_block_height',
@@ -22,16 +23,22 @@
 
 
 def initialize_rewards(lastBlockHeight, selfDelegationVal1, selfDelegationVal2, selfDelegationVal3):
-    cmd_devnull('networkd tx profile create-coordinator --from alice --chain-id spn-1 --keyring-backend test -y')
-    cmd_devnull(
+    time.sleep(2)
+    cmd('networkd tx profile create-coordinator --from alice --chain-id spn-1 --keyring-backend test -y')
+    time.sleep(2)
+    cmd(
         'networkd tx launch create-chain orbit-1 orbit.com 0xaaa --from alice --chain-id spn-1 --keyring-backend test -y')
-    cmd_devnull(
+    time.sleep(2)
+    cmd(
         'networkd tx project create-project orbit 1000000orbit --from alice --chain-id spn-1 --keyring-backend test -y')
-    cmd_devnull(
-        'networkd tx project mint-vouchers 1 50000orbit --from alice --chain-id spn-1 --keyring-backend test -y')
-    cmd_devnull(
-        'networkd tx reward set-rewards 1 50000v/1/orbit {} --from alice --chain-id spn-1 --keyring-backend test -y'.format(
+    time.sleep(2)
+    cmd(
+        'networkd tx project mint-vouchers 0 50000orbit --from alice --chain-id spn-1 --keyring-backend test -y')
+    time.sleep(2)
+    cmd(
+        'networkd tx reward set-rewards 0 50000v/1/orbit {} --from alice --chain-id spn-1 --keyring-backend test -y'.format(
             lastBlockHeight))
+    time.sleep(2)
 
     gentx1 = './testnet/node1/config/gentx/gentx.json'
     gentx2 = './testnet/node2/config/gentx/gentx.json'
@@ -43,20 +50,24 @@ def initialize_rewards(lastBlockHeight, selfDelegationVal1, selfDelegationVal2,
     val2 = 'spn1pkdk6m2nh77nlaep84cylmkhjder3arey7rll5'
     val3 = 'spn1twckcceyw43da9j247pfs3yhqsv25j38grh68q'
 
-    cmd_devnull(
-        'networkd tx launch request-add-validator 1 {} {} {} aaa foo.com --validator-address {} --from alice --chain-id spn-1 --keyring-backend test -y'.format(
+    cmd(
+        'networkd tx launch request-add-validator 0 {} {} {} aaa foo.com --validator-address {} --from alice --chain-id spn-1 --keyring-backend test -y'.format(
             gentx1, pub1, selfDelegationVal1, val1)),
-    cmd_devnull(
-        'networkd tx launch request-add-validator 1 {} {} {} aaa foo.com --validator-address {} --from alice --chain-id spn-1 --keyring-backend test -y'.format(
+    time.sleep(2)
+    cmd(
+        'networkd tx launch request-add-validator 0 {} {} {} aaa foo.com --validator-address {} --from alice --chain-id spn-1 --keyring-backend test -y'.format(
             gentx2, pub2, selfDelegationVal2, val2)),
-    cmd_devnull(
-        'networkd tx launch request-add-validator 1 {} {} {} aaa foo.com --validator-address {} --from alice --chain-id spn-1 --keyring-backend test -y'.format(
+    time.sleep(2)
+    cmd(
+        'networkd tx launch request-add-validator 0 {} {} {} aaa foo.com --validator-address {} --from alice --chain-id spn-1 --keyring-backend test -y'.format(
             gentx3, pub3, selfDelegationVal3, val3)),
+    time.sleep(2)
 
     # Uncomment for testing incomplete validator set
     # cmd_devnull('networkd tx launch request-add-validator 1 ./node3/config/gentx/gentx.json "FyTmyvZhwRjwqhY6eWykTfiE+0mwe+U0aSo3ti8DCW8=" 16000000stake aaa foo.com --validator-address spn1ezptsm3npn54qx9vvpah4nymre59ykr9exx2ul --from alice -y')
 
-    cmd_devnull('networkd tx launch trigger-launch 1 5s --from alice --chain-id spn-1 --keyring-backend test -y')
+    cmd('networkd tx launch trigger-launch 0 5s --from alice --chain-id spn-1 --keyring-backend test -y')
+    time.sleep(2)
 
 
 if __name__ == "__main__":

localnet/run_auction.py

@@ -2,7 +2,7 @@
 import os
 import datetime
 import time
-from utils import cmd_devnull, cmd, initialize_project, date_f
+from utils import cmd, initialize_project, date_f
 
 auction_template_file = './auctions/auction_template.json'
 auction_file = './auctions/auction.json'
@@ -32,25 +32,33 @@ def set_auction_json(selling_denom, selling_amount, paying_denom, start_price, m
 
     # Fundraising
     set_auction_json('v/1/orbit', '50000', 'uspn', '100', '50', date_f(start), date_f(end))
-    cmd('networkd tx fundraising create-batch-auction {} --from alice -y'.format(auction_file))
+    cmd('networkd tx fundraising create-batch-auction {} --from alice --chain-id spn-1 --keyring-backend test -y'.format(
+        auction_file))
+    time.sleep(2)
     os.remove(auction_file)
-    cmd_devnull('networkd tx participation participate 1 4 --from bob -y')
-    cmd_devnull('networkd tx participation participate 1 4 --from carol -y')
-    cmd_devnull('networkd tx participation participate 1 4 --from dave -y')
+    cmd('networkd tx participation participate 0 4 --from bob --chain-id spn-1 --keyring-backend test -y')
+    time.sleep(2)
+    cmd('networkd tx participation participate 0 4 --from carol --chain-id spn-1 --keyring-backend test -y')
+    time.sleep(2)
+    cmd('networkd tx participation participate 0 4 --from dave --chain-id spn-1 --keyring-backend test -y')
 
     # Wait auction start
     print("waiting for auction start...")
     time.sleep(15)
 
     # Place bid
-    cmd('networkd tx fundraising bid 1 batch-many 120 10000v/1/orbit --from bob -y')
-    cmd('networkd tx fundraising bid 1 batch-many 80 20000v/1/orbit --from carol -y')
-    cmd('networkd tx fundraising bid 1 batch-many 140 20000v/1/orbit --from dave -y')
+    cmd('networkd tx fundraising place-bid 0 batch-many 120 10000v/1/orbit --from bob --chain-id spn-1 --keyring-backend test -y')
+    time.sleep(2)
+    cmd('networkd tx fundraising place-bid 0 batch-many 80 20000v/1/orbit --from carol --chain-id spn-1 --keyring-backend test -y')
+    time.sleep(2)
+    cmd('networkd tx fundraising place-bid 0 batch-many 140 20000v/1/orbit --from dave --chain-id spn-1 --keyring-backend test -y')
 
     # Wait withdrawal delay
     print("waiting for withdrawal delay...")
     time.sleep(5)
 
-    cmd_devnull('networkd tx participation withdraw-allocations 1 --from bob -y')
-    cmd_devnull('networkd tx participation withdraw-allocations 1 --from carol -y')
-    cmd_devnull('networkd tx participation withdraw-allocations 1 --from dave -y')
+    cmd('networkd tx participation withdraw-allocations 0 --from bob --chain-id spn-1 --keyring-backend test -y')
+    time.sleep(2)
+    cmd('networkd tx participation withdraw-allocations 0 --from carol --chain-id spn-1 --keyring-backend test -y')
+    time.sleep(2)
+    cmd('networkd tx participation withdraw-allocations 0 --from dave --chain-id spn-1 --keyring-backend test -y')

localnet/run_incentivized.py

@@ -96,10 +96,12 @@
 
     # Create verified IBC client on SPN
     print('create verified client')
-    cmd('networkd q tendermint-validator-set 2 --node "tcp://localhost:26657" > vs.yaml')
-    cmd('networkd q ibc client self-consensus-state --height 2 --node "tcp://localhost:26657" > cs.yaml')
-    cmd('networkd tx monitoringc create-client 1 cs.yaml vs.yaml --unbonding-period {} --revision-height 2 --from alice --chain-id spn-1 --keyring-backend test -y'.format(
+    cmd('networkd q tendermint-validator-set 2 --node "tcp://localhost:26659" > vs.yaml')
+    cmd('networkd q ibc client self-consensus-state --height 2 --node "tcp://localhost:26659" > cs.yaml')
+    time.sleep(2)
+    cmd('networkd tx monitoringc create-client 0 cs.yaml vs.yaml --unbonding-period {} --revision-height 2 --from alice --chain-id spn-1 --keyring-backend test -y'.format(
         unbondingTime))
+    time.sleep(2)
 
     # Perform IBC connection
     cmd('hermes --config ./hermes/config.toml create connection --a-chain spn-1 --a-client 07-tendermint-0 --b-client 07-tendermint-0')

localnet/run_sale.py

@@ -2,7 +2,7 @@
 import os
 import datetime
 import time
-from utils import cmd_devnull, cmd, initialize_project, date_f
+from utils import cmd, initialize_project, date_f
 
 sale_template_file = './auctions/sale_template.json'
 sale_file = './auctions/sale.json'
@@ -27,29 +27,38 @@ def set_sale_json(selling_denom, selling_amount, paying_denom, price, start_time
     # Define auction start and end from current time
     date_now = datetime.datetime.utcnow()
     start = date_now + datetime.timedelta(seconds=15)
-    end = date_now + datetime.timedelta(seconds=40)
+    end = date_now + datetime.timedelta(seconds=55)
 
     # Fundraising
-    set_sale_json('v/1/orbit', '50000', 'uspn', '100', date_f(start), date_f(end))
-    cmd_devnull('networkd tx fundraising create-fixed-price-auction {} --from alice -y'.format(sale_file))
+    set_sale_json('v/0/orbit', '50000', 'uspn', '100', date_f(start), date_f(end))
+    time.sleep(2)
+    cmd('networkd tx fundraising create-fixed-price-auction {} --from alice --chain-id spn-1 --keyring-backend test -y'.format(
+        sale_file))
     os.remove(sale_file)
-    cmd_devnull('networkd tx participation participate 1 4 --from bob -y')
-    cmd_devnull('networkd tx participation participate 1 4 --from carol -y')
-    cmd_devnull('networkd tx participation participate 1 4 --from dave -y')
+    time.sleep(2)
+    cmd('networkd tx participation participate 0 4 --from bob --chain-id spn-1 --keyring-backend test -y')
+    time.sleep(2)
+    cmd('networkd tx participation participate 0 4 --from carol --chain-id spn-1 --keyring-backend test -y')
+    time.sleep(2)
+    cmd('networkd tx participation participate 0 4 --from dave --chain-id spn-1 --keyring-backend test -y')
 
     # Wait auction start
     print("waiting for auction start...")
     time.sleep(15)
 
     # Place bid
-    cmd('networkd tx fundraising bid 1 fixed-price 100 10000v/1/orbit --from bob -y')
-    cmd('networkd tx fundraising bid 1 fixed-price 100 20000v/1/orbit --from carol -y')
-    cmd('networkd tx fundraising bid 1 fixed-price 100 20000v/1/orbit --from dave -y')
+    cmd('networkd tx fundraising bid 0 fixed-price 100.0 10000v/0/orbit --from bob --chain-id spn-1 --keyring-backend test -y')
+    time.sleep(2)
+    cmd('networkd tx fundraising bid 0 fixed-price 100.0 20000v/0/orbit --from carol --chain-id spn-1 --keyring-backend test -y')
+    time.sleep(2)
+    cmd('networkd tx fundraising bid 0 fixed-price 100.0 20000v/0/orbit --from dave --chain-id spn-1 --keyring-backend test -y')
 
     # Wait withdrawal delay
     print("waiting for withdrawal delay...")
     time.sleep(5)
 
-    cmd_devnull('networkd tx participation withdraw-allocations 1 --from bob -y')
-    cmd_devnull('networkd tx participation withdraw-allocations 1 --from carol -y')
-    cmd_devnull('networkd tx participation withdraw-allocations 1 --from dave -y')
+    cmd('networkd tx participation withdraw-allocations 0 --from bob --chain-id spn-1 --keyring-backend test -y')
+    time.sleep(2)
+    cmd('networkd tx participation withdraw-allocations 0 --from carol --chain-id spn-1 --keyring-backend test -y')
+    time.sleep(2)
+    cmd('networkd tx participation withdraw-allocations 0 --from dave --chain-id spn-1 --keyring-backend test -y')

localnet/spn/genesis_template.json

@@ -91,6 +91,10 @@
             {
               "amount": "200000000",
               "denom": "uspn"
+            },
+            {
+              "amount": "200000000",
+              "denom": "v/0/orbit"
             }
           ]
         },

x/monitoringc/types/keys.go

@@ -16,7 +16,7 @@ const (
 	MemStoreKey = "mem_monitoringc"
 
 	// Version defines the current version the IBC module supports
-	Version = "monitoringc-1"
+	Version = "monitoring-1"
 
 	// PortID is the default port id that module binds to
 	PortID = "monitoringc"

x/monitoringp/types/keys.go

@@ -6,17 +6,14 @@ const (
 	// ModuleName defines the module name
 	ModuleName = "monitoringp"
 
-	// FullModuleName defines the full module name used in interface like CLI to make it more explanatory
-	FullModuleName = "monitoring-provider"
-
 	// StoreKey defines the primary module store key
 	StoreKey = ModuleName
 
 	// MemStoreKey defines the in-memory store key
 	MemStoreKey = "mem_monitoringp"
 
 	// Version defines the current version the IBC module supports
-	Version = "monitoringp-1"
+	Version = "monitoring-1"
 
 	// PortID is the default port id that module binds to
 	PortID = "monitoringp"