From 0c45c488298afaae246f47b059d6929c924225d9 Mon Sep 17 00:00:00 2001 From: CodingCattwo <847701726@qq.com> Date: Tue, 22 Jun 2021 18:14:28 +0800 Subject: [PATCH 01/26] add trans encode convert api --- docs/WeBASE-Front/interface.md | 404 ++++++++++++++++++++++++--------- 1 file changed, 294 insertions(+), 110 deletions(-) diff --git a/docs/WeBASE-Front/interface.md b/docs/WeBASE-Front/interface.md index 6225c52f..96aeecb4 100644 --- a/docs/WeBASE-Front/interface.md +++ b/docs/WeBASE-Front/interface.md @@ -3784,20 +3784,36 @@ HTTP POST ``` { - "groupId" :1, - "signUserId": "458ecc77a08c486087a3dcbc7ab5a9c3", - "contractAbi":[{"constant":true,"inputs":[],"name":"getVersion","outputs":[{"name":"","type":"string"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"getStorageCell","outputs":[{"name":"","type":"string"},{"name":"","type":"string"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"n","type":"string"}],"name":"setVersion","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"inputs":[{"name":"storageHash","type":"string"},{"name":"storageInfo","type":"string"}],"payable":false,"stateMutability":"nonpayable","type":"constructor"}], - "contractAddress":"0x14d5af9419bb5f89496678e3e74ce47583f8c166", - "funcName":"set", - "funcParam":["test"], - "useCns":false + "groupId": "1", + "signUserId": "f4975519b0274e6ca8283650a7e1bc07", + "contractName": "HelloWorld", + "contractPath": "/", + "version": "", + "funcName": "set", + "funcParam": ["333"], + "contractAddress": "0xe10441d9179cf0424aae808b51bc85dcbbfe1447", + "contractAbi": [{ + "inputs": [{ + "internalType": "string", + "name": "n", + "type": "string" + }], + "name": "set", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function", + "funcId": 2 + }], + "useAes": false, + "useCns": false, + "cnsName": "" } ``` 示例： ``` -curl -X POST "http://localhost:5002/WeBASE-Front/trans/handleWithSign" -H "accept: */*" -H "Content-Type: application/json" -d "{ \"contractAbi\": [ { \"outputs\": [], \"constant\": false, \"payable\": false, \"inputs\": [ { \"name\": \"n\", \"type\": \"string\" } ], \"name\": \"set\", \"stateMutability\": \"nonpayable\", \"type\": \"function\" }, { \"outputs\": [ { \"name\": \"\", \"type\": \"string\" } ], \"constant\": true, \"payable\": false, \"inputs\": [], \"name\": \"get\", \"stateMutability\": \"view\", \"type\": \"function\" }, { \"payable\": false, \"inputs\": [], \"stateMutability\": \"nonpayable\", \"type\": \"constructor\" }, { \"inputs\": [ { \"indexed\": false, \"name\": \"name\", \"type\": \"string\" } ], \"name\": \"nameEvent\", \"anonymous\": false, \"type\": \"event\" } ], \"contractAddress\": \"0x7571ff73f1a37ca07f678aebc4d8213e7ef5c266\", \"funcName\": \"set\", \"funcParam\": [ \"test\" ], \"groupId\": 1, \"signUserId\": "458ecc77a08c486087a3dcbc7ab5a9c3"}" +curl -X POST "http://localhost:5002/WeBASE-Front/trans/handleWithSign" -H "accept: */*" -H "Content-Type: application/json" -d "{\"groupId\":\"1\",\"signUserId\":\"f4975519b0274e6ca8283650a7e1bc07\",\"contractName\":\"HelloWorld\",\"contractPath\":\"/\",\"version\":\"\",\"funcName\":\"set\",\"funcParam\":[\"333\"],\"contractAddress\":\"0xe10441d9179cf0424aae808b51bc85dcbbfe1447\",\"contractAbi\":[{\"inputs\":[{\"internalType\":\"string\",\"name\":\"n\",\"type\":\"string\"}],\"name\":\"set\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\",\"funcId\":2}],\"useAes\":false,\"useCns\":false,\"cnsName\":\"\"}" ``` #### 响应参数 @@ -3812,42 +3828,25 @@ b、正确发送数据上链返回值信息（交易收据） ``` { - "transactionHash": "0x0b426a58af8ba449742b937f1e9b2b225335638707b93d6b296dfd8107edddd7", - "transactionIndex": 0, - "blockHash": "0xc8eb7a983ecb8c2a0a64450a059d2cf3de8c8d786211dcec48ab9c47219ee8f7", - "blockNumber": 36985, - "gasUsed": 35400, - "contractAddress": "0x0000000000000000000000000000000000000000", - "root": null, - "status": "0x0", - "from": "0xb173ca9a2e07efe6007aee751a013849d53e7c29", - "to": "0x7571ff73f1a37ca07f678aebc4d8213e7ef5c266", - "input": "0x4ed3885e000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000047465737400000000000000000000000000000000000000000000000000000000", - "output": "0x", - "logs": [ - { - "removed": false, - "logIndex": null, - "transactionIndex": null, - "transactionHash": null, - "blockHash": null, - "blockNumber": null, - "address": "0x7571ff73f1a37ca07f678aebc4d8213e7ef5c266", - "data": "0x000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000047465737400000000000000000000000000000000000000000000000000000000", - "type": null, - "topics": [ - "0x9645e7fb5eec05c0f156d4901a10663561199c6dd0401214a0b833fe0022d899" - ], - "logIndexRaw": null, - "blockNumberRaw": null, - "transactionIndexRaw": null - } - ], - "logsBloom": "0x00000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000020000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000", - "gasUsedRaw": "0x8a48", - "statusOK": true, - "blockNumberRaw": "0x9079", - "transactionIndexRaw": "0x0" + "transactionHash": "0xd1234cdb673447b654874d05d4ed98be89f3cb7c5a6c12bc51e1274a03af029c", + "transactionIndex": "0x0", + "root": "0xeecf2b6bbb028e38e704ca88fe1d9f5e3d43197b32c3336d3273d86fb3a135f0", + "blockNumber": "0xa9", + "blockHash": "0x906bdf0747ba68c03e6cf73463db62fdbd8ab8debc149f890475775d7c6a8af7", + "from": "0x7bfa3539c8761978f0a2a1f7f240bde97819fb03", + "to": "0xe10441d9179cf0424aae808b51bc85dcbbfe1447", + "gasUsed": "0x710b", + "contractAddress": "0x0000000000000000000000000000000000000000", + "logs": [], + "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "status": "0x0", + "statusMsg": "None", + "input": "0x3590b49f000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000033333330000000000000000000000000000000000000000000000000000000000", + "output": "0x", + "txProof": null, + "receiptProof": null, + "message": "Success", + "statusOK": true } ``` @@ -3903,22 +3902,36 @@ HTTP POST 示例： ``` -curl -l -H "Content-type: application/json" -X POST -d '{"contractName": -"HelloWorld", "contractAbi": [{\"constant\":false,\"inputs\":[{\"indexed\":false,\"name\":\"n\",\"type\":\"string\"}],\"name\":\"set\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"}], funcName": "set", "funcParam": ["Hi,Welcome!"], "user": "0x2db346f9d24324a4b0eac7fb7f3379a2422704db", "contractAddress":"dasdfav23rf213vbcdvadf3bcdf2fc23rqde","groupId": 1,"useCns": false}' http://10.0.0.1:5002/WeBASE-Front/trans/handle +curl -l -H "Content-type: application/json" -X POST -d '{\"groupId\":\"1\",\"user\":\"0x7bfa3539c8761978f0a2a1f7f240bde97819fb03\",\"contractName\":\"HelloWorld\",\"contractPath\":\"/\",\"version\":\"\",\"funcName\":\"set\",\"funcParam\":[\"333\"],\"contractAddress\":\"0xe10441d9179cf0424aae808b51bc85dcbbfe1447\",\"contractAbi\":[{\"inputs\":[{\"internalType\":\"string\",\"name\":\"n\",\"type\":\"string\"}],\"name\":\"set\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\",\"funcId\":2}],\"useAes\":false,\"useCns\":false,\"cnsName\":\"\"}' http://10.0.0.1:5002/WeBASE-Front/trans/handle ``` 传入合约abi: ``` { - "user":"0x2db346f9d24324a4b0eac7fb7f3379a2422704db", - "contractName":"HelloWorld", - "contractAddress":"dasdfav23rf213vbcdvadf3bcdf2fc23rqde", - "funcName":"set", - "contractAbi":[{"constant":true,"inputs":[],"name":"getVersion","outputs":[{"name":"","type":"string"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"getStorageCell","outputs":[{"name":"","type":"string"},{"name":"","type":"string"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"n","type":"string"}],"name":"setVersion","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"inputs":[{"name":"storageHash","type":"string"},{"name":"storageInfo","type":"string"}],"payable":false,"stateMutability":"nonpayable","type":"constructor"}], - "funcParam":["Hi,Welcome!"], - "groupId" :"1", - "useCns": false + "groupId": "1", + "user": "0x7bfa3539c8761978f0a2a1f7f240bde97819fb03", + "contractName": "HelloWorld", + "contractPath": "/", + "version": "", + "funcName": "set", + "funcParam": ["333"], + "contractAddress": "0xe10441d9179cf0424aae808b51bc85dcbbfe1447", + "contractAbi": [{ + "inputs": [{ + "internalType": "string", + "name": "n", + "type": "string" + }], + "name": "set", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function", + "funcId": 2 + }], + "useAes": false, + "useCns": false, + "cnsName": "" } ``` @@ -3934,23 +3947,25 @@ b、正确发送数据上链返回值信息（交易收据） ``` { - "code": 0, - "message": "success", - "data": { - "blockHash": - "0x1d8d8275aa116d65893291c140849be272dac1d4ca0a0a722f44404b2f2356c3", - "gasUsed": 32798, - "transactionIndexRaw": "0", - "blockNumberRaw": "33", - "blockNumber": 33, - "contractAddress": "0x0000000000000000000000000000000000000000", - "cumulativeGasUsed": 32798, - "transactionIndex": 0, - "gasUsedRaw": "0x801e", - "logs": [], - "cumulativeGasUsedRaw": "0x801e", - "transactionHash":"0x0653a8e959771955330461456dd094a96d9071bfa31e6f43b68b30f10a85689c" - } + "transactionHash": "0xd1234cdb673447b654874d05d4ed98be89f3cb7c5a6c12bc51e1274a03af029c", + "transactionIndex": "0x0", + "root": "0xeecf2b6bbb028e38e704ca88fe1d9f5e3d43197b32c3336d3273d86fb3a135f0", + "blockNumber": "0xa9", + "blockHash": "0x906bdf0747ba68c03e6cf73463db62fdbd8ab8debc149f890475775d7c6a8af7", + "from": "0x7bfa3539c8761978f0a2a1f7f240bde97819fb03", + "to": "0xe10441d9179cf0424aae808b51bc85dcbbfe1447", + "gasUsed": "0x710b", + "contractAddress": "0x0000000000000000000000000000000000000000", + "logs": [], + "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "status": "0x0", + "statusMsg": "None", + "input": "0x3590b49f000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000033333330000000000000000000000000000000000000000000000000000000000", + "output": "0x", + "txProof": null, + "receiptProof": null, + "message": "Success", + "statusOK": true } ``` @@ -3982,8 +3997,8 @@ HTTP POST ``` { - "signedStr": "0xddd", - "sync": 1, + "signedStr": "0xf9012da001071041dddc1b3c553b48c0fbefecc07f3812f5ce4004d47708f1c3342844db018405f5e10082029d94e10441d9179cf0424aae808b51bc85dcbbfe144780b8643590b49f000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000033333330000000000000000000000000000000000000000000000000000000000010180b84083bb5313e3dd7825b8b3e32d73aa8aedf9f9a8fcf435e5c37edfe4645c1af4211c12e1368024336a576f26ed624407da0b94e0bc5760514543c0b7a38fa03a7da0972843d0879ffdbdae733e8707896a532e5e1a3c7262cb84db657dd34f09111ba0786106465fe0fd2383588693cafef8934df62b188c6bb5a74eb6b9f23adaba32", + "sync": true, "groupId":1 } ``` @@ -3994,43 +4009,25 @@ HTTP POST ``` { - "transactionHash": "0xb2c733b742045e61c0fd6e7e2bafece04d56262a4887de9f78dad2c5dd2f944b", - "transactionIndex": 0, - "blockHash": "0xf27ff42d4be65329a1e7b11365e190086d92f9836168d0379e92642786db7ade", - "blockNumber": 100, - "cumulativeGasUsed": 121038, - "gasUsed": 121038, - "contractAddress": "0x0000000000000000000000000000000000000000", - "root": null, - "from": null, - "to": null, - "logs": [ - { - "removed": false, - "logIndex": 0, - "transactionIndex": 0, - "transactionHash": "0xb2c733b742045e61c0fd6e7e2bafece04d56262a4887de9f78dad2c5dd2f944b", - "blockHash": "0xf27ff42d4be65329a1e7b11365e190086d92f9836168d0379e92642786db7ade", - "blockNumber": 100, - "address": "0x986278eb8e8b4ef98bdfc055c02d65865fc87ad2", - "data": "0x00000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000001caf3fbec3675eabb85c0b25e2992d6f0a5e1546dad85c20733fdb27cfa4ca782a5fdfb621b416f3494c7d8ca436c12309884550d402ea79f03ef8ddfdd494f7a40000000000000000000000000000000000000000000000000000000000000040666164363863656230616530316530643731616635356331316561643031613532656638363435343866306134643133633836363164393664326461366239380000000000000000000000000000000000000000000000000000000000000002363000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000023630000000000000000000000000000000000000000000000000000000000000", - "type": "mined", - "topics": [ - "0xbf474e795141390215f4f179557402a28c562b860f7b74dce4a3c0e0604cd97e" - ], - "logIndexRaw": "0", - "blockNumberRaw": "100", - "transactionIndexRaw": "0" - } - ], - "logsBloom": null, - "gasUsedRaw": "0x1d8ce", - "blockNumberRaw": "100", - "transactionIndexRaw": "0", - "cumulativeGasUsedRaw": "0x1d8ce", - "message": null, - "txProof": null, - "receiptProof": null + "transactionHash": "0xd1234cdb673447b654874d05d4ed98be89f3cb7c5a6c12bc51e1274a03af029c", + "transactionIndex": "0x0", + "root": "0xeecf2b6bbb028e38e704ca88fe1d9f5e3d43197b32c3336d3273d86fb3a135f0", + "blockNumber": "0xa9", + "blockHash": "0x906bdf0747ba68c03e6cf73463db62fdbd8ab8debc149f890475775d7c6a8af7", + "from": "0x7bfa3539c8761978f0a2a1f7f240bde97819fb03", + "to": "0xe10441d9179cf0424aae808b51bc85dcbbfe1447", + "gasUsed": "0x710b", + "contractAddress": "0x0000000000000000000000000000000000000000", + "logs": [], + "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "status": "0x0", + "statusMsg": "None", + "input": "0x3590b49f000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000033333330000000000000000000000000000000000000000000000000000000000", + "output": "0x", + "txProof": null, + "receiptProof": null, + "message": "Success", + "statusOK": true } ``` @@ -4128,6 +4125,193 @@ HTTP POST } ``` + +### 5.6. 获取签名后的交易体编码值（结合WeBASE-Sign） + +#### 接口描述 + +构造交易体RawTransaction并将交易体编码，通过传入的`signUserId`签名服务的用户ID，使用对应的私钥对交易提进行签名后，返回已签名的交易体编码值（十六进制字符串） + +签名后的交易的编码值可以直接通过`/trans/signed-transaction`接口提交到链上 + +#### 接口URL + +**http://localhost:5002/WeBASE-Front/trans/convertRawTxStr/withSign** + +#### 调用方法 + +HTTP POST + +#### 请求参数 + +**1）参数表** + +| **序号** | **中文** | **参数名** | **类型** | **最大长度** | **必填** | **说明** | +| -------- | -------------- | --------------- | -------- | ------------ | -------- | ---------------------------------------------- | +| 1 | 用户编号 | signUserId | String | 64 | 是 | WeBASE-Sign用户编号，若为空则返回未签名交易提编码值 | +| 2 | 合约名称 | contractName | String | | 是 | | +| 3 | 合约地址 | contractAddress | String | | 是 | | +| 4 | 方法名 | funcName | String | | 是 | | +| 5 | 合约编译后生成的abi文件内容 | contractAbi | List | | 是 | 合约中单个函数的ABI，若不存在同名函数可以传入整个合约ABI，格式：JSONArray | +| 6 | 方法参数 | funcParam | List | | 否 | JSON数组，多个参数以逗号分隔（参数为数组时同理），如：["str1",["arr1","arr2"]] | +| 7 | 群组ID | groupId | int | | 是 | 默认为1 | +| 8 | 是否使用cns调用 | useCns | bool | | 是 | | +| 9 | cns名称 | cnsName | String | | 否 | CNS名称，useCns为true时不能为空 | +| 10 | cns版本 | version | String | | 否 | CNS版本，useCns为true时不能为空 | + + +**2）数据格式** + +``` +{ + "transactionHash": "0x42894f8478bc5cf3417c31a559f22e7d59b049fc3136e223d9ec7003927b16c1", + "transactionIndex": "0x0", + "root": "0x0000000000000000000000000000000000000000000000000000000000000000", + "blockNumber": "369", + "blockHash": "0x2462d0e8d7f4ed892a0a18c982c3398dd43250863c6fe5e182df4f7eaab205f7", + "from": "0xfc2038f30e82a2c7afbb27da4cd7c44ece8a5c91", + "to": "0xe10441d9179cf0424aae808b51bc85dcbbfe1447", + "gasUsed": "149305", + "contractAddress": "0x0000000000000000000000000000000000000000", + "logs": [], + "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "status": "0x0", + "statusMsg": "None", + "input": "0x3590b49f000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000033333330000000000000000000000000000000000000000000000000000000000", + "output": "0x", + "txProof": null, + "receiptProof": null, + "message": null, + "statusOK": true +} +``` + +#### 响应参数 + +``` +0xf9012da002c1442b6ce974291ec317db9859e8310de46f6636d105f19fee67f10ac60b2f018405f5e10082029e94e10441d9179cf0424aae808b51bc85dcbbfe144780b8643590b49f000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000033333330000000000000000000000000000000000000000000000000000000000010180b8407d3efe268051e49350d877eaba7bbe6369a44263aec6e47fcba2ac1aff849261e833361bc67befbf4566894478c011dcae3e06818a381401751d1bf8bceecedaa01605fb8fcb546b0dc79e1da004a8323b151d1f569e10cae85a3f62bad5d7150fa0d77282eb650e0f52956693177717eb31cfddcada0681973a6aed9c46f3d8eb4d +``` + + +### 5.7. 获取签名后的交易体编码值（本地签名） + +#### 接口描述 + +构造交易体RawTransaction并将交易体编码，并通过传入的`user`地址的私钥对交易提进行签名后，返回已签名的交易体编码值（十六进制字符串） + +签名后的交易的编码值可以直接通过`/trans/signed-transaction`接口提交到链上 + +#### 接口URL + +**http://localhost:5002/WeBASE-Front/trans/convertRawTxStr/local** + +#### 调用方法 + +HTTP POST + +#### 请求参数 + +**1）参数表** + +| **序号** | **中文** | **参数名** | **类型** | **最大长度** | **必填** | **说明** | +| -------- | --------------------------- | --------------- | -------- | ------------ | -------- | ------------------------------------------------------------ | +| 1 | 用户地址 | user | String | | 是 | 用户地址，可通过`/privateKey`接口创建。*若user为空，则返回未签名交易编码值* | +| 2 | 合约名称 | contractName | String | | 是 | | +| 3 | 合约地址 | contractAddress | String | | 是 | | +| 4 | 方法名 | funcName | String | | 是 | | +| 5 | 合约编译后生成的abi文件内容 | contractAbi | List | | 是 | 合约中单个函数的ABI，若不存在同名函数可以传入整个合约ABI，格式：JSONArray | +| 6 | 方法参数 | funcParam | List | | 否 | JSON数组，多个参数以逗号分隔（参数为数组时同理），如：["str1",["arr1","arr2"]]，根据所调用的合约方法判断是否必填 | +| 7 | 群组ID | groupId | int | | 是 | 默认为1 | +| 8 | 合约路径 | contractPath | int | | 否 | | +| 9 | 是否使用cns调用 | useCns | bool | | 是 | | +| 10 | cns名称 | cnsName | String | | 否 | CNS名称，useCns为true时不能为空 | +| 11 | cns版本 | version | String | | 否 | CNS版本，useCns为true时不能为空 | + +**2）数据格式** + +示例： + +``` +{ + "user":"0x2db346f9d24324a4b0eac7fb7f3379a2422704db", + "contractName":"HelloWorld", + "contractAddress":"dasdfav23rf213vbcdvadf3bcdf2fc23rqde", + "funcName":"set", + "contractAbi":[{"constant":true,"inputs":[],"name":"getVersion","outputs":[{"name":"","type":"string"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"getStorageCell","outputs":[{"name":"","type":"string"},{"name":"","type":"string"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"n","type":"string"}],"name":"setVersion","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"inputs":[{"name":"storageHash","type":"string"},{"name":"storageInfo","type":"string"}],"payable":false,"stateMutability":"nonpayable","type":"constructor"}], + "funcParam":["Hi,Welcome!"], + "groupId" :"1", + "useCns": false +} +``` + +#### 响应参数 + +**1）数据格式** + +``` +0xf9012da001071041dddc1b3c553b48c0fbefecc07f3812f5ce4004d47708f1c3342844db018405f5e10082029d94e10441d9179cf0424aae808b51bc85dcbbfe144780b8643590b49f000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000033333330000000000000000000000000000000000000000000000000000000000010180b84083bb5313e3dd7825b8b3e32d73aa8aedf9f9a8fcf435e5c37edfe4645c1af4211c12e1368024336a576f26ed624407da0b94e0bc5760514543c0b7a38fa03a7da0972843d0879ffdbdae733e8707896a532e5e1a3c7262cb84db657dd34f09111ba0786106465fe0fd2383588693cafef8934df62b188c6bb5a74eb6b9f23adaba32 +``` + + +### 5.8. 获取合约函数的编码值 + +#### 接口描述 + +构造合约函数的编码值，适用于查询交易，合约函数的编码值可以直接通过`/trans/query-transaction`接口提交到链上 + +#### 接口URL + +**http://localhost:5002/WeBASE-Front/trans/encodeFunction** + +#### 调用方法 + +HTTP POST + +#### 请求参数 + +**1）参数表** + +| **序号** | **中文** | **参数名** | **类型** | **最大长度** | **必填** | **说明** | +| -------- | --------------------------- | --------------- | -------- | ------------ | -------- | ------------------------------------------------------------ | +| 1 | 方法名 | funcName | String | | 是 | | +| 2 | 合约编译后生成的abi文件内容 | contractAbi | List | | 是 | 合约中单个函数的ABI，若不存在同名函数可以传入整个合约ABI，格式：JSONArray | +| 3 | 方法参数 | funcParam | List | | 否 | JSON数组，多个参数以逗号分隔（参数为数组时同理），如：["str1",["arr1","arr2"]]，根据所调用的合约方法判断是否必填 | + +**2）数据格式** + +示例： + +``` +{ + "contractAbi": [{ + "inputs": [], + "name": "get", + "outputs": [{ + "internalType": "string", + "name": "", + "type": "string" + }], + "stateMutability": "view", + "type": "function", + "funcId": 1 + }], + "contractAddress": "0xe10441d9179cf0424aae808b51bc85dcbbfe1447", + "encodeStr": "0x299f7f9d", + "funcName": "get", + "groupId": 1, + "userAddress": "0x7bfa3539c8761978f0a2a1f7f240bde97819fb03" +} +``` + +#### 响应参数 + +**1）数据格式** + +``` +0x299f7f9d +``` + + ## 6. 系统管理接口 使用FISCO BCOS v2.5.0 与 WeBASE-Front v1.4.1 (及)以上版本将使用预编译合约中的ChainGovernance接口(从本章节[接口6.13](#governance)开始)，详情可参考[FISCO BCOS基于角色的权限控制](https://fisco-bcos-documentation.readthedocs.io/zh_CN/latest/docs/manual/permission_control.html#id2) From 3af437f7009e2c833fa40b9f089ef4b188b02ad6 Mon Sep 17 00:00:00 2001 From: CodingCattwo <847701726@qq.com> Date: Wed, 30 Jun 2021 16:56:54 +0800 Subject: [PATCH 02/26] merge --- docs/WeBASE-Training-Plugin-Plan/index.md | 37 ++++++++++++----------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/docs/WeBASE-Training-Plugin-Plan/index.md b/docs/WeBASE-Training-Plugin-Plan/index.md index 0eca7817..f7164eec 100644 --- a/docs/WeBASE-Training-Plugin-Plan/index.md +++ b/docs/WeBASE-Training-Plugin-Plan/index.md @@ -29,7 +29,24 @@ WeBASE实训插件方案主要的目的是：将WeBASE管理台的部分功能 ### 4.2 WeBASE配置 -#### 4.2.1 WeBASE-Node-Manager配置 +#### 4.2.1 WeBASE-Node-Manager数据库中插入参数设置数据，脚本如下： + +```plain +INSERT INTO `tb_config`(`config_name`, `config_type`, `config_value`, `create_time`, `modify_time`) VALUES ('SupportIframe', 2, '1', '2020-09-22 17:14:23', '2020-09-22 17:14:23'); +INSERT INTO `tb_config`(`config_name`, `config_type`, `config_value`, `create_time`, `modify_time`) VALUES ('IframeSupportHostList', 3, 'baidu.com|163.com', '2020-09-22 17:14:23', '2020-09-22 17:14:23');  +``` + +其中，SupportIframe设置为1，表示开启iframe嵌入支持；IframeSupportHostList为iframe嵌入支持的host白名单列表。 + +配置访问接口如下： + +``` +http://127.0.0.1:5001/WeBASE-Node-Manager/config/list?type=2 +``` + + + +#### 4.2.2 WeBASE-Node-Manager配置 修改webase-node-manager/conf/application.yml。 @@ -37,7 +54,7 @@ WeBASE实训插件方案主要的目的是：将WeBASE管理台的部分功能 ```plain -permitUrlArray: /account/login,/account/pictureCheckCode,/login,/user/privateKey/**,/config/encrypt,/config/version,/front/refresh,/api/*,/config/list +permitUrlArray:/account/login,/account/pictureCheckCode,/login,/user/privateKey/**,/config/encrypt,/config/version,/front/refresh,/api/*,/config/list ``` - 修改constant.verificationCodeMaxAge，设置为与你的系统的session时间一致。 @@ -51,22 +68,6 @@ permitUrlArray: /account/login,/account/pictureCheckCode,/login,/user/privateKey 2. 固定校验码为了实现单点登录 3. permitUrlArray配置是为了放开接口访问权限 - -#### 4.2.2 WeBASE-Node-Manager数据库中插入参数设置数据，脚本如下： - -```plain -INSERT INTO `tb_config`(`config_name`, `config_type`, `config_value`, `create_time`, `modify_time`) VALUES ('SupportIframe', 2, '1', '2020-09-22 17:14:23', '2020-09-22 17:14:23'); -INSERT INTO `tb_config`(`config_name`, `config_type`, `config_value`, `create_time`, `modify_time`) VALUES ('IframeSupportHostList', 3, 'baidu.com|163.com', '2020-09-22 17:14:23', '2020-09-22 17:14:23');  -``` - -其中，SupportIframe设置为1，表示开启iframe嵌入支持；IframeSupportHostList为iframe嵌入支持的host白名单列表。 - -配置访问接口如下： - -``` -http://127.0.0.1:5001/WeBASE-Node-Manager/config/list?type=2 -``` - ## 5 实验台中使用 ### 5.1 iframe嵌入 From 06edaf17f3ebf6060e3a4b245f0b25d10bf82f26 Mon Sep 17 00:00:00 2001 From: CodingCattwo <847701726@qq.com> Date: Wed, 30 Jun 2021 16:57:03 +0800 Subject: [PATCH 03/26] update doc descriptopn --- docs/WeBASE-Front/install.md | 26 ++++++++++---------------- docs/WeBASE-Node-Manager/install.md | 24 +++++++----------------- docs/WeBASE-Sign/install.md | 8 ++++---- docs/WeBASE-Web/install.md | 10 +++++++--- 4 files changed, 28 insertions(+), 40 deletions(-) diff --git a/docs/WeBASE-Front/install.md b/docs/WeBASE-Front/install.md index 2ea9ec5b..a7cd02ff 100644 --- a/docs/WeBASE-Front/install.md +++ b/docs/WeBASE-Front/install.md @@ -4,25 +4,18 @@ | 依赖软件 | 支持版本 | | :-: | :-: | -| Java | JDK8或以上版本 | -| FISCO-BCOS | V2.0.x版本 | +| Java | Java 1.8或以上版本 | +| FISCO-BCOS | v2.0.0及以上版本 | **备注：** Java推荐使用[OracleJDK](https://www.oracle.com/technetwork/java/javase/downloads/index.html)，可参考[JDK配置指引](./appendix.html#jdk)（CentOS的yum仓库的OpenJDK缺少JCE(Java Cryptography Extension)，导致Web3SDK无法正常连接区块链节点） -### 国密支持 +#### 国密支持 WeBASE-Front v1.2.2+已支持 [国密版FISCO-BCOS](https://fisco-bcos-documentation.readthedocs.io/zh_CN/latest/docs/manual/guomi_crypto.html) - -开启国密国密SSL： - 在v1.5.0后，sdk将自动根据链的加密类型切换国密或非国密，自动根据链的SSL类型切换国密SSL -国密编译： -- 编译国密版智能合约在v1.3.1版本后，通过引入solcJ:0.4.25-rc1.jar，自动切换支持国密版智能合约的编译/部署/调用；（可自行替换jar包版本为solcJ-0.5.2来使用0.5进行后台接口的合约编译） -- 该部分仅影响后台的`/contract`合约编译接口，不影响前端合约IDE的合约编译 - - -### solidity v0.6.10支持 +#### solidity v0.6.10支持 WeBASE-Front v1.4.2已支持solidity `v0.5.1`和`v0.6.10` @@ -71,7 +64,7 @@ dist目录提供了一份配置模板conf_template： ``` 根据配置模板生成一份实际配置conf。初次部署可直接拷贝。 -例如：cp conf_template conf -r +例如：cp -r conf_template conf ``` （2）进入conf目录： @@ -87,7 +80,7 @@ cd conf （3）修改配置（根据实际情况修改）： -*如果在企业部署中使用WeBASE-Front，必须配置下文中的`keyServer`* +如果在企业部署中使用WeBASE-Front，必须配置下文中的`keyServer`，用于连接WeBASE-Sign服务 ``` vi application.yml @@ -108,11 +101,11 @@ sdk: certPath: conf // sdk证书的目录，默认为conf constant: keyServer: 127.0.0.1:5004 // 密钥服务的IP和端口(WeBASE-Node-Manager服务或者WeBASE-Sign服务，不同服务支持的接口不同)，如果作为独立控制台使用可以不配置 + aesKey: EfdsW23D23d3df43 // aes加密key(16位) 如启用，各互联的子系统的加密key需保持一致 transMaxWait: 30 // 交易最大等待时间 monitorDisk: / // 要监控的磁盘目录，配置节点所在目录（如：/data） monitorEnabled: true // 是否监控数据，默认true - aesKey: EfdsW23D23d3df43 // aes加密key(16位) 如启用，各互联的子系统的加密key需保持一致 - nodePath: /fisco/nodes/127.0.0.1/node0 //配置连接节点的绝对路径 + nodePath: /fisco/nodes/127.0.0.1/node0 //配置所连节点的绝对路径，用于监控节点配置与日志 ... ``` @@ -147,6 +140,7 @@ http://{deployIP}:{frontPort}/WeBASE-Front 在dist目录查看： ``` -前置服务日志：tail -f log/WeBASE-Front.log +前置服务全量日志：tail -f log/WeBASE-Front.log +前置服务错误日志：tail -f log/WeBASE-Front.log web3连接日志：tail -f log/web3sdk.log ``` \ No newline at end of file diff --git a/docs/WeBASE-Node-Manager/install.md b/docs/WeBASE-Node-Manager/install.md index aec773c1..8535b26e 100644 --- a/docs/WeBASE-Node-Manager/install.md +++ b/docs/WeBASE-Node-Manager/install.md @@ -4,8 +4,8 @@ | 序号 | 软件 | | ---- | --------------------- | -| 1 | FISCO-BCOS 2.0 | -| 2 | WeBASE-Front 对应版本 | +| 1 | FISCO-BCOS 2.0+ | +| 2 | WeBASE-Front [对应版本](../WeBASE/ChangeLOG.md) | | 3 | MySQL5.6或以上版本 | | 4 | Java8或以上版本 | @@ -13,23 +13,18 @@ ## 2. 注意事项 * Java推荐使用[OracleJDK](https://www.oracle.com/technetwork/java/javase/downloads/index.html)，[JDK配置指引](./appendix.html#jdk) * 在服务搭建的过程中，如碰到问题，请查看 [常见问题解答](./install_FAQ.html) -* 安全温馨提示： 强烈建议设置复杂的数据库登录密码，且严格控制数据操作的权限和网络策略 +* 安全提示： 强烈建议设置复杂的数据库登录密码，且严格控制数据操作的权限和网络策略 **通过WeBASE-Sign私钥管理** -WeBASE-Node-Manager v1.3.0+将通过WeBASE-Sign进行私钥管理，即使用WeBASE-Node-Manager v1.3.0+的版本需要同步安装WeBASE-Sign v1.3.0，详情可参考[升级文档](upgrade.html)进行阅读 +WeBASE-Node-Manager v1.3.0及以上版本将通过WeBASE-Sign进行私钥管理，即使用WeBASE-Node-Manager v1.3.0+的版本需要同步安装WeBASE-Sign v1.3.0，详情可参考[升级文档](upgrade.html)进行阅读 **国密支持：** WeBASE-Node-Manager v1.2.2+已支持 [国密版FISCO-BCOS](https://fisco-bcos-documentation.readthedocs.io/zh_CN/latest/docs/manual/guomi_crypto.html)，与[WeBASE-Front v1.2.2+](../WeBASE-Front/index.html)配合使用 -```eval_rst -.. important:: - 使用国密版WeBASE-Node-Manager需要开启java-sdk的国密开关和script/gm中的webase-gm.sh脚本进行数据库初始化 -``` - -开启java-sdk的国密开关： -- 将配置文件`application.yml/applicationContext.xml`中sdk配置的`encryptType`从`0`修改为`1`； +开启WeBASE-Node-Manager的国密开关： +- 将配置文件`application.yml`中的`sdk.encryptType`从`0`修改为`1`； ## 3. 拉取代码 @@ -79,11 +74,6 @@ CREATE DATABASE IF NOT EXISTS {your_db_name} DEFAULT CHARSET utf8 COLLATE utf8_g cd dist/script ``` -```eval_rst -.. important:: - 如果使用国密版，应进入dist/script/gm目录，对/gm目录下的webase-gm.sh进行下文的操作（即`sed`操作`/gm/webase-gm.sh`），并在最后运行webase-gm.sh -``` - 修改数据库连接信息： ```shell 修改数据库名称：sed -i "s/webasenodemanager/${your_db_name}/g" webase.sh @@ -123,7 +113,7 @@ bash webase.sh 127.0.0.1 3306 ``` **备注**： -- 如果使用国密版本，则将application.yml中`sdk-encryptType`由`0`改为`1` +- 如果使用国密版本，则将application.yml中`sdk.encryptType`由`0`改为`1` - 如果使用可视化部署，则将application.yml中`constant-deployType`由`0`改为`1`，并设置`constant-webaseSignAddress`为当前的webase-sign路径。具体使用方法可以参考[可视化部署-手动部署](../WeBASE-Install/visual_deploy.html#visual-deploy-manual) diff --git a/docs/WeBASE-Sign/install.md b/docs/WeBASE-Sign/install.md index 08eab647..b978b398 100644 --- a/docs/WeBASE-Sign/install.md +++ b/docs/WeBASE-Sign/install.md @@ -4,7 +4,7 @@ | 环境 | 版本 | | ------ | ------------------- | -| Java | jdk1.8或以上版本 | +| Java | Java1.8或以上版本 | | 数据库 | MySQL-5.6或以上版本 | 备注：安装说明请参看 [附录-1](./appendix.html#id2)。 @@ -121,8 +121,8 @@ constant: ## 6. 查看日志 -在dist目录下查看： - +在dist目录查看： ```shell -tail -f log/WeBASE-Sign.log +全量日志：tail -f log/WeBASE-Sign.log +错误日志：tail -f log/WeBASE-Sign-error.log ``` \ No newline at end of file diff --git a/docs/WeBASE-Web/install.md b/docs/WeBASE-Web/install.md index a8dcdc1c..8bb27673 100644 --- a/docs/WeBASE-Web/install.md +++ b/docs/WeBASE-Web/install.md @@ -5,6 +5,7 @@ | 环境 | 版本 | | ------ | --------------- | | nginx | nginx1.6或以上版本，安装请参考[附录](appendix.html) | +| WeBASE-Node-Manager | WeBASE-Node-Manager[对应版本](../WeBASE/ChangeLOG.md) | ### 2. 拉取代码 @@ -48,8 +49,8 @@ cd WeBASE-Web 执行完后检查dist/static/js是否下载完这些js文件。 ### 3. 拉取移动端代码 -WeBASE新增了h5的移动端页面，支持手机浏览器访问 -代码和WeBASE-Web放在同一个目录 +WeBASE新增了h5的移动端页面，支持手机浏览器访问。代码和WeBASE-Web放在同一个目录 + 拉取代码 ```shell git clone https://github.com/WeBankFinTech/WeBASE-Web-Mobile.git @@ -62,6 +63,7 @@ git clone https://gitee.com/WeBank/WeBASE-Web-Mobile.git 在docs目录下有配置文件nginx.conf，修改完后替换安装的nginx的配置文件nginx.conf（这里nginx安装配置文件在/usr/local/nginx/conf下面，如果这里没找到，可以到/etc下寻找，如有权限问题，请加上sudo）。 + - 修改配置： ``` @@ -78,7 +80,8 @@ sed -i "s%/data/WeBASE-Web/dist%${your_file_dir}%g" docs/nginx.conf sed -i "s%10.0.0.1:5001%${your_node_manager}%g" docs/nginx.conf ``` -- 复制配置文件nginx.conf +- 复制配置文件nginx.conf到默认配置目录中 +- 也可以直接通过`nginx -c docs/nginx.conf`命令加载docs/nginx.conf配置 ``` cp -rf docs/nginx.conf /usr/local/nginx/conf @@ -126,6 +129,7 @@ cp -rf docs/nginx.conf /usr/local/nginx/conf ``` ps -ef | grep nginx ``` + ### 6. 访问页面 ``` From 15f0be03b1635ec2a31a1c17829ba8b962fb4db5 Mon Sep 17 00:00:00 2001 From: CodingCattwo <847701726@qq.com> Date: Thu, 1 Jul 2021 10:54:26 +0800 Subject: [PATCH 04/26] add ledger in index --- index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.rst b/index.rst index a7f51ca3..e7f2846e 100644 --- a/index.rst +++ b/index.rst @@ -95,7 +95,7 @@ WeBASE（WeBank Blockchain Application Software Extension） 是在区块链应 - SmartDev-Contract 智能合约库组件：`[GitHub] `_ `[Gitee] `_ `[文档] `_ - SmartDev-SCGP 合约编译插件：`[GitHub] `_ `[Gitee] `_ `[文档] `_ - SmartDev-Scaffold 应用开发脚手架：`[GitHub] `_ `[Gitee] `_ `[文档] `_ - + - **WeBankBlockchain-OpenLedger 分布式账本解决方案**：`[GitHub] `_ `[Gitee] `_ `[文档] `_ .. toctree:: From ea4a648ea197101b05fc8debece6618dd280ef1b Mon Sep 17 00:00:00 2001 From: CodingCattwo <847701726@qq.com> Date: Tue, 6 Jul 2021 17:01:39 +0800 Subject: [PATCH 05/26] update check nginx command --- docs/WeBASE/install.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/WeBASE/install.md b/docs/WeBASE/install.md index 7d8e2b8d..ca735462 100644 --- a/docs/WeBASE/install.md +++ b/docs/WeBASE/install.md @@ -306,9 +306,9 @@ $ ps -ef | grep webase.node.mgr root 4696 1 0 17:26 pts/2 00:00:40 /usr/local/jdk/bin/java -Djdk.tls.namedGroups=secp256k1 ... conf/:apps/*:lib/* com.webank.webase.node.mgr.Application ``` -- 检查webase-web的nginx进程 +- 检查webase-web的nginx进程（运行路径为webase-deploy目录） ``` -$ ps -ef | grep webase |grep nginx +$ ps -ef | grep nginx ``` 输出如下 From a702e03707f3fedaba235f21cc516cd1883c9597 Mon Sep 17 00:00:00 2001 From: CodingCattwo <847701726@qq.com> Date: Tue, 6 Jul 2021 17:11:25 +0800 Subject: [PATCH 06/26] update version 1.5.2 --- conf.py | 2 +- docs/WeBASE-Install/developer.md | 2 +- docs/WeBASE/install.md | 8 ++++---- docs_en/conf.py | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/conf.py b/conf.py index 6aa218d8..05d18ed2 100644 --- a/conf.py +++ b/conf.py @@ -110,7 +110,7 @@ # The short X.Y version. version = '1.5' # The full version, including alpha/beta/rc tags. -release = 'v1.5.1' +release = 'v1.5.2' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/WeBASE-Install/developer.md b/docs/WeBASE-Install/developer.md index 3c1a60a6..fa008a52 100644 --- a/docs/WeBASE-Install/developer.md +++ b/docs/WeBASE-Install/developer.md @@ -18,7 +18,7 @@ 1. 下载安装包 ```shell - wget https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/WeBASE/releases/download/v1.5.1/webase-front.zip + wget https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/WeBASE/releases/download/v1.5.2/webase-front.zip ``` diff --git a/docs/WeBASE/install.md b/docs/WeBASE/install.md index ca735462..56d5ead7 100644 --- a/docs/WeBASE/install.md +++ b/docs/WeBASE/install.md @@ -96,7 +96,7 @@ Python3.6及以上版本，需安装`PyMySQL`依赖包 获取部署安装包： ```shell -wget https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/WeBASE/releases/download/v1.5.1/webase-deploy.zip +wget https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/WeBASE/releases/download/v1.5.2/webase-deploy.zip ``` 解压安装包： ```shell @@ -130,10 +130,10 @@ cd webase-deploy ```shell # WeBASE子系统的最新版本(v1.1.0或以上版本) -webase.web.version=v1.5.1 -webase.mgr.version=v1.5.1 +webase.web.version=v1.5.2 +webase.mgr.version=v1.5.2 webase.sign.version=v1.5.0 -webase.front.version=v1.5.1 +webase.front.version=v1.5.2 # 节点管理子系统mysql数据库配置 mysql.ip=127.0.0.1 diff --git a/docs_en/conf.py b/docs_en/conf.py index 40a7ba2c..37d047a2 100644 --- a/docs_en/conf.py +++ b/docs_en/conf.py @@ -110,7 +110,7 @@ # The short X.Y version. version = '1.5' # The full version, including alpha/beta/rc tags. -release = 'v1.5.1' +release = 'v1.5.2' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. From 9a7155304b17a14358aa3e8a4949f6452049819e Mon Sep 17 00:00:00 2001 From: CodingCattwo <847701726@qq.com> Date: Thu, 8 Jul 2021 15:45:59 +0800 Subject: [PATCH 07/26] update 1.5.0 upgrade doc --- docs/WeBASE-Front/upgrade.md | 3 +-- docs/WeBASE-Node-Manager/upgrade.md | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/WeBASE-Front/upgrade.md b/docs/WeBASE-Front/upgrade.md index f64d501b..4032e84c 100644 --- a/docs/WeBASE-Front/upgrade.md +++ b/docs/WeBASE-Front/upgrade.md @@ -18,8 +18,7 @@ WeBASE-Front升级的必须步骤： - 修复合约IDE中合约调用参数为字符串时不能输入空格 #### v1.5.0 - -##### 支持导出证书与私钥 +- Web3SDK切换到JavaSDK - 支持导出前置的SDK证书与私钥、支持导出Pem/P12/WeID私钥 #### v1.4.3 diff --git a/docs/WeBASE-Node-Manager/upgrade.md b/docs/WeBASE-Node-Manager/upgrade.md index 1d31a558..30ec2e8c 100644 --- a/docs/WeBASE-Node-Manager/upgrade.md +++ b/docs/WeBASE-Node-Manager/upgrade.md @@ -40,6 +40,7 @@ WeBASE-Node-Manager升级的必须步骤： - 新增节点监控的链上TPS、出块周期、块大小的统计 - 新增合约列表中的已登记合约与链上全量合约视图、新增私钥用户列表中的已登记私钥与链上全量私钥视图 - 支持导出Txt/Pem/P12/WeID私钥文件、支持导出前置的SDK证书 +- Web3SDK切换到JavaSDK ##### 数据表更新 From d1389b5b2520b963c88781620820b6d109587d64 Mon Sep 17 00:00:00 2001 From: CodingCattwo <847701726@qq.com> Date: Thu, 8 Jul 2021 16:08:08 +0800 Subject: [PATCH 08/26] update web3 api of java sdk --- docs/WeBASE-Front/interface.md | 937 +++++++++++++++++++-------------- 1 file changed, 532 insertions(+), 405 deletions(-) diff --git a/docs/WeBASE-Front/interface.md b/docs/WeBASE-Front/interface.md index 96aeecb4..f49fa1fc 100644 --- a/docs/WeBASE-Front/interface.md +++ b/docs/WeBASE-Front/interface.md @@ -1663,9 +1663,7 @@ http://localhost:5002/WeBASE-Front/1/web3/blockNumber #### 响应参数 **1）数据格式** ``` -{ - 8346 -} +232 ``` @@ -1696,7 +1694,7 @@ HTTP GET **2）数据格式** ``` -http://localhost:5002/WeBASE-Front/1/web3/blockByNumber/100 +http://localhost:5002/WeBASE-Front/1/web3/blockByNumber/2 ``` #### 响应参数 @@ -1704,66 +1702,64 @@ http://localhost:5002/WeBASE-Front/1/web3/blockByNumber/100 **1）数据格式** ``` { - "code": 0, - "message": "success", - "data": { - "number": 100, - "hash": "0xf27ff42d4be65329a1e7b11365e190086d92f9836168d0379e92642786db7ade", - "parentHash": "0xc784a2af86e6726fcdc63b57ed1b91a40efc7d8b1b7285154d399ea78bd18754", - "nonce": 0, - "sha3Uncles": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", - "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000040000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000800000000000000000000000000", - "transactionsRoot": "0x27055bac669a67e8aaa1455ad9fd70b75dd86dc905c6bd0d111ed67ab182d1dc", - "stateRoot": "0xa05ad5db11b8be6aed3b591f2f64fdbb241506cbe9ef591f3a4b946ca777f838", - "receiptsRoot": "0xc1d4b43ed68d7263ddf50861feec26440e933a0b152917e938194f5079b48ce4", - "author": "0x0000000000000000000000000000000000000000", - "miner": "0x0000000000000000000000000000000000000000", - "mixHash": null, - "difficulty": 1, - "totalDifficulty": 101, - "extraData": "0xd98097312e332e302b2b302d524c696e75782f672b2b2f496e74", - "size": 71, - "gasLimit": 2000000000, - "gasUsed": 121038, - "timestamp": 1526437108478, - "transactions": [ - { - "hash": "0xb2c733b742045e61c0fd6e7e2bafece04d56262a4887de9f78dad2c5dd2f944b", - "nonce": 9.1623055443573E+74, - "blockHash": "0xf27ff42d4be65329a1e7b11365e190086d92f9836168d0379e92642786db7ade", - "blockNumber": 100, - "transactionIndex": 0, - "from": "0x59bd3815f73b197d6ef327f2a45089f50aba942a", - "to": "0x986278eb8e8b4ef98bdfc055c02d65865fc87ad2", - "value": 0, - "gasPrice": 30000000, - "gas": 30000000, - "input": "0x48f85bce000000000000000000000000000000000000000000000000000000000000001caf3fbec3675eabb85c0b25e2992d6f0a5e1546dad85c20733fdb27cfa4ca782a5fdfb621b416f3494c7d8ca436c12309884550d402ea79f03ef8ddfdd494f7a4", - "creates": null, - "publicKey": null, - "raw": null, - "r": null, - "s": null, - "v": 0, - "valueRaw": "0x0", - "gasPriceRaw": "0x1c9c380", - "gasRaw": "0x1c9c380", - "blockNumberRaw": "0x64", - "transactionIndexRaw": "0x0", - "nonceRaw": "0x2069170146129593df177e2c37f1b7fe74e2d0fda53dcbbca34a243d46e367a" - } - ], - "uncles": [], - "sealFields": null, - "gasUsedRaw": "0x1d8ce", - "totalDifficultyRaw": "0x65", - "numberRaw": "0x64", - "nonceRaw": null, - "sizeRaw": "0x47", - "gasLimitRaw": "0x77359400", - "timestampRaw": "0x16366bddafe", - "difficultyRaw": "0x1" + "number": 2, + "hash": "0xf58f4f43b3761f4863ad366c4a7e2a812ed68df9f7bcad6b502fd544665e7625", + "parentHash": "0x489ee0c00527879f7e2470bde7b62e9ea30fadb242bcbd9ba582d0dee4958e2f", + "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "transactionsRoot": "0xade02313d3200f38dfc18cdc368241cf4c1cb7e72011edf847ec216efa43a99e", + "receiptsRoot": "0xb7c4b856c9335bd345c0b022057567a2223218e7a7dab822981467b29ac1e326", + "dbHash": "0x8cbc3f2c0e35a71738909e3b388efa6697084b05badd3a3bd3c64f0575c78c15", + "stateRoot": "0x8cbc3f2c0e35a71738909e3b388efa6697084b05badd3a3bd3c64f0575c78c15", + "sealer": "0x2", + "sealerList": [ + "06269e130f8220ebaa78e67832df0de6b4c5ee3f1b14e64ab2bae26510a4bcf997454b35067c1685d4343e6ad84b45c3b8690a858f2831a9247a97a27166ce1f", + "65bc44d398d99d95a9d404aa16e4bfbc2f9ebb40f20439ddef8575a139dc3a80310cfc98a035bd59a67cc5f659f519e3e99b855f3d27f21a889c23a14036d0c7", + "95efafa5197796e7edf647191de83f4259d7cbb060f4bac5868be474037f49144d581c15d8aef9b07d78f18041a5f43c3c26352ebbf5583cd23070358c8fba39", + "fe57d7b39ed104b4fb2770ae5aad7946bfd377d0eb91ab92a383447e834c3257dec56686551d08178f2d5f40d9fad615293e46c9f5fc23cf187258e121213b1d" + ], + "extraData": [], + "gasLimit": "0", + "gasUsed": "0", + "timestamp": "1619424150450", + "signatureList": [ + { + "index": "0x1", + "signature": "0xa05b5d220e41051fa80f212884d9cdda3a8973a4ac2d2dc74e42db32b459e5f595a61e30266f0e8bf7edb065ff107c6af5e6349f9ae518146dc686406ebbade165bc44d398d99d95a9d404aa16e4bfbc2f9ebb40f20439ddef8575a139dc3a80310cfc98a035bd59a67cc5f659f519e3e99b855f3d27f21a889c23a14036d0c7" + }, + { + "index": "0x3", + "signature": "0x48bb622e24b18f4eb601137d44b5d86e2c287be3aa849dce1768e87e75308ba69391e62f90d76bf84b9b6eb1509d11409f9b784bc7b052458a4596b81961fac8fe57d7b39ed104b4fb2770ae5aad7946bfd377d0eb91ab92a383447e834c3257dec56686551d08178f2d5f40d9fad615293e46c9f5fc23cf187258e121213b1d" + }, + { + "index": "0x2", + "signature": "0x3a3cc8c20c5cdbb6431ec1f749d94662670e87442debef119a4e6469ccb16a60a152d32754ab833efa513839b076c2aa1ceb7e536db3734b740e9192b10ee38695efafa5197796e7edf647191de83f4259d7cbb060f4bac5868be474037f49144d581c15d8aef9b07d78f18041a5f43c3c26352ebbf5583cd23070358c8fba39" + } + ], + "transactions": [ + { + "blockHash": "0xf58f4f43b3761f4863ad366c4a7e2a812ed68df9f7bcad6b502fd544665e7625", + "blockNumber": 2, + "from": "0x9d75e0ee66cfef16897b601624b60413d988ae7d", + "gas": "0x419ce0", + "hash": "0x69ced0162a0c3892e4eaa3091b831ac3aaeb772c062746b20891ceaf8a4fb429", + "input": "0x608060405234801561001057600080fd5b506103e3806100206000396000f300608060405260043610610057576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063299f7f9d1461005c5780633590b49f146100ec57806362e8d6ce14610155575b600080fd5b34801561006857600080fd5b5061007161016c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156100b1578082015181840152602081019050610096565b50505050905090810190601f1680156100de5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b3480156100f857600080fd5b50610153600480360381019080803590602001908201803590602001908080601f016020809104026020016040519081016040528093929190818152602001838380828437820191505050505050919291929050505061020e565b005b34801561016157600080fd5b5061016a6102c4565b005b606060008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156102045780601f106101d957610100808354040283529160200191610204565b820191906000526020600020905b8154815290600101906020018083116101e757829003601f168201915b5050505050905090565b7f5715c9562eaf8d524d564edb392acddefc81d8133e2fc3b8125a260b1b413fda816040518080602001828103825283818151815260200191508051906020019080838360005b83811015610270578082015181840152602081019050610255565b50505050905090810190601f16801561029d5780820380516001836020036101000a031916815260200191505b509250505060405180910390a180600090805190602001906102c0929190610312565b5050565b6040805190810160405280600d81526020017f48656c6c6f2c20576f726c6421000000000000000000000000000000000000008152506000908051906020019061030f929190610312565b50565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061035357805160ff1916838001178555610381565b82800160010185558215610381579182015b82811115610380578251825591602001919060010190610365565b5b50905061038e9190610392565b5090565b6103b491905b808211156103b0576000816000905550600101610398565b5090565b905600a165627a7a72305820f3088deb3d14c6893440e4769f2389e9335e04faa10e6de5b4c93af15d1a34e80029", + "nonce": "0x3460c30bd3e4e88a31d6d033b3a172859bf003258e9606fd63fb0d91f91f4e6", + "to": "0x0000000000000000000000000000000000000000", + "transactionIndex": "0x0", + "value": "0x0", + "gasPrice": "0x51f4d5c00", + "blockLimit": "0x1f5", + "chainId": "0x1", + "groupId": "0x1", + "extraData": "0x", + "signature": { + "r": "0x3416723318505669cca91689b213ff08ffb96d538210a0f691cfcfa9d529462b", + "s": "0xd3642f19c228e2e86689de9efc19ecbb68378a6bb7c219984431e93d60c89124", + "v": "0xc7935c199b680452eb37911856282b9c820322fd5fdec8a06b48cc3df4e8ed7d3d66a5adcc134cca609146ec0aed12827c35df07eed96042763c0926cf4223b7", + "signature": "0x3416723318505669cca91689b213ff08ffb96d538210a0f691cfcfa9d529462bd3642f19c228e2e86689de9efc19ecbb68378a6bb7c219984431e93d60c89124c7935c199b680452eb37911856282b9c820322fd5fdec8a06b48cc3df4e8ed7d3d66a5adcc134cca609146ec0aed12827c35df07eed96042763c0926cf4223b7" + } } + ] } ``` ### 3.3. 根据块hash获取块信息接口 @@ -1793,74 +1789,72 @@ HTTP GET **2）数据格式** ``` -http://localhost:5002/WeBASE-Front/1/web3/blockByHash/0xf27ff42d4be65329a1e7b11365e190086d92f9836168d0379e92642786db7ade +http://localhost:5002/WeBASE-Front/1/web3/blockByHash/0xf58f4f43b3761f4863ad366c4a7e2a812ed68df9f7bcad6b502fd544665e7625 ``` #### 响应参数 **1）数据格式** ``` -{ - "code": 0, - "message": "success", - "data": { - "number": 100, - "hash": "0xf27ff42d4be65329a1e7b11365e190086d92f9836168d0379e92642786db7ade", - "parentHash": "0xc784a2af86e6726fcdc63b57ed1b91a40efc7d8b1b7285154d399ea78bd18754", - "nonce": 0, - "sha3Uncles": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", - "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000040000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000800000000000000000000000000", - "transactionsRoot": "0x27055bac669a67e8aaa1455ad9fd70b75dd86dc905c6bd0d111ed67ab182d1dc", - "stateRoot": "0xa05ad5db11b8be6aed3b591f2f64fdbb241506cbe9ef591f3a4b946ca777f838", - "receiptsRoot": "0xc1d4b43ed68d7263ddf50861feec26440e933a0b152917e938194f5079b48ce4", - "author": "0x0000000000000000000000000000000000000000", - "miner": "0x0000000000000000000000000000000000000000", - "mixHash": null, - "difficulty": 1, - "totalDifficulty": 101, - "extraData": "0xd98097312e332e302b2b302d524c696e75782f672b2b2f496e74", - "size": 71, - "gasLimit": 2000000000, - "gasUsed": 121038, - "timestamp": 1526437108478, - "transactions": [ - { - "hash": "0xb2c733b742045e61c0fd6e7e2bafece04d56262a4887de9f78dad2c5dd2f944b", - "nonce": 9.1623055443573E+74, - "blockHash": "0xf27ff42d4be65329a1e7b11365e190086d92f9836168d0379e92642786db7ade", - "blockNumber": 100, - "transactionIndex": 0, - "from": "0x59bd3815f73b197d6ef327f2a45089f50aba942a", - "to": "0x986278eb8e8b4ef98bdfc055c02d65865fc87ad2", - "value": 0, - "gasPrice": 30000000, - "gas": 30000000, - "input": "0x48f85bce000000000000000000000000000000000000000000000000000000000000001caf3fbec3675eabb85c0b25e2992d6f0a5e1546dad85c20733fdb27cfa4ca782a5fdfb621b416f3494c7d8ca436c12309884550d402ea79f03ef8ddfdd494f7a4", - "creates": null, - "publicKey": null, - "raw": null, - "r": null, - "s": null, - "v": 0, - "valueRaw": "0x0", - "gasPriceRaw": "0x1c9c380", - "gasRaw": "0x1c9c380", - "blockNumberRaw": "0x64", - "transactionIndexRaw": "0x0", - "nonceRaw": "0x2069170146129593df177e2c37f1b7fe74e2d0fda53dcbbca34a243d46e367a" - } - ], - "uncles": [], - "sealFields": null, - "gasUsedRaw": "0x1d8ce", - "totalDifficultyRaw": "0x65", - "numberRaw": "0x64", - "nonceRaw": null, - "sizeRaw": "0x47", - "gasLimitRaw": "0x77359400", - "timestampRaw": "0x16366bddafe", - "difficultyRaw": "0x1" +{{ + "number": 2, + "hash": "0xf58f4f43b3761f4863ad366c4a7e2a812ed68df9f7bcad6b502fd544665e7625", + "parentHash": "0x489ee0c00527879f7e2470bde7b62e9ea30fadb242bcbd9ba582d0dee4958e2f", + "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "transactionsRoot": "0xade02313d3200f38dfc18cdc368241cf4c1cb7e72011edf847ec216efa43a99e", + "receiptsRoot": "0xb7c4b856c9335bd345c0b022057567a2223218e7a7dab822981467b29ac1e326", + "dbHash": "0x8cbc3f2c0e35a71738909e3b388efa6697084b05badd3a3bd3c64f0575c78c15", + "stateRoot": "0x8cbc3f2c0e35a71738909e3b388efa6697084b05badd3a3bd3c64f0575c78c15", + "sealer": "0x2", + "sealerList": [ + "06269e130f8220ebaa78e67832df0de6b4c5ee3f1b14e64ab2bae26510a4bcf997454b35067c1685d4343e6ad84b45c3b8690a858f2831a9247a97a27166ce1f", + "65bc44d398d99d95a9d404aa16e4bfbc2f9ebb40f20439ddef8575a139dc3a80310cfc98a035bd59a67cc5f659f519e3e99b855f3d27f21a889c23a14036d0c7", + "95efafa5197796e7edf647191de83f4259d7cbb060f4bac5868be474037f49144d581c15d8aef9b07d78f18041a5f43c3c26352ebbf5583cd23070358c8fba39", + "fe57d7b39ed104b4fb2770ae5aad7946bfd377d0eb91ab92a383447e834c3257dec56686551d08178f2d5f40d9fad615293e46c9f5fc23cf187258e121213b1d" + ], + "extraData": [], + "gasLimit": "0", + "gasUsed": "0", + "timestamp": "1619424150450", + "signatureList": [ + { + "index": "0x1", + "signature": "0xa05b5d220e41051fa80f212884d9cdda3a8973a4ac2d2dc74e42db32b459e5f595a61e30266f0e8bf7edb065ff107c6af5e6349f9ae518146dc686406ebbade165bc44d398d99d95a9d404aa16e4bfbc2f9ebb40f20439ddef8575a139dc3a80310cfc98a035bd59a67cc5f659f519e3e99b855f3d27f21a889c23a14036d0c7" + }, + { + "index": "0x3", + "signature": "0x48bb622e24b18f4eb601137d44b5d86e2c287be3aa849dce1768e87e75308ba69391e62f90d76bf84b9b6eb1509d11409f9b784bc7b052458a4596b81961fac8fe57d7b39ed104b4fb2770ae5aad7946bfd377d0eb91ab92a383447e834c3257dec56686551d08178f2d5f40d9fad615293e46c9f5fc23cf187258e121213b1d" + }, + { + "index": "0x2", + "signature": "0x3a3cc8c20c5cdbb6431ec1f749d94662670e87442debef119a4e6469ccb16a60a152d32754ab833efa513839b076c2aa1ceb7e536db3734b740e9192b10ee38695efafa5197796e7edf647191de83f4259d7cbb060f4bac5868be474037f49144d581c15d8aef9b07d78f18041a5f43c3c26352ebbf5583cd23070358c8fba39" + } + ], + "transactions": [ + { + "blockHash": "0xf58f4f43b3761f4863ad366c4a7e2a812ed68df9f7bcad6b502fd544665e7625", + "blockNumber": 2, + "from": "0x9d75e0ee66cfef16897b601624b60413d988ae7d", + "gas": "0x419ce0", + "hash": "0x69ced0162a0c3892e4eaa3091b831ac3aaeb772c062746b20891ceaf8a4fb429", + "input": "0x608060405234801561001057600080fd5b506103e3806100206000396000f300608060405260043610610057576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063299f7f9d1461005c5780633590b49f146100ec57806362e8d6ce14610155575b600080fd5b34801561006857600080fd5b5061007161016c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156100b1578082015181840152602081019050610096565b50505050905090810190601f1680156100de5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b3480156100f857600080fd5b50610153600480360381019080803590602001908201803590602001908080601f016020809104026020016040519081016040528093929190818152602001838380828437820191505050505050919291929050505061020e565b005b34801561016157600080fd5b5061016a6102c4565b005b606060008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156102045780601f106101d957610100808354040283529160200191610204565b820191906000526020600020905b8154815290600101906020018083116101e757829003601f168201915b5050505050905090565b7f5715c9562eaf8d524d564edb392acddefc81d8133e2fc3b8125a260b1b413fda816040518080602001828103825283818151815260200191508051906020019080838360005b83811015610270578082015181840152602081019050610255565b50505050905090810190601f16801561029d5780820380516001836020036101000a031916815260200191505b509250505060405180910390a180600090805190602001906102c0929190610312565b5050565b6040805190810160405280600d81526020017f48656c6c6f2c20576f726c6421000000000000000000000000000000000000008152506000908051906020019061030f929190610312565b50565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061035357805160ff1916838001178555610381565b82800160010185558215610381579182015b82811115610380578251825591602001919060010190610365565b5b50905061038e9190610392565b5090565b6103b491905b808211156103b0576000816000905550600101610398565b5090565b905600a165627a7a72305820f3088deb3d14c6893440e4769f2389e9335e04faa10e6de5b4c93af15d1a34e80029", + "nonce": "0x3460c30bd3e4e88a31d6d033b3a172859bf003258e9606fd63fb0d91f91f4e6", + "to": "0x0000000000000000000000000000000000000000", + "transactionIndex": "0x0", + "value": "0x0", + "gasPrice": "0x51f4d5c00", + "blockLimit": "0x1f5", + "chainId": "0x1", + "groupId": "0x1", + "extraData": "0x", + "signature": { + "r": "0x3416723318505669cca91689b213ff08ffb96d538210a0f691cfcfa9d529462b", + "s": "0xd3642f19c228e2e86689de9efc19ecbb68378a6bb7c219984431e93d60c89124", + "v": "0xc7935c199b680452eb37911856282b9c820322fd5fdec8a06b48cc3df4e8ed7d3d66a5adcc134cca609146ec0aed12827c35df07eed96042763c0926cf4223b7", + "signature": "0x3416723318505669cca91689b213ff08ffb96d538210a0f691cfcfa9d529462bd3642f19c228e2e86689de9efc19ecbb68378a6bb7c219984431e93d60c89124c7935c199b680452eb37911856282b9c820322fd5fdec8a06b48cc3df4e8ed7d3d66a5adcc134cca609146ec0aed12827c35df07eed96042763c0926cf4223b7" + } } + ] } ``` @@ -1898,9 +1892,7 @@ http://localhost:5002/WeBASE-Front/1/web3/blockTransCnt/100 **1）数据格式** ``` -{ - 1 -} +2 ``` ### 3.5. 获取PbftView接口 @@ -1969,7 +1961,7 @@ HTTP GET **2）数据格式** ``` -http://localhost:5002/WeBASE-Front/1/web3/transactionReceipt/0xb2c733b742045e61c0fd6e7e2bafece04d56262a4887de9f78dad2c5dd2f944b +http://localhost:5002/WeBASE-Front/1/web3/transactionReceipt/0x69ced0162a0c3892e4eaa3091b831ac3aaeb772c062746b20891ceaf8a4fb429 ``` #### 响应参数 @@ -1978,43 +1970,25 @@ http://localhost:5002/WeBASE-Front/1/web3/transactionReceipt/0xb2c733b742045e61c ``` { - "transactionHash": "0xb2c733b742045e61c0fd6e7e2bafece04d56262a4887de9f78dad2c5dd2f944b", - "transactionIndex": 0, - "blockHash": "0xf27ff42d4be65329a1e7b11365e190086d92f9836168d0379e92642786db7ade", - "blockNumber": 100, - "cumulativeGasUsed": 121038, - "gasUsed": 121038, - "contractAddress": "0x0000000000000000000000000000000000000000", - "root": null, - "from": null, - "to": null, - "logs": [ - { - "removed": false, - "logIndex": 0, - "transactionIndex": 0, - "transactionHash": "0xb2c733b742045e61c0fd6e7e2bafece04d56262a4887de9f78dad2c5dd2f944b", - "blockHash": "0xf27ff42d4be65329a1e7b11365e190086d92f9836168d0379e92642786db7ade", - "blockNumber": 100, - "address": "0x986278eb8e8b4ef98bdfc055c02d65865fc87ad2", - "data": "0x00000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000001caf3fbec3675eabb85c0b25e2992d6f0a5e1546dad85c20733fdb27cfa4ca782a5fdfb621b416f3494c7d8ca436c12309884550d402ea79f03ef8ddfdd494f7a40000000000000000000000000000000000000000000000000000000000000040666164363863656230616530316530643731616635356331316561643031613532656638363435343866306134643133633836363164393664326461366239380000000000000000000000000000000000000000000000000000000000000002363000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000023630000000000000000000000000000000000000000000000000000000000000", - "type": "mined", - "topics": [ - "0xbf474e795141390215f4f179557402a28c562b860f7b74dce4a3c0e0604cd97e" - ], - "logIndexRaw": "0", - "blockNumberRaw": "100", - "transactionIndexRaw": "0" - } - ], - "logsBloom": null, - "gasUsedRaw": "0x1d8ce", - "blockNumberRaw": "100", - "transactionIndexRaw": "0", - "cumulativeGasUsedRaw": "0x1d8ce", - "message": null, - "txProof": null, - "receiptProof": null + "transactionHash": "0x69ced0162a0c3892e4eaa3091b831ac3aaeb772c062746b20891ceaf8a4fb429", + "transactionIndex": "0x0", + "root": "0x8cbc3f2c0e35a71738909e3b388efa6697084b05badd3a3bd3c64f0575c78c15", + "blockNumber": "2", + "blockHash": "0xf58f4f43b3761f4863ad366c4a7e2a812ed68df9f7bcad6b502fd544665e7625", + "from": "0x9d75e0ee66cfef16897b601624b60413d988ae7d", + "to": "0x0000000000000000000000000000000000000000", + "gasUsed": "316449", + "contractAddress": "0xa8af0ee580d8af674a60341030ddbc45431bc235", + "logs": [], + "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "status": "0x0", + "statusMsg": "None", + "input": "0x608060405234801561001057600080fd5b506103e3806100206000396000f300608060405260043610610057576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063299f7f9d1461005c5780633590b49f146100ec57806362e8d6ce14610155575b600080fd5b34801561006857600080fd5b5061007161016c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156100b1578082015181840152602081019050610096565b50505050905090810190601f1680156100de5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b3480156100f857600080fd5b50610153600480360381019080803590602001908201803590602001908080601f016020809104026020016040519081016040528093929190818152602001838380828437820191505050505050919291929050505061020e565b005b34801561016157600080fd5b5061016a6102c4565b005b606060008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156102045780601f106101d957610100808354040283529160200191610204565b820191906000526020600020905b8154815290600101906020018083116101e757829003601f168201915b5050505050905090565b7f5715c9562eaf8d524d564edb392acddefc81d8133e2fc3b8125a260b1b413fda816040518080602001828103825283818151815260200191508051906020019080838360005b83811015610270578082015181840152602081019050610255565b50505050905090810190601f16801561029d5780820380516001836020036101000a031916815260200191505b509250505060405180910390a180600090805190602001906102c0929190610312565b5050565b6040805190810160405280600d81526020017f48656c6c6f2c20576f726c6421000000000000000000000000000000000000008152506000908051906020019061030f929190610312565b50565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061035357805160ff1916838001178555610381565b82800160010185558215610381579182015b82811115610380578251825591602001919060010190610365565b5b50905061038e9190610392565b5090565b6103b491905b808211156103b0576000816000905550600101610398565b5090565b905600a165627a7a72305820f3088deb3d14c6893440e4769f2389e9335e04faa10e6de5b4c93af15d1a34e80029", + "output": "0x", + "txProof": null, + "receiptProof": null, + "message": null, + "statusOK": true } ``` @@ -2045,7 +2019,7 @@ HTTP GET **2）数据格式** ``` -http://localhost:5002/WeBASE-Front/1/web3/transaction/0xa6750b812b1a7e36313879b09f0c41fc583b463c15e57608416f3a32688b432b +http://localhost:5002/WeBASE-Front/1/web3/transaction/0x69ced0162a0c3892e4eaa3091b831ac3aaeb772c062746b20891ceaf8a4fb429 ``` #### 响应参数 @@ -2054,29 +2028,27 @@ http://localhost:5002/WeBASE-Front/1/web3/transaction/0xa6750b812b1a7e36313879b0 **1）数据格式** ``` { - "hash": "0xb2c733b742045e61c0fd6e7e2bafece04d56262a4887de9f78dad2c5dd2f944b", - "nonce": 9.1623055443573E+74, - "blockHash": "0xf27ff42d4be65329a1e7b11365e190086d92f9836168d0379e92642786db7ade", - "blockNumber": 100, - "transactionIndex": 0, - "from": "0x59bd3815f73b197d6ef327f2a45089f50aba942a", - "to": "0x986278eb8e8b4ef98bdfc055c02d65865fc87ad2", - "value": 0, - "gasPrice": 30000000, - "gas": 30000000, - "input": "0x48f85bce000000000000000000000000000000000000000000000000000000000000001caf3fbec3675eabb85c0b25e2992d6f0a5e1546dad85c20733fdb27cfa4ca782a5fdfb621b416f3494c7d8ca436c12309884550d402ea79f03ef8ddfdd494f7a4", - "creates": null, - "publicKey": null, - "raw": null, - "r": null, - "s": null, - "v": 0, - "nonceRaw": "0x2069170146129593df177e2c37f1b7fe74e2d0fda53dcbbca34a243d46e367a", - "blockNumberRaw": "0x64", - "transactionIndexRaw": "0x0", - "valueRaw": "0x0", - "gasPriceRaw": "0x1c9c380", - "gasRaw": "0x1c9c380" + "blockHash": "0xf58f4f43b3761f4863ad366c4a7e2a812ed68df9f7bcad6b502fd544665e7625", + "blockNumber": 2, + "from": "0x9d75e0ee66cfef16897b601624b60413d988ae7d", + "gas": "4300000", + "hash": "0x69ced0162a0c3892e4eaa3091b831ac3aaeb772c062746b20891ceaf8a4fb429", + "input": "0x608060405234801561001057600080fd5b506103e3806100206000396000f300608060405260043610610057576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063299f7f9d1461005c5780633590b49f146100ec57806362e8d6ce14610155575b600080fd5b34801561006857600080fd5b5061007161016c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156100b1578082015181840152602081019050610096565b50505050905090810190601f1680156100de5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b3480156100f857600080fd5b50610153600480360381019080803590602001908201803590602001908080601f016020809104026020016040519081016040528093929190818152602001838380828437820191505050505050919291929050505061020e565b005b34801561016157600080fd5b5061016a6102c4565b005b606060008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156102045780601f106101d957610100808354040283529160200191610204565b820191906000526020600020905b8154815290600101906020018083116101e757829003601f168201915b5050505050905090565b7f5715c9562eaf8d524d564edb392acddefc81d8133e2fc3b8125a260b1b413fda816040518080602001828103825283818151815260200191508051906020019080838360005b83811015610270578082015181840152602081019050610255565b50505050905090810190601f16801561029d5780820380516001836020036101000a031916815260200191505b509250505060405180910390a180600090805190602001906102c0929190610312565b5050565b6040805190810160405280600d81526020017f48656c6c6f2c20576f726c6421000000000000000000000000000000000000008152506000908051906020019061030f929190610312565b50565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061035357805160ff1916838001178555610381565b82800160010185558215610381579182015b82811115610380578251825591602001919060010190610365565b5b50905061038e9190610392565b5090565b6103b491905b808211156103b0576000816000905550600101610398565b5090565b905600a165627a7a72305820f3088deb3d14c6893440e4769f2389e9335e04faa10e6de5b4c93af15d1a34e80029", + "nonce": "0x3460c30bd3e4e88a31d6d033b3a172859bf003258e9606fd63fb0d91f91f4e6", + "to": "0x0000000000000000000000000000000000000000", + "transactionIndex": "0x0", + "value": "0x0", + "gasPrice": "22000000000", + "blockLimit": "0x1f5", + "chainId": "0x1", + "groupId": "1", + "extraData": "0x", + "signature": { + "r": "0x3416723318505669cca91689b213ff08ffb96d538210a0f691cfcfa9d529462b", + "s": "0xd3642f19c228e2e86689de9efc19ecbb68378a6bb7c219984431e93d60c89124", + "v": "0xc7935c199b680452eb37911856282b9c820322fd5fdec8a06b48cc3df4e8ed7d3d66a5adcc134cca609146ec0aed12827c35df07eed96042763c0926cf4223b7", + "signature": "0x3416723318505669cca91689b213ff08ffb96d538210a0f691cfcfa9d529462bd3642f19c228e2e86689de9efc19ecbb68378a6bb7c219984431e93d60c89124c7935c199b680452eb37911856282b9c820322fd5fdec8a06b48cc3df4e8ed7d3d66a5adcc134cca609146ec0aed12827c35df07eed96042763c0926cf4223b7" + } } ``` @@ -2118,11 +2090,13 @@ http://localhost:5002/WeBASE-Front/1/web3/clientVersion **2）数据格式** ``` { - "Build Time": "20190318 10:56:37", - "Build Type": "Linux/g++/RelWithDebInfo", - "FISCO-BCOS Version": "2.0.0-rc1", - "Git Branch": "master", - "Git Commit Hash": "2467ddf73b091bc8e0ee611ccee85db7989ad389" + "FISCO-BCOS Version": "2.7.2 gm", + "Supported Version": "2.7.2", + "Chain Id": "1", + "Build Time": "20210201 10:03:03", + "Build Type": "Linux/clang/Release", + "Git Branch": "HEAD", + "Git Commit Hash": "4c8a5bbe44c19db8a002017ff9dbb16d3d28e9da" } ``` @@ -2245,7 +2219,7 @@ HTTP GET **2）数据格式** ``` -http://localhost:5002/WeBASE-Front/1/web3/transByBlockHashAndIndex/0xf27ff42d4be65329a1e7b11365e190086d92f9836168d0379e92642786db7ade/0 +http://localhost:5002/WeBASE-Front/1/web3/transByBlockHashAndIndex/0x69ced0162a0c3892e4eaa3091b831ac3aaeb772c062746b20891ceaf8a4fb429/0 ``` #### 响应参数 @@ -2254,29 +2228,27 @@ http://localhost:5002/WeBASE-Front/1/web3/transByBlockHashAndIndex/0xf27ff42d4be ``` { - "hash": "0x7c503f202a5e275d8792dd2419ac48418dbec602038fb2a85c899403471f065d", - "nonce": 1.26575985412899E+75, - "blockHash": "0x0d9ed7b20645d5b8200347a72e7fb15347b83d74c6e1b6c3995cdb7a849f95d9", - "blockNumber": 100, - "transactionIndex": 0, - "from": "0x6f00a620a61fd6b33e6076880fecc49959eaa4ea", - "to": "0x9cb5641d991df690ed905c34f9aaf22370034220", - "value": 0, - "gasPrice": 1, - "gas": 100000000, - "input": "0x4ed3885e000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000", - "creates": null, - "publicKey": null, - "raw": null, - "r": null, - "s": null, - "v": 0, - "blockNumberRaw": "0x64", - "nonceRaw": "0x2cc650a5cbeb268577ac15c7dd2afee0680901de94f8543e86e906247e7edbf", - "valueRaw": "0x0", - "gasPriceRaw": "0x1", - "gasRaw": "0x5f5e100", - "transactionIndexRaw": "0x0" + "blockHash": "0xf58f4f43b3761f4863ad366c4a7e2a812ed68df9f7bcad6b502fd544665e7625", + "blockNumber": 2, + "from": "0x9d75e0ee66cfef16897b601624b60413d988ae7d", + "gas": "4300000", + "hash": "0x69ced0162a0c3892e4eaa3091b831ac3aaeb772c062746b20891ceaf8a4fb429", + "input": "0x608060405234801561001057600080fd5b506103e3806100206000396000f300608060405260043610610057576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063299f7f9d1461005c5780633590b49f146100ec57806362e8d6ce14610155575b600080fd5b34801561006857600080fd5b5061007161016c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156100b1578082015181840152602081019050610096565b50505050905090810190601f1680156100de5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b3480156100f857600080fd5b50610153600480360381019080803590602001908201803590602001908080601f016020809104026020016040519081016040528093929190818152602001838380828437820191505050505050919291929050505061020e565b005b34801561016157600080fd5b5061016a6102c4565b005b606060008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156102045780601f106101d957610100808354040283529160200191610204565b820191906000526020600020905b8154815290600101906020018083116101e757829003601f168201915b5050505050905090565b7f5715c9562eaf8d524d564edb392acddefc81d8133e2fc3b8125a260b1b413fda816040518080602001828103825283818151815260200191508051906020019080838360005b83811015610270578082015181840152602081019050610255565b50505050905090810190601f16801561029d5780820380516001836020036101000a031916815260200191505b509250505060405180910390a180600090805190602001906102c0929190610312565b5050565b6040805190810160405280600d81526020017f48656c6c6f2c20576f726c6421000000000000000000000000000000000000008152506000908051906020019061030f929190610312565b50565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061035357805160ff1916838001178555610381565b82800160010185558215610381579182015b82811115610380578251825591602001919060010190610365565b5b50905061038e9190610392565b5090565b6103b491905b808211156103b0576000816000905550600101610398565b5090565b905600a165627a7a72305820f3088deb3d14c6893440e4769f2389e9335e04faa10e6de5b4c93af15d1a34e80029", + "nonce": "0x3460c30bd3e4e88a31d6d033b3a172859bf003258e9606fd63fb0d91f91f4e6", + "to": "0x0000000000000000000000000000000000000000", + "transactionIndex": "0x0", + "value": "0x0", + "gasPrice": "22000000000", + "blockLimit": "0x1f5", + "chainId": "0x1", + "groupId": "1", + "extraData": "0x", + "signature": { + "r": "0x3416723318505669cca91689b213ff08ffb96d538210a0f691cfcfa9d529462b", + "s": "0xd3642f19c228e2e86689de9efc19ecbb68378a6bb7c219984431e93d60c89124", + "v": "0xc7935c199b680452eb37911856282b9c820322fd5fdec8a06b48cc3df4e8ed7d3d66a5adcc134cca609146ec0aed12827c35df07eed96042763c0926cf4223b7", + "signature": "0x3416723318505669cca91689b213ff08ffb96d538210a0f691cfcfa9d529462bd3642f19c228e2e86689de9efc19ecbb68378a6bb7c219984431e93d60c89124c7935c199b680452eb37911856282b9c820322fd5fdec8a06b48cc3df4e8ed7d3d66a5adcc134cca609146ec0aed12827c35df07eed96042763c0926cf4223b7" + } } ``` @@ -2308,7 +2280,7 @@ HTTP GET **2）数据格式** ``` -http://localhost:5002/WeBASE-Front/1/web3/transByBlockNumberAndIndex/100/0 +http://localhost:5002/WeBASE-Front/1/web3/transByBlockNumberAndIndex/2/0 ``` #### 响应参数 @@ -2316,29 +2288,27 @@ http://localhost:5002/WeBASE-Front/1/web3/transByBlockNumberAndIndex/100/0 **1）数据格式** ``` { - "hash": "0x7c503f202a5e275d8792dd2419ac48418dbec602038fb2a85c899403471f065d", - "nonce": 1.26575985412899E+75, - "blockHash": "0x0d9ed7b20645d5b8200347a72e7fb15347b83d74c6e1b6c3995cdb7a849f95d9", - "blockNumber": 100, - "transactionIndex": 0, - "from": "0x6f00a620a61fd6b33e6076880fecc49959eaa4ea", - "to": "0x9cb5641d991df690ed905c34f9aaf22370034220", - "value": 0, - "gasPrice": 1, - "gas": 100000000, - "input": "0x4ed3885e000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000", - "creates": null, - "publicKey": null, - "raw": null, - "r": null, - "s": null, - "v": 0, - "blockNumberRaw": "0x64", - "nonceRaw": "0x2cc650a5cbeb268577ac15c7dd2afee0680901de94f8543e86e906247e7edbf", - "valueRaw": "0x0", - "gasPriceRaw": "0x1", - "gasRaw": "0x5f5e100", - "transactionIndexRaw": "0x0" + "blockHash": "0xf58f4f43b3761f4863ad366c4a7e2a812ed68df9f7bcad6b502fd544665e7625", + "blockNumber": 2, + "from": "0x9d75e0ee66cfef16897b601624b60413d988ae7d", + "gas": "4300000", + "hash": "0x69ced0162a0c3892e4eaa3091b831ac3aaeb772c062746b20891ceaf8a4fb429", + "input": "0x608060405234801561001057600080fd5b506103e3806100206000396000f300608060405260043610610057576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063299f7f9d1461005c5780633590b49f146100ec57806362e8d6ce14610155575b600080fd5b34801561006857600080fd5b5061007161016c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156100b1578082015181840152602081019050610096565b50505050905090810190601f1680156100de5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b3480156100f857600080fd5b50610153600480360381019080803590602001908201803590602001908080601f016020809104026020016040519081016040528093929190818152602001838380828437820191505050505050919291929050505061020e565b005b34801561016157600080fd5b5061016a6102c4565b005b606060008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156102045780601f106101d957610100808354040283529160200191610204565b820191906000526020600020905b8154815290600101906020018083116101e757829003601f168201915b5050505050905090565b7f5715c9562eaf8d524d564edb392acddefc81d8133e2fc3b8125a260b1b413fda816040518080602001828103825283818151815260200191508051906020019080838360005b83811015610270578082015181840152602081019050610255565b50505050905090810190601f16801561029d5780820380516001836020036101000a031916815260200191505b509250505060405180910390a180600090805190602001906102c0929190610312565b5050565b6040805190810160405280600d81526020017f48656c6c6f2c20576f726c6421000000000000000000000000000000000000008152506000908051906020019061030f929190610312565b50565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061035357805160ff1916838001178555610381565b82800160010185558215610381579182015b82811115610380578251825591602001919060010190610365565b5b50905061038e9190610392565b5090565b6103b491905b808211156103b0576000816000905550600101610398565b5090565b905600a165627a7a72305820f3088deb3d14c6893440e4769f2389e9335e04faa10e6de5b4c93af15d1a34e80029", + "nonce": "0x3460c30bd3e4e88a31d6d033b3a172859bf003258e9606fd63fb0d91f91f4e6", + "to": "0x0000000000000000000000000000000000000000", + "transactionIndex": "0x0", + "value": "0x0", + "gasPrice": "22000000000", + "blockLimit": "0x1f5", + "chainId": "0x1", + "groupId": "1", + "extraData": "0x", + "signature": { + "r": "0x3416723318505669cca91689b213ff08ffb96d538210a0f691cfcfa9d529462b", + "s": "0xd3642f19c228e2e86689de9efc19ecbb68378a6bb7c219984431e93d60c89124", + "v": "0xc7935c199b680452eb37911856282b9c820322fd5fdec8a06b48cc3df4e8ed7d3d66a5adcc134cca609146ec0aed12827c35df07eed96042763c0926cf4223b7", + "signature": "0x3416723318505669cca91689b213ff08ffb96d538210a0f691cfcfa9d529462bd3642f19c228e2e86689de9efc19ecbb68378a6bb7c219984431e93d60c89124c7935c199b680452eb37911856282b9c820322fd5fdec8a06b48cc3df4e8ed7d3d66a5adcc134cca609146ec0aed12827c35df07eed96042763c0926cf4223b7" + } } ``` @@ -2375,49 +2345,54 @@ http://localhost:5002/WeBASE-Front/1/web3/consensusStatus **1）数据格式** ``` -[ +{ + "baseConsensusInfo": { + "nodeNum": "4", + "consensusedBlockNumber": "233", + "highestblockNumber": "232", + "groupId": "1", + "protocolId": "65544", + "accountType": "1", + "cfgErr": "false", + "omitEmptyBlock": "true", + "nodeId": "fe57d7b39ed104b4fb2770ae5aad7946bfd377d0eb91ab92a383447e834c3257dec56686551d08178f2d5f40d9fad615293e46c9f5fc23cf187258e121213b1d", + "allowFutureBlocks": "true", + "connectedNodes": "3", + "currentView": "102303", + "toView": "102303", + "leaderFailed": "false", + "highestblockHash": "0x7f0885a7188bd5c1b3f8c182e00be0e63a3b1653b12752cf8501ddac995e6efc", + "leaderId": null, + "leaderIdx": null, + "node_index": "3", + "node index": null, + "max_faulty_leader": "1", + "sealer.": [ + "06269e130f8220ebaa78e67832df0de6b4c5ee3f1b14e64ab2bae26510a4bcf997454b35067c1685d4343e6ad84b45c3b8690a858f2831a9247a97a27166ce1f", + "65bc44d398d99d95a9d404aa16e4bfbc2f9ebb40f20439ddef8575a139dc3a80310cfc98a035bd59a67cc5f659f519e3e99b855f3d27f21a889c23a14036d0c7", + "95efafa5197796e7edf647191de83f4259d7cbb060f4bac5868be474037f49144d581c15d8aef9b07d78f18041a5f43c3c26352ebbf5583cd23070358c8fba39", + "fe57d7b39ed104b4fb2770ae5aad7946bfd377d0eb91ab92a383447e834c3257dec56686551d08178f2d5f40d9fad615293e46c9f5fc23cf187258e121213b1d" + ] + }, + "viewInfos": [ { - "accountType": 1, - "allowFutureBlocks": true, - "cfgErr": false, - "connectedNodes": 3, - "consensusedBlockNumber": 126, - "currentView": 499824, - "groupId": 1, - "highestblockHash": "0x563d4ec57b597d5d81f0c1b0045c04e57ffebe3a02ff3fef402be56742dc8fd1", - "highestblockNumber": 125, - "leaderFailed": false, - "max_faulty_leader": 1, - "node index": 2, - "nodeId": "d822165959a0ed217df6541f1a7dd38b79336ff571dd5f8f85ad76f3e7ec097e1eabd8b03e4a757fd5a9fb0eea905aded56aaf44df83c34b73acb9ab7ac65010", - "nodeNum": 4, - "omitEmptyBlock": true, - "protocolId": 264, - "sealer.0": "552398be0eef124c000e632b0b76a48c52b6cfbd547d92c15527c2d1df15fab2bcded48353db22526c3540e4ab2027630722889f20a4a614bb11a7887a85941b", - "sealer.1": "adfa2f9116d7ff68e0deb75307fa1595d636bf097ad1de4fb55cff00e4fef40b453abb30388aa2112bf5cd4c987afe2e047250f7049791aa1ee7091c9e2ab7bb", - "sealer.2": "d822165959a0ed217df6541f1a7dd38b79336ff571dd5f8f85ad76f3e7ec097e1eabd8b03e4a757fd5a9fb0eea905aded56aaf44df83c34b73acb9ab7ac65010", - "sealer.3": "dde0bbf5eb3a731e6da861586e98e088e16e6fdd9afae2f2c213cead20a4f5eaa3910042b70d62266d2350d98a43c1f235c8e0da384448384893857873abdb75", - "toView": 499824 + "nodeId": "06269e130f8220ebaa78e67832df0de6b4c5ee3f1b14e64ab2bae26510a4bcf997454b35067c1685d4343e6ad84b45c3b8690a858f2831a9247a97a27166ce1f", + "view": "102300" }, - [ - { - "nodeId": "552398be0eef124c000e632b0b76a48c52b6cfbd547d92c15527c2d1df15fab2bcded48353db22526c3540e4ab2027630722889f20a4a614bb11a7887a85941b", - "view": 499823 - }, - { - "nodeId": "adfa2f9116d7ff68e0deb75307fa1595d636bf097ad1de4fb55cff00e4fef40b453abb30388aa2112bf5cd4c987afe2e047250f7049791aa1ee7091c9e2ab7bb", - "view": 499820 - }, - { - "nodeId": "d822165959a0ed217df6541f1a7dd38b79336ff571dd5f8f85ad76f3e7ec097e1eabd8b03e4a757fd5a9fb0eea905aded56aaf44df83c34b73acb9ab7ac65010", - "view": 499824 - }, - { - "nodeId": "dde0bbf5eb3a731e6da861586e98e088e16e6fdd9afae2f2c213cead20a4f5eaa3910042b70d62266d2350d98a43c1f235c8e0da384448384893857873abdb75", - "view": 499822 - } - ] -] + { + "nodeId": "65bc44d398d99d95a9d404aa16e4bfbc2f9ebb40f20439ddef8575a139dc3a80310cfc98a035bd59a67cc5f659f519e3e99b855f3d27f21a889c23a14036d0c7", + "view": "102301" + }, + { + "nodeId": "95efafa5197796e7edf647191de83f4259d7cbb060f4bac5868be474037f49144d581c15d8aef9b07d78f18041a5f43c3c26352ebbf5583cd23070358c8fba39", + "view": "102302" + }, + { + "nodeId": "fe57d7b39ed104b4fb2770ae5aad7946bfd377d0eb91ab92a383447e834c3257dec56686551d08178f2d5f40d9fad615293e46c9f5fc23cf187258e121213b1d", + "view": "102303" + } + ] +} ``` ### 3.14. 获取节点状态列表接口 @@ -2466,18 +2441,32 @@ http://localhost:5002/WeBASE-Front/1/web3/getNodeStatusList ``` [ { - "nodeId": "2917803543bcb58ad91cdf67e7b576a5b0440b4f76e6f5440edb8b09dadee297174d25133e841a17e4f89aa59bbaf4c80896af9d6a978aae04b3d0b9cd9d5b84", - "blockNumber": 3, - "pbftView": 146093, + "nodeId": "06269e130f8220ebaa78e67832df0de6b4c5ee3f1b14e64ab2bae26510a4bcf997454b35067c1685d4343e6ad84b45c3b8690a858f2831a9247a97a27166ce1f", + "blockNumber": 232, + "pbftView": 101224, "status": 1, - "latestStatusUpdateTime": "2019-07-25 10:07:07" + "latestStatusUpdateTime": "2021-07-08 15:42:01" }, { - "nodeId": "8722cc018a79bc48b7408649fac4a45bd336a88959570ebba15eefb48fdc23b8a96f328d46852f3d12c4dde7346c573585386fadb5568ce1820144c106af1f72", - "blockNumber": 3, - "pbftView": 146095, + "nodeId": "65bc44d398d99d95a9d404aa16e4bfbc2f9ebb40f20439ddef8575a139dc3a80310cfc98a035bd59a67cc5f659f519e3e99b855f3d27f21a889c23a14036d0c7", + "blockNumber": 232, + "pbftView": 101221, "status": 1, - "latestStatusUpdateTime": "2019-07-25 10:07:07" + "latestStatusUpdateTime": "2021-07-08 15:42:01" + }, + { + "nodeId": "95efafa5197796e7edf647191de83f4259d7cbb060f4bac5868be474037f49144d581c15d8aef9b07d78f18041a5f43c3c26352ebbf5583cd23070358c8fba39", + "blockNumber": 232, + "pbftView": 101222, + "status": 1, + "latestStatusUpdateTime": "2021-07-08 15:42:01" + }, + { + "nodeId": "fe57d7b39ed104b4fb2770ae5aad7946bfd377d0eb91ab92a383447e834c3257dec56686551d08178f2d5f40d9fad615293e46c9f5fc23cf187258e121213b1d", + "blockNumber": 232, + "pbftView": 101225, + "status": 1, + "latestStatusUpdateTime": "2021-07-08 15:42:01" } ] ``` @@ -2635,36 +2624,31 @@ http://localhost:5002/WeBASE-Front/1/web3/peers **1）数据格式** ``` [ - { - "ipandPort": "127.0.0.1:30301", - "IPAndPort": "127.0.0.1:30301", - "NodeID": "adfa2f9116d7ff68e0deb75307fa1595d636bf097ad1de4fb55cff00e4fef40b453abb30388aa2112bf5cd4c987afe2e047250f7049791aa1ee7091c9e2ab7bb", - "Topic": [] - }, - { - "ipandPort": "127.0.0.1:57678", - "IPAndPort": "127.0.0.1:57678", - "NodeID": "e28f3d7f5b82e21918a15639eac342dcf678ebb0efe7c65c76514b0ba6b28ace8e47b4a25c9b3f9763b79db847e250a19f827b132f230298980f3ca9779c2564", - "Topic": [] - }, - { - "ipandPort": "127.0.0.1:57608", - "IPAndPort": "127.0.0.1:57608", - "NodeID": "dde0bbf5eb3a731e6da861586e98e088e16e6fdd9afae2f2c213cead20a4f5eaa3910042b70d62266d2350d98a43c1f235c8e0da384448384893857873abdb75", - "Topic": [] - }, - { - "ipandPort": "127.0.0.1:57616", - "IPAndPort": "127.0.0.1:57616", - "NodeID": "552398be0eef124c000e632b0b76a48c52b6cfbd547d92c15527c2d1df15fab2bcded48353db22526c3540e4ab2027630722889f20a4a614bb11a7887a85941b", - "Topic": [] - }, - { - "ipandPort": "127.0.0.1:57670", - "IPAndPort": "127.0.0.1:57670", - "NodeID": "56edfaf60bcb09b9814ad31dcd959eb388f0314445db3deb92cedde97c0ecec210f713591a15f3a7168ba023290cfbe78656b57c37157e6ec74a85182630bd61", - "Topic": [] - } + { + "NodeID": "06269e130f8220ebaa78e67832df0de6b4c5ee3f1b14e64ab2bae26510a4bcf997454b35067c1685d4343e6ad84b45c3b8690a858f2831a9247a97a27166ce1f", + "IPAndPort": "127.0.0.1:65030", + "Agency": "agencyA_son", + "Topic": [], + "Node": "node2" + }, + { + "NodeID": "95efafa5197796e7edf647191de83f4259d7cbb060f4bac5868be474037f49144d581c15d8aef9b07d78f18041a5f43c3c26352ebbf5583cd23070358c8fba39", + "IPAndPort": "127.0.0.1:65014", + "Agency": "agencyA_son", + "Topic": [], + "Node": "node3" + }, + { + "NodeID": "65bc44d398d99d95a9d404aa16e4bfbc2f9ebb40f20439ddef8575a139dc3a80310cfc98a035bd59a67cc5f659f519e3e99b855f3d27f21a889c23a14036d0c7", + "IPAndPort": "127.0.0.1:65022", + "Agency": "agencyA_son", + "Topic": [ + "_block_notify_1", + "_block_notify_2", + "_block_notify_2147483647" + ], + "Node": "node1" + } ] ``` @@ -2774,7 +2758,7 @@ HTTP GET **2）数据格式** ``` -http://localhost:5002/WeBASE-Front/1/web3/search?input=1 +http://localhost:5002/WeBASE-Front/1/web3/search?input=123 ``` #### 响应参数 @@ -2782,62 +2766,64 @@ http://localhost:5002/WeBASE-Front/1/web3/search?input=1 **1）数据格式** ``` { - "number": 1, - "hash": "0x3875dbec6e0ad0790dc0a0e8535b7c286ef7cee4149e5b1494f5c65631a9e321", - "parentHash": "0xed3350d191d23cbc609c98e920baa583403b9a02fa934df868e7f425cd72f5c3", - "nonce": 0, - "sha3Uncles": null, - "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", - "transactionsRoot": "0xa3db8478e08931f8967023a60d260b182d828aad959433e0b77f097d7650b742", - "stateRoot": "0xf32d3e504fc8813c139d1f6f61ae1c8e355502e10b9ea24e5ad5d3ada01ea400", - "receiptsRoot": null, - "author": null, - "sealer": "0x0", - "mixHash": null, - "difficulty": 0, - "totalDifficulty": 0, - "extraData": [], - "size": 0, - "gasLimit": 0, - "gasUsed": 0, - "timestamp": 1557304350431, - "transactions": [ - { - "hash": "0x4145b921309fcaa92b05b782e0181d671b8e68fc6d61d939358ed558fa3489c9", - "nonce": 1.47418536037145E+75, - "blockHash": "0x3875dbec6e0ad0790dc0a0e8535b7c286ef7cee4149e5b1494f5c65631a9e321", - "blockNumber": 1, - "transactionIndex": 0, - "from": "0x33a41878e78fb26735bf425f9328990e3a1a89df", - "to": null, - "value": 0, - "gasPrice": 1, - "gas": 100000000, - "input": "0x6080604052348015600f57600080fd5b5060868061001e6000396000f300608060405260043610603f576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806335b09a6e146044575b600080fd5b348015604f57600080fd5b5060566058565b005b5600a165627a7a723058204aacdb57d6f2ae0f7f6c89c28236bba0205631183fd99785de220481566e683f0029", - "creates": null, - "publicKey": null, - "raw": null, - "r": null, - "s": null, - "v": 0, - "nonceRaw": "0x3425bfe0f36e343686ccbe34a4fe8b05e0e0257ea7ee87417a6d898f0eb43ec", - "transactionIndexRaw": "0x0", - "blockNumberRaw": "0x1", - "valueRaw": "0x0", - "gasPriceRaw": "0x1", - "gasRaw": "0x5f5e100" - } - ], - "uncles": null, - "sealFields": null, - "nonceRaw": null, - "numberRaw": "0x1", - "difficultyRaw": null, - "totalDifficultyRaw": null, - "sizeRaw": null, - "gasLimitRaw": "0x0", - "gasUsedRaw": "0x0", - "timestampRaw": "0x16a969296df" + "number": 123, + "hash": "0xa12a4a8d26a15fcff6f67acf94a3fb2c08d4476806009be40fe4026fd622419d", + "parentHash": "0x898c6b1657d4eb26307b39f248e471498975eb820671c7540fa516e6c7b411e8", + "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "transactionsRoot": "0xa94acacd692cf3b23e19b429ce89c2016020b2264854fd609ba2b16f0c7d5f73", + "receiptsRoot": "0x9529b51c1f7ddd178ffd4a65d146b50cfc0beb405a808677dfddd694cf555a09", + "dbHash": "0x3047354b6776fd1f02911f2c4fc4aa1b215b3df53cc7504a71b5f3bfe12eca3a", + "stateRoot": "0x3047354b6776fd1f02911f2c4fc4aa1b215b3df53cc7504a71b5f3bfe12eca3a", + "sealer": "0x1", + "sealerList": [ + "06269e130f8220ebaa78e67832df0de6b4c5ee3f1b14e64ab2bae26510a4bcf997454b35067c1685d4343e6ad84b45c3b8690a858f2831a9247a97a27166ce1f", + "65bc44d398d99d95a9d404aa16e4bfbc2f9ebb40f20439ddef8575a139dc3a80310cfc98a035bd59a67cc5f659f519e3e99b855f3d27f21a889c23a14036d0c7", + "95efafa5197796e7edf647191de83f4259d7cbb060f4bac5868be474037f49144d581c15d8aef9b07d78f18041a5f43c3c26352ebbf5583cd23070358c8fba39", + "fe57d7b39ed104b4fb2770ae5aad7946bfd377d0eb91ab92a383447e834c3257dec56686551d08178f2d5f40d9fad615293e46c9f5fc23cf187258e121213b1d" + ], + "extraData": [], + "gasLimit": "0", + "gasUsed": "0", + "timestamp": "1621928850887", + "signatureList": [ + { + "index": "0x3", + "signature": "0x8549a8adddb9ff2d8d472b7a65ca414a7f10519f59e11244b9e92fed2e30f29cc272938a695ebb1ead579bdaed401b6aa31395890139abe406518471efa55d6afe57d7b39ed104b4fb2770ae5aad7946bfd377d0eb91ab92a383447e834c3257dec56686551d08178f2d5f40d9fad615293e46c9f5fc23cf187258e121213b1d" + }, + { + "index": "0x1", + "signature": "0x0ff480d6c3fe5908c554653376492cba23cfc938bc0847298c9c8b4c140b417be1990d25c0239f9b18e24276e864e1f2ac4beab47ddf5277a767bb7c93e143ed65bc44d398d99d95a9d404aa16e4bfbc2f9ebb40f20439ddef8575a139dc3a80310cfc98a035bd59a67cc5f659f519e3e99b855f3d27f21a889c23a14036d0c7" + }, + { + "index": "0x2", + "signature": "0x50aa1513c390e5e61221418aa46f8dd45e3ce6e8c0a6fa5aa75650517560589590172b1e6cc64e9ba7ab45c964ff925524cecf6c2be0a28ea11426febb69305195efafa5197796e7edf647191de83f4259d7cbb060f4bac5868be474037f49144d581c15d8aef9b07d78f18041a5f43c3c26352ebbf5583cd23070358c8fba39" + } + ], + "transactions": [ + { + "blockHash": "0xa12a4a8d26a15fcff6f67acf94a3fb2c08d4476806009be40fe4026fd622419d", + "blockNumber": 123, + "from": "0x1cd8126354aa951dc8ed083ed91fd31fad1f50d8", + "gas": "0x5f5e100", + "hash": "0xbe858390cf0bd94f9d17c6ab5e04a7d354f9482f2568f067bdc2529a0af324db", + "input": "0x25e85d16000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000803935656661666135313937373936653765646636343731393164653833663432353964376362623036306634626163353836386265343734303337663439313434643538316331356438616566396230376437386631383034316135663433633363323633353265626266353538336364323330373033353863386662613339", + "nonce": "0x1479caf2ff5f1a6121beac93c85b59c36280ffe6a7f124cbc3d232021fa3307", + "to": "0x0000000000000000000000000000000000001003", + "transactionIndex": "0x0", + "value": "0x0", + "gasPrice": "0x1", + "blockLimit": "0x26e", + "chainId": "0x1", + "groupId": "0x1", + "extraData": "0x", + "signature": { + "r": "0x36edc104cc5c2c5c992f9804bd3415378f93c18ebc9cdeb7794c08b1c95fd7ad", + "s": "0xed555fe3a192acc5ea01951f7286f93cff3471e84731a2942968a2fd9a9a14bc", + "v": "0xd3a0fac51c66adf23bfccc6bb3aaa3d3623040912963ceb818ca2d8b1fb649c64bce64d99a8d9a39158b2c713101dbca10a478131dcae7e42d156e0e69455652", + "signature": "0x36edc104cc5c2c5c992f9804bd3415378f93c18ebc9cdeb7794c08b1c95fd7aded555fe3a192acc5ea01951f7286f93cff3471e84731a2942968a2fd9a9a14bcd3a0fac51c66adf23bfccc6bb3aaa3d3623040912963ceb818ca2d8b1fb649c64bce64d99a8d9a39158b2c713101dbca10a478131dcae7e42d156e0e69455652" + } + } + ] } ``` @@ -2875,33 +2861,35 @@ http://localhost:5002/WeBASE-Front/1/web3/syncStatus **1）数据格式** ``` { - "blockNumber": 126, - "genesisHash": "0xed3350d191d23cbc609c98e920baa583403b9a02fa934df868e7f425cd72f5c3", - "isSyncing": false, - "latestHash": "0x49ca6eb004f372c71ed900ec6992582cd107e4f3ea36aaa5a0a78829ebef1f14", - "nodeId": "d822165959a0ed217df6541f1a7dd38b79336ff571dd5f8f85ad76f3e7ec097e1eabd8b03e4a757fd5a9fb0eea905aded56aaf44df83c34b73acb9ab7ac65010", - "peers": [ - { - "blockNumber": 126, - "genesisHash": "0xed3350d191d23cbc609c98e920baa583403b9a02fa934df868e7f425cd72f5c3", - "latestHash": "0x49ca6eb004f372c71ed900ec6992582cd107e4f3ea36aaa5a0a78829ebef1f14", - "nodeId": "552398be0eef124c000e632b0b76a48c52b6cfbd547d92c15527c2d1df15fab2bcded48353db22526c3540e4ab2027630722889f20a4a614bb11a7887a85941b" - }, - { - "blockNumber": 126, - "genesisHash": "0xed3350d191d23cbc609c98e920baa583403b9a02fa934df868e7f425cd72f5c3", - "latestHash": "0x49ca6eb004f372c71ed900ec6992582cd107e4f3ea36aaa5a0a78829ebef1f14", - "nodeId": "adfa2f9116d7ff68e0deb75307fa1595d636bf097ad1de4fb55cff00e4fef40b453abb30388aa2112bf5cd4c987afe2e047250f7049791aa1ee7091c9e2ab7bb" - }, - { - "blockNumber": 126, - "genesisHash": "0xed3350d191d23cbc609c98e920baa583403b9a02fa934df868e7f425cd72f5c3", - "latestHash": "0x49ca6eb004f372c71ed900ec6992582cd107e4f3ea36aaa5a0a78829ebef1f14", - "nodeId": "dde0bbf5eb3a731e6da861586e98e088e16e6fdd9afae2f2c213cead20a4f5eaa3910042b70d62266d2350d98a43c1f235c8e0da384448384893857873abdb75" - } - ], - "protocolId": 265, - "txPoolSize": "0" + "isSyncing": "false", + "protocolId": "65545", + "genesisHash": "1caec77e0ff42af4f045af2ba5503c775c33430085b246374cdd23d1c9191173", + "nodeId": "fe57d7b39ed104b4fb2770ae5aad7946bfd377d0eb91ab92a383447e834c3257dec56686551d08178f2d5f40d9fad615293e46c9f5fc23cf187258e121213b1d", + "blockNumber": "232", + "latestHash": "7f0885a7188bd5c1b3f8c182e00be0e63a3b1653b12752cf8501ddac995e6efc", + "knownHighestNumber": "232", + "txPoolSize": "0", + "peers": [ + { + "nodeId": "06269e130f8220ebaa78e67832df0de6b4c5ee3f1b14e64ab2bae26510a4bcf997454b35067c1685d4343e6ad84b45c3b8690a858f2831a9247a97a27166ce1f", + "genesisHash": "1caec77e0ff42af4f045af2ba5503c775c33430085b246374cdd23d1c9191173", + "blockNumber": "232", + "latestHash": "7f0885a7188bd5c1b3f8c182e00be0e63a3b1653b12752cf8501ddac995e6efc" + }, + { + "nodeId": "65bc44d398d99d95a9d404aa16e4bfbc2f9ebb40f20439ddef8575a139dc3a80310cfc98a035bd59a67cc5f659f519e3e99b855f3d27f21a889c23a14036d0c7", + "genesisHash": "1caec77e0ff42af4f045af2ba5503c775c33430085b246374cdd23d1c9191173", + "blockNumber": "232", + "latestHash": "7f0885a7188bd5c1b3f8c182e00be0e63a3b1653b12752cf8501ddac995e6efc" + }, + { + "nodeId": "95efafa5197796e7edf647191de83f4259d7cbb060f4bac5868be474037f49144d581c15d8aef9b07d78f18041a5f43c3c26352ebbf5583cd23070358c8fba39", + "genesisHash": "1caec77e0ff42af4f045af2ba5503c775c33430085b246374cdd23d1c9191173", + "blockNumber": "232", + "latestHash": "7f0885a7188bd5c1b3f8c182e00be0e63a3b1653b12752cf8501ddac995e6efc" + } + ], + "knownLatestHash": "7f0885a7188bd5c1b3f8c182e00be0e63a3b1653b12752cf8501ddac995e6efc" } ``` @@ -3310,6 +3298,145 @@ http://localhost:5002/WeBASE-Front/1/web3/nodeInfo ``` +### 3.30. 根据块高获取区块头 + + +#### 接口描述 + +> 返回 + +#### 接口URL + +**http://localhost:5002/WeBASE-Front/{groupId}/web3/blockHeaderByNumber/{blockNumber}** + +#### 调用方法 + +HTTP GET + +#### 请求参数 + +**1）参数表** + +| **序号** | **中文** | **参数名** | **类型** | **最大长度** | **必填** | **说明** | +| -------- | -------- | ---------------- | ---------- | ------------ | -------- | -------- | +| 1 | 群组编号 | groupId | int | | 是 | | + +**2）数据格式** + +``` +http://localhost:5002/WeBASE-Front/1/web3/blockHeaderByNumber/2 +``` + +#### 响应参数 +**1）数据格式** + +``` +{ + "number": 2, + "hash": "0xf58f4f43b3761f4863ad366c4a7e2a812ed68df9f7bcad6b502fd544665e7625", + "parentHash": "0x489ee0c00527879f7e2470bde7b62e9ea30fadb242bcbd9ba582d0dee4958e2f", + "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "transactionsRoot": "0xade02313d3200f38dfc18cdc368241cf4c1cb7e72011edf847ec216efa43a99e", + "receiptsRoot": "0xb7c4b856c9335bd345c0b022057567a2223218e7a7dab822981467b29ac1e326", + "dbHash": "0x8cbc3f2c0e35a71738909e3b388efa6697084b05badd3a3bd3c64f0575c78c15", + "stateRoot": "0x8cbc3f2c0e35a71738909e3b388efa6697084b05badd3a3bd3c64f0575c78c15", + "sealer": "0x2", + "sealerList": [ + "06269e130f8220ebaa78e67832df0de6b4c5ee3f1b14e64ab2bae26510a4bcf997454b35067c1685d4343e6ad84b45c3b8690a858f2831a9247a97a27166ce1f", + "65bc44d398d99d95a9d404aa16e4bfbc2f9ebb40f20439ddef8575a139dc3a80310cfc98a035bd59a67cc5f659f519e3e99b855f3d27f21a889c23a14036d0c7", + "95efafa5197796e7edf647191de83f4259d7cbb060f4bac5868be474037f49144d581c15d8aef9b07d78f18041a5f43c3c26352ebbf5583cd23070358c8fba39", + "fe57d7b39ed104b4fb2770ae5aad7946bfd377d0eb91ab92a383447e834c3257dec56686551d08178f2d5f40d9fad615293e46c9f5fc23cf187258e121213b1d" + ], + "extraData": [], + "gasLimit": "0", + "gasUsed": "0", + "timestamp": "1619424150450", + "signatureList": [ + { + "index": "0x1", + "signature": "0xa05b5d220e41051fa80f212884d9cdda3a8973a4ac2d2dc74e42db32b459e5f595a61e30266f0e8bf7edb065ff107c6af5e6349f9ae518146dc686406ebbade165bc44d398d99d95a9d404aa16e4bfbc2f9ebb40f20439ddef8575a139dc3a80310cfc98a035bd59a67cc5f659f519e3e99b855f3d27f21a889c23a14036d0c7" + }, + { + "index": "0x3", + "signature": "0x48bb622e24b18f4eb601137d44b5d86e2c287be3aa849dce1768e87e75308ba69391e62f90d76bf84b9b6eb1509d11409f9b784bc7b052458a4596b81961fac8fe57d7b39ed104b4fb2770ae5aad7946bfd377d0eb91ab92a383447e834c3257dec56686551d08178f2d5f40d9fad615293e46c9f5fc23cf187258e121213b1d" + }, + { + "index": "0x2", + "signature": "0x3a3cc8c20c5cdbb6431ec1f749d94662670e87442debef119a4e6469ccb16a60a152d32754ab833efa513839b076c2aa1ceb7e536db3734b740e9192b10ee38695efafa5197796e7edf647191de83f4259d7cbb060f4bac5868be474037f49144d581c15d8aef9b07d78f18041a5f43c3c26352ebbf5583cd23070358c8fba39" + } + ] +} +``` + +### 3.31. 根据区块哈希获取区块头 + + +#### 接口描述 + +> 返回 + +#### 接口URL + +**http://localhost:5002/WeBASE-Front/{groupId}/web3/blockHeaderByHash/{blockHash}** + +#### 调用方法 + +HTTP GET + +#### 请求参数 + +**1）参数表** + +| **序号** | **中文** | **参数名** | **类型** | **最大长度** | **必填** | **说明** | +| -------- | -------- | ---------------- | ---------- | ------------ | -------- | -------- | +| 1 | 群组编号 | groupId | int | | 是 | | + +**2）数据格式** + +``` +http://localhost:5002/WeBASE-Front/1/web3/blockHeaderByHash/0xf58f4f43b3761f4863ad366c4a7e2a812ed68df9f7bcad6b502fd544665e7625 +``` + +#### 响应参数 +**1）数据格式** + +``` +{ + "number": 2, + "hash": "0xf58f4f43b3761f4863ad366c4a7e2a812ed68df9f7bcad6b502fd544665e7625", + "parentHash": "0x489ee0c00527879f7e2470bde7b62e9ea30fadb242bcbd9ba582d0dee4958e2f", + "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "transactionsRoot": "0xade02313d3200f38dfc18cdc368241cf4c1cb7e72011edf847ec216efa43a99e", + "receiptsRoot": "0xb7c4b856c9335bd345c0b022057567a2223218e7a7dab822981467b29ac1e326", + "dbHash": "0x8cbc3f2c0e35a71738909e3b388efa6697084b05badd3a3bd3c64f0575c78c15", + "stateRoot": "0x8cbc3f2c0e35a71738909e3b388efa6697084b05badd3a3bd3c64f0575c78c15", + "sealer": "0x2", + "sealerList": [ + "06269e130f8220ebaa78e67832df0de6b4c5ee3f1b14e64ab2bae26510a4bcf997454b35067c1685d4343e6ad84b45c3b8690a858f2831a9247a97a27166ce1f", + "65bc44d398d99d95a9d404aa16e4bfbc2f9ebb40f20439ddef8575a139dc3a80310cfc98a035bd59a67cc5f659f519e3e99b855f3d27f21a889c23a14036d0c7", + "95efafa5197796e7edf647191de83f4259d7cbb060f4bac5868be474037f49144d581c15d8aef9b07d78f18041a5f43c3c26352ebbf5583cd23070358c8fba39", + "fe57d7b39ed104b4fb2770ae5aad7946bfd377d0eb91ab92a383447e834c3257dec56686551d08178f2d5f40d9fad615293e46c9f5fc23cf187258e121213b1d" + ], + "extraData": [], + "gasLimit": "0", + "gasUsed": "0", + "timestamp": "1619424150450", + "signatureList": [ + { + "index": "0x1", + "signature": "0xa05b5d220e41051fa80f212884d9cdda3a8973a4ac2d2dc74e42db32b459e5f595a61e30266f0e8bf7edb065ff107c6af5e6349f9ae518146dc686406ebbade165bc44d398d99d95a9d404aa16e4bfbc2f9ebb40f20439ddef8575a139dc3a80310cfc98a035bd59a67cc5f659f519e3e99b855f3d27f21a889c23a14036d0c7" + }, + { + "index": "0x3", + "signature": "0x48bb622e24b18f4eb601137d44b5d86e2c287be3aa849dce1768e87e75308ba69391e62f90d76bf84b9b6eb1509d11409f9b784bc7b052458a4596b81961fac8fe57d7b39ed104b4fb2770ae5aad7946bfd377d0eb91ab92a383447e834c3257dec56686551d08178f2d5f40d9fad615293e46c9f5fc23cf187258e121213b1d" + }, + { + "index": "0x2", + "signature": "0x3a3cc8c20c5cdbb6431ec1f749d94662670e87442debef119a4e6469ccb16a60a152d32754ab833efa513839b076c2aa1ceb7e536db3734b740e9192b10ee38695efafa5197796e7edf647191de83f4259d7cbb060f4bac5868be474037f49144d581c15d8aef9b07d78f18041a5f43c3c26352ebbf5583cd23070358c8fba39" + } + ] +} +``` ## 4. 性能检测接口 From df21cea2dd9f7948a740ad85449b2980d66c927b Mon Sep 17 00:00:00 2001 From: CodingCattwo <847701726@qq.com> Date: Thu, 8 Jul 2021 16:11:31 +0800 Subject: [PATCH 09/26] update api trans receipt --- docs/WeBASE-Front/interface.md | 76 +++++++++++++++++----------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/docs/WeBASE-Front/interface.md b/docs/WeBASE-Front/interface.md index f49fa1fc..8e0439a4 100644 --- a/docs/WeBASE-Front/interface.md +++ b/docs/WeBASE-Front/interface.md @@ -3955,25 +3955,25 @@ b、正确发送数据上链返回值信息（交易收据） ``` { - "transactionHash": "0xd1234cdb673447b654874d05d4ed98be89f3cb7c5a6c12bc51e1274a03af029c", - "transactionIndex": "0x0", - "root": "0xeecf2b6bbb028e38e704ca88fe1d9f5e3d43197b32c3336d3273d86fb3a135f0", - "blockNumber": "0xa9", - "blockHash": "0x906bdf0747ba68c03e6cf73463db62fdbd8ab8debc149f890475775d7c6a8af7", - "from": "0x7bfa3539c8761978f0a2a1f7f240bde97819fb03", - "to": "0xe10441d9179cf0424aae808b51bc85dcbbfe1447", - "gasUsed": "0x710b", - "contractAddress": "0x0000000000000000000000000000000000000000", - "logs": [], - "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", - "status": "0x0", - "statusMsg": "None", - "input": "0x3590b49f000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000033333330000000000000000000000000000000000000000000000000000000000", - "output": "0x", - "txProof": null, - "receiptProof": null, - "message": "Success", - "statusOK": true + "transactionHash": "0x69ced0162a0c3892e4eaa3091b831ac3aaeb772c062746b20891ceaf8a4fb429", + "transactionIndex": "0x0", + "root": "0x8cbc3f2c0e35a71738909e3b388efa6697084b05badd3a3bd3c64f0575c78c15", + "blockNumber": "2", + "blockHash": "0xf58f4f43b3761f4863ad366c4a7e2a812ed68df9f7bcad6b502fd544665e7625", + "from": "0x9d75e0ee66cfef16897b601624b60413d988ae7d", + "to": "0x0000000000000000000000000000000000000000", + "gasUsed": "316449", + "contractAddress": "0xa8af0ee580d8af674a60341030ddbc45431bc235", + "logs": [], + "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "status": "0x0", + "statusMsg": "None", + "input": "0x608060405234801561001057600080fd5b506103e3806100206000396000f300608060405260043610610057576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063299f7f9d1461005c5780633590b49f146100ec57806362e8d6ce14610155575b600080fd5b34801561006857600080fd5b5061007161016c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156100b1578082015181840152602081019050610096565b50505050905090810190601f1680156100de5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b3480156100f857600080fd5b50610153600480360381019080803590602001908201803590602001908080601f016020809104026020016040519081016040528093929190818152602001838380828437820191505050505050919291929050505061020e565b005b34801561016157600080fd5b5061016a6102c4565b005b606060008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156102045780601f106101d957610100808354040283529160200191610204565b820191906000526020600020905b8154815290600101906020018083116101e757829003601f168201915b5050505050905090565b7f5715c9562eaf8d524d564edb392acddefc81d8133e2fc3b8125a260b1b413fda816040518080602001828103825283818151815260200191508051906020019080838360005b83811015610270578082015181840152602081019050610255565b50505050905090810190601f16801561029d5780820380516001836020036101000a031916815260200191505b509250505060405180910390a180600090805190602001906102c0929190610312565b5050565b6040805190810160405280600d81526020017f48656c6c6f2c20576f726c6421000000000000000000000000000000000000008152506000908051906020019061030f929190610312565b50565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061035357805160ff1916838001178555610381565b82800160010185558215610381579182015b82811115610380578251825591602001919060010190610365565b5b50905061038e9190610392565b5090565b6103b491905b808211156103b0576000816000905550600101610398565b5090565b905600a165627a7a72305820f3088deb3d14c6893440e4769f2389e9335e04faa10e6de5b4c93af15d1a34e80029", + "output": "0x", + "txProof": null, + "receiptProof": null, + "message": null, + "statusOK": true } ``` @@ -4074,25 +4074,25 @@ b、正确发送数据上链返回值信息（交易收据） ``` { - "transactionHash": "0xd1234cdb673447b654874d05d4ed98be89f3cb7c5a6c12bc51e1274a03af029c", - "transactionIndex": "0x0", - "root": "0xeecf2b6bbb028e38e704ca88fe1d9f5e3d43197b32c3336d3273d86fb3a135f0", - "blockNumber": "0xa9", - "blockHash": "0x906bdf0747ba68c03e6cf73463db62fdbd8ab8debc149f890475775d7c6a8af7", - "from": "0x7bfa3539c8761978f0a2a1f7f240bde97819fb03", - "to": "0xe10441d9179cf0424aae808b51bc85dcbbfe1447", - "gasUsed": "0x710b", - "contractAddress": "0x0000000000000000000000000000000000000000", - "logs": [], - "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", - "status": "0x0", - "statusMsg": "None", - "input": "0x3590b49f000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000033333330000000000000000000000000000000000000000000000000000000000", - "output": "0x", - "txProof": null, - "receiptProof": null, - "message": "Success", - "statusOK": true + "transactionHash": "0x69ced0162a0c3892e4eaa3091b831ac3aaeb772c062746b20891ceaf8a4fb429", + "transactionIndex": "0x0", + "root": "0x8cbc3f2c0e35a71738909e3b388efa6697084b05badd3a3bd3c64f0575c78c15", + "blockNumber": "2", + "blockHash": "0xf58f4f43b3761f4863ad366c4a7e2a812ed68df9f7bcad6b502fd544665e7625", + "from": "0x9d75e0ee66cfef16897b601624b60413d988ae7d", + "to": "0x0000000000000000000000000000000000000000", + "gasUsed": "316449", + "contractAddress": "0xa8af0ee580d8af674a60341030ddbc45431bc235", + "logs": [], + "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "status": "0x0", + "statusMsg": "None", + "input": "0x608060405234801561001057600080fd5b506103e3806100206000396000f300608060405260043610610057576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063299f7f9d1461005c5780633590b49f146100ec57806362e8d6ce14610155575b600080fd5b34801561006857600080fd5b5061007161016c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156100b1578082015181840152602081019050610096565b50505050905090810190601f1680156100de5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b3480156100f857600080fd5b50610153600480360381019080803590602001908201803590602001908080601f016020809104026020016040519081016040528093929190818152602001838380828437820191505050505050919291929050505061020e565b005b34801561016157600080fd5b5061016a6102c4565b005b606060008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156102045780601f106101d957610100808354040283529160200191610204565b820191906000526020600020905b8154815290600101906020018083116101e757829003601f168201915b5050505050905090565b7f5715c9562eaf8d524d564edb392acddefc81d8133e2fc3b8125a260b1b413fda816040518080602001828103825283818151815260200191508051906020019080838360005b83811015610270578082015181840152602081019050610255565b50505050905090810190601f16801561029d5780820380516001836020036101000a031916815260200191505b509250505060405180910390a180600090805190602001906102c0929190610312565b5050565b6040805190810160405280600d81526020017f48656c6c6f2c20576f726c6421000000000000000000000000000000000000008152506000908051906020019061030f929190610312565b50565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061035357805160ff1916838001178555610381565b82800160010185558215610381579182015b82811115610380578251825591602001919060010190610365565b5b50905061038e9190610392565b5090565b6103b491905b808211156103b0576000816000905550600101610398565b5090565b905600a165627a7a72305820f3088deb3d14c6893440e4769f2389e9335e04faa10e6de5b4c93af15d1a34e80029", + "output": "0x", + "txProof": null, + "receiptProof": null, + "message": null, + "statusOK": true } ``` From f089471ac2871962584bf63d7951a11122eed9dd Mon Sep 17 00:00:00 2001 From: CodingCattwo <847701726@qq.com> Date: Thu, 8 Jul 2021 16:17:23 +0800 Subject: [PATCH 10/26] update encode function api --- docs/WeBASE-Front/interface.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/WeBASE-Front/interface.md b/docs/WeBASE-Front/interface.md index 8e0439a4..92f2565f 100644 --- a/docs/WeBASE-Front/interface.md +++ b/docs/WeBASE-Front/interface.md @@ -4402,7 +4402,7 @@ HTTP POST | -------- | --------------------------- | --------------- | -------- | ------------ | -------- | ------------------------------------------------------------ | | 1 | 方法名 | funcName | String | | 是 | | | 2 | 合约编译后生成的abi文件内容 | contractAbi | List | | 是 | 合约中单个函数的ABI，若不存在同名函数可以传入整个合约ABI，格式：JSONArray | -| 3 | 方法参数 | funcParam | List | | 否 | JSON数组，多个参数以逗号分隔（参数为数组时同理），如：["str1",["arr1","arr2"]]，根据所调用的合约方法判断是否必填 | +| 3 | 方法参数 | funcParam | List | | 是 | JSON数组，多个参数以逗号分隔（参数为数组时同理），如：["str1",["arr1","arr2"]]，根据所调用的合约方法判断是否必填，为空则使用`[]`空数组代替 | **2）数据格式** From d466dbb4f1ec2e16d866b4f1a973c465fed63334 Mon Sep 17 00:00:00 2001 From: CodingCattwo <847701726@qq.com> Date: Thu, 8 Jul 2021 16:55:28 +0800 Subject: [PATCH 11/26] update java sdk nodemgr api doc --- docs/WeBASE-Node-Manager/interface.md | 370 ++++++++++++++++++++------ 1 file changed, 282 insertions(+), 88 deletions(-) diff --git a/docs/WeBASE-Node-Manager/interface.md b/docs/WeBASE-Node-Manager/interface.md index 879f9c9b..c9e5b8bb 100644 --- a/docs/WeBASE-Node-Manager/interface.md +++ b/docs/WeBASE-Node-Manager/interface.md @@ -488,13 +488,13 @@ http://127.0.0.1:5001/WeBASE-Node-Manager/transaction/transList/300001/1/10?tran | 序号 | 输入参数 | 类型 | 可为空 | 备注 | |------|-------------|---------------|--------|-------------------------------| | 1 | groupId | int | 否 | 所属群组编号 | -| 2 | transHash | String | 是 | 交易hash | +| 2 | transHash | String | 否 | 交易hash | ***2）入参示例*** ``` -http://127.0.0.1:5001/WeBASE-Node-Manager/transaction/transactionReceipt/1/0xda879949df6b5d75d2d807f036b461e0cebcc1abaccac119c9a282d3941a4818 +http://127.0.0.1:5001/WeBASE-Node-Manager/transaction/transactionReceipt/1/0x69ced0162a0c3892e4eaa3091b831ac3aaeb772c062746b20891ceaf8a4fb429 ``` @@ -529,23 +529,25 @@ http://127.0.0.1:5001/WeBASE-Node-Manager/transaction/transactionReceipt/1/0xda8 "code": 0, "message": "success", "data": { - "transactionHash": "0xda879949df6b5d75d2d807f036b461e0cebcc1abaccac119c9a282d3941a4818", - "transactionIndex": 0, - "blockHash": "0x739853061c6c87ed691c0ee6f938589f7e2e442d42b16f582b353a475359b91d", - "blockNumber": 4311, - "cumulativeGasUsed": 0, - "gasUsed": 32940, - "contractAddress": "0x0000000000000000000000000000000000000000", + "transactionHash": "0x69ced0162a0c3892e4eaa3091b831ac3aaeb772c062746b20891ceaf8a4fb429", + "transactionIndex": "0x0", + "root": "0x8cbc3f2c0e35a71738909e3b388efa6697084b05badd3a3bd3c64f0575c78c15", + "blockNumber": "2", + "blockHash": "0xf58f4f43b3761f4863ad366c4a7e2a812ed68df9f7bcad6b502fd544665e7625", + "from": "0x9d75e0ee66cfef16897b601624b60413d988ae7d", + "to": "0x0000000000000000000000000000000000000000", + "gasUsed": "316449", + "contractAddress": "0xa8af0ee580d8af674a60341030ddbc45431bc235", + "logs": [], + "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "status": "0x0", - "from": "0xe4bc056009daed8253008e03db6f62d93ccfacea", - "to": "0x522eda3fbe88c07025f1db3f7dc7d9836af95b3f", + "statusMsg": "None", + "input": "0x608060405234801561001057600080fd5b506103e3806100206000396000f300608060405260043610610057576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063299f7f9d1461005c5780633590b49f146100ec57806362e8d6ce14610155575b600080fd5b34801561006857600080fd5b5061007161016c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156100b1578082015181840152602081019050610096565b50505050905090810190601f1680156100de5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b3480156100f857600080fd5b50610153600480360381019080803590602001908201803590602001908080601f016020809104026020016040519081016040528093929190818152602001838380828437820191505050505050919291929050505061020e565b005b34801561016157600080fd5b5061016a6102c4565b005b606060008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156102045780601f106101d957610100808354040283529160200191610204565b820191906000526020600020905b8154815290600101906020018083116101e757829003601f168201915b5050505050905090565b7f5715c9562eaf8d524d564edb392acddefc81d8133e2fc3b8125a260b1b413fda816040518080602001828103825283818151815260200191508051906020019080838360005b83811015610270578082015181840152602081019050610255565b50505050905090810190601f16801561029d5780820380516001836020036101000a031916815260200191505b509250505060405180910390a180600090805190602001906102c0929190610312565b5050565b6040805190810160405280600d81526020017f48656c6c6f2c20576f726c6421000000000000000000000000000000000000008152506000908051906020019061030f929190610312565b50565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061035357805160ff1916838001178555610381565b82800160010185558215610381579182015b82811115610380578251825591602001919060010190610365565b5b50905061038e9190610392565b5090565b6103b491905b808211156103b0576000816000905550600101610398565b5090565b905600a165627a7a72305820f3088deb3d14c6893440e4769f2389e9335e04faa10e6de5b4c93af15d1a34e80029", "output": "0x", - "logs": [], - "logsBloom": "0x000000000000000000000000000000000000000", - "blockNumberRaw": "0x10d7", - "transactionIndexRaw": "0x0", - "statusOK": true, - "gasUsedRaw": "0x80ac" + "txProof": null, + "receiptProof": null, + "message": null, + "statusOK": true } } ``` @@ -583,7 +585,7 @@ http://127.0.0.1:5001/WeBASE-Node-Manager/transaction/transactionReceipt/1/0xda8 ***2）入参示例*** ``` -http://127.0.0.1:5001/WeBASE-Node-Manager/transaction/transInfo/1/0xda879949df6b5d75d2d807f036b461e0cebcc1abaccac119c9a282d3941a4818 +http://127.0.0.1:5001/WeBASE-Node-Manager/transaction/transInfo/1/0x69ced0162a0c3892e4eaa3091b831ac3aaeb772c062746b20891ceaf8a4fb429 ``` @@ -628,23 +630,27 @@ http://127.0.0.1:5001/WeBASE-Node-Manager/transaction/transInfo/1/0xda879949df6b "code": 0, "message": "success", "data": { - "hash": "0xda879949df6b5d75d2d807f036b461e0cebcc1abaccac119c9a282d3941a4818", - "nonce": "600264747827990445399299219738839026203774909117379671331964756256186263529", - "blockHash": "0x739853061c6c87ed691c0ee6f938589f7e2e442d42b16f582b353a475359b91d", - "blockNumber": 4311, - "transactionIndex": 0, - "from": "0xe4bc056009daed8253008e03db6f62d93ccfacea", - "to": "0x522eda3fbe88c07025f1db3f7dc7d9836af95b3f", - "value": 0, - "gasPrice": 100000000, - "gas": 100000000, - "input": "0x4ed3885e000000000000000", - "v": 0, - "nonceRaw": "0x153bce0f26461030fe5189385b9c3e84336b007769a3849524ca3f4af7d67e9", - "blockNumberRaw": "0x10d7", - "transactionIndexRaw": "0x0", - "gasPriceRaw": "0x5f5e100", - "gasRaw": "0x5f5e100" + "blockHash": "0xf58f4f43b3761f4863ad366c4a7e2a812ed68df9f7bcad6b502fd544665e7625", + "blockNumber": 2, + "from": "0x9d75e0ee66cfef16897b601624b60413d988ae7d", + "gas": "4300000", + "hash": "0x69ced0162a0c3892e4eaa3091b831ac3aaeb772c062746b20891ceaf8a4fb429", + "input": "0x608060405234801561001057600080fd5b506103e3806100206000396000f300608060405260043610610057576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063299f7f9d1461005c5780633590b49f146100ec57806362e8d6ce14610155575b600080fd5b34801561006857600080fd5b5061007161016c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156100b1578082015181840152602081019050610096565b50505050905090810190601f1680156100de5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b3480156100f857600080fd5b50610153600480360381019080803590602001908201803590602001908080601f016020809104026020016040519081016040528093929190818152602001838380828437820191505050505050919291929050505061020e565b005b34801561016157600080fd5b5061016a6102c4565b005b606060008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156102045780601f106101d957610100808354040283529160200191610204565b820191906000526020600020905b8154815290600101906020018083116101e757829003601f168201915b5050505050905090565b7f5715c9562eaf8d524d564edb392acddefc81d8133e2fc3b8125a260b1b413fda816040518080602001828103825283818151815260200191508051906020019080838360005b83811015610270578082015181840152602081019050610255565b50505050905090810190601f16801561029d5780820380516001836020036101000a031916815260200191505b509250505060405180910390a180600090805190602001906102c0929190610312565b5050565b6040805190810160405280600d81526020017f48656c6c6f2c20576f726c6421000000000000000000000000000000000000008152506000908051906020019061030f929190610312565b50565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061035357805160ff1916838001178555610381565b82800160010185558215610381579182015b82811115610380578251825591602001919060010190610365565b5b50905061038e9190610392565b5090565b6103b491905b808211156103b0576000816000905550600101610398565b5090565b905600a165627a7a72305820f3088deb3d14c6893440e4769f2389e9335e04faa10e6de5b4c93af15d1a34e80029", + "nonce": "0x3460c30bd3e4e88a31d6d033b3a172859bf003258e9606fd63fb0d91f91f4e6", + "to": "0x0000000000000000000000000000000000000000", + "transactionIndex": "0x0", + "value": "0x0", + "gasPrice": "22000000000", + "blockLimit": "0x1f5", + "chainId": "0x1", + "groupId": "1", + "extraData": "0x", + "signature": { + "r": "0x3416723318505669cca91689b213ff08ffb96d538210a0f691cfcfa9d529462b", + "s": "0xd3642f19c228e2e86689de9efc19ecbb68378a6bb7c219984431e93d60c89124", + "v": "0xc7935c199b680452eb37911856282b9c820322fd5fdec8a06b48cc3df4e8ed7d3d66a5adcc134cca609146ec0aed12827c35df07eed96042763c0926cf4223b7", + "signature": "0x3416723318505669cca91689b213ff08ffb96d538210a0f691cfcfa9d529462bd3642f19c228e2e86689de9efc19ecbb68378a6bb7c219984431e93d60c89124c7935c199b680452eb37911856282b9c820322fd5fdec8a06b48cc3df4e8ed7d3d66a5adcc134cca609146ec0aed12827c35df07eed96042763c0926cf4223b7" + } } } ``` @@ -1178,13 +1184,13 @@ http://127.0.0.1:5001/WeBASE-Node-Manager/account/login?checkCode=aege ### 4.1 查询区块列表 -#### 4.1.1 传输协议规范 +#### 传输协议规范 * 网络传输协议：使用HTTP协议 * 请求地址：**/block/blockList/{groupId}/{pageNumber}/{pageSize}}?pkHash={pkHash}&blockNumber={blockNumber}** * 请求方式：GET * 返回格式：JSON -#### 4.1.2 请求参数 +#### 请求参数 ***1）入参表*** @@ -1204,7 +1210,7 @@ http://127.0.0.1:5001/WeBASE-Node-Manager/account/login?checkCode=aege http://127.0.0.1:5001/WeBASE-Node-Manager/block/blockList/300001/1/10?pkHash= ``` -#### 4.1.3 返回参数 +#### 返回参数 ***1）出参表*** @@ -1260,13 +1266,13 @@ http://127.0.0.1:5001/WeBASE-Node-Manager/block/blockList/300001/1/10?pkHash= ### 4.2 根据块高或hash查询区块信息 -#### 4.2.1 传输协议规范 +#### 传输协议规范 * 网络传输协议：使用HTTP协议 -* 请求地址：**/block/blockList/{groupId}/{pageNumber}/{pageSize}}?pkHash={pkHash}&blockNumber={blockNumber}** +* 请求地址：**/block/blockByNumber/{groupId}/{blockNumber}** * 请求方式：GET * 返回格式：JSON -#### 4.2.2 请求参数 +#### 请求参数 ***1）入参表*** @@ -1281,11 +1287,11 @@ http://127.0.0.1:5001/WeBASE-Node-Manager/block/blockList/300001/1/10?pkHash= ***2）入参示例*** ``` -http://127.0.0.1:5001/WeBASE-Node-Manager/block/blockByNumber/1/11 +http://127.0.0.1:5001/WeBASE-Node-Manager/block/blockByNumber/1/2 ``` -#### 4.2.3 返回参数 +#### 返回参数 ***1）出参表*** @@ -1344,50 +1350,70 @@ http://127.0.0.1:5001/WeBASE-Node-Manager/block/blockByNumber/1/11 * 成功： ``` { - "code": 0, - "message": "success", - "data": { - "number": 11, - "hash": "0xeef574a136f1d5031ce7f5d4bbc19fa1a1b5736f38ec5687d43405a572219405", - "parentHash": "0xca84147e343acb972dc9247727b920b5c081320bbe940f4e2b24363836dca4a1", - "nonce": "0", - "sealer": "0x0", - "logsBloom": "0x000000000000000000000000000000000000", - "transactionsRoot": "0x68510be0e37b993874c6cb59170b87f01fc9672a162b30df7ea96cb026f3ab27", - "stateRoot": "0xa6e930f100c2f4a13816e57aede9b63f3b7d51d64148f4412d8a6efcb0fa9c79", - "difficulty": 0, - "totalDifficulty": 0, - "extraData": [], - "size": 0, - "gasLimit": 0, - "gasUsed": 0, - "timestamp": "1551667286153", - "gasLimitRaw": "0x0", - "timestampRaw": "0x1694693d089", - "gasUsedRaw": "0x0", - "numberRaw": "0xb", - "transactions": [ - { - "hash": "0x30ab22a942a6545cfe46fd725e53311fbcfea655f9c0d1e198b83749f5d7bf9b", - "nonce": "1224685724047484442779169279180691132123728860283320089873703663086305160417", - "blockHash": "0xeef574a136f1d5031ce7f5d4bbc19fa1a1b5736f38ec5687d43405a572219405", - "blockNumber": 11, - "transactionIndex": 0, - "from": "0x148947262ec5e21739fe3a931c29e8b84ee34a0f", - "to": "0xdfb1684019f7f6ea2c41590ac55d29961de5deba", - "value": 0, - "gasPrice": 300000000, - "gas": 300000000, - "input": "0x66c991390000000000000000000000000000000000000000000000000000000000000004", - "v": 0, - "nonceRaw": "0x2b525c633f530fdd935428a58afcfbb533e4dd16f24eda6b6a860b63e6a2ce1", - "blockNumberRaw": "0xb", - "transactionIndexRaw": "0x0", - "gasPriceRaw": "0x11e1a300", - "gasRaw": "0x11e1a300" - } - ] - } + "code": 0, + "message": "success", + "data": { + "number": 2, + "hash": "0xf58f4f43b3761f4863ad366c4a7e2a812ed68df9f7bcad6b502fd544665e7625", + "parentHash": "0x489ee0c00527879f7e2470bde7b62e9ea30fadb242bcbd9ba582d0dee4958e2f", + "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "transactionsRoot": "0xade02313d3200f38dfc18cdc368241cf4c1cb7e72011edf847ec216efa43a99e", + "receiptsRoot": "0xb7c4b856c9335bd345c0b022057567a2223218e7a7dab822981467b29ac1e326", + "dbHash": "0x8cbc3f2c0e35a71738909e3b388efa6697084b05badd3a3bd3c64f0575c78c15", + "stateRoot": "0x8cbc3f2c0e35a71738909e3b388efa6697084b05badd3a3bd3c64f0575c78c15", + "sealer": "0x2", + "sealerList": [ + "06269e130f8220ebaa78e67832df0de6b4c5ee3f1b14e64ab2bae26510a4bcf997454b35067c1685d4343e6ad84b45c3b8690a858f2831a9247a97a27166ce1f", + "65bc44d398d99d95a9d404aa16e4bfbc2f9ebb40f20439ddef8575a139dc3a80310cfc98a035bd59a67cc5f659f519e3e99b855f3d27f21a889c23a14036d0c7", + "95efafa5197796e7edf647191de83f4259d7cbb060f4bac5868be474037f49144d581c15d8aef9b07d78f18041a5f43c3c26352ebbf5583cd23070358c8fba39", + "fe57d7b39ed104b4fb2770ae5aad7946bfd377d0eb91ab92a383447e834c3257dec56686551d08178f2d5f40d9fad615293e46c9f5fc23cf187258e121213b1d" + ], + "extraData": [], + "gasLimit": "0", + "gasUsed": "0", + "timestamp": "1619424150450", + "signatureList": [ + { + "index": "0x1", + "signature": "0xa05b5d220e41051fa80f212884d9cdda3a8973a4ac2d2dc74e42db32b459e5f595a61e30266f0e8bf7edb065ff107c6af5e6349f9ae518146dc686406ebbade165bc44d398d99d95a9d404aa16e4bfbc2f9ebb40f20439ddef8575a139dc3a80310cfc98a035bd59a67cc5f659f519e3e99b855f3d27f21a889c23a14036d0c7" + }, + { + "index": "0x3", + "signature": "0x48bb622e24b18f4eb601137d44b5d86e2c287be3aa849dce1768e87e75308ba69391e62f90d76bf84b9b6eb1509d11409f9b784bc7b052458a4596b81961fac8fe57d7b39ed104b4fb2770ae5aad7946bfd377d0eb91ab92a383447e834c3257dec56686551d08178f2d5f40d9fad615293e46c9f5fc23cf187258e121213b1d" + }, + { + "index": "0x2", + "signature": "0x3a3cc8c20c5cdbb6431ec1f749d94662670e87442debef119a4e6469ccb16a60a152d32754ab833efa513839b076c2aa1ceb7e536db3734b740e9192b10ee38695efafa5197796e7edf647191de83f4259d7cbb060f4bac5868be474037f49144d581c15d8aef9b07d78f18041a5f43c3c26352ebbf5583cd23070358c8fba39" + } + ], + "transactions": [ + { + "blockHash": "0xf58f4f43b3761f4863ad366c4a7e2a812ed68df9f7bcad6b502fd544665e7625", + "blockNumber": 2, + "from": "0x9d75e0ee66cfef16897b601624b60413d988ae7d", + "gas": "0x419ce0", + "hash": "0x69ced0162a0c3892e4eaa3091b831ac3aaeb772c062746b20891ceaf8a4fb429", + "input": "0x608060405234801561001057600080fd5b506103e3806100206000396000f300608060405260043610610057576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063299f7f9d1461005c5780633590b49f146100ec57806362e8d6ce14610155575b600080fd5b34801561006857600080fd5b5061007161016c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156100b1578082015181840152602081019050610096565b50505050905090810190601f1680156100de5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b3480156100f857600080fd5b50610153600480360381019080803590602001908201803590602001908080601f016020809104026020016040519081016040528093929190818152602001838380828437820191505050505050919291929050505061020e565b005b34801561016157600080fd5b5061016a6102c4565b005b606060008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156102045780601f106101d957610100808354040283529160200191610204565b820191906000526020600020905b8154815290600101906020018083116101e757829003601f168201915b5050505050905090565b7f5715c9562eaf8d524d564edb392acddefc81d8133e2fc3b8125a260b1b413fda816040518080602001828103825283818151815260200191508051906020019080838360005b83811015610270578082015181840152602081019050610255565b50505050905090810190601f16801561029d5780820380516001836020036101000a031916815260200191505b509250505060405180910390a180600090805190602001906102c0929190610312565b5050565b6040805190810160405280600d81526020017f48656c6c6f2c20576f726c6421000000000000000000000000000000000000008152506000908051906020019061030f929190610312565b50565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061035357805160ff1916838001178555610381565b82800160010185558215610381579182015b82811115610380578251825591602001919060010190610365565b5b50905061038e9190610392565b5090565b6103b491905b808211156103b0576000816000905550600101610398565b5090565b905600a165627a7a72305820f3088deb3d14c6893440e4769f2389e9335e04faa10e6de5b4c93af15d1a34e80029", + "nonce": "0x3460c30bd3e4e88a31d6d033b3a172859bf003258e9606fd63fb0d91f91f4e6", + "to": "0x0000000000000000000000000000000000000000", + "transactionIndex": "0x0", + "value": "0x0", + "gasPrice": "0x51f4d5c00", + "blockLimit": "0x1f5", + "chainId": "0x1", + "groupId": "0x1", + "extraData": "0x", + "signature": { + "r": "0x3416723318505669cca91689b213ff08ffb96d538210a0f691cfcfa9d529462b", + "s": "0xd3642f19c228e2e86689de9efc19ecbb68378a6bb7c219984431e93d60c89124", + "v": "0xc7935c199b680452eb37911856282b9c820322fd5fdec8a06b48cc3df4e8ed7d3d66a5adcc134cca609146ec0aed12827c35df07eed96042763c0926cf4223b7", + "signature": "0x3416723318505669cca91689b213ff08ffb96d538210a0f691cfcfa9d529462bd3642f19c228e2e86689de9efc19ecbb68378a6bb7c219984431e93d60c89124c7935c199b680452eb37911856282b9c820322fd5fdec8a06b48cc3df4e8ed7d3d66a5adcc134cca609146ec0aed12827c35df07eed96042763c0926cf4223b7" + } + } + ] + }, + "attachment": null +} ``` * 失败： @@ -1400,6 +1426,154 @@ http://127.0.0.1:5001/WeBASE-Node-Manager/block/blockByNumber/1/11 ``` +### 4.5 根据块高获取区块头 + + +#### 接口描述 + +> 返回 + +#### 接口URL + +**http://localhost:5001/WeBASE-Node-Manager/block/blockHeaderByNumber/{blockNumber}** + +#### 调用方法 + +HTTP GET + +#### 请求参数 + +**1）参数表** + +| **序号** | **中文** | **参数名** | **类型** | **最大长度** | **必填** | **说明** | +| -------- | -------- | ---------------- | ---------- | ------------ | -------- | -------- | +| 1 | 群组编号 | groupId | int | | 是 | | + +**2）数据格式** + +``` +http://localhost:5001/WeBASE-Node-Manager/block/blockHeaderByNumber/2 +``` + +#### 响应参数 +**1）数据格式** + +``` +{ + "code": 0, + "message": "success", + "data": { + "number": 2, + "hash": "0xf58f4f43b3761f4863ad366c4a7e2a812ed68df9f7bcad6b502fd544665e7625", + "parentHash": "0x489ee0c00527879f7e2470bde7b62e9ea30fadb242bcbd9ba582d0dee4958e2f", + "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "transactionsRoot": "0xade02313d3200f38dfc18cdc368241cf4c1cb7e72011edf847ec216efa43a99e", + "receiptsRoot": "0xb7c4b856c9335bd345c0b022057567a2223218e7a7dab822981467b29ac1e326", + "dbHash": "0x8cbc3f2c0e35a71738909e3b388efa6697084b05badd3a3bd3c64f0575c78c15", + "stateRoot": "0x8cbc3f2c0e35a71738909e3b388efa6697084b05badd3a3bd3c64f0575c78c15", + "sealer": "0x2", + "sealerList": [ + "06269e130f8220ebaa78e67832df0de6b4c5ee3f1b14e64ab2bae26510a4bcf997454b35067c1685d4343e6ad84b45c3b8690a858f2831a9247a97a27166ce1f", + "65bc44d398d99d95a9d404aa16e4bfbc2f9ebb40f20439ddef8575a139dc3a80310cfc98a035bd59a67cc5f659f519e3e99b855f3d27f21a889c23a14036d0c7", + "95efafa5197796e7edf647191de83f4259d7cbb060f4bac5868be474037f49144d581c15d8aef9b07d78f18041a5f43c3c26352ebbf5583cd23070358c8fba39", + "fe57d7b39ed104b4fb2770ae5aad7946bfd377d0eb91ab92a383447e834c3257dec56686551d08178f2d5f40d9fad615293e46c9f5fc23cf187258e121213b1d" + ], + "extraData": [], + "gasLimit": "0", + "gasUsed": "0", + "timestamp": "1619424150450", + "signatureList": [ + { + "index": "0x1", + "signature": "0xa05b5d220e41051fa80f212884d9cdda3a8973a4ac2d2dc74e42db32b459e5f595a61e30266f0e8bf7edb065ff107c6af5e6349f9ae518146dc686406ebbade165bc44d398d99d95a9d404aa16e4bfbc2f9ebb40f20439ddef8575a139dc3a80310cfc98a035bd59a67cc5f659f519e3e99b855f3d27f21a889c23a14036d0c7" + }, + { + "index": "0x3", + "signature": "0x48bb622e24b18f4eb601137d44b5d86e2c287be3aa849dce1768e87e75308ba69391e62f90d76bf84b9b6eb1509d11409f9b784bc7b052458a4596b81961fac8fe57d7b39ed104b4fb2770ae5aad7946bfd377d0eb91ab92a383447e834c3257dec56686551d08178f2d5f40d9fad615293e46c9f5fc23cf187258e121213b1d" + }, + { + "index": "0x2", + "signature": "0x3a3cc8c20c5cdbb6431ec1f749d94662670e87442debef119a4e6469ccb16a60a152d32754ab833efa513839b076c2aa1ceb7e536db3734b740e9192b10ee38695efafa5197796e7edf647191de83f4259d7cbb060f4bac5868be474037f49144d581c15d8aef9b07d78f18041a5f43c3c26352ebbf5583cd23070358c8fba39" + } + ] + } +} +``` + +### 4.4. 根据区块哈希获取区块头 + + +#### 接口描述 + +> 返回 + +#### 接口URL + +**http://localhost:5001/WeBASE-Node-Manager/block/blockHeaderByHash/{blockHash}** + +#### 调用方法 + +HTTP GET + +#### 请求参数 + +**1）参数表** + +| **序号** | **中文** | **参数名** | **类型** | **最大长度** | **必填** | **说明** | +| -------- | -------- | ---------------- | ---------- | ------------ | -------- | -------- | +| 1 | 群组编号 | groupId | int | | 是 | | + +**2）数据格式** + +``` +http://localhost:5001/WeBASE-Front/block/blockHeaderByHash/0xf58f4f43b3761f4863ad366c4a7e2a812ed68df9f7bcad6b502fd544665e7625 +``` + +#### 响应参数 +**1）数据格式** + +``` +{ + "code": 0, + "message": "success", + "data": { + "number": 2, + "hash": "0xf58f4f43b3761f4863ad366c4a7e2a812ed68df9f7bcad6b502fd544665e7625", + "parentHash": "0x489ee0c00527879f7e2470bde7b62e9ea30fadb242bcbd9ba582d0dee4958e2f", + "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "transactionsRoot": "0xade02313d3200f38dfc18cdc368241cf4c1cb7e72011edf847ec216efa43a99e", + "receiptsRoot": "0xb7c4b856c9335bd345c0b022057567a2223218e7a7dab822981467b29ac1e326", + "dbHash": "0x8cbc3f2c0e35a71738909e3b388efa6697084b05badd3a3bd3c64f0575c78c15", + "stateRoot": "0x8cbc3f2c0e35a71738909e3b388efa6697084b05badd3a3bd3c64f0575c78c15", + "sealer": "0x2", + "sealerList": [ + "06269e130f8220ebaa78e67832df0de6b4c5ee3f1b14e64ab2bae26510a4bcf997454b35067c1685d4343e6ad84b45c3b8690a858f2831a9247a97a27166ce1f", + "65bc44d398d99d95a9d404aa16e4bfbc2f9ebb40f20439ddef8575a139dc3a80310cfc98a035bd59a67cc5f659f519e3e99b855f3d27f21a889c23a14036d0c7", + "95efafa5197796e7edf647191de83f4259d7cbb060f4bac5868be474037f49144d581c15d8aef9b07d78f18041a5f43c3c26352ebbf5583cd23070358c8fba39", + "fe57d7b39ed104b4fb2770ae5aad7946bfd377d0eb91ab92a383447e834c3257dec56686551d08178f2d5f40d9fad615293e46c9f5fc23cf187258e121213b1d" + ], + "extraData": [], + "gasLimit": "0", + "gasUsed": "0", + "timestamp": "1619424150450", + "signatureList": [ + { + "index": "0x1", + "signature": "0xa05b5d220e41051fa80f212884d9cdda3a8973a4ac2d2dc74e42db32b459e5f595a61e30266f0e8bf7edb065ff107c6af5e6349f9ae518146dc686406ebbade165bc44d398d99d95a9d404aa16e4bfbc2f9ebb40f20439ddef8575a139dc3a80310cfc98a035bd59a67cc5f659f519e3e99b855f3d27f21a889c23a14036d0c7" + }, + { + "index": "0x3", + "signature": "0x48bb622e24b18f4eb601137d44b5d86e2c287be3aa849dce1768e87e75308ba69391e62f90d76bf84b9b6eb1509d11409f9b784bc7b052458a4596b81961fac8fe57d7b39ed104b4fb2770ae5aad7946bfd377d0eb91ab92a383447e834c3257dec56686551d08178f2d5f40d9fad615293e46c9f5fc23cf187258e121213b1d" + }, + { + "index": "0x2", + "signature": "0x3a3cc8c20c5cdbb6431ec1f749d94662670e87442debef119a4e6469ccb16a60a152d32754ab833efa513839b076c2aa1ceb7e536db3734b740e9192b10ee38695efafa5197796e7edf647191de83f4259d7cbb060f4bac5868be474037f49144d581c15d8aef9b07d78f18041a5f43c3c26352ebbf5583cd23070358c8fba39" + } + ] + } +} +``` + ## 5 合约管理模块 ### 5.1 查询合约列表 @@ -1810,7 +1984,27 @@ http://127.0.0.1:5001/WeBASE-Node-Manager/contract/transaction { "code": 0, "message": "success", - "data": {} + "data": { + "transactionHash": "0x69ced0162a0c3892e4eaa3091b831ac3aaeb772c062746b20891ceaf8a4fb429", + "transactionIndex": "0x0", + "root": "0x8cbc3f2c0e35a71738909e3b388efa6697084b05badd3a3bd3c64f0575c78c15", + "blockNumber": "2", + "blockHash": "0xf58f4f43b3761f4863ad366c4a7e2a812ed68df9f7bcad6b502fd544665e7625", + "from": "0x9d75e0ee66cfef16897b601624b60413d988ae7d", + "to": "0x0000000000000000000000000000000000000000", + "gasUsed": "316449", + "contractAddress": "0xa8af0ee580d8af674a60341030ddbc45431bc235", + "logs": [], + "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "status": "0x0", + "statusMsg": "None", + "input": "0x608060405234801561001057600080fd5b506103e3806100206000396000f300608060405260043610610057576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063299f7f9d1461005c5780633590b49f146100ec57806362e8d6ce14610155575b600080fd5b34801561006857600080fd5b5061007161016c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156100b1578082015181840152602081019050610096565b50505050905090810190601f1680156100de5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b3480156100f857600080fd5b50610153600480360381019080803590602001908201803590602001908080601f016020809104026020016040519081016040528093929190818152602001838380828437820191505050505050919291929050505061020e565b005b34801561016157600080fd5b5061016a6102c4565b005b606060008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156102045780601f106101d957610100808354040283529160200191610204565b820191906000526020600020905b8154815290600101906020018083116101e757829003601f168201915b5050505050905090565b7f5715c9562eaf8d524d564edb392acddefc81d8133e2fc3b8125a260b1b413fda816040518080602001828103825283818151815260200191508051906020019080838360005b83811015610270578082015181840152602081019050610255565b50505050905090810190601f16801561029d5780820380516001836020036101000a031916815260200191505b509250505060405180910390a180600090805190602001906102c0929190610312565b5050565b6040805190810160405280600d81526020017f48656c6c6f2c20576f726c6421000000000000000000000000000000000000008152506000908051906020019061030f929190610312565b50565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061035357805160ff1916838001178555610381565b82800160010185558215610381579182015b82811115610380578251825591602001919060010190610365565b5b50905061038e9190610392565b5090565b6103b491905b808211156103b0576000816000905550600101610398565b5090565b905600a165627a7a72305820f3088deb3d14c6893440e4769f2389e9335e04faa10e6de5b4c93af15d1a34e80029", + "output": "0x", + "txProof": null, + "receiptProof": null, + "message": null, + "statusOK": true + } } ``` From 7b054f9268167a1db2988025b4447059a7b46cb4 Mon Sep 17 00:00:00 2001 From: CodingCattwo <847701726@qq.com> Date: Mon, 12 Jul 2021 11:11:29 +0800 Subject: [PATCH 12/26] add disabled auth doc --- docs/WeBASE-Node-Manager/appendix.md | 15 +++++++++++++-- images/WeBASE/mgr/api_with_header_account.png | Bin 0 -> 12961 bytes images/WeBASE/mgr/disable_auth.png | Bin 0 -> 13846 bytes 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 images/WeBASE/mgr/api_with_header_account.png create mode 100644 images/WeBASE/mgr/disable_auth.png diff --git a/docs/WeBASE-Node-Manager/appendix.md b/docs/WeBASE-Node-Manager/appendix.md index d41c40c7..16296f10 100644 --- a/docs/WeBASE-Node-Manager/appendix.md +++ b/docs/WeBASE-Node-Manager/appendix.md @@ -131,13 +131,24 @@ Could not find method compileOnly() for arguments [[org.projectlombok:lombok:1.1 INSERT INTO tb_account_info (account,account_pwd,role_id,create_time,modify_time)values('test', '$2a$10$F/aEB1iEx/FvVh0fMn6L/uyy.PkpTy8Kd9EdbqLGo7Bw7eCivpq.m',100000,now(),now()); ``` +##### 免鉴权调用 + +在`application.yml`中配置`constant.isUseSecurity`为`false`即可禁用WeBASE-Node-Manager的登录鉴权。 + +![](../../images/WeBASE/mgr/disable_auth.png) + +- 免鉴权后，默认使用的是管理员用户admin（管理员用户可以看到所有用户的数据），可以调过登陆直接访问WeBASE-Web节点管理台的主页，如`http://localhost:5000/#/home`。 +- 若需要指定用户进行接口调用，可以在请求的`headers`中增加`Account`字段，其值设置为节点管理服务的用户名，如获取开发者用户`developer1`对应数据（开发者用户只能看到自己所创建的数据）。 + +![](../../images/WeBASE/mgr/api_with_header_account.png) + ### 3. 配置文件解析 | 参数 | 默认值 | 描述 | |------|-------------|-----------| | server.port | 5001 | 当前服务端口 | -| server.servlet.context-path | /WeBASE-Node-Manager | 当前服务访问目录 | +| server.servlet.context-path | /WeBASE-Node-Manager | 当前服务访问路径 | | mybatis.typeAliasesPackage | com.webank.webase.node.mgr | mapper类扫描路径 | | mybatis.mapperLocations | classpath:mapper/*.xml | mybatis的xml路径 | | spring.datasource.driver-class-name | com.mysql.cj.jdbc.Driver | mysql驱动 | @@ -160,7 +171,7 @@ INSERT INTO tb_account_info (account,account_pwd,role_id,create_time,modify_time | constant.blockRetainMax | 10000 | 表中区块保留的条数（开启constant.isDeleteInfo时有效） | | constant.verificationCodeMaxAge | 300 | y验证码有效时长（秒） | | constant.authTokenMaxAge | 1800 | 登录token有效时长（秒） | -| constant.isUseSecurity | true | 是否启用登录鉴权 | +| constant.isUseSecurity | true | 是否启用登录鉴权，若false则默认使用admin权限免登陆鉴权 | | constant.aesKey | ERTadb83f9ege39k | aes加密key（16位），建议更改 | | constant.jwtSecret | S3g4HtJyg7G6Hg0Ln3g4H5Jyg7H6f9dL | jwt生成时用到的key，建议更改 | | constant.frontUrl | http://%1s:%2d/WeBASE-Front/%3s | 前置服务的请求路径 | diff --git a/images/WeBASE/mgr/api_with_header_account.png b/images/WeBASE/mgr/api_with_header_account.png new file mode 100644 index 0000000000000000000000000000000000000000..736c090ed9f5f7c15d7b187c7693781ae7ffe049 GIT binary patch literal 12961 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 literal 0 HcmV?d00001 diff --git a/images/WeBASE/mgr/disable_auth.png b/images/WeBASE/mgr/disable_auth.png new file mode 100644 index 0000000000000000000000000000000000000000..85b2dd927d95d527b3100acf948f7528509d5230 GIT binary patch literal 13846 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 G|33g)`Xw&_ literal 0 HcmV?d00001 From c863d1a3ac63549d6caa3b887e40e5a3a744ecb8 Mon Sep 17 00:00:00 2001 From: CodingCattwo <847701726@qq.com> Date: Mon, 12 Jul 2021 11:25:53 +0800 Subject: [PATCH 13/26] update upgrade --- docs/WeBASE-Front/upgrade.md | 5 +++++ docs/WeBASE-Node-Manager/appendix.md | 2 +- docs/WeBASE-Node-Manager/upgrade.md | 12 ++++++++++++ docs/WeBASE/ChangeLOG.md | 14 ++++++++++++++ release_note.txt | 2 +- 5 files changed, 33 insertions(+), 2 deletions(-) diff --git a/docs/WeBASE-Front/upgrade.md b/docs/WeBASE-Front/upgrade.md index 4032e84c..4b134f7b 100644 --- a/docs/WeBASE-Front/upgrade.md +++ b/docs/WeBASE-Front/upgrade.md @@ -10,6 +10,11 @@ WeBASE-Front升级的必须步骤： 各个版本的具体修改可参考下文 +#### v1.5.2 +- 优化合约IDE Java项目导出功能，支持多用户与channel端口检查 +- 合约仓库新增Asset资产合约 +- 增加交易组装接口`/tran/convertRawTxStr`和编码交易函数接口`/trans/encodeFunction` + #### v1.5.1 - 合约IDE支持导出合约的Java工程脚手架 - 合约仓库新增SmartDev存证合约 diff --git a/docs/WeBASE-Node-Manager/appendix.md b/docs/WeBASE-Node-Manager/appendix.md index 16296f10..100be352 100644 --- a/docs/WeBASE-Node-Manager/appendix.md +++ b/docs/WeBASE-Node-Manager/appendix.md @@ -131,7 +131,7 @@ Could not find method compileOnly() for arguments [[org.projectlombok:lombok:1.1 INSERT INTO tb_account_info (account,account_pwd,role_id,create_time,modify_time)values('test', '$2a$10$F/aEB1iEx/FvVh0fMn6L/uyy.PkpTy8Kd9EdbqLGo7Bw7eCivpq.m',100000,now(),now()); ``` -##### 免鉴权调用 +##### 免鉴权调用（联调） 在`application.yml`中配置`constant.isUseSecurity`为`false`即可禁用WeBASE-Node-Manager的登录鉴权。 diff --git a/docs/WeBASE-Node-Manager/upgrade.md b/docs/WeBASE-Node-Manager/upgrade.md index 30ec2e8c..8b689c41 100644 --- a/docs/WeBASE-Node-Manager/upgrade.md +++ b/docs/WeBASE-Node-Manager/upgrade.md @@ -12,6 +12,18 @@ WeBASE-Node-Manager升级的必须步骤： 各个版本的具体修改可参考下文 +#### v1.5.2 +- 优化合约IDE Java项目导出功能，支持多用户与channel端口检查 +- 合约仓库新增Asset资产合约 +- 优化免登陆鉴权模式，方便联调 + + +##### 数据表更新 + +执行webase-node-mgr中`script/upgrade`目录中的`v151_v152.sql`即可更新数据表，可通过`mysql -e source v151_v152.sql`命令执行 +- 注：更新前提前备份mysql数据 + + #### v1.5.1 - 新增导出合约Java工程脚手架 - 新增合约仓库接口 diff --git a/docs/WeBASE/ChangeLOG.md b/docs/WeBASE/ChangeLOG.md index 83e33efa..18202cbf 100644 --- a/docs/WeBASE/ChangeLOG.md +++ b/docs/WeBASE/ChangeLOG.md @@ -3,6 +3,20 @@ ## 支持FISCO-BCOS 2.X.X系列版本 +### WeBASE v1.5.2 + +WeBASE v1.5.2 版本支持 FISCO-BCOS 2.5.x及以上版本。WeBASE 子系统推荐使用下表的版本搭配，FISCO-BCOS 推荐使用 [FISCO BCOS 2.7.2](https://github.com/FISCO-BCOS/FISCO-BCOS/releases/tag/v2.7.2)版本。 + +| WeBASE子系统名称 | 配套版本地址 | FISCO-BCOS 2.X.X | +| ------------------------------------------------------------ | ------------------------------------------------------------ | ------------------------------------------------------------ | +| [节点前置服务](https://webasedoc.readthedocs.io/zh_CN/latest/docs/WeBASE-Front/index.html) | [WeBASE-Front Release v1.5.2](https://github.com/WeBankFinTech/WeBASE-Front/releases/tag/v1.5.2) | [FISCO BCOS 2.7.2](https://github.com/FISCO-BCOS/FISCO-BCOS/releases/tag/v2.7.2) | +| [节点管理服务](https://webasedoc.readthedocs.io/zh_CN/latest/docs/WeBASE-Node-Manager/index.html) | [WeBASE-Node-Manager Release v1.5.2](https://github.com/WeBankFinTech/WeBASE-Node-Manager/releases/tag/v1.5.2) | [FISCO BCOS 2.7.2](https://github.com/FISCO-BCOS/FISCO-BCOS/releases/tag/v2.7.2) | +| [WeBASE管理平台](https://webasedoc.readthedocs.io/zh_CN/latest/docs/WeBASE-Web/index.html) | [WeBASE-Web Release v1.5.2](https://github.com/WeBankFinTech/WeBASE-Web/releases/tag/v1.5.2) | [FISCO BCOS 2.7.2](https://github.com/FISCO-BCOS/FISCO-BCOS/releases/tag/v2.7.2) | +| [签名服务](https://webasedoc.readthedocs.io/zh_CN/latest/docs/WeBASE-Sign/index.html) | [WeBASE-Sign Release v1.5.0](https://github.com/WeBankFinTech/WeBASE-Sign/releases/tag/v1.5.0) | [FISCO BCOS 2.7.2](https://github.com/FISCO-BCOS/FISCO-BCOS/releases/tag/v2.7.2) | +| [交易服务](https://webasedoc.readthedocs.io/zh_CN/latest/docs/WeBASE-Transaction/index.html) | [WeBASE-Transaction Release v1.4.0](https://github.com/WeBankFinTech/WeBASE-Transaction/releases/tag/v1.4.0) | [FISCO BCOS 2.7.2](https://github.com/FISCO-BCOS/FISCO-BCOS/releases/tag/v2.7.2) | + + + ### WeBASE v1.5.1 WeBASE v1.5.1 版本支持 FISCO-BCOS 2.5.x及以上版本。WeBASE 子系统推荐使用下表的版本搭配，FISCO-BCOS 推荐使用 [FISCO BCOS 2.7.2](https://github.com/FISCO-BCOS/FISCO-BCOS/releases/tag/v2.7.2)版本。 diff --git a/release_note.txt b/release_note.txt index de27550e..59b432c2 100644 --- a/release_note.txt +++ b/release_note.txt @@ -1 +1 @@ -v1.5.1 +v1.5.2 From e6697b340e2ee5c18171446f3fc22d010e7afa72 Mon Sep 17 00:00:00 2001 From: CodingCattwo <847701726@qq.com> Date: Mon, 12 Jul 2021 16:09:38 +0800 Subject: [PATCH 14/26] add mariadb 10.2 installation --- docs/WeBASE/install.md | 39 ++++++++++++++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/docs/WeBASE/install.md b/docs/WeBASE/install.md index e19b298d..b5aa9d35 100644 --- a/docs/WeBASE/install.md +++ b/docs/WeBASE/install.md @@ -522,14 +522,43 @@ java -version ### 2. 数据库部署 -此处以Centos安装*MariaDB*为例。*MariaDB*数据库是 MySQL 的一个分支，主要由开源社区在维护，采用 GPL 授权许可。*MariaDB*完全兼容 MySQL，包括API和命令行。其他安装方式请参考[MySQL官网](https://dev.mysql.com/downloads/mysql/)。 - #### ① 安装MariaDB -- 安装命令 +此处以CentOS 7(x86_64)安装*MariaDB 10.2*为例。*MariaDB*数据库是 MySQL 的一个分支，主要由开源社区在维护，采用 GPL 授权许可。*MariaDB*完全兼容 MySQL，包括API和命令行。MariaDB 10.2版本对应Mysql 5.7。其他安装方式请参考[MySQL官网](https://dev.mysql.com/downloads/mysql/)。 -```shell -sudo yum install -y mariadb* +使用`vi`或`vim`创建新文件`/etc/yum.repos.d/mariadb.repo`，并写入下文的文件内容（参考[MariaDB中科大镜像源修改](http://mirrors.ustc.edu.cn/help/mariadb.html)进行配置） + +- 创建repo文件 +```Bash +sudo vi /etc/yum.repos.d/mariadb.repo +``` + +- 文件内容，此处使用的是中科大镜像源 +```Bash +# MariaDB 10.2 CentOS repository list - created 2021-07-12 07:37 UTC +# http://downloads.mariadb.org/mariadb/repositories/ +[mariadb] +name = MariaDB +baseurl = https://mirrors.ustc.edu.cn/mariadb/yum/10.2/centos7-amd64 +gpgkey=https://mirrors.ustc.edu.cn/mariadb/yum/RPM-GPG-KEY-MariaDB +gpgcheck=1 +``` + +- 更新yum源缓存数据 +``` +yum clean all +yum makecache all +``` + +- 安装`MariaDB 10.2` +- 如果已存在使用`sudo yum install -y mariadb*`命令安装的MariaDB，其版本默认为5.5版本，对应Mysql版本为5.5。新版本MariaDB无法兼容升级，需要先**卸载旧版本**的MariaDB，卸载前需要**备份**数据库内容，卸载命令可参考`yum remove mariadb` +``` +sudo yum install MariaDB-server MariaDB-client -y +``` + +若安装时遇到错误`“Failed to connect to 2001:da8:d800:95::110: Network is unreachable”`，将源地址中的 `mirrors.ustc.edu.cn` 替换为 `ipv4.mirrors.ustc.edu.cn` 以强制使用 IPv4： +``` +sudo sed -i 's#//mirrors.ustc.edu.cn#//ipv4.mirrors.ustc.edu.cn#g' /etc/yum.repos.d/mariadb ``` - 启停 From 04e5d39b07b73cb3d9036b4d6b04202a243b332e Mon Sep 17 00:00:00 2001 From: CodingCattwo <847701726@qq.com> Date: Mon, 12 Jul 2021 16:09:44 +0800 Subject: [PATCH 15/26] add upgrade --- docs/WeBASE-Front/upgrade.md | 2 +- docs/WeBASE-Web/upgrade.md | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/WeBASE-Front/upgrade.md b/docs/WeBASE-Front/upgrade.md index 4b134f7b..aff93730 100644 --- a/docs/WeBASE-Front/upgrade.md +++ b/docs/WeBASE-Front/upgrade.md @@ -11,7 +11,7 @@ WeBASE-Front升级的必须步骤： 各个版本的具体修改可参考下文 #### v1.5.2 -- 优化合约IDE Java项目导出功能，支持多用户与channel端口检查 +- 优化合约Java项目导出功能，支持批量编译合约，支持多用户与channel端口检查 - 合约仓库新增Asset资产合约 - 增加交易组装接口`/tran/convertRawTxStr`和编码交易函数接口`/trans/encodeFunction` diff --git a/docs/WeBASE-Web/upgrade.md b/docs/WeBASE-Web/upgrade.md index ac4ccb82..85ed46d5 100644 --- a/docs/WeBASE-Web/upgrade.md +++ b/docs/WeBASE-Web/upgrade.md @@ -8,6 +8,10 @@ WeBASE-Web升级的必须步骤： 各个版本的具体修改可参考下文 +#### v1.5.2 +- 优化合约Java项目导出功能，支持批量编译合约，支持多用户与channel端口检查 +- 合约仓库新增Asset资产合约 + #### v1.5.1 - 新增导出合约Java工程脚手架 - 新增合约仓库 From 871a09742d8a05dfbef1264d8bbf429748bd16a2 Mon Sep 17 00:00:00 2001 From: CodingCattwo <847701726@qq.com> Date: Mon, 12 Jul 2021 17:06:10 +0800 Subject: [PATCH 16/26] add centos 8 desc --- docs/WeBASE/install.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/WeBASE/install.md b/docs/WeBASE/install.md index b5aa9d35..96e135f0 100644 --- a/docs/WeBASE/install.md +++ b/docs/WeBASE/install.md @@ -522,9 +522,11 @@ java -version ### 2. 数据库部署 -#### ① 安装MariaDB +#### ① CentOS安装MariaDB -此处以CentOS 7(x86_64)安装*MariaDB 10.2*为例。*MariaDB*数据库是 MySQL 的一个分支，主要由开源社区在维护，采用 GPL 授权许可。*MariaDB*完全兼容 MySQL，包括API和命令行。MariaDB 10.2版本对应Mysql 5.7。其他安装方式请参考[MySQL官网](https://dev.mysql.com/downloads/mysql/)。 +此处以**CentOS 7(x86_64)**安装**MariaDB 10.2**为例。*MariaDB*数据库是 MySQL 的一个分支，主要由开源社区在维护，采用 GPL 授权许可。*MariaDB*完全兼容 MySQL，包括API和命令行。MariaDB 10.2版本对应Mysql 5.7。其他安装方式请参考[MySQL官网](https://dev.mysql.com/downloads/mysql/)。 +- CentOS 7 默认MariaDB为5.5版本，安装10.2版本需要按下文进行10.2版本的配置。 +- 若使用CentOS 8则直接使用`sudo yum install -y mariadb*`即可安装MariaDB 10.3，并跳到下文的 *启停* 章节即可。 使用`vi`或`vim`创建新文件`/etc/yum.repos.d/mariadb.repo`，并写入下文的文件内容（参考[MariaDB中科大镜像源修改](http://mirrors.ustc.edu.cn/help/mariadb.html)进行配置） From 2ed1f829c52527b1f3fdbc7a317187437cc9c05e Mon Sep 17 00:00:00 2001 From: CodingCattwo <847701726@qq.com> Date: Fri, 16 Jul 2021 11:55:20 +0800 Subject: [PATCH 17/26] update upgrade desc --- docs/WeBASE-Front/upgrade.md | 1 + docs/WeBASE-Node-Manager/upgrade.md | 3 ++- docs/WeBASE-Web/upgrade.md | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/WeBASE-Front/upgrade.md b/docs/WeBASE-Front/upgrade.md index aff93730..46d3932f 100644 --- a/docs/WeBASE-Front/upgrade.md +++ b/docs/WeBASE-Front/upgrade.md @@ -14,6 +14,7 @@ WeBASE-Front升级的必须步骤： - 优化合约Java项目导出功能，支持批量编译合约，支持多用户与channel端口检查 - 合约仓库新增Asset资产合约 - 增加交易组装接口`/tran/convertRawTxStr`和编码交易函数接口`/trans/encodeFunction` +- 支持合约IDE绑定合约地址、支持无私钥用户时交易窗口直接创建私钥 #### v1.5.1 - 合约IDE支持导出合约的Java工程脚手架 diff --git a/docs/WeBASE-Node-Manager/upgrade.md b/docs/WeBASE-Node-Manager/upgrade.md index 8b689c41..086b11c7 100644 --- a/docs/WeBASE-Node-Manager/upgrade.md +++ b/docs/WeBASE-Node-Manager/upgrade.md @@ -15,7 +15,8 @@ WeBASE-Node-Manager升级的必须步骤： #### v1.5.2 - 优化合约IDE Java项目导出功能，支持多用户与channel端口检查 - 合约仓库新增Asset资产合约 -- 优化免登陆鉴权模式，方便联调 +- 优化免登陆鉴权模式、增加Swagger、支持开发者导出私钥、支持合约IDE绑定合约地址 +- 修复异常合约列表排序、修复获取区块头接口 ##### 数据表更新 diff --git a/docs/WeBASE-Web/upgrade.md b/docs/WeBASE-Web/upgrade.md index 85ed46d5..220790ce 100644 --- a/docs/WeBASE-Web/upgrade.md +++ b/docs/WeBASE-Web/upgrade.md @@ -11,6 +11,8 @@ WeBASE-Web升级的必须步骤： #### v1.5.2 - 优化合约Java项目导出功能，支持批量编译合约，支持多用户与channel端口检查 - 合约仓库新增Asset资产合约 +- 优化交易弹窗，支持无私钥用户时直接创建私钥 +- 支持开发者导出私钥、支持合约IDE绑定合约地址 #### v1.5.1 - 新增导出合约Java工程脚手架 From e5eba2facdce57584c9ea53f2cf025b004828bd0 Mon Sep 17 00:00:00 2001 From: "42059349@qq.com" <42059349@qq.com> Date: Mon, 19 Jul 2021 14:59:38 +0800 Subject: [PATCH 18/26] add appintegration --- .../api.md} | 68 +------ docs/WeBASE-APP-SDK/appintegration.md | 172 ++++++++++++++++++ docs/WeBASE-APP-SDK/appintegrationlist.md | 30 +++ docs/WeBASE-APP-SDK/desc.md | 56 ++++++ docs/WeBASE-APP-SDK/index.md | 11 ++ docs/WeBASE-Node-Manager/index.md | 1 - 6 files changed, 270 insertions(+), 68 deletions(-) rename docs/{WeBASE-Node-Manager/appintegration.md => WeBASE-APP-SDK/api.md} (96%) create mode 100644 docs/WeBASE-APP-SDK/appintegration.md create mode 100644 docs/WeBASE-APP-SDK/appintegrationlist.md create mode 100644 docs/WeBASE-APP-SDK/desc.md create mode 100644 docs/WeBASE-APP-SDK/index.md diff --git a/docs/WeBASE-Node-Manager/appintegration.md b/docs/WeBASE-APP-SDK/api.md similarity index 96% rename from docs/WeBASE-Node-Manager/appintegration.md rename to docs/WeBASE-APP-SDK/api.md index fc0360db..365d9747 100644 --- a/docs/WeBASE-Node-Manager/appintegration.md +++ b/docs/WeBASE-APP-SDK/api.md @@ -1,75 +1,9 @@ -# 应用接入说明 - -应用管理是WeBASE管理台提供的一种第三方应用接入功能。其他应用可以通过WeBASE通用API来开发自己的运维管理台。接入的步骤如下： - -1. 通过WeBASE管理平台获得注册信息，并通过API向WeBASE注册服务。 -2. 通过WeBASE提供的基础能力API和WeBASE连通。 - -## 签名 - -### 签名说明 - -第三方应用从WeBASE管理平台获取注册信息**WeBASE的IP和端口、为应用分配的`appKey`（应用Key）和`appSecret`（应用密码，应用自己保存，不要暴露）**，向WeBASE发送请求时，需要使用应用分配的`appSecret`对请求进行签名。WeBASE收到请求后，根据`appKey`查询应用对应的`appSecret`，使用相同规则对请求进行签名验证。只有在验证通过后，WeBASE才会对请求进行相应的处理。 - -* 每个URL请求需带以下三个参数： - -| 参数名 | 类型 | 描述 | 参数值 | 备注 | -| --------- | ------ | -------------------- | ------------- | --------------------------------------------- | -| timestamp | long | 请求的时间戳（毫秒） | 1614928857832 | 当前时间戳，有效期默认5分钟 | -| appKey | String | 应用Key | fdsf78aW | 从WeBASE管理平台获取 | -| signature | String | 签名串 | 15B8F38... | 从WeBASE管理平台获取appSecret对appKey做的签名 | - -### 签名规则 - -使用MD5对`timestamp`、`appKey`加密并转大写得到签名值`signature` - -``` -public static String md5Encrypt(long timestamp, String appKey, String appSecret) { - try { - String dataStr = timestamp + appKey + appSecret; - MessageDigest m = MessageDigest.getInstance("MD5"); - m.update(dataStr.getBytes("UTF8")); - byte s[] = m.digest(); - String result = ""; - for (int i = 0; i < s.length; i++) { - result += Integer.toHexString((0x000000FF & s[i]) | 0xFFFFFF00).substring(6); - } - return result.toUpperCase(); - } catch (Exception e) { - e.printStackTrace(); - } - return ""; - } -``` - -### 示例 - -* 参数值： - -| 参数 | 参数值 | -| --------- | ---------------------------------- | -| timestamp | `1614928857832` | -| appKey | `fdsf78aW` | -| appSecret | `oMdarsqFOsSKThhvXagTpNdoOcIJxUwQ` | - -* 签名后的 `signature` 为 - -```Bash -EEFD7CD030E6B311AA85B053A90E8A31 -``` - - - - - -## WeBASE通用API - +# API ## 1 应用管理模块 ### 1.1 应用注册 - #### 传输协议规范 * 网络传输协议：使用HTTP协议 diff --git a/docs/WeBASE-APP-SDK/appintegration.md b/docs/WeBASE-APP-SDK/appintegration.md new file mode 100644 index 00000000..d8d3e367 --- /dev/null +++ b/docs/WeBASE-APP-SDK/appintegration.md @@ -0,0 +1,172 @@ +# 接入说明 + +应用管理是WeBASE管理台提供的一种第三方应用接入功能。其他应用可以通过WeBASE通用API来开发自己的运维管理台。接入的步骤如下： + +1. 通过WeBASE管理平台获得注册信息，并通过API向WeBASE注册服务。 +2. 通过WeBASE提供的基础能力API和WeBASE连通。 + + +## 应用集成SDK + +### SDK简介 +WeBASE-APP-SDK是应用集成SDK，提供调用WeBASE-Node-Manager的接口，方便WeBASE管理台接入第三方应用。 +​ 从`v1.5.1`开始，提供应用集成SDK，方便应用接入。接口API可以查看[WeBASE通用API](./api.html)。调用之前需要添加依赖和初始化应用信息。 + +- `v1.5.1`及其以上版本，应用配置AppConfig的属性`isTransferEncrypt`需和WeBASE-Node-Manager的配置文件`/conf/application.yml`下的配置`constant.isTransferEncrypt`相同，默认为`true`。 +- 如果`v1.5.0`需要使用SDK，应用配置AppConfig的属性`isTransferEncrypt`需设置为`false`。`v1.5.1`及其以上版本新增的接口调用不了。 + +### 添加依赖 + +- 添加 SDK 的依赖，以Gradle为例 + +```java +repositories { + maven { url "http://maven.aliyun.com/nexus/content/groups/public/" } + maven { url "https://oss.sonatype.org/content/repositories/snapshots" } +} +dependencies { + implementation 'com.webank:webase-app-sdk:1.5.1-SNAPSHOT' + implementation 'org.bouncycastle:bcprov-jdk15on:1.67' + implementation 'org.apache.commons:commons-lang3:3.8.1' + implementation 'com.squareup.okhttp3:okhttp:4.8.1' + implementation 'com.fasterxml.jackson.core:jackson-databind:2.11.0' + implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.0' + implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.0' + implementation 'com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.0' + implementation 'org.projectlombok:lombok:1.18.12' + implementation 'org.apache.logging.log4j:log4j-api:2.13.3' + implementation 'org.apache.logging.log4j:log4j-core:2.13.3' + implementation 'org.apache.logging.log4j:log4j-slf4j-impl:2.13.3' +} +``` + +### 配置说明 + +- 应用配置 + +``` +public class AppConfig { + // 节点管理服务地址 + private String nodeManagerUrl; + // 应用Key + private String appKey; + // 应用密码 + private String appSecret; + // 是否加密传输 + private boolean isTransferEncrypt; +} +``` + +- Http请求配置 + +``` +public class HttpConfig { + // 连接超时（默认30s） + private int connectTimeout; + // 读取超时（默认30s） + private int readTimeout; + // 写超时（默认30s） + private int writeTimeout; +} +``` + +### 调用示例 + +完整示例请查看[SDK示例](https://github.com/WeBankFinTech/WeBASE-APP-SDK/blob/main/src/test/java/com/webank/webase/app/sdk/ClientTest.java)。 + +```java +public class ClientTest { + + // WeBASE-Node-Manager的url + private static String url = "http://localhost:5001"; + private static String appKey = "RUPCNAsd"; + private static String appSecret = "65KiXNxUpPywVwQxM7SFsMHsKmCbpGrQ"; + private static boolean isTransferEncrypt = true; + + private static AppClient appClient = null; + + public static void main(String[] args) { + try { + initClient(); + appRegister(); + } catch (Exception e) { + e.printStackTrace(); + } + System.exit(0); + } + + public static void initClient() { + // 未设置httpConfig时，默认http连接均为30s + HttpConfig httpConfig = new HttpConfig(30, 30, 30); + appClient = new AppClient(url, appKey, appSecret, isTransferEncrypt, httpConfig); + System.out.println("testInitClient:" + JacksonUtil.objToString(appClient)); + } + + public static void appRegister() throws Exception { + try { + ReqAppRegister req = new ReqAppRegister(); + req.setAppIp("127.0.0.1"); + req.setAppPort(5001); + req.setAppLink("https://127.0.0.1:5001/"); + appClient.appRegister(req); + System.out.println("appRegister end."); + } catch (Exception e) { + e.printStackTrace(); + } + } +} +``` + +## 签名 +使用SDK时，SDK会自动填充。 + +### 签名说明 + +第三方应用从WeBASE管理平台获取注册信息**WeBASE的IP和端口、为应用分配的`appKey`（应用Key）和`appSecret`（应用密码，应用自己保存，不要暴露）**，向WeBASE发送请求时，需要使用应用分配的`appSecret`对请求进行签名。WeBASE收到请求后，根据`appKey`查询应用对应的`appSecret`，使用相同规则对请求进行签名验证。只有在验证通过后，WeBASE才会对请求进行相应的处理。 + +* 每个URL请求需带以下三个参数： + +| 参数名 | 类型 | 描述 | 参数值 | 备注 | +| --------- | ------ | -------------------- | ------------- | --------------------------------------------- | +| timestamp | long | 请求的时间戳（毫秒） | 1614928857832 | 当前时间戳，有效期默认5分钟 | +| appKey | String | 应用Key | fdsf78aW | 从WeBASE管理平台获取 | +| signature | String | 签名串 | 15B8F38... | 从WeBASE管理平台获取appSecret对appKey做的签名 | + +### 签名规则 + +使用MD5对`timestamp`、`appKey`加密并转大写得到签名值`signature` + +``` +public static String md5Encrypt(long timestamp, String appKey, String appSecret) { + try { + String dataStr = timestamp + appKey + appSecret; + MessageDigest m = MessageDigest.getInstance("MD5"); + m.update(dataStr.getBytes("UTF8")); + byte s[] = m.digest(); + String result = ""; + for (int i = 0; i < s.length; i++) { + result += Integer.toHexString((0x000000FF & s[i]) | 0xFFFFFF00).substring(6); + } + return result.toUpperCase(); + } catch (Exception e) { + e.printStackTrace(); + } + return ""; + } +``` + +### 示例 + +* 参数值： + +| 参数 | 参数值 | +| --------- | ---------------------------------- | +| timestamp | `1614928857832` | +| appKey | `fdsf78aW` | +| appSecret | `oMdarsqFOsSKThhvXagTpNdoOcIJxUwQ` | + +* 签名后的 `signature` 为 + +```Bash +EEFD7CD030E6B311AA85B053A90E8A31 +``` \ No newline at end of file diff --git a/docs/WeBASE-APP-SDK/appintegrationlist.md b/docs/WeBASE-APP-SDK/appintegrationlist.md new file mode 100644 index 00000000..86de6f37 --- /dev/null +++ b/docs/WeBASE-APP-SDK/appintegrationlist.md @@ -0,0 +1,30 @@ +# 实例列表 + +## 基于区块链的实体身份标识及可信数据交换解决方案 + +WeIdentity + WeBASE集成模式 + +git地址：https://github.com/WeBankFinTech/WeIdentity-Build-Tools + +文档地址：https://weidentity.readthedocs.io/zh_CN/latest/docs/deploy-via-web.html + + +## 基于FISCO BCOS 从0-1的供应链支付结算案例 + +FISCO BCOS Supply Chain Payment Settlement Demo created by Shanghai JiuYu Software Systems Co,Ltd. + +由上海久誉软件系统有限公司研发的针对基于 FISCO BCOS 的供应链支付结算案例。 + +git地址：https://github.com/jiuyu-software/supply-chain-demo + +文档地址：https://github.com/jiuyu-software/supply-chain-demo/blob/master/README.md + + +## 基于 FISCO BCOS实现的电子存证平台案例 + +由杭州亦笔科技有限公司开发的针对基于 FISCO BCOS 的区块链电子存证平台案例。 + +git地址：https://github.com/YibiOpen/evidence-chain-demo + +文档地址：https://github.com/YibiOpen/evidence-chain-demo/blob/master/README.md + diff --git a/docs/WeBASE-APP-SDK/desc.md b/docs/WeBASE-APP-SDK/desc.md new file mode 100644 index 00000000..b1720cb5 --- /dev/null +++ b/docs/WeBASE-APP-SDK/desc.md @@ -0,0 +1,56 @@ +# 应用管理 + + + +应用管理是WeBASE管理台提供的一种第三方应用接入功能。WeBASE作为底层运维平台，已经有了底层运维基础能力。各个应用可以利用这些基础能力来开发自己的运维管理台。这些可以利用的基础能力主要包括四个方面：1、链信息和链运维（权限，配置等）；2、合约；3、链的私钥账号；4、管理账号（登录态）。![](../../images/WeBASE-Console-Suit/app_intergrate.png) +这样的主要好处是： + +1. 各应用的进程管理还是自我管理，避免WeBASE过于笨重 +2. WeBASE提供的是规范，方便其他应用参考打通应用与WeBASE的联系 +3. 如果有扩展，WeBASE也方便提供API来实现 +4. 不破坏各应用自身的完整性 + + +管理台新增了应用管理菜单。新增应用有两种方式，一种是选择已有应用模板——目前仅支持WeID；另外一种是自定应用： + +![](../../images/WeBASE-Console-Suit/app_new.png) + +新增应用后，会生成应用相关的注册信息，为应用分配的`appKey`（应用Key）和`appSecret`（应用密码，应用自己保存，不要暴露），WeBASE的`IP`为内网IP，访问不了的话需对应修改： + +![](../../images/WeBASE-Console-Suit/app_register_info.png) + +第三方应用未向WeBASE进行注册时，WeBASE管理台不可以通过应用链接跳转到应用服务： + +![](../../images/WeBASE-Console-Suit/app_link_unable.png) + +第三方应用接入时，使用注册信息向WeBASE进行注册，调用相关OPEN API。第三方应用接入请参考【[应用接入说明](./appintegration.html)】。以下以 [WeIdentity](https://weidentity.readthedocs.io/zh_CN/latest/docs/weidentity-installation-by-web.html) 可视化页面接入为例： + +选择 WeID + WeBASE集成模式，从WeBASE复制注册信息： + +![](../../images/WeBASE-Console-Suit/app_weid_home.png) + +点击下一步时，WeID会向WeBASE进行注册并调用相关API，从WeBASE获取群组、节点、证书等相关信息： + +![](../../images/WeBASE-Console-Suit/app_weid_node.png) + +可以选择自动创建公私钥，或选择从WeBASE同步公私钥用户： + +![](../../images/WeBASE-Console-Suit/app_weid_user.png) + +![](../../images/WeBASE-Console-Suit/app_weid_userlist.png) + +部署WeID之后，WeID会将合约相关信息通过API导入WeBASE： + +![](../../images/WeBASE-Console-Suit/app_weid_deploy.png) + +![](../../images/WeBASE-Console-Suit/app_weid_deployed.png) + +![](../../images/WeBASE-Console-Suit/app_weid_contract.png) + +第三方应用向WeBASE进行注册后，在WeBASE管理台可以通过应用链接跳转到应用服务： + +注册后WeBASE将和应用间保持心跳。如果应用状态变成不能访问，则应用链接会置灰，变成不可跳转。 + +![](../../images/WeBASE-Console-Suit/app_link_enable.png) + + diff --git a/docs/WeBASE-APP-SDK/index.md b/docs/WeBASE-APP-SDK/index.md new file mode 100644 index 00000000..b63a6514 --- /dev/null +++ b/docs/WeBASE-APP-SDK/index.md @@ -0,0 +1,11 @@ +# 应用管理 + +```eval_rst +.. toctree:: + :maxdepth: 1 + + desc.md + appintegration.md + appintegrationlist.md + api.md +``` \ No newline at end of file diff --git a/docs/WeBASE-Node-Manager/index.md b/docs/WeBASE-Node-Manager/index.md index b08aca63..4363465c 100644 --- a/docs/WeBASE-Node-Manager/index.md +++ b/docs/WeBASE-Node-Manager/index.md @@ -7,7 +7,6 @@ README.md install.md interface.md - appintegration.md upgrade.md appendix.md ``` From 8cb74579187f2238a4b6328526b973253061aeb0 Mon Sep 17 00:00:00 2001 From: "42059349@qq.com" <42059349@qq.com> Date: Mon, 19 Jul 2021 15:01:55 +0800 Subject: [PATCH 19/26] add appintegration --- index.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/index.rst b/index.rst index e7f2846e..7ad1bb8d 100644 --- a/index.rst +++ b/index.rst @@ -22,6 +22,7 @@ WeBASE（WeBank Blockchain Application Software Extension） 是在区块链应 - `WeBASE版本信息 <./docs/WeBASE/ChangeLOG.html#fisco-bcos-2-x-x>`_ - `安装部署 <./docs/WeBASE-Install/index.html>`_ - `WeBASE管理平台使用手册 <./docs/WeBASE-Console-Suit/index.html>`_ + - `WeBASE应用管理 <./docs/WeBASE-APP-SDK/index.html>`_ - `WeBASE合约仓库 <./docs/WeBASE-Contract-Warehouse/index.html>`_ - `WeBASE实训插件方案 <./docs/WeBASE-Training-Plugin-Plan/index.html>`_ From eb6b5bf70032bbabb662960947dc6ce0b8f1531a Mon Sep 17 00:00:00 2001 From: "42059349@qq.com" <42059349@qq.com> Date: Mon, 19 Jul 2021 15:20:29 +0800 Subject: [PATCH 20/26] add --- index.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/index.rst b/index.rst index 7ad1bb8d..243227fd 100644 --- a/index.rst +++ b/index.rst @@ -125,6 +125,7 @@ WeBASE（WeBank Blockchain Application Software Extension） 是在区块链应 :caption: WeBASE使用指南 docs/WeBASE-Console-Suit/index.md + docs/WeBASE-APP-SDK/index.md docs/WeBASE-Contract-Warehouse/index.md docs/WeBASE-Training-Plugin-Plan/index.md docs/WeBASE/quick-start.md From 93443a003d4abb4cd10106c8f0dc7ee9fd485890 Mon Sep 17 00:00:00 2001 From: "42059349@qq.com" <42059349@qq.com> Date: Mon, 19 Jul 2021 15:32:41 +0800 Subject: [PATCH 21/26] add WeBASE --- docs/WeBASE-APP-SDK/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/WeBASE-APP-SDK/index.md b/docs/WeBASE-APP-SDK/index.md index b63a6514..a7da8ca0 100644 --- a/docs/WeBASE-APP-SDK/index.md +++ b/docs/WeBASE-APP-SDK/index.md @@ -1,4 +1,4 @@ -# 应用管理 +# WeBASE应用管理 ```eval_rst .. toctree:: From d55df622172c6710e897c2ce95a23e9516f7371c Mon Sep 17 00:00:00 2001 From: "42059349@qq.com" <42059349@qq.com> Date: Mon, 19 Jul 2021 15:35:14 +0800 Subject: [PATCH 22/26] bugfix --- docs/WeBASE-APP-SDK/api.md | 2 +- docs/WeBASE-APP-SDK/appintegrationlist.md | 2 +- docs/WeBASE-APP-SDK/desc.md | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/docs/WeBASE-APP-SDK/api.md b/docs/WeBASE-APP-SDK/api.md index 365d9747..2946b5c0 100644 --- a/docs/WeBASE-APP-SDK/api.md +++ b/docs/WeBASE-APP-SDK/api.md @@ -1,4 +1,4 @@ -# API +# 接口说明 ## 1 应用管理模块 diff --git a/docs/WeBASE-APP-SDK/appintegrationlist.md b/docs/WeBASE-APP-SDK/appintegrationlist.md index 86de6f37..b228e123 100644 --- a/docs/WeBASE-APP-SDK/appintegrationlist.md +++ b/docs/WeBASE-APP-SDK/appintegrationlist.md @@ -1,4 +1,4 @@ -# 实例列表 +# 管理实例 ## 基于区块链的实体身份标识及可信数据交换解决方案 diff --git a/docs/WeBASE-APP-SDK/desc.md b/docs/WeBASE-APP-SDK/desc.md index b1720cb5..9153248d 100644 --- a/docs/WeBASE-APP-SDK/desc.md +++ b/docs/WeBASE-APP-SDK/desc.md @@ -2,7 +2,10 @@ -应用管理是WeBASE管理台提供的一种第三方应用接入功能。WeBASE作为底层运维平台，已经有了底层运维基础能力。各个应用可以利用这些基础能力来开发自己的运维管理台。这些可以利用的基础能力主要包括四个方面：1、链信息和链运维（权限，配置等）；2、合约；3、链的私钥账号；4、管理账号（登录态）。![](../../images/WeBASE-Console-Suit/app_intergrate.png) +应用管理是WeBASE管理台提供的一种第三方应用接入功能。WeBASE作为底层运维平台，已经有了底层运维基础能力。各个应用可以利用这些基础能力来开发自己的运维管理台。这些可以利用的基础能力主要包括四个方面：1、链信息和链运维（权限，配置等）；2、合约；3、链的私钥账号；4、管理账号（登录态）。 + +![](../../images/WeBASE-Console-Suit/app_intergrate.png) + 这样的主要好处是： 1. 各应用的进程管理还是自我管理，避免WeBASE过于笨重 From b2b068cc343d512919f7e208c12a383b4454c64c Mon Sep 17 00:00:00 2001 From: "42059349@qq.com" <42059349@qq.com> Date: Mon, 19 Jul 2021 15:36:25 +0800 Subject: [PATCH 23/26] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BB=8B=E7=BB=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/WeBASE-APP-SDK/desc.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/WeBASE-APP-SDK/desc.md b/docs/WeBASE-APP-SDK/desc.md index 9153248d..71982b8b 100644 --- a/docs/WeBASE-APP-SDK/desc.md +++ b/docs/WeBASE-APP-SDK/desc.md @@ -1,4 +1,4 @@ -# 应用管理 +# 功能介绍 From c4e3bd5acaebdbcf14880dd2e7c876d14fe4f37c Mon Sep 17 00:00:00 2001 From: marsli Date: Mon, 19 Jul 2021 16:04:32 +0800 Subject: [PATCH 24/26] fix permit array format --- docs/WeBASE-Training-Plugin-Plan/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/WeBASE-Training-Plugin-Plan/index.md b/docs/WeBASE-Training-Plugin-Plan/index.md index f7164eec..57f6ecfd 100644 --- a/docs/WeBASE-Training-Plugin-Plan/index.md +++ b/docs/WeBASE-Training-Plugin-Plan/index.md @@ -54,7 +54,7 @@ http://127.0.0.1:5001/WeBASE-Node-Manager/config/list?type=2 ```plain -permitUrlArray:/account/login,/account/pictureCheckCode,/login,/user/privateKey/**,/config/encrypt,/config/version,/front/refresh,/api/*,/config/list +permitUrlArray: /account/login,/account/pictureCheckCode,/login,/user/privateKey/**,/config/encrypt,/config/version,/front/refresh,/api/*,/config/list ``` - 修改constant.verificationCodeMaxAge，设置为与你的系统的session时间一致。 From a2b3357b6c7d4e6661c41911d8756149b74c5d96 Mon Sep 17 00:00:00 2001 From: CodingCattwo <847701726@qq.com> Date: Mon, 19 Jul 2021 17:24:28 +0800 Subject: [PATCH 25/26] fix jump mysql --- docs/WeBASE/install.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/WeBASE/install.md b/docs/WeBASE/install.md index 96e135f0..a2915910 100644 --- a/docs/WeBASE/install.md +++ b/docs/WeBASE/install.md @@ -44,7 +44,7 @@ MySQL-5.6或以上版本： mysql --version ``` -- Mysql安装部署可参考[数据库部署](#mysql) +- Mysql安装部署可参考[数据库部署](#mysql-install) #### 检查Python @@ -520,7 +520,7 @@ java -version ``` ### 2. 数据库部署 - + #### ① CentOS安装MariaDB @@ -633,8 +633,8 @@ mysql -utest -p123456 -h localhost -P 3306 mysql > create database webasenodemanager; ``` -### 3. Python部署 +### 3. Python部署 python版本要求使用python3.x, 推荐使用python3.6及以上版本 From 1c6ea6b6b620d26e007b3532c62c8880eed071ef Mon Sep 17 00:00:00 2001 From: CodingCattwo <847701726@qq.com> Date: Mon, 19 Jul 2021 17:38:43 +0800 Subject: [PATCH 26/26] update index of card --- index.rst | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/index.rst b/index.rst index 243227fd..097b6c41 100644 --- a/index.rst +++ b/index.rst @@ -26,6 +26,20 @@ WeBASE（WeBank Blockchain Application Software Extension） 是在区块链应 - `WeBASE合约仓库 <./docs/WeBASE-Contract-Warehouse/index.html>`_ - `WeBASE实训插件方案 <./docs/WeBASE-Training-Plugin-Plan/index.html>`_ + .. container:: card-holder + + .. container:: card ref + + .. raw:: html + +
+             解决方案 +

+ + - `WeBASE应用管理 <./docs/WeBASE-APP-SDK/index.html>`_ + - `WeBASE合约仓库 <./docs/WeBASE-Contract-Warehouse/index.html>`_ + - `WeBASE实训插件方案 <./docs/WeBASE-Training-Plugin-Plan/index.html>`_ + .. container:: card-holder .. container:: card ref