From 64be77515eb35af1db5a4365990cb22d201230fb Mon Sep 17 00:00:00 2001 From: MengXiangJian <805442788@qq.com> Date: Wed, 26 Aug 2020 15:38:31 +0800 Subject: [PATCH] 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 --- Makefile | 2 +- app/genesis/genesis.json | 44 +++++++++++++++++++-------------------- go.mod | 2 +- go.sum | 2 ++ x/backend/orm/backend.db | Bin 225280 -> 225280 bytes 5 files changed, 26 insertions(+), 24 deletions(-) diff --git a/Makefile b/Makefile index 368dced60a..6384d82173 100644 --- 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 index 3b9c3515ad..97eee1b2d5 100644 --- 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,7 +174,7 @@ "minted_per_block": [ { "amount": "0.00000000", - "denom": "okt" + "denom": "tokt" } ], "next_block_to_update": "0" @@ -182,7 +182,7 @@ "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 index 90b100459c..dd37e559d3 100644 --- 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 index 4f8780fa15..d92ef44d71 100644 --- 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 index 62a4ebfd95d3d3907361e431d71d52db1722b7b1..c7fe7b7b035b4b22c5503734c7c7f8016df11646 100644 GIT binary patch delta 4129 zcmd5I)h zX(xn0!UM$$i>Rm&(g#pNn`Ui-!3SfoEeXOCv0xKZtf5kAk-L|3X3locE=7pGaGv)6 zzW@IJ=j?9Bh~6=xclyxD{W+`9$mZn@rf zE!56yVNFqwtE-$N&K*vl(yy%RElSCdl^Ri%(7ZSOU8iQ1xZ5_hwyh~HD^u4ahMvqS z(J8ueZLKPhQ`?0+Yn7%7 zGnl3_a-X*}J0A7t0`r927Ms@9=}qsFvtNpbW*SW?%)UCC&-(I*^c)TWW24zzXht?+ zMtXg`>9uC_gmlJk_i?6-Y;rO3YJ%w{mbJ#%qMXv%)4ht3sx^fSBnu6F6-}GFHu+cN z#Vh~S%DmBOsino#B3mZWig@`nHx_n0V1WUvH#dGkL+q3o5t;jj9nX9@lt5 z)NFod%oltpxR^mE{mg~Q;Dq+JbWUnZ3xRAZ<0cnQRhD?py))O7D&7e_jYOv=~g>F*# zP6P*FC)|Kx7=W*6+OZS$2hbbP?v_Xs_y&k61W72ETDVOeR;MG$C^#n>sZ{JqIu%1w zGE!~R0Ur}2*npq|HjwFj+cz6kJZ3UxaVwDZ&IV$W;bvz|CZ<7?e!_%eP3DRQzqMONm3C>AIDizYH^MVZyA~+2Pp>MYMm)Khs z*y~#AjV&=h!%n&fqBqtfjw;_sDI0B0cI1abl<~ZfWp0v!5Z8vPF{%bvNXUK!gQUnC zQTGaT0@frK*!f6-8>w?{U8=@xNk#DlTPPMF70=a|xXQJV z`nGeIa#;St@s0hWG-|tV)5QQ1VI1xIrJjt8unQ+`yJei3vVMz#kw3~6L=i_O8kLk4%q9NZ=H7i(N3jZR}8 z{2)@#q|x>29it_c!FI`nX{+UmNqVcsBiAKyj9BI}mESEDGPqYGU)#k@LirhW#U687 zrv+CUEjbJyaKyaU5p5qs`(zU(#gSRJW;67tB2F(%jTT&FguRUEbej4kaGh3}VT3&l ze@~4^txPdmvKSuLO#G%M(x{mXUF$N@VV4;-gP|*RK58X0!s(33$FZpO+Qa{Ian<-$ ei{4u(>LKX~kJB^!oP4>nW5%a0p~eYO?)V4T(}I-% delta 3729 zcmd5;ZERCj7(VCR+uruJy>H9fwOhNjBSQfbm~4cvgstjkz^!G#_{y>tgAnkCGc1uM zm~A04P0VDwxVlX~C5|Y;uw_gLMj)DqZV3c5QTbS+8B;NUF#>T!&+R?8J?l_@=nu}1 zE3H3UTdmV9XDxB*et$SrF5#W+$7WhqVOhj8Hv82Ny-Vybz1Z+n z%~~17vt?1mzM3g==?E>at(Zp^i57Rpw{$9tOM!8>4tlVJY6q(4V5EZYSw1_9W$(;c z>YJ23g@I!^OVy}PqIo|QCl`vj81!83(i|ht0OL;9RdxB@>e<}6Ecx3mZFQpj*O$X)Nr7TRT$lvTqx#X6~6YTX&YeN&cJyAgZ4#(wv9pEfplI9l$qk= zfhDZpPmFP$l|glROHwi!V9dh6PxFktb4H%Tpo07*1%^xp7&GgjemIemO=={V9MmtD z-Wbx>Fsd`@F^Z_LTfY&MpOheUoO@Eg(>C-J8aqkLtnS?N~VsM=$28P3CJ@G%@w zT3|oyhSy;`)WZf?1C>ywG(ZVVhX6Q1RPJi0pWM@1&pyk^o#s3$VnZ>GeCcW3e6dwsKu1wi42LE zo|QtT$49h>MuZjtTHu;Ug?^8UTm!hQJ?w7^8oH)6(seDv>{;|08l}k^`c9T6Q{M^F z(92po5J`$>RCj7hiEvVYle$uat}?t2V)=$j2t8D%Obw!zNgAw7Y9K%#fj$_8VeKs1 z02jB1JwczLKwA5%4cY7d9iEr@6X2rxuoNE=|#6~}#08BEj9 zad z3UD#1pg$q%s$Ct4C#+7dIa05@twHsj>*znUUv{Qy zWYg{Ogi&HPQV+hvO4uVaQOjmY=aFc;hg-G(@DfE^w1Nj!?NSiP!tX&ijPmb86W6y|rc26vj*xNvl9#6m4uN@*Cxx?@0V2k};W@c`WFh znY1RVB~nYBn*z*vT%yj!7P3x@^fTuH3rP)HLxC;13~00JfZEWx(q27>rsObWyG-l6 zVj>mvOx*UUheAFEZMIS9woUKrWzJQ0>bz>#`(`s|*unaqcaUUX4+CZ?T;C|B#oY`E zK)SETHcpW&hIj>v&~ewM&G(Yei;itPvq~^Z? DUu?{2