Merge pull request #74 from oracleNetworkProtocol/worry-free

upgrade v1.7
oracleNetworkProtocol · Aug 16, 2022 · 03a937e · 03a937e
2 parents 4ca5ed5 + e3b4d66
commit 03a937e
Show file tree

Hide file tree

Showing 21 changed files with 41 additions and 97 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -117,8 +117,7 @@ Stable version of existing functions in the warehouse
 ## v0.6.0 - 2021-09-29
 - Mainnet upgrade 
 - Bump x/prc10 and x/nft
-- Add [\#Liquidity](https://github.com/oracleNetworkProtocol/liquidity) module [\#v0.1.2](https://github.com/oracleNetworkProtocol/liquidity/tree/v0.1.2) 
-
+- Add [Liquidity](https://github.com/oracleNetworkProtocol/liquidity) module [v0.1.2](https://github.com/oracleNetworkProtocol/liquidity/tree/v0.1.2) 
 ## v0.5.0 - 2021-08-19
 - cosmos-sdk v0.42.7
 - tendermint v0.34.11

diff --git a/app/app.go b/app/app.go
@@ -651,7 +651,7 @@ func New(
 	app.RegisterUpgradePlan("v1.5", &store.StoreUpgrades{}, func(ctx sdk.Context, _ upgradetypes.Plan, _ module.VersionMap) (module.VersionMap, error) {
 		return app.mm.GetVersionMap(), nil
 	})
-	app.RegisterUpgradePlan("v2", &store.StoreUpgrades{
+	app.RegisterUpgradePlan("v1.7", &store.StoreUpgrades{
 		Added:   []string{authz.ModuleName},
 		Deleted: []string{nfttypes.StoreKey},
 	}, func(ctx sdk.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
@@ -672,12 +672,10 @@ func New(
 		depositp := app.GovKeeper.GetDepositParams(ctx)
 		votep := app.GovKeeper.GetVotingParams(ctx)
 		depositp.MaxDepositPeriod = time.Duration(48 * time.Hour) // 2days
-		// depositp.MaxDepositPeriod = time.Duration(2 * time.Minute) // 2 minute
-
-		votep.VotingPeriod = time.Duration(120 * time.Hour) // 5days
-		// votep.VotingPeriod = time.Duration(5 * time.Minute) // 5 mintute
+		votep.VotingPeriod = time.Duration(120 * time.Hour)       // 5days
 		app.GovKeeper.SetDepositParams(ctx, depositp)
 		app.GovKeeper.SetVotingParams(ctx, votep)
+		//bank update metadata
 		plugdenom, ok := app.BankKeeper.GetDenomMetaData(ctx, pctypes.BaseNativeDenom)
 		if !ok {
 			panic("get uplugcn metadata err")
@@ -691,6 +689,7 @@ func New(
 		}
 		app.BankKeeper.SetDenomMetaData(ctx, plugdenom)
 
+		//token update
 		tokenplug, err := app.TokenKeeper.GetToken(ctx, pctypes.BaseNativeDenom)
 		if err != nil {
 			panic("get token for plug err:" + err.Error())

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -19,7 +19,7 @@ services:
     build:
       context: ./
       dockerfile: Dockerfile
-    # command: './scripts/setup-docker.sh'
+    command: './scripts/setup-docker.sh'
     tty: true
 
   plugchain_node1:
@@ -82,7 +82,7 @@ services:
     networks:
       localnet:
         ipv4_address: 192.17.10.5
-    command: './scripts/setup-docker.sh'
+    # command: './scripts/setup-docker.sh'
     tty: true
 
 networks:

diff --git a/docs/README.md b/docs/README.md
@@ -28,5 +28,4 @@ The plugchain is built on the Cosmos SDK using the following modules:
 
 The following modules are built on the OracleNetworkProtocol repository:
 
-- x/prc10: token logic.
-- x/nft: nft logic Off-chain assets on-chain.
+- x/prc10: token logic.
diff --git a/docs/endpoints/intro.md b/docs/endpoints/intro.md
@@ -12,4 +12,4 @@ Each node can be configured with the following endpoints, and each type of endpo
 
 - [Restful API](./grpc-rest.md)
 - [gRPC](./grpc-client.md)
-- [socker subscription](./subscription.md)
+- [socker subscription](./subscription.md)
diff --git a/docs/get-started/mainnet.md b/docs/get-started/mainnet.md
@@ -5,6 +5,9 @@ order: 3
 # Join mainnet
 
 :::tip
+
+**Requirements:** [install plugchaind](install.md) or download the corresponding version of the binary file [releases](https://github.com/oracleNetworkProtocol/plugchain/releases)
+
 You need to [install plugchaind](install.md) first, or download the corresponding version of the binary file [releases](https://github.com/oracleNetworkProtocol/plugchain/releases)
 :::
 

diff --git a/docs/pvm/json-rpc.md b/docs/pvm/json-rpc.md
@@ -638,7 +638,6 @@ curl -X POST --data '{ "jsonrpc": "2.0", "method": "rpc_getProof", "params": [ "
 { "Jsonrpc": "2.0", "id": 1, "result": { "address": "gx1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq8rta3w", "accountProof": [ "0xf90211a090dcaf88c40c7bbc95a912cbdde67c175767b31173df9ee4b0d733bfdd511c43a0babe369f6b12092f49181ae04ca173fb68d1a5456f18d20fa32cba73954052bda0473ecf8a7e36a829e75039a3b055e51b8332cbf03324ab4af2066bbd6fbf0021a0bbda34753d7aa6c38e603f360244e8f59611921d9e1f128372fec0d586d4f9e0a04e44caecff45c9891f74f6a2156735886eedf6f1a733628ebc802ec79d844648a0a5f3f2f7542148c973977c8a1e154c4300fec92f755f7846f1b734d3ab1d90e7a0e823850f50bf72baae9d1733a36a444ab65d0a6faaba404f0583ce0ca4dad92da0f7a00cbe7d4b30b11faea3ae61b7f1f2b315b61d9f6bd68bfe587ad0eeceb721a07117ef9fc932f1a88e908eaead8565c19b5645dc9e5b1b6e841c5edbdfd71681a069eb2de283f32c11f859d7bcf93da23990d3e662935ed4d6b39ce3673ec84472a0203d26456312bbc4da5cd293b75b840fc5045e493d6f904d180823ec22bfed8ea09287b5c21f2254af4e64fca76acc5cd87399c7f1ede818db4326c98ce2dc2208a06fc2d754e304c48ce6a517753c62b1a9c1d5925b89707486d7fc08919e0a94eca07b1c54f15e299bd58bd fef9741538c7828b5d7d11a489f9c20d052b3471df475a051f9dd3739a927c89e357580a4c97b40234aa01ed3d5e0390dc982a7975880a0a089d613f26159af43616fd9455bb461f4869bfede26f2130835ed067a8b967bfb80 "," 0xf90211a0395d87a95873cd98c21cf1df9421af03f7247880a2554e20738eec2c7507a494a0bcf6546339a1e7e14eb8fb572a968d217d2a0d1f3bc4257b22ef5333e9e4433ca012ae12498af8b2752c99efce07f3feef8ec910493be749acd63822c3558e6671a0dbf51303afdc36fc0c2d68a9bb05dab4f4917e7531e4a37ab0a153472d1b86e2a0ae90b50f067d9a2244e3d975233c0a0558c39ee152969f6678790abf773a9621a01d65cd682cc1be7c5e38d8da5c942e0a73eeaef10f387340a40a106699d494c3a06163b53d956c55544390c13634ea9aa75309f4fd866f312586942daf0f60fb37a058a52c1e858b1382a8893eb9c1f111f266eb9e21e6137aff0dddea243a567000a037b4b100761e02de63ea5f1fcfcf43e81a372dafb4419d126342136d329b7a7ba032472415864b08f808ba4374092003c8d7c40a9f7f9fe9cc8291f62538e1cc14a074e238ff5ec96b810364515551344100138916594d6af966170ff326a092fab0a0d31ac4eef14a79845200a496662e92186ca8b55e29ed0f9f59dbc6b521b116fea090607784fe73845 8b63c1942bba7c0321ae77e18df4961b2bc66727ea996464ea078f757653c1b63f72aff3dcc3f2a2e4c8cb4a9d36d1117c742833c84e20de994a0f78407de07f4b4cb4f899dfb95eedeb4049aeb5fc1635d65cf2f2f4dfd25d1d7a0862037513ba9d45354dd3e36264aceb2b862ac79d2050f14c95657e43a51b85c80 "," 0xf90171a04ad705ea7bf04339fa36b124fa221379bd5a38ffe9a6112cb2d94be3a437b879a08e45b5f72e8149c01efcb71429841d6a8879d4bbe27335604a5bff8dfdf85dcea00313d9b2f7c03733d6549ea3b810e5262ed844ea12f70993d87d3e0f04e3979ea0b59e3cdd6750fa8b15164612a5cb6567cdfb386d4e0137fccee5f35ab55d0efda0fe6db56e42f2057a071c980a778d9a0b61038f269dd74a0e90155b3f40f14364a08538587f2378a0849f9608942cf481da4120c360f8391bbcc225d811823c6432a026eac94e755534e16f9552e73025d6d9c30d1d7682a4cb5bd7741ddabfd48c50a041557da9a74ca68da793e743e81e2029b2835e1cc16e9e25bd0c1e89d4ccad6980a041dda0a40a21ade3a20fcd1a4abb2a42b74e9a32b02424ff8db4ea708a5e0fb9a09aaf8326a51f613607a8685f57458329b41e938bb761131a5747e066b81a0a16808080a022e6cef138e16d2272ef58434ddf49260dc1de1f8ad6dfca3da5d2a92aaaadc58080 " , "0xf851808080a009833150c367df138f1538689984b8a84fc55692d3d41fe4d1e5720ff5483a6980808080808080808080a0a319c1c415b271afc0adcb664e67738d103ac168e0bc0b7bd2da7966165cb9518080"], "balance": "0x0", "codeHash": "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470", "nonce": "0x0", "storageHash": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "storageProof": [{ "key": "0x0000000000000000000000000000000000000000000000000000000000000000 ", "value": "0x0", "proof": []}, {"key": "0x00000000000000000000000000000000000000000000000000000000000001", "value": "0x0", "proof": []}]}}
 ```
 
-
 ## Web3 Methods
 
 ### `web3_clientVersion`
@@ -1716,4 +1715,5 @@ curl -X POST --data '{"jsonrpc":"2.0","method":"miner_setEtherbase","params":["0
 {"jsonrpc":"2.0","id":1,"result":true}
 ```
 
-## TxPool Methods
+## TxPool Methods
+>>>>>>> d79323fb0f7dd4dd7b9baf4a27f51c8e5ac75472
diff --git a/docs/zh/README.md b/docs/zh/README.md
@@ -28,5 +28,4 @@ Plug Chain 使用以下模块构建在 Cosmos SDK 上：
 
 以下模块构建在 OracleNetworkProtocol 仓库上：
 
-- x/prc10: 代币逻辑。
-- x/nft: 链下资产上链。
+- x/prc10: 代币逻辑。
diff --git a/docs/zh/endpoints/intro.md b/docs/zh/endpoints/intro.md
@@ -10,6 +10,6 @@ order: 1
 
 - [Restful API](./grpc-rest.md)
 - [gRPC](./grpc-client.md)
-
+- [Client SDKs](./sdk.md) 
 
 *本社区诚邀各位同道朋友参与工具开发，社区会根据贡献奖励。*
diff --git a/docs/zh/endpoints/sdk.md b/docs/zh/endpoints/sdk.md
@@ -0,0 +1,16 @@
+---
+order: 5
+---
+
+## SDK
+
+Plug Chain Hub 客户端 SDK 是根据 Plug Chain Hub 提供的 Endpoint 制作的软件开发工具包，为用户快速开发基于 Plug Chain Hub 链的应用程序提供了极大的便利。
+
+- [Plug Chain Hub-sdk-go](https://github.com/oracleNetworkProtocol/plugchain-sdk-go)
+
+## 设计目标和概念
+
+SDK 主要实现了 Plug Chain Hub 各模块功能的封装，包括：auth、bank、gov、keys、staking,prc10,evm等使用户可以快速实现以下功能的开发：
+
+- 构造、签名和广播交易
+- 私钥管理
diff --git a/docs/zh/get-started/mainnet.md b/docs/zh/get-started/mainnet.md
@@ -5,6 +5,7 @@ order: 3
 # 加入主网
 
 :::tip
+
 需要先 [安装 plugchaind](install.md),或者下载对应版本的二进制文件 [releases](https://github.com/oracleNetworkProtocol/plugchain/releases)
 :::
 

diff --git a/docs/zh/pvm/json-rpc.md b/docs/zh/pvm/json-rpc.md
@@ -31,7 +31,6 @@ order: 3
 | `admin`                                       | The `admin` API gives you access to several non-standard RPC methods, which will allow you to have a fine grained control over your nodeinstance, including but not limited to network peer and RPC endpoint management.     | ❌        |                    |
 | [`personal`](#personal-methods) | The `personal` API manages private keys in the key store.                                                                                                                                                                    | ✔        | ❌                 |
 
-
 ## 端点
 
 | Method                                                                            | Namespace | Implemented | Public | Notes              |
@@ -280,6 +279,7 @@ curl -X POST --data '{"jsonrpc":"2.0","method":"rpc_blockNumber","params":[],"id
 
 - bech32 Address
 
+
 - Block Number or 块hash（0x...........） 
 
 ```json
@@ -352,7 +352,7 @@ curl -X POST --data '{"jsonrpc":"2.0","method":"rpc_addressTranslation","params"
 #### 参数
 
 - bech32 Address
-
+- Block Number  or Block Hash 
 - 存储位置的整数
 
 - Block Number  or 块hash（0x...........） 
@@ -423,6 +423,7 @@ curl -X POST --data '{"jsonrpc":"2.0","method":"rpc_getBlockTransactionCountByHa
 
 - bech32 Address
 
+
 - Block Number  or 块hash（0x...........） 
 
 ```json
@@ -510,6 +511,7 @@ curl -X POST --data '{"jsonrpc":"2.0","method":"rpc_sendRawTransaction","params"
 
     `data`: `DATA` - 可选）方法签名和编码参数的哈希。有关详细信息，请参阅 Solidity 文档中的以太坊合约 ABI
 
+
 - 块高（0x0）  or 块hash（0x...........） 
 
 ```json
@@ -1711,4 +1713,5 @@ curl -X POST --data '{"jsonrpc":"2.0","method":"miner_setEtherbase","params":["0
 {"jsonrpc":"2.0","id":1,"result":true}
 ```
 
-## TxPool Methods
+## TxPool Methods
+>>>>>>> d79323fb0f7dd4dd7b9baf4a27f51c8e5ac75472
diff --git a/go.mod b/go.mod
@@ -156,8 +156,7 @@ require (
 )
 
 replace (
-	google.golang.org/grpc => google.golang.org/grpc v1.33.2
-	github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
 	github.com/99designs/keyring => github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76
+	github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
+	google.golang.org/grpc => google.golang.org/grpc v1.33.2
 )
-
diff --git a/ibc/chains/evm_100-1.json b/ibc/chains/evm_100-1.json
diff --git a/ibc/chains/jntm_522-1.json b/ibc/chains/jntm_522-1.json
diff --git a/ibc/chains/plugchain_520-1.json b/ibc/chains/plugchain_520-1.json
diff --git a/ibc/paths/ibc-evm.json b/ibc/paths/ibc-evm.json
diff --git a/relayer/keys/evm_100-1/keyring-test/7d8b5c06e159feb36bf018a127266b70655af35f.address b/relayer/keys/evm_100-1/keyring-test/7d8b5c06e159feb36bf018a127266b70655af35f.address
diff --git a/relayer/keys/evm_100-1/keyring-test/ibcevm.info b/relayer/keys/evm_100-1/keyring-test/ibcevm.info
diff --git a/relayer/keys/jntm_522-1/keyring-test/9864ed077fc9a4b08b46d3618771c25c868c2364.address b/relayer/keys/jntm_522-1/keyring-test/9864ed077fc9a4b08b46d3618771c25c868c2364.address
diff --git a/relayer/keys/jntm_522-1/keyring-test/val1.info b/relayer/keys/jntm_522-1/keyring-test/val1.info
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,9 @@ order: 3 @@
     # Join mainnet
     :::tip
+    **Requirements:** [install plugchaind](install.md) or download the corresponding version of the binary file [releases](https://github.com/oracleNetworkProtocol/plugchain/releases)
     You need to [install plugchaind](install.md) first, or download the corresponding version of the binary file [releases](https://github.com/oracleNetworkProtocol/plugchain/releases)
     :::
@@ Expand Down @@