diff --git a/benchmarks/samples/fisco-bcos/helloworld/config.yaml b/benchmarks/samples/fisco-bcos/helloworld/config.yaml deleted file mode 100755 index 096d81e68..000000000 --- a/benchmarks/samples/fisco-bcos/helloworld/config.yaml +++ /dev/null @@ -1,26 +0,0 @@ -test: - name: Hello World - description: This is a helloworld benchmark of FISCO BCOS for caliper - workers: - number: 1 - rounds: - - label: get - description: Test performance of getting name - txNumber: - - 10000 - rateControl: - - type: fixed-rate - opts: - tps: 1000 - workload: - module: benchmarks/samples/fisco-bcos/helloworld/get.js - - label: set - description: Test performance of setting name - txNumber: - - 10000 - rateControl: - - type: fixed-rate - opts: - tps: 1000 - workload: - module: benchmarks/samples/fisco-bcos/helloworld/set.js diff --git a/benchmarks/samples/fisco-bcos/helloworld/get.js b/benchmarks/samples/fisco-bcos/helloworld/get.js deleted file mode 100755 index 18258490b..000000000 --- a/benchmarks/samples/fisco-bcos/helloworld/get.js +++ /dev/null @@ -1,47 +0,0 @@ -/* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -'use strict'; - -const { WorkloadModuleBase } = require('@hyperledger/caliper-core'); - -/** - * Workload module for the benchmark round. - */ -class GetWorkload extends WorkloadModuleBase { - /** - * Assemble TXs for the round. - * @return {Promise} - */ - async submitTransaction() { - const args = { - contractId: 'helloworld', - args: { - transaction_type: 'get()' - }, - readOnly: true - }; - await this.sutAdapter.sendRequests(args); - } -} - -/** - * Create a new instance of the workload module. - * @return {WorkloadModuleInterface} - */ -function createWorkloadModule() { - return new GetWorkload(); -} - -module.exports.createWorkloadModule = createWorkloadModule; diff --git a/benchmarks/samples/fisco-bcos/helloworld/set.js b/benchmarks/samples/fisco-bcos/helloworld/set.js deleted file mode 100755 index 852adf6e8..000000000 --- a/benchmarks/samples/fisco-bcos/helloworld/set.js +++ /dev/null @@ -1,55 +0,0 @@ -/* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -'use strict'; - -const { WorkloadModuleBase } = require('@hyperledger/caliper-core'); - -/** - * Workload module for the benchmark round. - */ -class SetWorkload extends WorkloadModuleBase { - /** - * Initializes the workload module instance. - */ - constructor() { - super(); - } - - /** - * Assemble TXs for the round. - * @return {Promise} - */ - async submitTransaction() { - const args = { - contractId: 'helloworld', - args: { - transaction_type: 'set(string)', - name: 'hello! - from ' + this.workerIndex.toString() - }, - readOnly: false - }; - await this.sutAdapter.sendRequests(args); - } -} - -/** - * Create a new instance of the workload module. - * @return {WorkloadModuleInterface} - */ -function createWorkloadModule() { - return new SetWorkload(); -} - -module.exports.createWorkloadModule = createWorkloadModule; diff --git a/benchmarks/samples/fisco-bcos/transfer/addUser.js b/benchmarks/samples/fisco-bcos/transfer/addUser.js deleted file mode 100755 index 7eb61d400..000000000 --- a/benchmarks/samples/fisco-bcos/transfer/addUser.js +++ /dev/null @@ -1,112 +0,0 @@ -/* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -'use strict'; - -const { WorkloadModuleBase } = require('@hyperledger/caliper-core'); - -let accountList = []; -const initMoney = 100000000; - -/** - * Workload module for the benchmark round. - */ -class AddUserWorkload extends WorkloadModuleBase { - /** - * Initializes the workload module instance. - */ - constructor() { - super(); - this.prefix = ''; - } - - /** - * Generate unique account key for the transaction - * @param {Number} index account index - * @returns {String} account key - */ - _generateAccount(index) { - return this.prefix + index.toString(); - } - - /** - * Generates simple workload - * @returns {Object} array of json objects - */ - _generateWorkload() { - let workload = []; - let index = accountList.length; - let accountID = this._generateAccount(index); - accountList.push({ - 'accountID': accountID, - 'balance': initMoney - }); - - workload.push({ - contractId: 'parallelok', - args: { - transaction_type: 'set(string,uint256)', - name: accountID, - num: initMoney - } - }); - return workload; - } - - /** - * Initialize the workload module with the given parameters. - * @param {number} workerIndex The 0-based index of the worker instantiating the workload module. - * @param {number} totalWorkers The total number of workers participating in the round. - * @param {number} roundIndex The 0-based index of the currently executing round. - * @param {Object} roundArguments The user-provided arguments for the round from the benchmark configuration file. - * @param {ConnectorBase} sutAdapter The adapter of the underlying SUT. - * @param {Object} sutContext The custom context object provided by the SUT adapter. - * @async - */ - async initializeWorkloadModule(workerIndex, totalWorkers, roundIndex, roundArguments, sutAdapter, sutContext) { - await super.initializeWorkloadModule(workerIndex, totalWorkers, roundIndex, roundArguments, sutAdapter, sutContext); - - this.prefix = this.workerIndex.toString(); - - const args = { - contractId: 'parallelok', - args: { - transaction_type: 'enableParallel()' - } - }; - - // Enable parallel transaction executor first, this transaction should *NOT* be recorded by context - await this.sutAdapter.sendRequests(args); - } - - /** - * Assemble TXs for the round. - * @return {Promise} - */ - async submitTransaction() { - const args = this._generateWorkload(); - await this.sutAdapter.sendRequests(args); - } -} - -/** - * Create a new instance of the workload module. - * @return {WorkloadModuleInterface} - */ -function createWorkloadModule() { - return new AddUserWorkload(); -} - -module.exports.createWorkloadModule = createWorkloadModule; -module.exports.accountList = accountList; diff --git a/benchmarks/samples/fisco-bcos/transfer/config.yaml b/benchmarks/samples/fisco-bcos/transfer/config.yaml deleted file mode 100755 index cd078beb9..000000000 --- a/benchmarks/samples/fisco-bcos/transfer/config.yaml +++ /dev/null @@ -1,28 +0,0 @@ -test: - name: Solidity Transfer - description: This is a solidity transfer benchmark of FISCO BCOS for caliper - workers: - number: 4 - rounds: - - label: addUser - description: generate users for transfer test later - txNumber: - - 1000 - rateControl: - - type: fixed-rate - opts: - tps: 1000 - workload: - module: benchmarks/samples/fisco-bcos/transfer/solidity/addUser.js - - label: transfer - description: transfer money between users - txNumber: - - 10000 - rateControl: - - type: fixed-rate - opts: - tps: 1000 - workload: - module: benchmarks/samples/fisco-bcos/transfer/solidity/transfer.js - arguments: - txnPerBatch: 10 diff --git a/benchmarks/samples/fisco-bcos/transfer/transfer.js b/benchmarks/samples/fisco-bcos/transfer/transfer.js deleted file mode 100755 index 94892e73d..000000000 --- a/benchmarks/samples/fisco-bcos/transfer/transfer.js +++ /dev/null @@ -1,130 +0,0 @@ -/* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -'use strict'; - -const { WorkloadModuleBase } = require('@hyperledger/caliper-core'); - -/** - * Workload module for the benchmark round. - */ -class TransferWorkload extends WorkloadModuleBase { - /** - * Initializes the workload module instance. - */ - constructor() { - super(); - this.index = 0; - this.accountList = []; - this.txnPerBatch = 1; - } - - /** - * Generates simple workload - * @return {Object} array of json objects - */ - _generateWorkload() { - let workload = []; - for (let i = 0; i < this.txnPerBatch; i++) { - let fromIndex = this.index % this.accountList.length; - let toIndex = (this.index + Math.floor(this.accountList.length / 2)) % this.accountList.length; - let value = Math.floor(Math.random() * 100); - let args = { - contractId: 'parallelok', - args: { - transaction_type: 'transfer(string,string,uint256)', - from: this.accountList[fromIndex].accountID, - to: this.accountList[toIndex].accountID, - num: value - } - }; - workload.push(args); - - this.index++; - this.accountList[fromIndex].balance -= value; - this.accountList[toIndex].balance += value; - } - return workload; - } - - /** - * Initialize the workload module with the given parameters. - * @param {number} workerIndex The 0-based index of the worker instantiating the workload module. - * @param {number} totalWorkers The total number of workers participating in the round. - * @param {number} roundIndex The 0-based index of the currently executing round. - * @param {Object} roundArguments The user-provided arguments for the round from the benchmark configuration file. - * @param {ConnectorBase} sutAdapter The adapter of the underlying SUT. - * @param {Object} sutContext The custom context object provided by the SUT adapter. - * @async - */ - async initializeWorkloadModule(workerIndex, totalWorkers, roundIndex, roundArguments, sutAdapter, sutContext) { - await super.initializeWorkloadModule(workerIndex, totalWorkers, roundIndex, roundArguments, sutAdapter, sutContext); - - this.txnPerBatch = this.roundArguments.txnPerBatch || 1; - - const addUser = require('./addUser'); - this.accountList = addUser.accountList; - } - - /** - * Assemble TXs for the round. - * @return {Promise} - */ - async submitTransaction() { - const workload = this._generateWorkload(); - await this.sutAdapter.sendRequests(workload); - } - - async cleanupWorkloadModule() { - console.info('Start balance validation ...'); - let correctAcccountNum = this.accountList.length; - for (let i = 0; i < this.accountList.length; ++i) { - let account = this.accountList[i]; - let accountID = account.accountID; - let balance = account.balance; - const queryArgs = { - contractId: 'parallelok', - args: { - transaction_type: 'balanceOf(string)', - name: accountID - }, - readOnly: true - }; - let state = await this.sutAdapter.sendRequests(queryArgs); - let remoteBalance = state.status.result.result.output; - remoteBalance = parseInt(remoteBalance, 16); - if (remoteBalance !== balance) { - console.error(`Abnormal account state: AccountID=${accountID}, LocalBalance=${balance}, RemoteBalance=${remoteBalance}`); - correctAcccountNum--; - } - } - - if (correctAcccountNum === this.accountList.length) { - console.info('Balance validation succeeded'); - } - else { - throw new Error(`Balance validation failed: success=${correctAcccountNum}, fail=${this.accountList.length - correctAcccountNum}`); - } - } -} - -/** - * Create a new instance of the workload module. - * @return {WorkloadModuleInterface} - */ -function createWorkloadModule() { - return new TransferWorkload(); -} - -module.exports.createWorkloadModule = createWorkloadModule; diff --git a/networks/fisco-bcos/4nodes1group/docker-compose.yaml b/networks/fisco-bcos/4nodes1group/docker-compose.yaml deleted file mode 100644 index aba2480b3..000000000 --- a/networks/fisco-bcos/4nodes1group/docker-compose.yaml +++ /dev/null @@ -1,56 +0,0 @@ -version: "3" - -services: - node0: - image: fiscoorg/fiscobcos:latest - ports: - - "20914:20914" - - "8914:8914" - - "30914:30914" - working_dir: /data - volumes: - - ./node0:/data - container_name: node0 - command: /usr/local/bin/fisco-bcos -c config.ini - - node1: - image: fiscoorg/fiscobcos:latest - ports: - - "20915:20915" - - "8915:8915" - - "30915:30915" - working_dir: "/data" - volumes: - - ./node1:/data - container_name: node1 - command: /usr/local/bin/fisco-bcos -c config.ini - depends_on: - - "node0" - - node2: - image: fiscoorg/fiscobcos:latest - ports: - - "20916:20916" - - "8916:8916" - - "30916:30916" - working_dir: "/data" - volumes: - - ./node2:/data - container_name: node2 - command: /usr/local/bin/fisco-bcos -c config.ini - depends_on: - - "node1" - - node3: - image: fiscoorg/fiscobcos:latest - ports: - - "20917:20917" - - "8917:8917" - - "30917:30917" - working_dir: "/data" - volumes: - - ./node3:/data - container_name: node3 - command: /usr/local/bin/fisco-bcos -c config.ini - depends_on: - - "node2" diff --git a/networks/fisco-bcos/4nodes1group/fisco-bcos.json b/networks/fisco-bcos/4nodes1group/fisco-bcos.json deleted file mode 100644 index a1d3f1637..000000000 --- a/networks/fisco-bcos/4nodes1group/fisco-bcos.json +++ /dev/null @@ -1,71 +0,0 @@ -{ - "caliper": { - "blockchain": "fisco-bcos", - "command": { - "start": "docker-compose -f networks/fisco-bcos/4nodes1group/docker-compose.yaml up -d; sleep 3s", - "end": "docker-compose -f networks/fisco-bcos/4nodes1group/docker-compose.yaml down" - } - }, - "fisco-bcos": { - "config": { - "privateKey": "bcec428d5205abe0f0cc8a734083908d9eb8563e31f943d760786edf42ad67dd", - "account": "0x64fa644d2a694681bd6addd6c5e36cccd8dcdde3" - }, - "network": { - "nodes": [ - { - "ip": "127.0.0.1", - "rpcPort": "8914", - "channelPort": "20914" - }, - { - "ip": "127.0.0.1", - "rpcPort": "8915", - "channelPort": "20915" - }, - { - "ip": "127.0.0.1", - "rpcPort": "8916", - "channelPort": "20916" - }, - { - "ip": "127.0.0.1", - "rpcPort": "8917", - "channelPort": "20917" - } - ], - "authentication": { - "key": "./networks/fisco-bcos/4nodes1group/sdk/node.key", - "cert": "./networks/fisco-bcos/4nodes1group/sdk/node.crt", - "ca": "./networks/fisco-bcos/4nodes1group/sdk/ca.crt" - }, - "groupID": 1, - "timeout": 100000 - }, - "smartContracts": [ - { - "id": "helloworld", - "path": "src/fisco-bcos/helloworld/HelloWorld.sol", - "language": "solidity", - "version": "v0" - }, - { - "id": "parallelok", - "path": "src/fisco-bcos/transfer/ParallelOk.sol", - "language": "solidity", - "version": "v0" - }, - { - "id": "dagtransfer", - "address": "0x0000000000000000000000000000000000005002", - "language": "precompiled", - "version": "v0" - } - ] - }, - "info": { - "Version": "2.0.0", - "Size": "4 Nodes", - "Distribution": "Single Host" - } -} diff --git a/networks/fisco-bcos/4nodes1group/node0/conf/ca.crt b/networks/fisco-bcos/4nodes1group/node0/conf/ca.crt deleted file mode 100644 index 09bfbbde0..000000000 --- a/networks/fisco-bcos/4nodes1group/node0/conf/ca.crt +++ /dev/null @@ -1,20 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDPTCCAiWgAwIBAgIJAOGxa7KkPpF8MA0GCSqGSIb3DQEBCwUAMDUxDjAMBgNV -BAMMBWNoYWluMRMwEQYDVQQKDApmaXNjby1iY29zMQ4wDAYDVQQLDAVjaGFpbjAe -Fw0xOTA2MTEwMzMxMjZaFw0yOTA2MDgwMzMxMjZaMDUxDjAMBgNVBAMMBWNoYWlu -MRMwEQYDVQQKDApmaXNjby1iY29zMQ4wDAYDVQQLDAVjaGFpbjCCASIwDQYJKoZI -hvcNAQEBBQADggEPADCCAQoCggEBALvzIKFr9UnSQnOExe5NkKN1hN5RRcOPSPfs -MrUJ6k5Om/WfCMMCgIlIZASaK0WKBo45IvDLFuQmng/XziY7/i9mO3xgvyQxfQMj -qHGKpKmNxtj9wuORKT+w/5Ino+avMatucO5FrWrw9PloaEz8cmy8SVnD6E6JSbbr -uiTRoR5OXGiEzVaECMBeCobAbdy2hQSaaZnHJYtXYFqvo4Xnh5/PT5hVQCuKih8P -OXRune4Zvl2mydW+t3QSWrT33gUaPVZDrvaLWpbLeEXVwZ4jvUMo5qCiMzbX69db -F4K+VIT6PXi35OI6uxSjiaisDFUItZv/srGE4ikQxBuIP7PAizsCAwEAAaNQME4w -HQYDVR0OBBYEFCuHzKdBsmgEDTF28/PT/Jhn8DwPMB8GA1UdIwQYMBaAFCuHzKdB -smgEDTF28/PT/Jhn8DwPMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEB -AIPDj3p7xhS5+fI78A/qpToJDZvgwHs56jnJ8XtECfjrvtT0FinMI4pLPs+scj8b -Lm0RM+WKSpig7TtO1Zjwma22CSssr/MJAWOa8Y200qgVmuiOmtuVBPw+mMcI1Ijt -GDEgXVWL1odIHWjookjAzSRiOvU5KUGctImHZ3RPQozOt7TTVx3usH5qJiWVg2IB -DBiBdCVzwSR5EGkIr0cC6cih/08R0fDaLXwUrHgeJi6VUDdp+rV6h76frJowwbJc -Q3s8fdVW3ti7YUOHJD08WWz0+1PblVHwlCIYBxdH06m5nFYZyeoLg+I+xduH5hNH -VH3h/8g8OQvRZnc6nF/mXpU= ------END CERTIFICATE----- diff --git a/networks/fisco-bcos/4nodes1group/node0/conf/group.1.genesis b/networks/fisco-bcos/4nodes1group/node0/conf/group.1.genesis deleted file mode 100644 index 553ac0014..000000000 --- a/networks/fisco-bcos/4nodes1group/node0/conf/group.1.genesis +++ /dev/null @@ -1,26 +0,0 @@ -;consensus configuration -[consensus] - ;consensus algorithm type, now support PBFT(consensus_type=pbft) and Raft(consensus_type=raft) - consensus_type=pbft - ;the max number of transactions of a block - max_trans_num=10000 - ;the node id of leaders - node.0=0522afb1b6178903bef0fe9c78c91f8e1cda785c86a164beb0194eb19e977bd5aa4f7ad7a34d56cf7df1d86e8b37a9020643d8e2231e4ab42235f53b2251b697 - node.1=d0f6425fc9214cdd99f2fe15cf5c9d818113afac9c4a54366a5cc42e267c6384fa2e79eaae2c87e8103f41726585811c9089f20bca3454819f0fccdf406df0d8 - node.2=1e765dc25326d1c23c120355b01e11f6b3a23f5a2332151bde20aac292b35afee66fbec641dcabb888dccf4e65bd3e56cfdfe9af69883154b3ad3800cac4a2b5 - node.3=e2edc5a18abaf072836f48eb1050279171409ee45306fba37e1fc8b62691efe5d6bfccffe134794b6f420b49bbff53c6c4df70fa742c8f5059d4db7a1994bdfa - -[storage] - ;storage db type, leveldb or external - type=LevelDB - topic=DB -[state] - ;support mpt/storage - type=storage - -;tx gas limit -[tx] - gas_limit=300000000 -[group] - id=1 - timestamp=1560223886000 diff --git a/networks/fisco-bcos/4nodes1group/node0/conf/group.1.ini b/networks/fisco-bcos/4nodes1group/node0/conf/group.1.ini deleted file mode 100644 index cb8253f83..000000000 --- a/networks/fisco-bcos/4nodes1group/node0/conf/group.1.ini +++ /dev/null @@ -1,12 +0,0 @@ -; the ttl for broadcasting pbft message -[consensus] - ;ttl=2 - ;min block generation time(ms), the max block generation time is 1000 ms - ;min_block_generation_time=500 - ;enable_dynamic_block_size=true - -;txpool limit -[tx_pool] - limit=150000 -[tx_execute] - enable_parallel=true diff --git a/networks/fisco-bcos/4nodes1group/node0/conf/node.crt b/networks/fisco-bcos/4nodes1group/node0/conf/node.crt deleted file mode 100644 index 8575712e7..000000000 --- a/networks/fisco-bcos/4nodes1group/node0/conf/node.crt +++ /dev/null @@ -1,33 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICOjCCASKgAwIBAgIJAIr5gH0OTKgwMA0GCSqGSIb3DQEBCwUAMDcxDzANBgNV -BAMMBmFnZW5jeTETMBEGA1UECgwKZmlzY28tYmNvczEPMA0GA1UECwwGYWdlbmN5 -MB4XDTE5MDYxMTAzMzEyN1oXDTI5MDYwODAzMzEyN1owNDEOMAwGA1UEAwwFbm9k -ZTAxEzARBgNVBAoMCmZpc2NvLWJjb3MxDTALBgNVBAsMBG5vZGUwVjAQBgcqhkjO -PQIBBgUrgQQACgNCAAQFIq+xtheJA77w/px4yR+OHNp4XIahZL6wGU6xnpd71apP -etejTVbPffHYbos3qQIGQ9jiIx5KtCI19TsiUbaXoxowGDAJBgNVHRMEAjAAMAsG -A1UdDwQEAwIF4DANBgkqhkiG9w0BAQsFAAOCAQEA7jjd6E3uT0P40/Hr6BIgLhp9 -SVTDXGGGzvOQSU+1eAvFIT18ZSM8frvHOwuSo3d2FTi7V/iVcT+aOX9nEHWKos/f -kWMfuNxJwfGhGg2WXkZ20CWDhqRZDksmFWx55W0rT16wH1/v2uSGDkdbSLyLyT8T -Q/Cvvi/a9Cwn1rCBy2AceHkUqOD8NXr1hdKPtdw2Op+Sge4G6juN1hQvtqNgXXfe -rHyXd88G/YphBSpKHIdhWOhYn38+HgAqkdyp1qqBdAvJs3rNjaMylbhTWwbsR7F4 -feNMI6gq0FBk9y40d5liVNRv6n97UPv7VzcS7aCVJ0IdG57T2VmsDT6fmQU10Q== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIC/zCCAeegAwIBAgIJAJohET2vzuAvMA0GCSqGSIb3DQEBCwUAMDUxDjAMBgNV -BAMMBWNoYWluMRMwEQYDVQQKDApmaXNjby1iY29zMQ4wDAYDVQQLDAVjaGFpbjAe -Fw0xOTA2MTEwMzMxMjdaFw0yOTA2MDgwMzMxMjdaMDcxDzANBgNVBAMMBmFnZW5j -eTETMBEGA1UECgwKZmlzY28tYmNvczEPMA0GA1UECwwGYWdlbmN5MIIBIjANBgkq -hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA/QA51rMRyFZPNyb/MfrMe6Q3Oy5nWcZH -R1oDcdhBdSQs/CR1GFI0xDXQH5KjnC7yJsnnRdKdPQ/0x1thefS8WYwDie/wba7N -6hKhthiIiqRIGv1RzEKM3N69iux6KelCwuUmbLHQYl7WsmoD6+oDCtLHtb4QakAU -Ga7JPvWgbBfFQ24pud/7APCyYqOBfwtLtnuM7hEzaQxpwa9hUfCwElK3i+WqI10U -2OQBEL33Vj7eRgUNaxEF6OGhP15wAtR6ZIVrOyjrnd2zyudstLe4XC2iMNS2mkmX -7avgjXwGpSG4uT3x6LPHTNyRdJz8zd3NJdImwaMZpA4bzh3rik7f5wIDAQABoxAw -DjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQA1nHpk+WGkIBPe5c9t -pJ9lVVqmUFiAYW75GoyPRix8YX0BcKWQmC3Gch0mqOcJ8UZg3fN4z+U177MluTxZ -fC8a7Ju//4Dcbc7JSRLCqzvvtLwUydDoF+7lIzZi30ssLjM6Vb7OHl0z74NuUKOw -Jn5TCRKjiMiO3d0iCyE/TP6KJSt1m8yRGc4/mHEuCdLuHhSMIeKg8NIrP2/cTv3L -8/L0/rkHFTg9CQWWtC39uWOzXVpYG5U9ryCNNkFtu5hlS7MVlGaqQvaNlP1DnTiJ -0/KyZKkwpo9pQjjlWwe/O5CNsL12vri8MROX5yBxBcM3QXwsTz+Z3wJB3F19cyBi -5SXJ ------END CERTIFICATE----- diff --git a/networks/fisco-bcos/4nodes1group/node0/conf/node.key b/networks/fisco-bcos/4nodes1group/node0/conf/node.key deleted file mode 100644 index 1557c0666..000000000 --- a/networks/fisco-bcos/4nodes1group/node0/conf/node.key +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGEAgEAMBAGByqGSM49AgEGBSuBBAAKBG0wawIBAQQgWJwTtcTzhTBagb052aC2 -pkIceIZk8HW6uF1Lsk+1CqOhRANCAAQFIq+xtheJA77w/px4yR+OHNp4XIahZL6w -GU6xnpd71apPetejTVbPffHYbos3qQIGQ9jiIx5KtCI19TsiUbaX ------END PRIVATE KEY----- diff --git a/networks/fisco-bcos/4nodes1group/node0/conf/node.nodeid b/networks/fisco-bcos/4nodes1group/node0/conf/node.nodeid deleted file mode 100644 index 2c6284a7c..000000000 --- a/networks/fisco-bcos/4nodes1group/node0/conf/node.nodeid +++ /dev/null @@ -1 +0,0 @@ -0522afb1b6178903bef0fe9c78c91f8e1cda785c86a164beb0194eb19e977bd5aa4f7ad7a34d56cf7df1d86e8b37a9020643d8e2231e4ab42235f53b2251b697 diff --git a/networks/fisco-bcos/4nodes1group/node0/config.ini b/networks/fisco-bcos/4nodes1group/node0/config.ini deleted file mode 100644 index 449d4e225..000000000 --- a/networks/fisco-bcos/4nodes1group/node0/config.ini +++ /dev/null @@ -1,70 +0,0 @@ -[rpc] - ; rpc listen ip - listen_ip=0.0.0.0 - ; channelserver listen port - channel_listen_port=20914 - ; jsonrpc listen port - jsonrpc_listen_port=8914 -[p2p] - ; p2p listen ip - listen_ip=0.0.0.0 - ; p2p listen port - listen_port=30914 - ; nodes to connect - node.0=172.17.0.1:30914 - node.1=172.17.0.1:30915 - node.2=172.17.0.1:30916 - node.3=172.17.0.1:30917 - - ;enable/disable network compress - ;enable_compress=false - -;certificate rejected list -[certificate_blacklist] - ; crl.0 should be nodeid, nodeid's length is 128 - ;crl.0= - -;group configurations -;WARNING: group 0 is forbided -[group] - group_data_path=data/ - group_config_path=conf/ - -;certificate configuration -[network_security] - ; directory the certificates located in - data_path=conf/ - ; the node private key file - key=node.key - ; the node certificate file - cert=node.crt - ; the ca certificate file - ca_cert=ca.crt - -; storage security releated configurations -[storage_security] -; enable storage_security or not -;enable=true -; the IP of key mananger -;key_manager_ip= -; the Port of key manager -;key_manager_port= -;cipher_data_key= - -[chain] - id=1 -[compatibility] - supported_version=2.0.0-rc2 -;log configurations -[log] - ; the directory of the log - log_path=./log - ; info debug trace - level=info - ; MB - max_log_file_size=200 - ; control log auto_flush - flush=true - ; easylog config - format=%level|%datetime{%Y-%M-%d %H:%m:%s:%g}|%msg - log_flush_threshold=100 diff --git a/networks/fisco-bcos/4nodes1group/node0/data/group1/block/000020.ldb b/networks/fisco-bcos/4nodes1group/node0/data/group1/block/000020.ldb deleted file mode 100644 index 13c315563..000000000 Binary files a/networks/fisco-bcos/4nodes1group/node0/data/group1/block/000020.ldb and /dev/null differ diff --git a/networks/fisco-bcos/4nodes1group/node0/data/group1/block/000021.ldb b/networks/fisco-bcos/4nodes1group/node0/data/group1/block/000021.ldb deleted file mode 100644 index ed4d03945..000000000 Binary files a/networks/fisco-bcos/4nodes1group/node0/data/group1/block/000021.ldb and /dev/null differ diff --git a/networks/fisco-bcos/4nodes1group/node0/data/group1/block/000022.ldb b/networks/fisco-bcos/4nodes1group/node0/data/group1/block/000022.ldb deleted file mode 100644 index 58afdc1b3..000000000 Binary files a/networks/fisco-bcos/4nodes1group/node0/data/group1/block/000022.ldb and /dev/null differ diff --git a/networks/fisco-bcos/4nodes1group/node0/data/group1/block/000023.ldb b/networks/fisco-bcos/4nodes1group/node0/data/group1/block/000023.ldb deleted file mode 100644 index 163bf4732..000000000 Binary files a/networks/fisco-bcos/4nodes1group/node0/data/group1/block/000023.ldb and /dev/null differ diff --git a/networks/fisco-bcos/4nodes1group/node0/data/group1/block/000024.ldb b/networks/fisco-bcos/4nodes1group/node0/data/group1/block/000024.ldb deleted file mode 100644 index 9b15bf42f..000000000 Binary files a/networks/fisco-bcos/4nodes1group/node0/data/group1/block/000024.ldb and /dev/null differ diff --git a/networks/fisco-bcos/4nodes1group/node0/data/group1/block/000025.ldb b/networks/fisco-bcos/4nodes1group/node0/data/group1/block/000025.ldb deleted file mode 100644 index c4258a6cf..000000000 Binary files a/networks/fisco-bcos/4nodes1group/node0/data/group1/block/000025.ldb and /dev/null differ diff --git a/networks/fisco-bcos/4nodes1group/node0/data/group1/block/CURRENT b/networks/fisco-bcos/4nodes1group/node0/data/group1/block/CURRENT deleted file mode 100644 index 056df57bb..000000000 --- a/networks/fisco-bcos/4nodes1group/node0/data/group1/block/CURRENT +++ /dev/null @@ -1 +0,0 @@ -MANIFEST-000017 diff --git a/networks/fisco-bcos/4nodes1group/node0/data/group1/block/LOCK b/networks/fisco-bcos/4nodes1group/node0/data/group1/block/LOCK deleted file mode 100644 index e69de29bb..000000000 diff --git a/networks/fisco-bcos/4nodes1group/node0/data/group1/block/LOG b/networks/fisco-bcos/4nodes1group/node0/data/group1/block/LOG deleted file mode 100644 index 0678f4255..000000000 --- a/networks/fisco-bcos/4nodes1group/node0/data/group1/block/LOG +++ /dev/null @@ -1,20 +0,0 @@ -2019/11/20-00:51:22.603878 7fd61bc25c00 Recovering log #15 -2019/11/20-00:51:22.613462 7fd61bc25c00 Level-0 table #18: started -2019/11/20-00:51:22.778232 7fd61bc25c00 Level-0 table #18: 1755956 bytes OK -2019/11/20-00:51:22.785225 7fd61bc25c00 Delete type=0 #15 -2019/11/20-00:51:22.786811 7fd61bc25c00 Delete type=3 #11 -2019/11/20-00:51:22.793330 7fd60a2af700 Compacting 4@0 + 0@1 files -2019/11/20-00:51:22.849703 7fd60a2af700 Generated table #20@0: 39 keys, 2118515 bytes -2019/11/20-00:51:22.883143 7fd60a2af700 Generated table #21@0: 4 keys, 2404346 bytes -2019/11/20-00:51:22.967507 7fd60a2af700 Generated table #22@0: 3 keys, 4427607 bytes -2019/11/20-00:51:23.029843 7fd60a2af700 Generated table #23@0: 2 keys, 2409277 bytes -2019/11/20-00:51:23.450544 7fd60a2af700 Generated table #24@0: 8049 keys, 2134418 bytes -2019/11/20-00:51:23.541102 7fd60a2af700 Generated table #25@0: 1969 keys, 521252 bytes -2019/11/20-00:51:23.541421 7fd60a2af700 Compacted 4@0 + 0@1 files => 14015415 bytes -2019/11/20-00:51:23.543033 7fd60a2af700 compacted to: files[ 0 6 0 0 0 0 0 ] -2019/11/20-00:51:23.545708 7fd60a2af700 Delete type=2 #14 -2019/11/20-00:51:23.548605 7fd60a2af700 Delete type=2 #16 -2019/11/20-00:51:23.551801 7fd60a2af700 Delete type=2 #5 -2019/11/20-00:51:23.554066 7fd60a2af700 Delete type=2 #18 -2019/11/20-00:51:23.556921 7fd60a2af700 Moved #20 to level-2 2118515 bytes OK: files[ 0 5 1 0 0 0 0 ] -2019/11/20-00:51:23.558553 7fd60a2af700 Moved #21 to level-2 2404346 bytes OK: files[ 0 4 2 0 0 0 0 ] diff --git a/networks/fisco-bcos/4nodes1group/node0/data/group1/block/LOG.old b/networks/fisco-bcos/4nodes1group/node0/data/group1/block/LOG.old deleted file mode 100644 index d3cb1daba..000000000 --- a/networks/fisco-bcos/4nodes1group/node0/data/group1/block/LOG.old +++ /dev/null @@ -1,9 +0,0 @@ -2019/11/20-00:49:53.617769 7fafa793ec00 Recovering log #10 -2019/11/20-00:49:53.626280 7fafa793ec00 Delete type=0 #10 -2019/11/20-00:49:53.627018 7fafa793ec00 Delete type=3 #9 -2019/11/20-00:50:32.235855 7faf903bb700 Level-0 table #14: started -2019/11/20-00:50:32.668632 7faf903bb700 Level-0 table #14: 5795519 bytes OK -2019/11/20-00:50:32.726770 7faf903bb700 Delete type=0 #12 -2019/11/20-00:50:37.549070 7faf903bb700 Level-0 table #16: started -2019/11/20-00:50:38.105176 7faf903bb700 Level-0 table #16: 6490270 bytes OK -2019/11/20-00:50:38.116578 7faf903bb700 Delete type=0 #13 diff --git a/networks/fisco-bcos/4nodes1group/node0/data/group1/block/MANIFEST-000017 b/networks/fisco-bcos/4nodes1group/node0/data/group1/block/MANIFEST-000017 deleted file mode 100644 index fd9959ffa..000000000 Binary files a/networks/fisco-bcos/4nodes1group/node0/data/group1/block/MANIFEST-000017 and /dev/null differ diff --git a/networks/fisco-bcos/4nodes1group/node0/data/group1/pbftMsgBackup/000013.ldb b/networks/fisco-bcos/4nodes1group/node0/data/group1/pbftMsgBackup/000013.ldb deleted file mode 100644 index 261a15f2f..000000000 Binary files a/networks/fisco-bcos/4nodes1group/node0/data/group1/pbftMsgBackup/000013.ldb and /dev/null differ diff --git a/networks/fisco-bcos/4nodes1group/node0/data/group1/pbftMsgBackup/CURRENT b/networks/fisco-bcos/4nodes1group/node0/data/group1/pbftMsgBackup/CURRENT deleted file mode 100644 index ef20c6ded..000000000 --- a/networks/fisco-bcos/4nodes1group/node0/data/group1/pbftMsgBackup/CURRENT +++ /dev/null @@ -1 +0,0 @@ -MANIFEST-000012 diff --git a/networks/fisco-bcos/4nodes1group/node0/data/group1/pbftMsgBackup/LOCK b/networks/fisco-bcos/4nodes1group/node0/data/group1/pbftMsgBackup/LOCK deleted file mode 100644 index e69de29bb..000000000 diff --git a/networks/fisco-bcos/4nodes1group/node0/data/group1/pbftMsgBackup/LOG b/networks/fisco-bcos/4nodes1group/node0/data/group1/pbftMsgBackup/LOG deleted file mode 100644 index 8472830c0..000000000 --- a/networks/fisco-bcos/4nodes1group/node0/data/group1/pbftMsgBackup/LOG +++ /dev/null @@ -1,5 +0,0 @@ -2019/11/20-00:51:22.906587 7fd61bc25c00 Recovering log #11 -2019/11/20-00:51:22.937798 7fd61bc25c00 Level-0 table #13: started -2019/11/20-00:51:23.032625 7fd61bc25c00 Level-0 table #13: 4527502 bytes OK -2019/11/20-00:51:23.044627 7fd61bc25c00 Delete type=0 #11 -2019/11/20-00:51:23.047001 7fd61bc25c00 Delete type=3 #10 diff --git a/networks/fisco-bcos/4nodes1group/node0/data/group1/pbftMsgBackup/LOG.old b/networks/fisco-bcos/4nodes1group/node0/data/group1/pbftMsgBackup/LOG.old deleted file mode 100644 index db42ae104..000000000 --- a/networks/fisco-bcos/4nodes1group/node0/data/group1/pbftMsgBackup/LOG.old +++ /dev/null @@ -1,3 +0,0 @@ -2019/11/20-00:49:53.642505 7fafa793ec00 Recovering log #9 -2019/11/20-00:49:53.652264 7fafa793ec00 Delete type=3 #8 -2019/11/20-00:49:53.653162 7fafa793ec00 Delete type=0 #9 diff --git a/networks/fisco-bcos/4nodes1group/node0/data/group1/pbftMsgBackup/MANIFEST-000012 b/networks/fisco-bcos/4nodes1group/node0/data/group1/pbftMsgBackup/MANIFEST-000012 deleted file mode 100644 index af16de1c8..000000000 Binary files a/networks/fisco-bcos/4nodes1group/node0/data/group1/pbftMsgBackup/MANIFEST-000012 and /dev/null differ diff --git a/networks/fisco-bcos/4nodes1group/node1/conf/ca.crt b/networks/fisco-bcos/4nodes1group/node1/conf/ca.crt deleted file mode 100644 index 09bfbbde0..000000000 --- a/networks/fisco-bcos/4nodes1group/node1/conf/ca.crt +++ /dev/null @@ -1,20 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDPTCCAiWgAwIBAgIJAOGxa7KkPpF8MA0GCSqGSIb3DQEBCwUAMDUxDjAMBgNV -BAMMBWNoYWluMRMwEQYDVQQKDApmaXNjby1iY29zMQ4wDAYDVQQLDAVjaGFpbjAe -Fw0xOTA2MTEwMzMxMjZaFw0yOTA2MDgwMzMxMjZaMDUxDjAMBgNVBAMMBWNoYWlu -MRMwEQYDVQQKDApmaXNjby1iY29zMQ4wDAYDVQQLDAVjaGFpbjCCASIwDQYJKoZI -hvcNAQEBBQADggEPADCCAQoCggEBALvzIKFr9UnSQnOExe5NkKN1hN5RRcOPSPfs -MrUJ6k5Om/WfCMMCgIlIZASaK0WKBo45IvDLFuQmng/XziY7/i9mO3xgvyQxfQMj -qHGKpKmNxtj9wuORKT+w/5Ino+avMatucO5FrWrw9PloaEz8cmy8SVnD6E6JSbbr -uiTRoR5OXGiEzVaECMBeCobAbdy2hQSaaZnHJYtXYFqvo4Xnh5/PT5hVQCuKih8P -OXRune4Zvl2mydW+t3QSWrT33gUaPVZDrvaLWpbLeEXVwZ4jvUMo5qCiMzbX69db -F4K+VIT6PXi35OI6uxSjiaisDFUItZv/srGE4ikQxBuIP7PAizsCAwEAAaNQME4w -HQYDVR0OBBYEFCuHzKdBsmgEDTF28/PT/Jhn8DwPMB8GA1UdIwQYMBaAFCuHzKdB -smgEDTF28/PT/Jhn8DwPMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEB -AIPDj3p7xhS5+fI78A/qpToJDZvgwHs56jnJ8XtECfjrvtT0FinMI4pLPs+scj8b -Lm0RM+WKSpig7TtO1Zjwma22CSssr/MJAWOa8Y200qgVmuiOmtuVBPw+mMcI1Ijt -GDEgXVWL1odIHWjookjAzSRiOvU5KUGctImHZ3RPQozOt7TTVx3usH5qJiWVg2IB -DBiBdCVzwSR5EGkIr0cC6cih/08R0fDaLXwUrHgeJi6VUDdp+rV6h76frJowwbJc -Q3s8fdVW3ti7YUOHJD08WWz0+1PblVHwlCIYBxdH06m5nFYZyeoLg+I+xduH5hNH -VH3h/8g8OQvRZnc6nF/mXpU= ------END CERTIFICATE----- diff --git a/networks/fisco-bcos/4nodes1group/node1/conf/group.1.genesis b/networks/fisco-bcos/4nodes1group/node1/conf/group.1.genesis deleted file mode 100644 index 553ac0014..000000000 --- a/networks/fisco-bcos/4nodes1group/node1/conf/group.1.genesis +++ /dev/null @@ -1,26 +0,0 @@ -;consensus configuration -[consensus] - ;consensus algorithm type, now support PBFT(consensus_type=pbft) and Raft(consensus_type=raft) - consensus_type=pbft - ;the max number of transactions of a block - max_trans_num=10000 - ;the node id of leaders - node.0=0522afb1b6178903bef0fe9c78c91f8e1cda785c86a164beb0194eb19e977bd5aa4f7ad7a34d56cf7df1d86e8b37a9020643d8e2231e4ab42235f53b2251b697 - node.1=d0f6425fc9214cdd99f2fe15cf5c9d818113afac9c4a54366a5cc42e267c6384fa2e79eaae2c87e8103f41726585811c9089f20bca3454819f0fccdf406df0d8 - node.2=1e765dc25326d1c23c120355b01e11f6b3a23f5a2332151bde20aac292b35afee66fbec641dcabb888dccf4e65bd3e56cfdfe9af69883154b3ad3800cac4a2b5 - node.3=e2edc5a18abaf072836f48eb1050279171409ee45306fba37e1fc8b62691efe5d6bfccffe134794b6f420b49bbff53c6c4df70fa742c8f5059d4db7a1994bdfa - -[storage] - ;storage db type, leveldb or external - type=LevelDB - topic=DB -[state] - ;support mpt/storage - type=storage - -;tx gas limit -[tx] - gas_limit=300000000 -[group] - id=1 - timestamp=1560223886000 diff --git a/networks/fisco-bcos/4nodes1group/node1/conf/group.1.ini b/networks/fisco-bcos/4nodes1group/node1/conf/group.1.ini deleted file mode 100644 index cb8253f83..000000000 --- a/networks/fisco-bcos/4nodes1group/node1/conf/group.1.ini +++ /dev/null @@ -1,12 +0,0 @@ -; the ttl for broadcasting pbft message -[consensus] - ;ttl=2 - ;min block generation time(ms), the max block generation time is 1000 ms - ;min_block_generation_time=500 - ;enable_dynamic_block_size=true - -;txpool limit -[tx_pool] - limit=150000 -[tx_execute] - enable_parallel=true diff --git a/networks/fisco-bcos/4nodes1group/node1/conf/node.crt b/networks/fisco-bcos/4nodes1group/node1/conf/node.crt deleted file mode 100644 index 4a84f9d8b..000000000 --- a/networks/fisco-bcos/4nodes1group/node1/conf/node.crt +++ /dev/null @@ -1,33 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICOjCCASKgAwIBAgIJAIr5gH0OTKgyMA0GCSqGSIb3DQEBCwUAMDcxDzANBgNV -BAMMBmFnZW5jeTETMBEGA1UECgwKZmlzY28tYmNvczEPMA0GA1UECwwGYWdlbmN5 -MB4XDTE5MDYxMTAzMzEyN1oXDTI5MDYwODAzMzEyN1owNDEOMAwGA1UEAwwFbm9k -ZTExEzARBgNVBAoMCmZpc2NvLWJjb3MxDTALBgNVBAsMBG5vZGUwVjAQBgcqhkjO -PQIBBgUrgQQACgNCAATQ9kJfySFM3Zny/hXPXJ2BgROvrJxKVDZqXMQuJnxjhPou -eequLIfoED9BcmWFgRyQifILyjRUgZ8PzN9AbfDYoxowGDAJBgNVHRMEAjAAMAsG -A1UdDwQEAwIF4DANBgkqhkiG9w0BAQsFAAOCAQEA3tSFYo2QcIC8HpAF+5IsMvCv -lW5czJm7ybmN6gi+2KtJWfhupjyiEkxDU7+BJdNvdIBDLqR+/ctiyqDX2hDiDNIJ -LlWKZaprTjxpGeDUzSS7/JryzSLhIreqNeqn/b2oGZuV2LVWPt0jak5wKvjlrgu3 -wn4jjuwl3LfM23WyvlYotQes9tRXoUh2Fuv4yUTX+ywEuESk1o8jVDXEkqMVtSoe -vc/MndZEKl+wh4Eqr+sDg97AgjBOmr4Y52KFS8TWdkyU9U4H+Fv5rtNk/0w6V2Qb -yKcJg6Te3TokW3jM6wBWqhHyENSgysmHFju4Y/l8vxO7hiqtJibyj6MmHeAP3w== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIC/zCCAeegAwIBAgIJAJohET2vzuAvMA0GCSqGSIb3DQEBCwUAMDUxDjAMBgNV -BAMMBWNoYWluMRMwEQYDVQQKDApmaXNjby1iY29zMQ4wDAYDVQQLDAVjaGFpbjAe -Fw0xOTA2MTEwMzMxMjdaFw0yOTA2MDgwMzMxMjdaMDcxDzANBgNVBAMMBmFnZW5j -eTETMBEGA1UECgwKZmlzY28tYmNvczEPMA0GA1UECwwGYWdlbmN5MIIBIjANBgkq -hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA/QA51rMRyFZPNyb/MfrMe6Q3Oy5nWcZH -R1oDcdhBdSQs/CR1GFI0xDXQH5KjnC7yJsnnRdKdPQ/0x1thefS8WYwDie/wba7N -6hKhthiIiqRIGv1RzEKM3N69iux6KelCwuUmbLHQYl7WsmoD6+oDCtLHtb4QakAU -Ga7JPvWgbBfFQ24pud/7APCyYqOBfwtLtnuM7hEzaQxpwa9hUfCwElK3i+WqI10U -2OQBEL33Vj7eRgUNaxEF6OGhP15wAtR6ZIVrOyjrnd2zyudstLe4XC2iMNS2mkmX -7avgjXwGpSG4uT3x6LPHTNyRdJz8zd3NJdImwaMZpA4bzh3rik7f5wIDAQABoxAw -DjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQA1nHpk+WGkIBPe5c9t -pJ9lVVqmUFiAYW75GoyPRix8YX0BcKWQmC3Gch0mqOcJ8UZg3fN4z+U177MluTxZ -fC8a7Ju//4Dcbc7JSRLCqzvvtLwUydDoF+7lIzZi30ssLjM6Vb7OHl0z74NuUKOw -Jn5TCRKjiMiO3d0iCyE/TP6KJSt1m8yRGc4/mHEuCdLuHhSMIeKg8NIrP2/cTv3L -8/L0/rkHFTg9CQWWtC39uWOzXVpYG5U9ryCNNkFtu5hlS7MVlGaqQvaNlP1DnTiJ -0/KyZKkwpo9pQjjlWwe/O5CNsL12vri8MROX5yBxBcM3QXwsTz+Z3wJB3F19cyBi -5SXJ ------END CERTIFICATE----- diff --git a/networks/fisco-bcos/4nodes1group/node1/conf/node.key b/networks/fisco-bcos/4nodes1group/node1/conf/node.key deleted file mode 100644 index 0a634a182..000000000 --- a/networks/fisco-bcos/4nodes1group/node1/conf/node.key +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGEAgEAMBAGByqGSM49AgEGBSuBBAAKBG0wawIBAQQgB5dNhWs34bn0spho3mWB -pzn203dkiHZszGtbdFRq/2uhRANCAATQ9kJfySFM3Zny/hXPXJ2BgROvrJxKVDZq -XMQuJnxjhPoueequLIfoED9BcmWFgRyQifILyjRUgZ8PzN9AbfDY ------END PRIVATE KEY----- diff --git a/networks/fisco-bcos/4nodes1group/node1/conf/node.nodeid b/networks/fisco-bcos/4nodes1group/node1/conf/node.nodeid deleted file mode 100644 index 179585c68..000000000 --- a/networks/fisco-bcos/4nodes1group/node1/conf/node.nodeid +++ /dev/null @@ -1 +0,0 @@ -d0f6425fc9214cdd99f2fe15cf5c9d818113afac9c4a54366a5cc42e267c6384fa2e79eaae2c87e8103f41726585811c9089f20bca3454819f0fccdf406df0d8 diff --git a/networks/fisco-bcos/4nodes1group/node1/config.ini b/networks/fisco-bcos/4nodes1group/node1/config.ini deleted file mode 100644 index 36ef19ddc..000000000 --- a/networks/fisco-bcos/4nodes1group/node1/config.ini +++ /dev/null @@ -1,70 +0,0 @@ -[rpc] - ; rpc listen ip - listen_ip=0.0.0.0 - ; channelserver listen port - channel_listen_port=20915 - ; jsonrpc listen port - jsonrpc_listen_port=8915 -[p2p] - ; p2p listen ip - listen_ip=0.0.0.0 - ; p2p listen port - listen_port=30915 - ; nodes to connect - node.0=172.17.0.1:30914 - node.1=172.17.0.1:30915 - node.2=172.17.0.1:30916 - node.3=172.17.0.1:30917 - - ;enable/disable network compress - ;enable_compress=false - -;certificate rejected list -[certificate_blacklist] - ; crl.0 should be nodeid, nodeid's length is 128 - ;crl.0= - -;group configurations -;WARNING: group 0 is forbided -[group] - group_data_path=data/ - group_config_path=conf/ - -;certificate configuration -[network_security] - ; directory the certificates located in - data_path=conf/ - ; the node private key file - key=node.key - ; the node certificate file - cert=node.crt - ; the ca certificate file - ca_cert=ca.crt - -; storage security releated configurations -[storage_security] -; enable storage_security or not -;enable=true -; the IP of key mananger -;key_manager_ip= -; the Port of key manager -;key_manager_port= -;cipher_data_key= - -[chain] - id=1 -[compatibility] - supported_version=2.0.0-rc2 -;log configurations -[log] - ; the directory of the log - log_path=./log - ; info debug trace - level=info - ; MB - max_log_file_size=200 - ; control log auto_flush - flush=true - ; easylog config - format=%level|%datetime{%Y-%M-%d %H:%m:%s:%g}|%msg - log_flush_threshold=100 diff --git a/networks/fisco-bcos/4nodes1group/node1/data/group1/block/000020.ldb b/networks/fisco-bcos/4nodes1group/node1/data/group1/block/000020.ldb deleted file mode 100644 index 6dc259eb4..000000000 Binary files a/networks/fisco-bcos/4nodes1group/node1/data/group1/block/000020.ldb and /dev/null differ diff --git a/networks/fisco-bcos/4nodes1group/node1/data/group1/block/000021.ldb b/networks/fisco-bcos/4nodes1group/node1/data/group1/block/000021.ldb deleted file mode 100644 index 48c9a9a95..000000000 Binary files a/networks/fisco-bcos/4nodes1group/node1/data/group1/block/000021.ldb and /dev/null differ diff --git a/networks/fisco-bcos/4nodes1group/node1/data/group1/block/000022.ldb b/networks/fisco-bcos/4nodes1group/node1/data/group1/block/000022.ldb deleted file mode 100644 index 7b2a82f99..000000000 Binary files a/networks/fisco-bcos/4nodes1group/node1/data/group1/block/000022.ldb and /dev/null differ diff --git a/networks/fisco-bcos/4nodes1group/node1/data/group1/block/000023.ldb b/networks/fisco-bcos/4nodes1group/node1/data/group1/block/000023.ldb deleted file mode 100644 index ed0188d2c..000000000 Binary files a/networks/fisco-bcos/4nodes1group/node1/data/group1/block/000023.ldb and /dev/null differ diff --git a/networks/fisco-bcos/4nodes1group/node1/data/group1/block/000024.ldb b/networks/fisco-bcos/4nodes1group/node1/data/group1/block/000024.ldb deleted file mode 100644 index f0b25e890..000000000 Binary files a/networks/fisco-bcos/4nodes1group/node1/data/group1/block/000024.ldb and /dev/null differ diff --git a/networks/fisco-bcos/4nodes1group/node1/data/group1/block/000025.ldb b/networks/fisco-bcos/4nodes1group/node1/data/group1/block/000025.ldb deleted file mode 100644 index bd8ce8a7d..000000000 Binary files a/networks/fisco-bcos/4nodes1group/node1/data/group1/block/000025.ldb and /dev/null differ diff --git a/networks/fisco-bcos/4nodes1group/node1/data/group1/block/CURRENT b/networks/fisco-bcos/4nodes1group/node1/data/group1/block/CURRENT deleted file mode 100644 index 056df57bb..000000000 --- a/networks/fisco-bcos/4nodes1group/node1/data/group1/block/CURRENT +++ /dev/null @@ -1 +0,0 @@ -MANIFEST-000017 diff --git a/networks/fisco-bcos/4nodes1group/node1/data/group1/block/LOCK b/networks/fisco-bcos/4nodes1group/node1/data/group1/block/LOCK deleted file mode 100644 index e69de29bb..000000000 diff --git a/networks/fisco-bcos/4nodes1group/node1/data/group1/block/LOG b/networks/fisco-bcos/4nodes1group/node1/data/group1/block/LOG deleted file mode 100644 index 6d117c503..000000000 --- a/networks/fisco-bcos/4nodes1group/node1/data/group1/block/LOG +++ /dev/null @@ -1,20 +0,0 @@ -2019/11/20-00:51:23.768417 7f0418fafc00 Recovering log #15 -2019/11/20-00:51:23.780976 7f0418fafc00 Level-0 table #18: started -2019/11/20-00:51:23.988489 7f0418fafc00 Level-0 table #18: 1755956 bytes OK -2019/11/20-00:51:23.998872 7f0418fafc00 Delete type=0 #15 -2019/11/20-00:51:24.000738 7f0418fafc00 Delete type=3 #11 -2019/11/20-00:51:24.009521 7f0407639700 Compacting 4@0 + 0@1 files -2019/11/20-00:51:24.064442 7f0407639700 Generated table #20@0: 39 keys, 2118515 bytes -2019/11/20-00:51:24.105777 7f0407639700 Generated table #21@0: 4 keys, 2404346 bytes -2019/11/20-00:51:24.194732 7f0407639700 Generated table #22@0: 3 keys, 4427607 bytes -2019/11/20-00:51:24.237805 7f0407639700 Generated table #23@0: 2 keys, 2409277 bytes -2019/11/20-00:51:24.643005 7f0407639700 Generated table #24@0: 8049 keys, 2134418 bytes -2019/11/20-00:51:24.728679 7f0407639700 Generated table #25@0: 1969 keys, 521252 bytes -2019/11/20-00:51:24.728956 7f0407639700 Compacted 4@0 + 0@1 files => 14015415 bytes -2019/11/20-00:51:24.730537 7f0407639700 compacted to: files[ 0 6 0 0 0 0 0 ] -2019/11/20-00:51:24.732955 7f0407639700 Delete type=2 #14 -2019/11/20-00:51:24.735691 7f0407639700 Delete type=2 #16 -2019/11/20-00:51:24.738544 7f0407639700 Delete type=2 #5 -2019/11/20-00:51:24.740194 7f0407639700 Delete type=2 #18 -2019/11/20-00:51:24.743474 7f0407639700 Moved #20 to level-2 2118515 bytes OK: files[ 0 5 1 0 0 0 0 ] -2019/11/20-00:51:24.744641 7f0407639700 Moved #21 to level-2 2404346 bytes OK: files[ 0 4 2 0 0 0 0 ] diff --git a/networks/fisco-bcos/4nodes1group/node1/data/group1/block/LOG.old b/networks/fisco-bcos/4nodes1group/node1/data/group1/block/LOG.old deleted file mode 100644 index 8b10e86c0..000000000 --- a/networks/fisco-bcos/4nodes1group/node1/data/group1/block/LOG.old +++ /dev/null @@ -1,9 +0,0 @@ -2019/11/20-00:49:54.560960 7fdf1433ac00 Recovering log #10 -2019/11/20-00:49:54.571557 7fdf1433ac00 Delete type=0 #10 -2019/11/20-00:49:54.572199 7fdf1433ac00 Delete type=3 #9 -2019/11/20-00:50:32.394262 7fdefcdb7700 Level-0 table #14: started -2019/11/20-00:50:33.238067 7fdefcdb7700 Level-0 table #14: 5795519 bytes OK -2019/11/20-00:50:33.244816 7fdefcdb7700 Delete type=0 #12 -2019/11/20-00:50:37.678957 7fdefcdb7700 Level-0 table #16: started -2019/11/20-00:50:38.231184 7fdefcdb7700 Level-0 table #16: 6490270 bytes OK -2019/11/20-00:50:38.244370 7fdefcdb7700 Delete type=0 #13 diff --git a/networks/fisco-bcos/4nodes1group/node1/data/group1/block/MANIFEST-000017 b/networks/fisco-bcos/4nodes1group/node1/data/group1/block/MANIFEST-000017 deleted file mode 100644 index 61fbd2ae4..000000000 Binary files a/networks/fisco-bcos/4nodes1group/node1/data/group1/block/MANIFEST-000017 and /dev/null differ diff --git a/networks/fisco-bcos/4nodes1group/node1/data/group1/pbftMsgBackup/000013.ldb b/networks/fisco-bcos/4nodes1group/node1/data/group1/pbftMsgBackup/000013.ldb deleted file mode 100644 index 261a15f2f..000000000 Binary files a/networks/fisco-bcos/4nodes1group/node1/data/group1/pbftMsgBackup/000013.ldb and /dev/null differ diff --git a/networks/fisco-bcos/4nodes1group/node1/data/group1/pbftMsgBackup/CURRENT b/networks/fisco-bcos/4nodes1group/node1/data/group1/pbftMsgBackup/CURRENT deleted file mode 100644 index ef20c6ded..000000000 --- a/networks/fisco-bcos/4nodes1group/node1/data/group1/pbftMsgBackup/CURRENT +++ /dev/null @@ -1 +0,0 @@ -MANIFEST-000012 diff --git a/networks/fisco-bcos/4nodes1group/node1/data/group1/pbftMsgBackup/LOCK b/networks/fisco-bcos/4nodes1group/node1/data/group1/pbftMsgBackup/LOCK deleted file mode 100644 index e69de29bb..000000000 diff --git a/networks/fisco-bcos/4nodes1group/node1/data/group1/pbftMsgBackup/LOG b/networks/fisco-bcos/4nodes1group/node1/data/group1/pbftMsgBackup/LOG deleted file mode 100644 index b7eb0a4b8..000000000 --- a/networks/fisco-bcos/4nodes1group/node1/data/group1/pbftMsgBackup/LOG +++ /dev/null @@ -1,5 +0,0 @@ -2019/11/20-00:51:24.109750 7f0418fafc00 Recovering log #11 -2019/11/20-00:51:24.145116 7f0418fafc00 Level-0 table #13: started -2019/11/20-00:51:24.222214 7f0418fafc00 Level-0 table #13: 4527502 bytes OK -2019/11/20-00:51:24.245447 7f0418fafc00 Delete type=0 #11 -2019/11/20-00:51:24.251098 7f0418fafc00 Delete type=3 #10 diff --git a/networks/fisco-bcos/4nodes1group/node1/data/group1/pbftMsgBackup/LOG.old b/networks/fisco-bcos/4nodes1group/node1/data/group1/pbftMsgBackup/LOG.old deleted file mode 100644 index 9e776c613..000000000 --- a/networks/fisco-bcos/4nodes1group/node1/data/group1/pbftMsgBackup/LOG.old +++ /dev/null @@ -1,3 +0,0 @@ -2019/11/20-00:49:54.590801 7fdf1433ac00 Recovering log #9 -2019/11/20-00:49:54.601600 7fdf1433ac00 Delete type=3 #8 -2019/11/20-00:49:54.602632 7fdf1433ac00 Delete type=0 #9 diff --git a/networks/fisco-bcos/4nodes1group/node1/data/group1/pbftMsgBackup/MANIFEST-000012 b/networks/fisco-bcos/4nodes1group/node1/data/group1/pbftMsgBackup/MANIFEST-000012 deleted file mode 100644 index af16de1c8..000000000 Binary files a/networks/fisco-bcos/4nodes1group/node1/data/group1/pbftMsgBackup/MANIFEST-000012 and /dev/null differ diff --git a/networks/fisco-bcos/4nodes1group/node2/conf/ca.crt b/networks/fisco-bcos/4nodes1group/node2/conf/ca.crt deleted file mode 100644 index 09bfbbde0..000000000 --- a/networks/fisco-bcos/4nodes1group/node2/conf/ca.crt +++ /dev/null @@ -1,20 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDPTCCAiWgAwIBAgIJAOGxa7KkPpF8MA0GCSqGSIb3DQEBCwUAMDUxDjAMBgNV -BAMMBWNoYWluMRMwEQYDVQQKDApmaXNjby1iY29zMQ4wDAYDVQQLDAVjaGFpbjAe -Fw0xOTA2MTEwMzMxMjZaFw0yOTA2MDgwMzMxMjZaMDUxDjAMBgNVBAMMBWNoYWlu -MRMwEQYDVQQKDApmaXNjby1iY29zMQ4wDAYDVQQLDAVjaGFpbjCCASIwDQYJKoZI -hvcNAQEBBQADggEPADCCAQoCggEBALvzIKFr9UnSQnOExe5NkKN1hN5RRcOPSPfs -MrUJ6k5Om/WfCMMCgIlIZASaK0WKBo45IvDLFuQmng/XziY7/i9mO3xgvyQxfQMj -qHGKpKmNxtj9wuORKT+w/5Ino+avMatucO5FrWrw9PloaEz8cmy8SVnD6E6JSbbr -uiTRoR5OXGiEzVaECMBeCobAbdy2hQSaaZnHJYtXYFqvo4Xnh5/PT5hVQCuKih8P -OXRune4Zvl2mydW+t3QSWrT33gUaPVZDrvaLWpbLeEXVwZ4jvUMo5qCiMzbX69db -F4K+VIT6PXi35OI6uxSjiaisDFUItZv/srGE4ikQxBuIP7PAizsCAwEAAaNQME4w -HQYDVR0OBBYEFCuHzKdBsmgEDTF28/PT/Jhn8DwPMB8GA1UdIwQYMBaAFCuHzKdB -smgEDTF28/PT/Jhn8DwPMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEB -AIPDj3p7xhS5+fI78A/qpToJDZvgwHs56jnJ8XtECfjrvtT0FinMI4pLPs+scj8b -Lm0RM+WKSpig7TtO1Zjwma22CSssr/MJAWOa8Y200qgVmuiOmtuVBPw+mMcI1Ijt -GDEgXVWL1odIHWjookjAzSRiOvU5KUGctImHZ3RPQozOt7TTVx3usH5qJiWVg2IB -DBiBdCVzwSR5EGkIr0cC6cih/08R0fDaLXwUrHgeJi6VUDdp+rV6h76frJowwbJc -Q3s8fdVW3ti7YUOHJD08WWz0+1PblVHwlCIYBxdH06m5nFYZyeoLg+I+xduH5hNH -VH3h/8g8OQvRZnc6nF/mXpU= ------END CERTIFICATE----- diff --git a/networks/fisco-bcos/4nodes1group/node2/conf/group.1.genesis b/networks/fisco-bcos/4nodes1group/node2/conf/group.1.genesis deleted file mode 100644 index 553ac0014..000000000 --- a/networks/fisco-bcos/4nodes1group/node2/conf/group.1.genesis +++ /dev/null @@ -1,26 +0,0 @@ -;consensus configuration -[consensus] - ;consensus algorithm type, now support PBFT(consensus_type=pbft) and Raft(consensus_type=raft) - consensus_type=pbft - ;the max number of transactions of a block - max_trans_num=10000 - ;the node id of leaders - node.0=0522afb1b6178903bef0fe9c78c91f8e1cda785c86a164beb0194eb19e977bd5aa4f7ad7a34d56cf7df1d86e8b37a9020643d8e2231e4ab42235f53b2251b697 - node.1=d0f6425fc9214cdd99f2fe15cf5c9d818113afac9c4a54366a5cc42e267c6384fa2e79eaae2c87e8103f41726585811c9089f20bca3454819f0fccdf406df0d8 - node.2=1e765dc25326d1c23c120355b01e11f6b3a23f5a2332151bde20aac292b35afee66fbec641dcabb888dccf4e65bd3e56cfdfe9af69883154b3ad3800cac4a2b5 - node.3=e2edc5a18abaf072836f48eb1050279171409ee45306fba37e1fc8b62691efe5d6bfccffe134794b6f420b49bbff53c6c4df70fa742c8f5059d4db7a1994bdfa - -[storage] - ;storage db type, leveldb or external - type=LevelDB - topic=DB -[state] - ;support mpt/storage - type=storage - -;tx gas limit -[tx] - gas_limit=300000000 -[group] - id=1 - timestamp=1560223886000 diff --git a/networks/fisco-bcos/4nodes1group/node2/conf/group.1.ini b/networks/fisco-bcos/4nodes1group/node2/conf/group.1.ini deleted file mode 100644 index cb8253f83..000000000 --- a/networks/fisco-bcos/4nodes1group/node2/conf/group.1.ini +++ /dev/null @@ -1,12 +0,0 @@ -; the ttl for broadcasting pbft message -[consensus] - ;ttl=2 - ;min block generation time(ms), the max block generation time is 1000 ms - ;min_block_generation_time=500 - ;enable_dynamic_block_size=true - -;txpool limit -[tx_pool] - limit=150000 -[tx_execute] - enable_parallel=true diff --git a/networks/fisco-bcos/4nodes1group/node2/conf/node.crt b/networks/fisco-bcos/4nodes1group/node2/conf/node.crt deleted file mode 100644 index defb612b3..000000000 --- a/networks/fisco-bcos/4nodes1group/node2/conf/node.crt +++ /dev/null @@ -1,33 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICOjCCASKgAwIBAgIJAIr5gH0OTKg0MA0GCSqGSIb3DQEBCwUAMDcxDzANBgNV -BAMMBmFnZW5jeTETMBEGA1UECgwKZmlzY28tYmNvczEPMA0GA1UECwwGYWdlbmN5 -MB4XDTE5MDYxMTAzMzEyN1oXDTI5MDYwODAzMzEyN1owNDEOMAwGA1UEAwwFbm9k -ZTIxEzARBgNVBAoMCmZpc2NvLWJjb3MxDTALBgNVBAsMBG5vZGUwVjAQBgcqhkjO -PQIBBgUrgQQACgNCAAQedl3CUybRwjwSA1WwHhH2s6I/WiMyFRveIKrCkrNa/uZv -vsZB3Ku4iNzPTmW9PlbP3+mvaYgxVLOtOADKxKK1oxowGDAJBgNVHRMEAjAAMAsG -A1UdDwQEAwIF4DANBgkqhkiG9w0BAQsFAAOCAQEAuCnvOW7VK5PURmZMN6+scBgh -idJ4aD7iHLqiSMFxcB3Inl4DmK3My+CMFjSsHhWuct7S88PooGFE1HvzjhjAErIk -sS+vwy4qArQYpIpejeyddtchdSuKE5OL9o/JIhsw5WcRw56DG0KC2V5OppCXxg3j -ffKQHcM8PSIS7GLMT3nZCktRLpLLw5N0/87loSAkJhQW32lpjKrPsmdxaqpVR+bD -zXQrp44PxYJORalFhOGhxMgGXmn5RpGX/6TgLgQaTiKi3B66jR9mLliv0JQRmdih -JKNzrXN2fQqUOLQ2RmKpmzdlF5lKAxA9wm4qk3i0Vhi2lBTMJQiKUxe8osFd8A== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIC/zCCAeegAwIBAgIJAJohET2vzuAvMA0GCSqGSIb3DQEBCwUAMDUxDjAMBgNV -BAMMBWNoYWluMRMwEQYDVQQKDApmaXNjby1iY29zMQ4wDAYDVQQLDAVjaGFpbjAe -Fw0xOTA2MTEwMzMxMjdaFw0yOTA2MDgwMzMxMjdaMDcxDzANBgNVBAMMBmFnZW5j -eTETMBEGA1UECgwKZmlzY28tYmNvczEPMA0GA1UECwwGYWdlbmN5MIIBIjANBgkq -hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA/QA51rMRyFZPNyb/MfrMe6Q3Oy5nWcZH -R1oDcdhBdSQs/CR1GFI0xDXQH5KjnC7yJsnnRdKdPQ/0x1thefS8WYwDie/wba7N -6hKhthiIiqRIGv1RzEKM3N69iux6KelCwuUmbLHQYl7WsmoD6+oDCtLHtb4QakAU -Ga7JPvWgbBfFQ24pud/7APCyYqOBfwtLtnuM7hEzaQxpwa9hUfCwElK3i+WqI10U -2OQBEL33Vj7eRgUNaxEF6OGhP15wAtR6ZIVrOyjrnd2zyudstLe4XC2iMNS2mkmX -7avgjXwGpSG4uT3x6LPHTNyRdJz8zd3NJdImwaMZpA4bzh3rik7f5wIDAQABoxAw -DjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQA1nHpk+WGkIBPe5c9t -pJ9lVVqmUFiAYW75GoyPRix8YX0BcKWQmC3Gch0mqOcJ8UZg3fN4z+U177MluTxZ -fC8a7Ju//4Dcbc7JSRLCqzvvtLwUydDoF+7lIzZi30ssLjM6Vb7OHl0z74NuUKOw -Jn5TCRKjiMiO3d0iCyE/TP6KJSt1m8yRGc4/mHEuCdLuHhSMIeKg8NIrP2/cTv3L -8/L0/rkHFTg9CQWWtC39uWOzXVpYG5U9ryCNNkFtu5hlS7MVlGaqQvaNlP1DnTiJ -0/KyZKkwpo9pQjjlWwe/O5CNsL12vri8MROX5yBxBcM3QXwsTz+Z3wJB3F19cyBi -5SXJ ------END CERTIFICATE----- diff --git a/networks/fisco-bcos/4nodes1group/node2/conf/node.key b/networks/fisco-bcos/4nodes1group/node2/conf/node.key deleted file mode 100644 index b605421a7..000000000 --- a/networks/fisco-bcos/4nodes1group/node2/conf/node.key +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGEAgEAMBAGByqGSM49AgEGBSuBBAAKBG0wawIBAQQgMxCjKuN2kv/KYxRikpHu -cmIvcXGNI2JVtsNEeiYGTHKhRANCAAQedl3CUybRwjwSA1WwHhH2s6I/WiMyFRve -IKrCkrNa/uZvvsZB3Ku4iNzPTmW9PlbP3+mvaYgxVLOtOADKxKK1 ------END PRIVATE KEY----- diff --git a/networks/fisco-bcos/4nodes1group/node2/conf/node.nodeid b/networks/fisco-bcos/4nodes1group/node2/conf/node.nodeid deleted file mode 100644 index 0711da3d1..000000000 --- a/networks/fisco-bcos/4nodes1group/node2/conf/node.nodeid +++ /dev/null @@ -1 +0,0 @@ -1e765dc25326d1c23c120355b01e11f6b3a23f5a2332151bde20aac292b35afee66fbec641dcabb888dccf4e65bd3e56cfdfe9af69883154b3ad3800cac4a2b5 diff --git a/networks/fisco-bcos/4nodes1group/node2/config.ini b/networks/fisco-bcos/4nodes1group/node2/config.ini deleted file mode 100644 index 199ea0d72..000000000 --- a/networks/fisco-bcos/4nodes1group/node2/config.ini +++ /dev/null @@ -1,70 +0,0 @@ -[rpc] - ; rpc listen ip - listen_ip=0.0.0.0 - ; channelserver listen port - channel_listen_port=20916 - ; jsonrpc listen port - jsonrpc_listen_port=8916 -[p2p] - ; p2p listen ip - listen_ip=0.0.0.0 - ; p2p listen port - listen_port=30916 - ; nodes to connect - node.0=172.17.0.1:30914 - node.1=172.17.0.1:30915 - node.2=172.17.0.1:30916 - node.3=172.17.0.1:30917 - - ;enable/disable network compress - ;enable_compress=false - -;certificate rejected list -[certificate_blacklist] - ; crl.0 should be nodeid, nodeid's length is 128 - ;crl.0= - -;group configurations -;WARNING: group 0 is forbided -[group] - group_data_path=data/ - group_config_path=conf/ - -;certificate configuration -[network_security] - ; directory the certificates located in - data_path=conf/ - ; the node private key file - key=node.key - ; the node certificate file - cert=node.crt - ; the ca certificate file - ca_cert=ca.crt - -; storage security releated configurations -[storage_security] -; enable storage_security or not -;enable=true -; the IP of key mananger -;key_manager_ip= -; the Port of key manager -;key_manager_port= -;cipher_data_key= - -[chain] - id=1 -[compatibility] - supported_version=2.0.0-rc2 -;log configurations -[log] - ; the directory of the log - log_path=./log - ; info debug trace - level=info - ; MB - max_log_file_size=200 - ; control log auto_flush - flush=true - ; easylog config - format=%level|%datetime{%Y-%M-%d %H:%m:%s:%g}|%msg - log_flush_threshold=100 diff --git a/networks/fisco-bcos/4nodes1group/node2/data/group1/block/000020.ldb b/networks/fisco-bcos/4nodes1group/node2/data/group1/block/000020.ldb deleted file mode 100644 index 55692d108..000000000 Binary files a/networks/fisco-bcos/4nodes1group/node2/data/group1/block/000020.ldb and /dev/null differ diff --git a/networks/fisco-bcos/4nodes1group/node2/data/group1/block/000021.ldb b/networks/fisco-bcos/4nodes1group/node2/data/group1/block/000021.ldb deleted file mode 100644 index 0e31f378e..000000000 Binary files a/networks/fisco-bcos/4nodes1group/node2/data/group1/block/000021.ldb and /dev/null differ diff --git a/networks/fisco-bcos/4nodes1group/node2/data/group1/block/000022.ldb b/networks/fisco-bcos/4nodes1group/node2/data/group1/block/000022.ldb deleted file mode 100644 index c7d891833..000000000 Binary files a/networks/fisco-bcos/4nodes1group/node2/data/group1/block/000022.ldb and /dev/null differ diff --git a/networks/fisco-bcos/4nodes1group/node2/data/group1/block/000023.ldb b/networks/fisco-bcos/4nodes1group/node2/data/group1/block/000023.ldb deleted file mode 100644 index 4ef21bf28..000000000 Binary files a/networks/fisco-bcos/4nodes1group/node2/data/group1/block/000023.ldb and /dev/null differ diff --git a/networks/fisco-bcos/4nodes1group/node2/data/group1/block/000024.ldb b/networks/fisco-bcos/4nodes1group/node2/data/group1/block/000024.ldb deleted file mode 100644 index 8246c6b05..000000000 Binary files a/networks/fisco-bcos/4nodes1group/node2/data/group1/block/000024.ldb and /dev/null differ diff --git a/networks/fisco-bcos/4nodes1group/node2/data/group1/block/000025.ldb b/networks/fisco-bcos/4nodes1group/node2/data/group1/block/000025.ldb deleted file mode 100644 index 27d1e7fb2..000000000 Binary files a/networks/fisco-bcos/4nodes1group/node2/data/group1/block/000025.ldb and /dev/null differ diff --git a/networks/fisco-bcos/4nodes1group/node2/data/group1/block/CURRENT b/networks/fisco-bcos/4nodes1group/node2/data/group1/block/CURRENT deleted file mode 100644 index 056df57bb..000000000 --- a/networks/fisco-bcos/4nodes1group/node2/data/group1/block/CURRENT +++ /dev/null @@ -1 +0,0 @@ -MANIFEST-000017 diff --git a/networks/fisco-bcos/4nodes1group/node2/data/group1/block/LOCK b/networks/fisco-bcos/4nodes1group/node2/data/group1/block/LOCK deleted file mode 100644 index e69de29bb..000000000 diff --git a/networks/fisco-bcos/4nodes1group/node2/data/group1/block/LOG b/networks/fisco-bcos/4nodes1group/node2/data/group1/block/LOG deleted file mode 100644 index ab92d86d1..000000000 --- a/networks/fisco-bcos/4nodes1group/node2/data/group1/block/LOG +++ /dev/null @@ -1,20 +0,0 @@ -2019/11/20-00:51:24.949719 7f6672947c00 Recovering log #15 -2019/11/20-00:51:24.959288 7f6672947c00 Level-0 table #18: started -2019/11/20-00:51:25.162753 7f6672947c00 Level-0 table #18: 1755956 bytes OK -2019/11/20-00:51:25.173667 7f6672947c00 Delete type=0 #15 -2019/11/20-00:51:25.175680 7f6672947c00 Delete type=3 #11 -2019/11/20-00:51:25.187166 7f6660fd1700 Compacting 4@0 + 0@1 files -2019/11/20-00:51:25.228692 7f6660fd1700 Generated table #20@0: 39 keys, 2118515 bytes -2019/11/20-00:51:25.269093 7f6660fd1700 Generated table #21@0: 4 keys, 2404346 bytes -2019/11/20-00:51:25.350967 7f6660fd1700 Generated table #22@0: 3 keys, 4427607 bytes -2019/11/20-00:51:25.418721 7f6660fd1700 Generated table #23@0: 2 keys, 2409277 bytes -2019/11/20-00:51:25.868966 7f6660fd1700 Generated table #24@0: 8049 keys, 2134418 bytes -2019/11/20-00:51:25.941680 7f6660fd1700 Generated table #25@0: 1969 keys, 521252 bytes -2019/11/20-00:51:25.942013 7f6660fd1700 Compacted 4@0 + 0@1 files => 14015415 bytes -2019/11/20-00:51:25.943410 7f6660fd1700 compacted to: files[ 0 6 0 0 0 0 0 ] -2019/11/20-00:51:25.945471 7f6660fd1700 Delete type=2 #14 -2019/11/20-00:51:25.948090 7f6660fd1700 Delete type=2 #16 -2019/11/20-00:51:25.950992 7f6660fd1700 Delete type=2 #5 -2019/11/20-00:51:25.952767 7f6660fd1700 Delete type=2 #18 -2019/11/20-00:51:25.954974 7f6660fd1700 Moved #20 to level-2 2118515 bytes OK: files[ 0 5 1 0 0 0 0 ] -2019/11/20-00:51:25.956139 7f6660fd1700 Moved #21 to level-2 2404346 bytes OK: files[ 0 4 2 0 0 0 0 ] diff --git a/networks/fisco-bcos/4nodes1group/node2/data/group1/block/LOG.old b/networks/fisco-bcos/4nodes1group/node2/data/group1/block/LOG.old deleted file mode 100644 index 9e17549ca..000000000 --- a/networks/fisco-bcos/4nodes1group/node2/data/group1/block/LOG.old +++ /dev/null @@ -1,9 +0,0 @@ -2019/11/20-00:49:55.528928 7f4d2d5dcc00 Recovering log #10 -2019/11/20-00:49:55.544464 7f4d2d5dcc00 Delete type=0 #10 -2019/11/20-00:49:55.545378 7f4d2d5dcc00 Delete type=3 #9 -2019/11/20-00:50:32.034804 7f4d16059700 Level-0 table #14: started -2019/11/20-00:50:32.771142 7f4d16059700 Level-0 table #14: 5795519 bytes OK -2019/11/20-00:50:32.803413 7f4d16059700 Delete type=0 #12 -2019/11/20-00:50:37.695634 7f4d16059700 Level-0 table #16: started -2019/11/20-00:50:38.258669 7f4d16059700 Level-0 table #16: 6490270 bytes OK -2019/11/20-00:50:38.278941 7f4d16059700 Delete type=0 #13 diff --git a/networks/fisco-bcos/4nodes1group/node2/data/group1/block/MANIFEST-000017 b/networks/fisco-bcos/4nodes1group/node2/data/group1/block/MANIFEST-000017 deleted file mode 100644 index b575e28d5..000000000 Binary files a/networks/fisco-bcos/4nodes1group/node2/data/group1/block/MANIFEST-000017 and /dev/null differ diff --git a/networks/fisco-bcos/4nodes1group/node2/data/group1/pbftMsgBackup/000013.ldb b/networks/fisco-bcos/4nodes1group/node2/data/group1/pbftMsgBackup/000013.ldb deleted file mode 100644 index 261a15f2f..000000000 Binary files a/networks/fisco-bcos/4nodes1group/node2/data/group1/pbftMsgBackup/000013.ldb and /dev/null differ diff --git a/networks/fisco-bcos/4nodes1group/node2/data/group1/pbftMsgBackup/CURRENT b/networks/fisco-bcos/4nodes1group/node2/data/group1/pbftMsgBackup/CURRENT deleted file mode 100644 index ef20c6ded..000000000 --- a/networks/fisco-bcos/4nodes1group/node2/data/group1/pbftMsgBackup/CURRENT +++ /dev/null @@ -1 +0,0 @@ -MANIFEST-000012 diff --git a/networks/fisco-bcos/4nodes1group/node2/data/group1/pbftMsgBackup/LOCK b/networks/fisco-bcos/4nodes1group/node2/data/group1/pbftMsgBackup/LOCK deleted file mode 100644 index e69de29bb..000000000 diff --git a/networks/fisco-bcos/4nodes1group/node2/data/group1/pbftMsgBackup/LOG b/networks/fisco-bcos/4nodes1group/node2/data/group1/pbftMsgBackup/LOG deleted file mode 100644 index d2e6e8589..000000000 --- a/networks/fisco-bcos/4nodes1group/node2/data/group1/pbftMsgBackup/LOG +++ /dev/null @@ -1,5 +0,0 @@ -2019/11/20-00:51:25.298312 7f6672947c00 Recovering log #11 -2019/11/20-00:51:25.331734 7f6672947c00 Level-0 table #13: started -2019/11/20-00:51:25.427339 7f6672947c00 Level-0 table #13: 4527502 bytes OK -2019/11/20-00:51:25.441283 7f6672947c00 Delete type=0 #11 -2019/11/20-00:51:25.444925 7f6672947c00 Delete type=3 #10 diff --git a/networks/fisco-bcos/4nodes1group/node2/data/group1/pbftMsgBackup/LOG.old b/networks/fisco-bcos/4nodes1group/node2/data/group1/pbftMsgBackup/LOG.old deleted file mode 100644 index dd2be5c36..000000000 --- a/networks/fisco-bcos/4nodes1group/node2/data/group1/pbftMsgBackup/LOG.old +++ /dev/null @@ -1,3 +0,0 @@ -2019/11/20-00:49:55.564608 7f4d2d5dcc00 Recovering log #9 -2019/11/20-00:49:55.575367 7f4d2d5dcc00 Delete type=3 #8 -2019/11/20-00:49:55.576193 7f4d2d5dcc00 Delete type=0 #9 diff --git a/networks/fisco-bcos/4nodes1group/node2/data/group1/pbftMsgBackup/MANIFEST-000012 b/networks/fisco-bcos/4nodes1group/node2/data/group1/pbftMsgBackup/MANIFEST-000012 deleted file mode 100644 index af16de1c8..000000000 Binary files a/networks/fisco-bcos/4nodes1group/node2/data/group1/pbftMsgBackup/MANIFEST-000012 and /dev/null differ diff --git a/networks/fisco-bcos/4nodes1group/node3/conf/ca.crt b/networks/fisco-bcos/4nodes1group/node3/conf/ca.crt deleted file mode 100644 index 09bfbbde0..000000000 --- a/networks/fisco-bcos/4nodes1group/node3/conf/ca.crt +++ /dev/null @@ -1,20 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDPTCCAiWgAwIBAgIJAOGxa7KkPpF8MA0GCSqGSIb3DQEBCwUAMDUxDjAMBgNV -BAMMBWNoYWluMRMwEQYDVQQKDApmaXNjby1iY29zMQ4wDAYDVQQLDAVjaGFpbjAe -Fw0xOTA2MTEwMzMxMjZaFw0yOTA2MDgwMzMxMjZaMDUxDjAMBgNVBAMMBWNoYWlu -MRMwEQYDVQQKDApmaXNjby1iY29zMQ4wDAYDVQQLDAVjaGFpbjCCASIwDQYJKoZI -hvcNAQEBBQADggEPADCCAQoCggEBALvzIKFr9UnSQnOExe5NkKN1hN5RRcOPSPfs -MrUJ6k5Om/WfCMMCgIlIZASaK0WKBo45IvDLFuQmng/XziY7/i9mO3xgvyQxfQMj -qHGKpKmNxtj9wuORKT+w/5Ino+avMatucO5FrWrw9PloaEz8cmy8SVnD6E6JSbbr -uiTRoR5OXGiEzVaECMBeCobAbdy2hQSaaZnHJYtXYFqvo4Xnh5/PT5hVQCuKih8P -OXRune4Zvl2mydW+t3QSWrT33gUaPVZDrvaLWpbLeEXVwZ4jvUMo5qCiMzbX69db -F4K+VIT6PXi35OI6uxSjiaisDFUItZv/srGE4ikQxBuIP7PAizsCAwEAAaNQME4w -HQYDVR0OBBYEFCuHzKdBsmgEDTF28/PT/Jhn8DwPMB8GA1UdIwQYMBaAFCuHzKdB -smgEDTF28/PT/Jhn8DwPMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEB -AIPDj3p7xhS5+fI78A/qpToJDZvgwHs56jnJ8XtECfjrvtT0FinMI4pLPs+scj8b -Lm0RM+WKSpig7TtO1Zjwma22CSssr/MJAWOa8Y200qgVmuiOmtuVBPw+mMcI1Ijt -GDEgXVWL1odIHWjookjAzSRiOvU5KUGctImHZ3RPQozOt7TTVx3usH5qJiWVg2IB -DBiBdCVzwSR5EGkIr0cC6cih/08R0fDaLXwUrHgeJi6VUDdp+rV6h76frJowwbJc -Q3s8fdVW3ti7YUOHJD08WWz0+1PblVHwlCIYBxdH06m5nFYZyeoLg+I+xduH5hNH -VH3h/8g8OQvRZnc6nF/mXpU= ------END CERTIFICATE----- diff --git a/networks/fisco-bcos/4nodes1group/node3/conf/group.1.genesis b/networks/fisco-bcos/4nodes1group/node3/conf/group.1.genesis deleted file mode 100644 index 553ac0014..000000000 --- a/networks/fisco-bcos/4nodes1group/node3/conf/group.1.genesis +++ /dev/null @@ -1,26 +0,0 @@ -;consensus configuration -[consensus] - ;consensus algorithm type, now support PBFT(consensus_type=pbft) and Raft(consensus_type=raft) - consensus_type=pbft - ;the max number of transactions of a block - max_trans_num=10000 - ;the node id of leaders - node.0=0522afb1b6178903bef0fe9c78c91f8e1cda785c86a164beb0194eb19e977bd5aa4f7ad7a34d56cf7df1d86e8b37a9020643d8e2231e4ab42235f53b2251b697 - node.1=d0f6425fc9214cdd99f2fe15cf5c9d818113afac9c4a54366a5cc42e267c6384fa2e79eaae2c87e8103f41726585811c9089f20bca3454819f0fccdf406df0d8 - node.2=1e765dc25326d1c23c120355b01e11f6b3a23f5a2332151bde20aac292b35afee66fbec641dcabb888dccf4e65bd3e56cfdfe9af69883154b3ad3800cac4a2b5 - node.3=e2edc5a18abaf072836f48eb1050279171409ee45306fba37e1fc8b62691efe5d6bfccffe134794b6f420b49bbff53c6c4df70fa742c8f5059d4db7a1994bdfa - -[storage] - ;storage db type, leveldb or external - type=LevelDB - topic=DB -[state] - ;support mpt/storage - type=storage - -;tx gas limit -[tx] - gas_limit=300000000 -[group] - id=1 - timestamp=1560223886000 diff --git a/networks/fisco-bcos/4nodes1group/node3/conf/group.1.ini b/networks/fisco-bcos/4nodes1group/node3/conf/group.1.ini deleted file mode 100644 index cb8253f83..000000000 --- a/networks/fisco-bcos/4nodes1group/node3/conf/group.1.ini +++ /dev/null @@ -1,12 +0,0 @@ -; the ttl for broadcasting pbft message -[consensus] - ;ttl=2 - ;min block generation time(ms), the max block generation time is 1000 ms - ;min_block_generation_time=500 - ;enable_dynamic_block_size=true - -;txpool limit -[tx_pool] - limit=150000 -[tx_execute] - enable_parallel=true diff --git a/networks/fisco-bcos/4nodes1group/node3/conf/node.crt b/networks/fisco-bcos/4nodes1group/node3/conf/node.crt deleted file mode 100644 index cd01dc3ad..000000000 --- a/networks/fisco-bcos/4nodes1group/node3/conf/node.crt +++ /dev/null @@ -1,33 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICOjCCASKgAwIBAgIJAIr5gH0OTKg2MA0GCSqGSIb3DQEBCwUAMDcxDzANBgNV -BAMMBmFnZW5jeTETMBEGA1UECgwKZmlzY28tYmNvczEPMA0GA1UECwwGYWdlbmN5 -MB4XDTE5MDYxMTAzMzEyN1oXDTI5MDYwODAzMzEyN1owNDEOMAwGA1UEAwwFbm9k -ZTMxEzARBgNVBAoMCmZpc2NvLWJjb3MxDTALBgNVBAsMBG5vZGUwVjAQBgcqhkjO -PQIBBgUrgQQACgNCAATi7cWhirrwcoNvSOsQUCeRcUCe5FMG+6N+H8i2JpHv5da/ -zP/hNHlLb0ILSbv/U8bE33D6dCyPUFnU23oZlL36oxowGDAJBgNVHRMEAjAAMAsG -A1UdDwQEAwIF4DANBgkqhkiG9w0BAQsFAAOCAQEArkUui84yWQkLpENWrMWlDn3O -SHM5j4XnsAxD0c9TS4asuh4ehEChwLulyygQ2Qj7Fsrm1UQGmIERb0a2UYe74BW9 -oF9FuUVimggIQGGkXgiThZD/u8oe3dXpblzlIqDyqBRyB11FelZiJTVCKUPptIuv -xhXxjqzR6xPfq7rzzxIR+EcU2Adv5W6gxY7hUbYpHxUGiWiEAa7eKzJeRIyvFtOT -pJVAt5hJf1nMo9fx96RvhkL8P9Veob3uaOLHEu5qQgzGXRInAubeZ9A5KNejFGKw -dKaIEVZyGEbJ3TtOXOox4wfZsD6s/VINOo4G8E8i+8tkz/S7kUWxTGVrIKi9lw== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIC/zCCAeegAwIBAgIJAJohET2vzuAvMA0GCSqGSIb3DQEBCwUAMDUxDjAMBgNV -BAMMBWNoYWluMRMwEQYDVQQKDApmaXNjby1iY29zMQ4wDAYDVQQLDAVjaGFpbjAe -Fw0xOTA2MTEwMzMxMjdaFw0yOTA2MDgwMzMxMjdaMDcxDzANBgNVBAMMBmFnZW5j -eTETMBEGA1UECgwKZmlzY28tYmNvczEPMA0GA1UECwwGYWdlbmN5MIIBIjANBgkq -hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA/QA51rMRyFZPNyb/MfrMe6Q3Oy5nWcZH -R1oDcdhBdSQs/CR1GFI0xDXQH5KjnC7yJsnnRdKdPQ/0x1thefS8WYwDie/wba7N -6hKhthiIiqRIGv1RzEKM3N69iux6KelCwuUmbLHQYl7WsmoD6+oDCtLHtb4QakAU -Ga7JPvWgbBfFQ24pud/7APCyYqOBfwtLtnuM7hEzaQxpwa9hUfCwElK3i+WqI10U -2OQBEL33Vj7eRgUNaxEF6OGhP15wAtR6ZIVrOyjrnd2zyudstLe4XC2iMNS2mkmX -7avgjXwGpSG4uT3x6LPHTNyRdJz8zd3NJdImwaMZpA4bzh3rik7f5wIDAQABoxAw -DjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQA1nHpk+WGkIBPe5c9t -pJ9lVVqmUFiAYW75GoyPRix8YX0BcKWQmC3Gch0mqOcJ8UZg3fN4z+U177MluTxZ -fC8a7Ju//4Dcbc7JSRLCqzvvtLwUydDoF+7lIzZi30ssLjM6Vb7OHl0z74NuUKOw -Jn5TCRKjiMiO3d0iCyE/TP6KJSt1m8yRGc4/mHEuCdLuHhSMIeKg8NIrP2/cTv3L -8/L0/rkHFTg9CQWWtC39uWOzXVpYG5U9ryCNNkFtu5hlS7MVlGaqQvaNlP1DnTiJ -0/KyZKkwpo9pQjjlWwe/O5CNsL12vri8MROX5yBxBcM3QXwsTz+Z3wJB3F19cyBi -5SXJ ------END CERTIFICATE----- diff --git a/networks/fisco-bcos/4nodes1group/node3/conf/node.key b/networks/fisco-bcos/4nodes1group/node3/conf/node.key deleted file mode 100644 index a8919a81c..000000000 --- a/networks/fisco-bcos/4nodes1group/node3/conf/node.key +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGEAgEAMBAGByqGSM49AgEGBSuBBAAKBG0wawIBAQQgWE9yd400eHS/1J7I7csp -X6HRw3KBMBxYs6Y/rRzcU9WhRANCAATi7cWhirrwcoNvSOsQUCeRcUCe5FMG+6N+ -H8i2JpHv5da/zP/hNHlLb0ILSbv/U8bE33D6dCyPUFnU23oZlL36 ------END PRIVATE KEY----- diff --git a/networks/fisco-bcos/4nodes1group/node3/conf/node.nodeid b/networks/fisco-bcos/4nodes1group/node3/conf/node.nodeid deleted file mode 100644 index 58c012727..000000000 --- a/networks/fisco-bcos/4nodes1group/node3/conf/node.nodeid +++ /dev/null @@ -1 +0,0 @@ -e2edc5a18abaf072836f48eb1050279171409ee45306fba37e1fc8b62691efe5d6bfccffe134794b6f420b49bbff53c6c4df70fa742c8f5059d4db7a1994bdfa diff --git a/networks/fisco-bcos/4nodes1group/node3/config.ini b/networks/fisco-bcos/4nodes1group/node3/config.ini deleted file mode 100644 index 09dc30fad..000000000 --- a/networks/fisco-bcos/4nodes1group/node3/config.ini +++ /dev/null @@ -1,70 +0,0 @@ -[rpc] - ; rpc listen ip - listen_ip=0.0.0.0 - ; channelserver listen port - channel_listen_port=20917 - ; jsonrpc listen port - jsonrpc_listen_port=8917 -[p2p] - ; p2p listen ip - listen_ip=0.0.0.0 - ; p2p listen port - listen_port=30917 - ; nodes to connect - node.0=172.17.0.1:30914 - node.1=172.17.0.1:30915 - node.2=172.17.0.1:30916 - node.3=172.17.0.1:30917 - - ;enable/disable network compress - ;enable_compress=false - -;certificate rejected list -[certificate_blacklist] - ; crl.0 should be nodeid, nodeid's length is 128 - ;crl.0= - -;group configurations -;WARNING: group 0 is forbided -[group] - group_data_path=data/ - group_config_path=conf/ - -;certificate configuration -[network_security] - ; directory the certificates located in - data_path=conf/ - ; the node private key file - key=node.key - ; the node certificate file - cert=node.crt - ; the ca certificate file - ca_cert=ca.crt - -; storage security releated configurations -[storage_security] -; enable storage_security or not -;enable=true -; the IP of key mananger -;key_manager_ip= -; the Port of key manager -;key_manager_port= -;cipher_data_key= - -[chain] - id=1 -[compatibility] - supported_version=2.0.0-rc2 -;log configurations -[log] - ; the directory of the log - log_path=./log - ; info debug trace - level=info - ; MB - max_log_file_size=200 - ; control log auto_flush - flush=true - ; easylog config - format=%level|%datetime{%Y-%M-%d %H:%m:%s:%g}|%msg - log_flush_threshold=100 diff --git a/networks/fisco-bcos/4nodes1group/node3/data/group1/block/000020.ldb b/networks/fisco-bcos/4nodes1group/node3/data/group1/block/000020.ldb deleted file mode 100644 index 145bbec3f..000000000 Binary files a/networks/fisco-bcos/4nodes1group/node3/data/group1/block/000020.ldb and /dev/null differ diff --git a/networks/fisco-bcos/4nodes1group/node3/data/group1/block/000021.ldb b/networks/fisco-bcos/4nodes1group/node3/data/group1/block/000021.ldb deleted file mode 100644 index 35ad68978..000000000 Binary files a/networks/fisco-bcos/4nodes1group/node3/data/group1/block/000021.ldb and /dev/null differ diff --git a/networks/fisco-bcos/4nodes1group/node3/data/group1/block/000022.ldb b/networks/fisco-bcos/4nodes1group/node3/data/group1/block/000022.ldb deleted file mode 100644 index 38fd90f44..000000000 Binary files a/networks/fisco-bcos/4nodes1group/node3/data/group1/block/000022.ldb and /dev/null differ diff --git a/networks/fisco-bcos/4nodes1group/node3/data/group1/block/000023.ldb b/networks/fisco-bcos/4nodes1group/node3/data/group1/block/000023.ldb deleted file mode 100644 index f356ba757..000000000 Binary files a/networks/fisco-bcos/4nodes1group/node3/data/group1/block/000023.ldb and /dev/null differ diff --git a/networks/fisco-bcos/4nodes1group/node3/data/group1/block/000024.ldb b/networks/fisco-bcos/4nodes1group/node3/data/group1/block/000024.ldb deleted file mode 100644 index 32837c15e..000000000 Binary files a/networks/fisco-bcos/4nodes1group/node3/data/group1/block/000024.ldb and /dev/null differ diff --git a/networks/fisco-bcos/4nodes1group/node3/data/group1/block/000025.ldb b/networks/fisco-bcos/4nodes1group/node3/data/group1/block/000025.ldb deleted file mode 100644 index b3e6870a2..000000000 Binary files a/networks/fisco-bcos/4nodes1group/node3/data/group1/block/000025.ldb and /dev/null differ diff --git a/networks/fisco-bcos/4nodes1group/node3/data/group1/block/CURRENT b/networks/fisco-bcos/4nodes1group/node3/data/group1/block/CURRENT deleted file mode 100644 index 056df57bb..000000000 --- a/networks/fisco-bcos/4nodes1group/node3/data/group1/block/CURRENT +++ /dev/null @@ -1 +0,0 @@ -MANIFEST-000017 diff --git a/networks/fisco-bcos/4nodes1group/node3/data/group1/block/LOCK b/networks/fisco-bcos/4nodes1group/node3/data/group1/block/LOCK deleted file mode 100644 index e69de29bb..000000000 diff --git a/networks/fisco-bcos/4nodes1group/node3/data/group1/block/LOG b/networks/fisco-bcos/4nodes1group/node3/data/group1/block/LOG deleted file mode 100644 index 1220fde62..000000000 --- a/networks/fisco-bcos/4nodes1group/node3/data/group1/block/LOG +++ /dev/null @@ -1,20 +0,0 @@ -2019/11/20-00:51:26.149892 7f8d76b08c00 Recovering log #15 -2019/11/20-00:51:26.161284 7f8d76b08c00 Level-0 table #18: started -2019/11/20-00:51:26.343605 7f8d76b08c00 Level-0 table #18: 1755956 bytes OK -2019/11/20-00:51:26.352300 7f8d76b08c00 Delete type=0 #15 -2019/11/20-00:51:26.353842 7f8d76b08c00 Delete type=3 #11 -2019/11/20-00:51:26.361826 7f8d65192700 Compacting 4@0 + 0@1 files -2019/11/20-00:51:26.410346 7f8d65192700 Generated table #20@0: 39 keys, 2118515 bytes -2019/11/20-00:51:26.451294 7f8d65192700 Generated table #21@0: 4 keys, 2404346 bytes -2019/11/20-00:51:26.519517 7f8d65192700 Generated table #22@0: 3 keys, 4427607 bytes -2019/11/20-00:51:26.554658 7f8d65192700 Generated table #23@0: 2 keys, 2409277 bytes -2019/11/20-00:51:26.937006 7f8d65192700 Generated table #24@0: 8049 keys, 2134418 bytes -2019/11/20-00:51:27.041355 7f8d65192700 Generated table #25@0: 1969 keys, 521252 bytes -2019/11/20-00:51:27.041897 7f8d65192700 Compacted 4@0 + 0@1 files => 14015415 bytes -2019/11/20-00:51:27.044432 7f8d65192700 compacted to: files[ 0 6 0 0 0 0 0 ] -2019/11/20-00:51:27.047687 7f8d65192700 Delete type=2 #14 -2019/11/20-00:51:27.050837 7f8d65192700 Delete type=2 #16 -2019/11/20-00:51:27.054951 7f8d65192700 Delete type=2 #5 -2019/11/20-00:51:27.056388 7f8d65192700 Delete type=2 #18 -2019/11/20-00:51:27.060153 7f8d65192700 Moved #20 to level-2 2118515 bytes OK: files[ 0 5 1 0 0 0 0 ] -2019/11/20-00:51:27.061916 7f8d65192700 Moved #21 to level-2 2404346 bytes OK: files[ 0 4 2 0 0 0 0 ] diff --git a/networks/fisco-bcos/4nodes1group/node3/data/group1/block/LOG.old b/networks/fisco-bcos/4nodes1group/node3/data/group1/block/LOG.old deleted file mode 100644 index 17d7d0b2e..000000000 --- a/networks/fisco-bcos/4nodes1group/node3/data/group1/block/LOG.old +++ /dev/null @@ -1,9 +0,0 @@ -2019/11/20-00:49:56.510620 7f508c669c00 Recovering log #10 -2019/11/20-00:49:56.522488 7f508c669c00 Delete type=0 #10 -2019/11/20-00:49:56.523128 7f508c669c00 Delete type=3 #9 -2019/11/20-00:50:32.261086 7f50750e6700 Level-0 table #14: started -2019/11/20-00:50:32.920594 7f50750e6700 Level-0 table #14: 5795519 bytes OK -2019/11/20-00:50:32.935024 7f50750e6700 Delete type=0 #12 -2019/11/20-00:50:37.512993 7f50750e6700 Level-0 table #16: started -2019/11/20-00:50:38.234841 7f50750e6700 Level-0 table #16: 6490270 bytes OK -2019/11/20-00:50:38.247052 7f50750e6700 Delete type=0 #13 diff --git a/networks/fisco-bcos/4nodes1group/node3/data/group1/block/MANIFEST-000017 b/networks/fisco-bcos/4nodes1group/node3/data/group1/block/MANIFEST-000017 deleted file mode 100644 index 79fe82327..000000000 Binary files a/networks/fisco-bcos/4nodes1group/node3/data/group1/block/MANIFEST-000017 and /dev/null differ diff --git a/networks/fisco-bcos/4nodes1group/node3/data/group1/pbftMsgBackup/000013.ldb b/networks/fisco-bcos/4nodes1group/node3/data/group1/pbftMsgBackup/000013.ldb deleted file mode 100644 index 261a15f2f..000000000 Binary files a/networks/fisco-bcos/4nodes1group/node3/data/group1/pbftMsgBackup/000013.ldb and /dev/null differ diff --git a/networks/fisco-bcos/4nodes1group/node3/data/group1/pbftMsgBackup/CURRENT b/networks/fisco-bcos/4nodes1group/node3/data/group1/pbftMsgBackup/CURRENT deleted file mode 100644 index ef20c6ded..000000000 --- a/networks/fisco-bcos/4nodes1group/node3/data/group1/pbftMsgBackup/CURRENT +++ /dev/null @@ -1 +0,0 @@ -MANIFEST-000012 diff --git a/networks/fisco-bcos/4nodes1group/node3/data/group1/pbftMsgBackup/LOCK b/networks/fisco-bcos/4nodes1group/node3/data/group1/pbftMsgBackup/LOCK deleted file mode 100644 index e69de29bb..000000000 diff --git a/networks/fisco-bcos/4nodes1group/node3/data/group1/pbftMsgBackup/LOG b/networks/fisco-bcos/4nodes1group/node3/data/group1/pbftMsgBackup/LOG deleted file mode 100644 index 4eb0f1f43..000000000 --- a/networks/fisco-bcos/4nodes1group/node3/data/group1/pbftMsgBackup/LOG +++ /dev/null @@ -1,5 +0,0 @@ -2019/11/20-00:51:26.457260 7f8d76b08c00 Recovering log #11 -2019/11/20-00:51:26.484845 7f8d76b08c00 Level-0 table #13: started -2019/11/20-00:51:26.544567 7f8d76b08c00 Level-0 table #13: 4527502 bytes OK -2019/11/20-00:51:26.555587 7f8d76b08c00 Delete type=0 #11 -2019/11/20-00:51:26.558075 7f8d76b08c00 Delete type=3 #10 diff --git a/networks/fisco-bcos/4nodes1group/node3/data/group1/pbftMsgBackup/LOG.old b/networks/fisco-bcos/4nodes1group/node3/data/group1/pbftMsgBackup/LOG.old deleted file mode 100644 index 647629991..000000000 --- a/networks/fisco-bcos/4nodes1group/node3/data/group1/pbftMsgBackup/LOG.old +++ /dev/null @@ -1,3 +0,0 @@ -2019/11/20-00:49:56.548941 7f508c669c00 Recovering log #9 -2019/11/20-00:49:56.558615 7f508c669c00 Delete type=3 #8 -2019/11/20-00:49:56.559530 7f508c669c00 Delete type=0 #9 diff --git a/networks/fisco-bcos/4nodes1group/node3/data/group1/pbftMsgBackup/MANIFEST-000012 b/networks/fisco-bcos/4nodes1group/node3/data/group1/pbftMsgBackup/MANIFEST-000012 deleted file mode 100644 index af16de1c8..000000000 Binary files a/networks/fisco-bcos/4nodes1group/node3/data/group1/pbftMsgBackup/MANIFEST-000012 and /dev/null differ diff --git a/networks/fisco-bcos/4nodes1group/sdk/ca.crt b/networks/fisco-bcos/4nodes1group/sdk/ca.crt deleted file mode 100644 index 09bfbbde0..000000000 --- a/networks/fisco-bcos/4nodes1group/sdk/ca.crt +++ /dev/null @@ -1,20 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDPTCCAiWgAwIBAgIJAOGxa7KkPpF8MA0GCSqGSIb3DQEBCwUAMDUxDjAMBgNV -BAMMBWNoYWluMRMwEQYDVQQKDApmaXNjby1iY29zMQ4wDAYDVQQLDAVjaGFpbjAe -Fw0xOTA2MTEwMzMxMjZaFw0yOTA2MDgwMzMxMjZaMDUxDjAMBgNVBAMMBWNoYWlu -MRMwEQYDVQQKDApmaXNjby1iY29zMQ4wDAYDVQQLDAVjaGFpbjCCASIwDQYJKoZI -hvcNAQEBBQADggEPADCCAQoCggEBALvzIKFr9UnSQnOExe5NkKN1hN5RRcOPSPfs -MrUJ6k5Om/WfCMMCgIlIZASaK0WKBo45IvDLFuQmng/XziY7/i9mO3xgvyQxfQMj -qHGKpKmNxtj9wuORKT+w/5Ino+avMatucO5FrWrw9PloaEz8cmy8SVnD6E6JSbbr -uiTRoR5OXGiEzVaECMBeCobAbdy2hQSaaZnHJYtXYFqvo4Xnh5/PT5hVQCuKih8P -OXRune4Zvl2mydW+t3QSWrT33gUaPVZDrvaLWpbLeEXVwZ4jvUMo5qCiMzbX69db -F4K+VIT6PXi35OI6uxSjiaisDFUItZv/srGE4ikQxBuIP7PAizsCAwEAAaNQME4w -HQYDVR0OBBYEFCuHzKdBsmgEDTF28/PT/Jhn8DwPMB8GA1UdIwQYMBaAFCuHzKdB -smgEDTF28/PT/Jhn8DwPMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEB -AIPDj3p7xhS5+fI78A/qpToJDZvgwHs56jnJ8XtECfjrvtT0FinMI4pLPs+scj8b -Lm0RM+WKSpig7TtO1Zjwma22CSssr/MJAWOa8Y200qgVmuiOmtuVBPw+mMcI1Ijt -GDEgXVWL1odIHWjookjAzSRiOvU5KUGctImHZ3RPQozOt7TTVx3usH5qJiWVg2IB -DBiBdCVzwSR5EGkIr0cC6cih/08R0fDaLXwUrHgeJi6VUDdp+rV6h76frJowwbJc -Q3s8fdVW3ti7YUOHJD08WWz0+1PblVHwlCIYBxdH06m5nFYZyeoLg+I+xduH5hNH -VH3h/8g8OQvRZnc6nF/mXpU= ------END CERTIFICATE----- diff --git a/networks/fisco-bcos/4nodes1group/sdk/node.crt b/networks/fisco-bcos/4nodes1group/sdk/node.crt deleted file mode 100644 index d164b9b3f..000000000 --- a/networks/fisco-bcos/4nodes1group/sdk/node.crt +++ /dev/null @@ -1,33 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICODCCASCgAwIBAgIJAIr5gH0OTKg3MA0GCSqGSIb3DQEBCwUAMDcxDzANBgNV -BAMMBmFnZW5jeTETMBEGA1UECgwKZmlzY28tYmNvczEPMA0GA1UECwwGYWdlbmN5 -MB4XDTE5MDYxMTAzMzEyN1oXDTI5MDYwODAzMzEyN1owMjEMMAoGA1UEAwwDc2Rr -MRMwEQYDVQQKDApmaXNjby1iY29zMQ0wCwYDVQQLDARub2RlMFYwEAYHKoZIzj0C -AQYFK4EEAAoDQgAE6AII4zTYaX+a8l1eNrDvaMDI1C0SV03XjE7Hc+mONgAk/C3X -ZyPyXTZGJM5zlp96L4cmoTSInMM/x/3/eWDSRqMaMBgwCQYDVR0TBAIwADALBgNV -HQ8EBAMCBeAwDQYJKoZIhvcNAQELBQADggEBAJ1XZrZPqlG/Frk3n3EqaLugB4MK -5t3pI9XLQMHsqRLbG7519psM5Oxetcg3n+hvrAeII6xQSiZlSrGyc30dPafZEFfj -Of2rY+60BPH9Eqh4cFnGACB8GQ17pMAYERFBfv/90LgBQb0C8EWnQeMK3c4W2oLX -m81fwQzv72Ek8XQxmhO/cPOK3gkhgQm4RxNb9NptN/Fd3bkISqmLGcstGwe3pyS1 -/WEby+ovR+Lzo/WZUJ6fw1aCWXTLoP3EffMFzQMduz9jCtGMC4CaIvClu3zOj99J -AbnLfV+K025+jAUWY7m5FXZLQsMZCZiDu0wZc4nd2RIEjYSJ5oLGg4l2Dm4= ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIC/zCCAeegAwIBAgIJAJohET2vzuAvMA0GCSqGSIb3DQEBCwUAMDUxDjAMBgNV -BAMMBWNoYWluMRMwEQYDVQQKDApmaXNjby1iY29zMQ4wDAYDVQQLDAVjaGFpbjAe -Fw0xOTA2MTEwMzMxMjdaFw0yOTA2MDgwMzMxMjdaMDcxDzANBgNVBAMMBmFnZW5j -eTETMBEGA1UECgwKZmlzY28tYmNvczEPMA0GA1UECwwGYWdlbmN5MIIBIjANBgkq -hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA/QA51rMRyFZPNyb/MfrMe6Q3Oy5nWcZH -R1oDcdhBdSQs/CR1GFI0xDXQH5KjnC7yJsnnRdKdPQ/0x1thefS8WYwDie/wba7N -6hKhthiIiqRIGv1RzEKM3N69iux6KelCwuUmbLHQYl7WsmoD6+oDCtLHtb4QakAU -Ga7JPvWgbBfFQ24pud/7APCyYqOBfwtLtnuM7hEzaQxpwa9hUfCwElK3i+WqI10U -2OQBEL33Vj7eRgUNaxEF6OGhP15wAtR6ZIVrOyjrnd2zyudstLe4XC2iMNS2mkmX -7avgjXwGpSG4uT3x6LPHTNyRdJz8zd3NJdImwaMZpA4bzh3rik7f5wIDAQABoxAw -DjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQA1nHpk+WGkIBPe5c9t -pJ9lVVqmUFiAYW75GoyPRix8YX0BcKWQmC3Gch0mqOcJ8UZg3fN4z+U177MluTxZ -fC8a7Ju//4Dcbc7JSRLCqzvvtLwUydDoF+7lIzZi30ssLjM6Vb7OHl0z74NuUKOw -Jn5TCRKjiMiO3d0iCyE/TP6KJSt1m8yRGc4/mHEuCdLuHhSMIeKg8NIrP2/cTv3L -8/L0/rkHFTg9CQWWtC39uWOzXVpYG5U9ryCNNkFtu5hlS7MVlGaqQvaNlP1DnTiJ -0/KyZKkwpo9pQjjlWwe/O5CNsL12vri8MROX5yBxBcM3QXwsTz+Z3wJB3F19cyBi -5SXJ ------END CERTIFICATE----- diff --git a/networks/fisco-bcos/4nodes1group/sdk/node.key b/networks/fisco-bcos/4nodes1group/sdk/node.key deleted file mode 100644 index 92df74032..000000000 --- a/networks/fisco-bcos/4nodes1group/sdk/node.key +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGEAgEAMBAGByqGSM49AgEGBSuBBAAKBG0wawIBAQQgG2s8qW+v4uAVqlXkeqsi -5bu9qx8ltLP6o6zSOJfdhWyhRANCAAToAgjjNNhpf5ryXV42sO9owMjULRJXTdeM -Tsdz6Y42ACT8LddnI/JdNkYkznOWn3ovhyahNIicwz/H/f95YNJG ------END PRIVATE KEY----- diff --git a/src/fisco-bcos/helloworld/HelloWorld.address b/src/fisco-bcos/helloworld/HelloWorld.address deleted file mode 100644 index eb33dc93f..000000000 --- a/src/fisco-bcos/helloworld/HelloWorld.address +++ /dev/null @@ -1 +0,0 @@ -0x033ebcd4c392ad113b6b683ec6da8d2a23cef0df \ No newline at end of file diff --git a/src/fisco-bcos/helloworld/HelloWorld.sol b/src/fisco-bcos/helloworld/HelloWorld.sol deleted file mode 100644 index 26ce51e98..000000000 --- a/src/fisco-bcos/helloworld/HelloWorld.sol +++ /dev/null @@ -1,17 +0,0 @@ -pragma solidity ^0.4.2; - -contract HelloWorld { - string name; - - constructor() public { - name = "Hello, World!"; - } - - function get() public view returns(string) { - return name; - } - - function set(string n) public { - name = n; - } -} diff --git a/src/fisco-bcos/transfer/ParallelContract.sol b/src/fisco-bcos/transfer/ParallelContract.sol deleted file mode 100644 index 9b06294e8..000000000 --- a/src/fisco-bcos/transfer/ParallelContract.sol +++ /dev/null @@ -1,25 +0,0 @@ -pragma solidity ^0.4.25; - -contract ParallelConfigPrecompiled -{ - function registerParallelFunctionInternal(address, string, uint256) public returns (int); - function unregisterParallelFunctionInternal(address, string) public returns (int); -} - -contract ParallelContract -{ - ParallelConfigPrecompiled precompiled = ParallelConfigPrecompiled(0x1006); - - function registerParallelFunction(string functionName, uint256 criticalSize) public - { - precompiled.registerParallelFunctionInternal(address(this), functionName, criticalSize); - } - - function unregisterParallelFunction(string functionName) public - { - precompiled.unregisterParallelFunctionInternal(address(this), functionName); - } - - function enableParallel() public; - function disableParallel() public; -} diff --git a/src/fisco-bcos/transfer/ParallelOk.address b/src/fisco-bcos/transfer/ParallelOk.address deleted file mode 100644 index d219b478f..000000000 --- a/src/fisco-bcos/transfer/ParallelOk.address +++ /dev/null @@ -1 +0,0 @@ -0x5176c7741f15c5103c4ca4f2970a9cf1d7edd9d0 \ No newline at end of file diff --git a/src/fisco-bcos/transfer/ParallelOk.sol b/src/fisco-bcos/transfer/ParallelOk.sol deleted file mode 100644 index 99a868a31..000000000 --- a/src/fisco-bcos/transfer/ParallelOk.sol +++ /dev/null @@ -1,49 +0,0 @@ -pragma solidity ^0.4.25; - -import "./ParallelContract.sol"; - -// A parallel contract example -contract ParallelOk is ParallelContract -{ - mapping (string => uint256) _balance; - - // Just an example, overflow is ok, use 'SafeMath' if needed - function transfer(string from, string to, uint256 num) public - { - _balance[from] -= num; - _balance[to] += num; - } - - // Just for testing whether the parallel revert function is working well, no practical use - function transferWithRevert(string from, string to, uint256 num) public - { - _balance[from] -= num; - _balance[to] += num; - require(num <= 100); - } - - function set(string name, uint256 num) public - { - _balance[name] = num; - } - - function balanceOf(string name) public view returns (uint256) - { - return _balance[name]; - } - - // Register parallel function - function enableParallel() public - { - // critical number is to define how many critical params from start - registerParallelFunction("transfer(string,string,uint256)", 2); // critical: string string - registerParallelFunction("set(string,uint256)", 1); // critical: string - } - - // Disable register parallel function - function disableParallel() public - { - unregisterParallelFunction("transfer(string,string,uint256)"); - unregisterParallelFunction("set(string,uint256)"); - } -} \ No newline at end of file