Merge PR: change cosmos-sdk to v0.37.9-okchain9 (#319)

* change cosmos-sdk to v0.37.9-testnet3 * change version to v0.11.1 * update go.mod * fix ut Co-authored-by: evan.han <[email protected]>
okx · Aug 26, 2020 · 64be775 · 64be775
1 parent 808fa9b
commit 64be775
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 24 deletions.
diff --git a/Makefile b/Makefile
@@ -6,7 +6,7 @@ CAT := $(if $(filter $(OS),Windows_NT),type,cat)
 
 GithubTop=github.com
 
-Version=v0.11.0
+Version=v0.11.1
 CosmosSDK=v0.37.9
 Tendermint=v0.32.10
 Iavl=v0.12.4

diff --git a/app/genesis/genesis.json b/app/genesis/genesis.json
@@ -25,7 +25,7 @@
         "coins": [
           {
             "amount": "9000000.00000000",
-            "denom": "okt"
+            "denom": "tokt"
           }
         ],
         "delegated_free": [],
@@ -54,7 +54,7 @@
     "crisis": {
       "constant_fee": {
         "amount": "1000.00000000",
-        "denom": "okt"
+        "denom": "tokt"
       }
     },
     "debug": null,
@@ -66,21 +66,21 @@
         "delist_min_deposit": [
           {
             "amount": "100.00000000",
-            "denom": "okt"
+            "denom": "tokt"
           }
         ],
         "delist_voting_period": "259200000000000",
         "list_fee": {
           "amount": "20000.00000000",
-          "denom": "okt"
+          "denom": "tokt"
         },
         "register_operator_fee": {
           "amount": "0.00000000",
-          "denom": "okt"
+          "denom": "tokt"
         },
         "transfer_ownership_fee": {
           "amount": "10.00000000",
-          "denom": "okt"
+          "denom": "tokt"
         },
         "withdraw_period": "259200000000000"
       },
@@ -123,7 +123,7 @@
                   },
                   "min_self_delegation": {
                     "amount": "0.00100000",
-                    "denom": "okt"
+                    "denom": "tokt"
                   },
                   "pubkey": "okchainvalconspub1zcjduepqqxsxcjjletkq40ypzuqz8n925pk0ycw9h8g4saw27adyf2t93szsvpk77u",
                   "validator_address": "okchainvaloper10q0rk5qnyag7wfvvt7rtphlw589m7frs863s3m"
@@ -136,7 +136,7 @@
                   "type": "tendermint/PubKeySecp256k1",
                   "value": "AgYaL1tZ7ekqvweQhKojG8sDHUfN23qJWviAsTDIWvYU"
                 },
-                "signature": "ZuRwla7Kpt6H3etoJ6peAwzaC6k8m8lu7lQozm4oQKIpYEaoWAIZAqZBbAaqebKmIov3f22Ys4xDOlCt2teHlg=="
+                "signature": "MX+gzxaThOt7qpgX8mNGlgqpv3mbLQGvErMaA9VjsAk4WHyvcGQXWxuu2PwDhExApbhZQrBtz+5fZ7ZWcbSo9Q=="
               }
             ]
           }
@@ -149,7 +149,7 @@
         "min_deposit": [
           {
             "amount": "100.00000000",
-            "denom": "okt"
+            "denom": "tokt"
           }
         ]
       },
@@ -174,15 +174,15 @@
         "minted_per_block": [
           {
             "amount": "0.00000000",
-            "denom": "okt"
+            "denom": "tokt"
           }
         ],
         "next_block_to_update": "0"
       },
       "params": {
         "blocks_per_year": "10519200",
         "inflation_rate": "0.01000000",
-        "mint_denom": "okt"
+        "mint_denom": "tokt"
       }
     },
     "order": {
@@ -191,7 +191,7 @@
         "cancel_order_msg_gas_unit": "30000",
         "fee_per_block": {
           "amount": "0.00000000",
-          "denom": "okt"
+          "denom": "tokt"
         },
         "max_deals_per_block": "1000",
         "new_order_msg_gas_unit": "40000",
@@ -206,7 +206,7 @@
         "min_deposit": [
           {
             "amount": "100.00000000",
-            "denom": "okt"
+            "denom": "tokt"
           }
         ],
         "voting_period": "259200000000000"
@@ -231,7 +231,7 @@
       "last_total_power": "0",
       "last_validator_powers": null,
       "params": {
-        "bond_denom": "okt",
+        "bond_denom": "tokt",
         "epoch": 252,
         "max_bonded_validators": 21,
         "max_validators_to_add_shares": 30,
@@ -253,33 +253,33 @@
       "params": {
         "burn_fee": {
           "amount": "10.00000000",
-          "denom": "okt"
+          "denom": "tokt"
         },
         "issue_fee": {
           "amount": "2500.00000000",
-          "denom": "okt"
+          "denom": "tokt"
         },
         "mint_fee": {
           "amount": "10.00000000",
-          "denom": "okt"
+          "denom": "tokt"
         },
         "modify_fee": {
           "amount": "0.00000000",
-          "denom": "okt"
+          "denom": "tokt"
         },
         "transfer_ownership_fee": {
           "amount": "10.00000000",
-          "denom": "okt"
+          "denom": "tokt"
         }
       },
       "tokens": [
         {
           "description": "OK Group Global Utility Token",
           "mintable": true,
-          "original_symbol": "okt",
+          "original_symbol": "tokt",
           "original_total_supply": "1000000000.00000000",
           "owner": "okchain10q0rk5qnyag7wfvvt7rtphlw589m7frsmyq4ya",
-          "symbol": "okt",
+          "symbol": "tokt",
           "whole_name": "OKT"
         }
       ]
@@ -302,7 +302,7 @@
         "app_upgrade_min_deposit": [
           {
             "amount": "100.00000000",
-            "denom": "okt"
+            "denom": "tokt"
           }
         ],
         "app_upgrade_voting_period": "259200000000000"

diff --git a/go.mod b/go.mod
@@ -46,7 +46,7 @@ require (
 )
 
 replace (
-	github.com/cosmos/cosmos-sdk => github.com/okex/cosmos-sdk v0.37.9-okchain8
+	github.com/cosmos/cosmos-sdk => github.com/okex/cosmos-sdk v0.37.9-okchain9
 	github.com/tendermint/iavl => github.com/okex/iavl v0.12.4-okchain
 	github.com/tendermint/tendermint => github.com/okex/tendermint v0.32.10-okchain1
 )
diff --git a/go.sum b/go.sum
@@ -199,6 +199,8 @@ github.com/okex/cosmos-sdk v0.37.9-okchain7 h1:Y6bGsI6qy4gccPSEDfZ40BNhk3mnODl6R
 github.com/okex/cosmos-sdk v0.37.9-okchain7/go.mod h1:HjW0+Q5rWWm+4CaK8f5CIN/xf38vkPA2xue1PB5Nk3A=
 github.com/okex/cosmos-sdk v0.37.9-okchain8 h1:wefXKagVlmm5KVNzXBrlqvh17axzmZSTBsbES30Ma0w=
 github.com/okex/cosmos-sdk v0.37.9-okchain8/go.mod h1:HjW0+Q5rWWm+4CaK8f5CIN/xf38vkPA2xue1PB5Nk3A=
+github.com/okex/cosmos-sdk v0.37.9-okchain9 h1:EqlSvZ5mAxEVump/YpCsrQv86lF6nA20YPJQPGLtE14=
+github.com/okex/cosmos-sdk v0.37.9-okchain9/go.mod h1:HjW0+Q5rWWm+4CaK8f5CIN/xf38vkPA2xue1PB5Nk3A=
 github.com/okex/iavl v0.12.4-okchain h1:BAFmygzhx6k4KGnLrY87ZrJvRSb+wf8Oo4e2KhUwXcU=
 github.com/okex/iavl v0.12.4-okchain/go.mod h1:8LHakzt8/0G3/I8FUU0ReNx98S/EP6eyPJkAUvEXT/o=
 github.com/okex/tendermint v0.32.10-okchain1 h1:mEsl6YGb7mCkJaXZxnIZO6/jmF947X39wFa4oI8gKgE=

diff --git a/x/backend/orm/backend.db b/x/backend/orm/backend.db