Hello hace 4 años
padre
commit
0690ad69d2
Se han modificado 73 ficheros con 623 adiciones y 494 borrados
  1. 1 0
      .gitignore
  2. 0 0
      node1/certs/ca/ca.crt
  3. 0 17
      node1/certs/ca/wx-org1.chainmaker.org/ca.crt
  4. 0 17
      node1/certs/ca/wx-org2.chainmaker.org/ca.crt
  5. 0 17
      node1/certs/ca/wx-org3.chainmaker.org/ca.crt
  6. 0 16
      node1/certs/ca/wx-org4.chainmaker.org/ca.crt
  7. 0 1
      node1/certs/node/common1/common1.nodeid
  8. 0 16
      node1/certs/node/common1/common1.sign.crt
  9. 0 5
      node1/certs/node/common1/common1.sign.key
  10. 0 18
      node1/certs/node/common1/common1.tls.crt
  11. 0 5
      node1/certs/node/common1/common1.tls.key
  12. 0 11
      node1/certs/user/admin1/admin1.sign.crt
  13. 0 6
      node1/certs/user/admin1/admin1.sign.key
  14. 0 12
      node1/certs/user/admin1/admin1.tls.crt
  15. 0 6
      node1/certs/user/admin1/admin1.tls.key
  16. 0 1
      node1/certs/user/client1/client1.addr
  17. 0 15
      node1/certs/user/client1/client1.sign.crt
  18. 0 5
      node1/certs/user/client1/client1.sign.key
  19. 0 15
      node1/certs/user/client1/client1.tls.crt
  20. 0 5
      node1/certs/user/client1/client1.tls.key
  21. 0 15
      node1/certs/user/light1/light1.sign.crt
  22. 0 5
      node1/certs/user/light1/light1.sign.key
  23. 0 15
      node1/certs/user/light1/light1.tls.crt
  24. 0 5
      node1/certs/user/light1/light1.tls.key
  25. 0 18
      node1/chain.yml
  26. 1 1
      node1/chainconfig/bc1.yml
  27. 16 0
      node2/certs/ca/ca.crt
  28. 0 17
      node2/certs/ca/wx-org1.chainmaker.org/ca.crt
  29. 0 17
      node2/certs/ca/wx-org2.chainmaker.org/ca.crt
  30. 0 17
      node2/certs/ca/wx-org3.chainmaker.org/ca.crt
  31. 0 16
      node2/certs/ca/wx-org4.chainmaker.org/ca.crt
  32. 0 1
      node2/certs/node/common1/common1.nodeid
  33. 0 16
      node2/certs/node/common1/common1.sign.crt
  34. 0 5
      node2/certs/node/common1/common1.sign.key
  35. 0 18
      node2/certs/node/common1/common1.tls.crt
  36. 0 5
      node2/certs/node/common1/common1.tls.key
  37. 0 15
      node2/certs/user/admin1/admin1.sign.crt
  38. 0 5
      node2/certs/user/admin1/admin1.sign.key
  39. 0 15
      node2/certs/user/admin1/admin1.tls.crt
  40. 0 5
      node2/certs/user/admin1/admin1.tls.key
  41. 0 1
      node2/certs/user/client1/client1.addr
  42. 0 15
      node2/certs/user/client1/client1.sign.crt
  43. 0 5
      node2/certs/user/client1/client1.sign.key
  44. 0 15
      node2/certs/user/client1/client1.tls.crt
  45. 0 5
      node2/certs/user/client1/client1.tls.key
  46. 0 15
      node2/certs/user/light1/light1.sign.crt
  47. 0 5
      node2/certs/user/light1/light1.sign.key
  48. 0 15
      node2/certs/user/light1/light1.tls.crt
  49. 0 5
      node2/certs/user/light1/light1.tls.key
  50. 0 13
      node2/chain.yml
  51. 1 1
      node2/chainconfig/bc1.yml
  52. 16 0
      node3/certs/ca/ca.crt
  53. 1 0
      node3/certs/node/consensus1/consensus1.nodeid
  54. 14 0
      node3/certs/node/consensus1/consensus1.sign.crt
  55. 6 0
      node3/certs/node/consensus1/consensus1.sign.key
  56. 14 0
      node3/certs/node/consensus1/consensus1.tls.crt
  57. 6 0
      node3/certs/node/consensus1/consensus1.tls.key
  58. 110 0
      node3/chain.yml
  59. 81 0
      node3/chainconfig/bc1.yml
  60. 34 0
      node3/log.yml
  61. 16 0
      node4/certs/ca/ca.crt
  62. 14 0
      node4/certs/node/client1/client1.sign.crt
  63. 6 0
      node4/certs/node/client1/client1.sign.key
  64. 14 0
      node4/certs/node/client1/client1.tls.crt
  65. 6 0
      node4/certs/node/client1/client1.tls.key
  66. 1 0
      node4/certs/node/consensus1/consensus1.nodeid
  67. 14 0
      node4/certs/node/consensus1/consensus1.sign.crt
  68. 6 0
      node4/certs/node/consensus1/consensus1.sign.key
  69. 14 0
      node4/certs/node/consensus1/consensus1.tls.crt
  70. 6 0
      node4/certs/node/consensus1/consensus1.tls.key
  71. 110 0
      node4/chain.yml
  72. 81 0
      node4/chainconfig/bc1.yml
  73. 34 0
      node4/log.yml

+ 1 - 0
.gitignore

@@ -1,2 +1,3 @@
 /data
 /log
+/.idea

+ 0 - 0
node1/ca.crt → node1/certs/ca/ca.crt


+ 0 - 17
node1/certs/ca/wx-org1.chainmaker.org/ca.crt

@@ -1,17 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICnjCCAkSgAwIBAgIDBpdmMAoGCCqGSM49BAMCMIGKMQswCQYDVQQGEwJDTjEQ
-MA4GA1UECBMHQmVpamluZzEQMA4GA1UEBxMHQmVpamluZzEfMB0GA1UEChMWd3gt
-b3JnMS5jaGFpbm1ha2VyLm9yZzESMBAGA1UECxMJcm9vdC1jZXJ0MSIwIAYDVQQD
-ExljYS53eC1vcmcxLmNoYWlubWFrZXIub3JnMB4XDTIxMDkwNjA4MTg0MFoXDTMx
-MDkwNDA4MTg0MFowgYoxCzAJBgNVBAYTAkNOMRAwDgYDVQQIEwdCZWlqaW5nMRAw
-DgYDVQQHEwdCZWlqaW5nMR8wHQYDVQQKExZ3eC1vcmcxLmNoYWlubWFrZXIub3Jn
-MRIwEAYDVQQLEwlyb290LWNlcnQxIjAgBgNVBAMTGWNhLnd4LW9yZzEuY2hhaW5t
-YWtlci5vcmcwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAT9AN8/xv4MDoP+lWco
-1EUcO+xVBunz4kFlwi/iByDbac2x+XfhF6mXtT5mdg5jV6OykqIcqInKidRSIpxy
-Vk4go4GWMIGTMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MCkGA1Ud
-DgQiBCCcrysjykLsk4AJPejR9kKnC2V/QnIX3o/vlph20OjcoDBFBgNVHREEPjA8
-gg5jaGFpbm1ha2VyLm9yZ4IJbG9jYWxob3N0ghljYS53eC1vcmcxLmNoYWlubWFr
-ZXIub3JnhwR/AAABMAoGCCqGSM49BAMCA0gAMEUCIQDNLV6VKCqyd1ZHQbKUaM9G
-D4m5b5WAt2EJpkp7hMz7lgIgKwkOzti6D+kTU0a3LFfbVrMtbeo//hlcS5gwfo6B
-1nU=
------END CERTIFICATE-----

+ 0 - 17
node1/certs/ca/wx-org2.chainmaker.org/ca.crt

@@ -1,17 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICnzCCAkSgAwIBAgIDAubCMAoGCCqGSM49BAMCMIGKMQswCQYDVQQGEwJDTjEQ
-MA4GA1UECBMHQmVpamluZzEQMA4GA1UEBxMHQmVpamluZzEfMB0GA1UEChMWd3gt
-b3JnMi5jaGFpbm1ha2VyLm9yZzESMBAGA1UECxMJcm9vdC1jZXJ0MSIwIAYDVQQD
-ExljYS53eC1vcmcyLmNoYWlubWFrZXIub3JnMB4XDTIxMDkwNjA4MTg0MFoXDTMx
-MDkwNDA4MTg0MFowgYoxCzAJBgNVBAYTAkNOMRAwDgYDVQQIEwdCZWlqaW5nMRAw
-DgYDVQQHEwdCZWlqaW5nMR8wHQYDVQQKExZ3eC1vcmcyLmNoYWlubWFrZXIub3Jn
-MRIwEAYDVQQLEwlyb290LWNlcnQxIjAgBgNVBAMTGWNhLnd4LW9yZzIuY2hhaW5t
-YWtlci5vcmcwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARz7rY9/M1Vn96nc3GJ
-alXLMicCsvS3NBsPDUY4/HlgQzUbaPbyEnaaYZl4vWdJw6dWwpZb+ZjTO2mSsOKd
-YGsRo4GWMIGTMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MCkGA1Ud
-DgQiBCAqlldqcDDrsQX85UGtCpftpNSijKz2Yvu5a5R0MiYyAzBFBgNVHREEPjA8
-gg5jaGFpbm1ha2VyLm9yZ4IJbG9jYWxob3N0ghljYS53eC1vcmcyLmNoYWlubWFr
-ZXIub3JnhwR/AAABMAoGCCqGSM49BAMCA0kAMEYCIQCCcHQ/5E9QbQKgKAo9GdyV
-aUDRhVVcirV2XOPre/+j1gIhAIiOsMvTU3LzrYK8Y3AUf6n9wy3O1uwc4CLNQiLz
-oSS3
------END CERTIFICATE-----

+ 0 - 17
node1/certs/ca/wx-org3.chainmaker.org/ca.crt

@@ -1,17 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICnjCCAkSgAwIBAgIDDKj1MAoGCCqGSM49BAMCMIGKMQswCQYDVQQGEwJDTjEQ
-MA4GA1UECBMHQmVpamluZzEQMA4GA1UEBxMHQmVpamluZzEfMB0GA1UEChMWd3gt
-b3JnMy5jaGFpbm1ha2VyLm9yZzESMBAGA1UECxMJcm9vdC1jZXJ0MSIwIAYDVQQD
-ExljYS53eC1vcmczLmNoYWlubWFrZXIub3JnMB4XDTIxMDkwNjA4MTg0MFoXDTMx
-MDkwNDA4MTg0MFowgYoxCzAJBgNVBAYTAkNOMRAwDgYDVQQIEwdCZWlqaW5nMRAw
-DgYDVQQHEwdCZWlqaW5nMR8wHQYDVQQKExZ3eC1vcmczLmNoYWlubWFrZXIub3Jn
-MRIwEAYDVQQLEwlyb290LWNlcnQxIjAgBgNVBAMTGWNhLnd4LW9yZzMuY2hhaW5t
-YWtlci5vcmcwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATLaUl/2ZknzPMNa2Kd
-QAgkbr0TzIyMnpmUa1hwFLQMpnkHfR6UE4RppgYfhfGqs4Pf2q6+ACSZWcg6E+nu
-bw4no4GWMIGTMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MCkGA1Ud
-DgQiBCDSmEB5xMV6Qv96vQyyn8ANgb11BZFzNQM1XBFW9JRIjjBFBgNVHREEPjA8
-gg5jaGFpbm1ha2VyLm9yZ4IJbG9jYWxob3N0ghljYS53eC1vcmczLmNoYWlubWFr
-ZXIub3JnhwR/AAABMAoGCCqGSM49BAMCA0gAMEUCIHHI0cfmQtkzO9Oc8rDzbIzb
-aKRTDG+bNGNjt/ZnbEFkAiEA12Ahd2jtxtzUO8egORo3dM5Szm8JOMZ79GvoQjd/
-ag4=
------END CERTIFICATE-----

+ 0 - 16
node1/certs/ca/wx-org4.chainmaker.org/ca.crt

@@ -1,16 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICnDCCAkSgAwIBAgIDDdk+MAoGCCqGSM49BAMCMIGKMQswCQYDVQQGEwJDTjEQ
-MA4GA1UECBMHQmVpamluZzEQMA4GA1UEBxMHQmVpamluZzEfMB0GA1UEChMWd3gt
-b3JnNC5jaGFpbm1ha2VyLm9yZzESMBAGA1UECxMJcm9vdC1jZXJ0MSIwIAYDVQQD
-ExljYS53eC1vcmc0LmNoYWlubWFrZXIub3JnMB4XDTIxMDkwNjA4MTg0MFoXDTMx
-MDkwNDA4MTg0MFowgYoxCzAJBgNVBAYTAkNOMRAwDgYDVQQIEwdCZWlqaW5nMRAw
-DgYDVQQHEwdCZWlqaW5nMR8wHQYDVQQKExZ3eC1vcmc0LmNoYWlubWFrZXIub3Jn
-MRIwEAYDVQQLEwlyb290LWNlcnQxIjAgBgNVBAMTGWNhLnd4LW9yZzQuY2hhaW5t
-YWtlci5vcmcwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASwLBQRBswJX7Q/eBba
-I7jyipJLqtu5WECf7cjuwV+3SMvE/YO/wrF8FX37fgvuf6iY5yzmAVXdN0rvtVPW
-w28go4GWMIGTMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MCkGA1Ud
-DgQiBCDf/6SGbIrqJ8omuljlP8QeK5lBpyuSM9TGDLDil6Ct2zBFBgNVHREEPjA8
-gg5jaGFpbm1ha2VyLm9yZ4IJbG9jYWxob3N0ghljYS53eC1vcmc0LmNoYWlubWFr
-ZXIub3JnhwR/AAABMAoGCCqGSM49BAMCA0YAMEMCIAf14LxN5W7T2D19q4F695H/
-DyAc+98S9NJVIr9x9ZmzAh9ApVEvTwgXs60lZMWPuA6zM+Wr5oueUEHNggBZk4zD
------END CERTIFICATE-----

+ 0 - 1
node1/certs/node/common1/common1.nodeid

@@ -1 +0,0 @@
-QmVi5nGZc3GvQasmGESqYjWBEynvqFqepqhwopyUc6ZBXt

+ 0 - 16
node1/certs/node/common1/common1.sign.crt

@@ -1,16 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICnDCCAkGgAwIBAgIDAvOlMAoGCCqGSM49BAMCMIGKMQswCQYDVQQGEwJDTjEQ
-MA4GA1UECBMHQmVpamluZzEQMA4GA1UEBxMHQmVpamluZzEfMB0GA1UEChMWd3gt
-b3JnMS5jaGFpbm1ha2VyLm9yZzESMBAGA1UECxMJcm9vdC1jZXJ0MSIwIAYDVQQD
-ExljYS53eC1vcmcxLmNoYWlubWFrZXIub3JnMB4XDTIxMDkwNjA4MTg0MFoXDTI2
-MDkwNTA4MTg0MFowgZExCzAJBgNVBAYTAkNOMRAwDgYDVQQIEwdCZWlqaW5nMRAw
-DgYDVQQHEwdCZWlqaW5nMR8wHQYDVQQKExZ3eC1vcmcxLmNoYWlubWFrZXIub3Jn
-MQ8wDQYDVQQLEwZjb21tb24xLDAqBgNVBAMTI2NvbW1vbjEuc2lnbi53eC1vcmcx
-LmNoYWlubWFrZXIub3JnMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEVF3dBJuA
-TGqvVqLi6ls5j+UoRENS+B7gxQfaKa5iVz0yoqPEE9oEtiJoBPZqiBoJ//NO1gSH
-W/YqpueFIEq1IqOBjDCBiTApBgNVHQ4EIgQgk/77p+y4Gloy9v6t1iTqjvzppgzf
-8TS5Ue6+hSyXiEgwKwYDVR0jBCQwIoAgnK8rI8pC7JOACT3o0fZCpwtlf0JyF96P
-75aYdtDo3KAwLwYLgSdYj2QLHo9kCwQEIDc5OTlhZTAxYjllODQ1MmI4ZjhmMjcx
-YzZjYjdjMmE0MAoGCCqGSM49BAMCA0kAMEYCIQCZiDwN4+ScXLZ6nuwQnkop7hrA
-G8ki4488tDjMIDOBrwIhAP3m+fvPpcyvR8wMcXCIfiDOCA/+KKmRs2jIsjv1JvaR
------END CERTIFICATE-----

+ 0 - 5
node1/certs/node/common1/common1.sign.key

@@ -1,5 +0,0 @@
------BEGIN EC PRIVATE KEY-----
-MHcCAQEEIIEhYL7brNB/DORg9HKpHopzEhO/A9+ABwr+UGXEeqJgoAoGCCqGSM49
-AwEHoUQDQgAEVF3dBJuATGqvVqLi6ls5j+UoRENS+B7gxQfaKa5iVz0yoqPEE9oE
-tiJoBPZqiBoJ//NO1gSHW/YqpueFIEq1Ig==
------END EC PRIVATE KEY-----

+ 0 - 18
node1/certs/node/common1/common1.tls.crt

@@ -1,18 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIC6zCCApCgAwIBAgIDBwEOMAoGCCqGSM49BAMCMIGKMQswCQYDVQQGEwJDTjEQ
-MA4GA1UECBMHQmVpamluZzEQMA4GA1UEBxMHQmVpamluZzEfMB0GA1UEChMWd3gt
-b3JnMS5jaGFpbm1ha2VyLm9yZzESMBAGA1UECxMJcm9vdC1jZXJ0MSIwIAYDVQQD
-ExljYS53eC1vcmcxLmNoYWlubWFrZXIub3JnMB4XDTIxMDkwNjA4MTg0MFoXDTI2
-MDkwNTA4MTg0MFowgZAxCzAJBgNVBAYTAkNOMRAwDgYDVQQIEwdCZWlqaW5nMRAw
-DgYDVQQHEwdCZWlqaW5nMR8wHQYDVQQKExZ3eC1vcmcxLmNoYWlubWFrZXIub3Jn
-MQ8wDQYDVQQLEwZjb21tb24xKzApBgNVBAMTImNvbW1vbjEudGxzLnd4LW9yZzEu
-Y2hhaW5tYWtlci5vcmcwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQVRBCO4rE/
-MzU/6B1w0dUB0TkwL4eY54LOobiY8kWixQS/S4N2nPIYNo8dhSCQR8TiHHRp0cPw
-AzDmovLiIR/Wo4HcMIHZMCkGA1UdDgQiBCDQo3QnFWIVS0zBCzJ4fhLkrHgW6D4Q
-4ex3IcT8/Dh36DArBgNVHSMEJDAigCCcrysjykLsk4AJPejR9kKnC2V/QnIX3o/v
-lph20OjcoDBOBgNVHREERzBFgg5jaGFpbm1ha2VyLm9yZ4IJbG9jYWxob3N0giJj
-b21tb24xLnRscy53eC1vcmcxLmNoYWlubWFrZXIub3JnhwR/AAABMC8GC4EnWI9k
-Cx6PZAsEBCA3OTk5YWUwMWI5ZTg0NTJiOGY4ZjI3MWM2Y2I3YzJhNDAKBggqhkjO
-PQQDAgNJADBGAiEAvx3wy4OGRwZCLIbWElFJZ+ZzwJB3cfKdEGRgQ3cjEkMCIQCn
-UhEpGSVl+idrAoUvoyu3eQERikuUHzL0dIH7QJoYOg==
------END CERTIFICATE-----

+ 0 - 5
node1/certs/node/common1/common1.tls.key

@@ -1,5 +0,0 @@
------BEGIN EC PRIVATE KEY-----
-MHcCAQEEIB9DY6JhL3nP81RMxlwvkOQRgqZKzR01SjvRyHWBislGoAoGCCqGSM49
-AwEHoUQDQgAEFUQQjuKxPzM1P+gdcNHVAdE5MC+HmOeCzqG4mPJFosUEv0uDdpzy
-GDaPHYUgkEfE4hx0adHD8AMw5qLy4iEf1g==
------END EC PRIVATE KEY-----

+ 0 - 11
node1/certs/user/admin1/admin1.sign.crt

@@ -1,11 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIBrDCCAVOgAwIBAgIIMsKewqmT8bcwCgYIKoEcz1UBg3UwJDELMAkGA1UEBhMC
-Q04xFTATBgNVBAMTDE1vYmlsZVJvb3RDQTAeFw0yMTA5MTAwMzUwMjlaFw0yNjA5
-MDkwMzUwMjlaMIGQMQswCQYDVQQGEwJDTjESMBAGA1UECAwJ5rmW5Y2X55yBMRIw
-EAYDVQQHDAnplb/mspnluIIxHjAcBgNVBAoTFXl1bWF3ay5jaGFpbm1ha2VyLm9y
-ZzEOMAwGA1UECxMFYWRtaW4xKTAnBgNVBAMTIGFkbWluLnNpZ24ueXVtYXdrLmNo
-YWlubWFrZXIub3JnMFkwEwYHKoZIzj0CAQYIKoEcz1UBgi0DQgAEBGD8U6Hmkzec
-ZLu4j90RAfnxozuPq3BWbzi0MQ7mETU3RtBClFN69caNRkFAlvhlDmhy3m6mCK4V
-AtIBvWzuF6MCMAAwCgYIKoEcz1UBg3UDRwAwRAIgVWXPeEqYnOCeOPF+aXS9dcFT
-Opl3PHJjYLVJGwg8g7kCIEu3UgTimNQoULiTw40OxV8n/O0P5TZGOjY4WEIh6RWU
------END CERTIFICATE-----

+ 0 - 6
node1/certs/user/admin1/admin1.sign.key

@@ -1,6 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIGTAgEAMBMGByqGSM49AgEGCCqBHM9VAYItBHkwdwIBAQQg9hD4bMKI7UBMudwt
-PuaD0/nQYuR6fK/tzeDmOIpheXGgCgYIKoEcz1UBgi2hRANCAAQEYPxToeaTN5xk
-u7iP3REB+fGjO4+rcFZvOLQxDuYRNTdG0EKUU3r1xo1GQUCW+GUOaHLebqYIrhUC
-0gG9bO4X
------END PRIVATE KEY-----

+ 0 - 12
node1/certs/user/admin1/admin1.tls.crt

@@ -1,12 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIBrTCCAVKgAwIBAgIIGQMxW23TL9MwCgYIKoEcz1UBg3UwJDELMAkGA1UEBhMC
-Q04xFTATBgNVBAMTDE1vYmlsZVJvb3RDQTAeFw0yMTA5MTAwMzUwMjlaFw0yNjA5
-MDkwMzUwMjlaMIGPMQswCQYDVQQGEwJDTjESMBAGA1UECAwJ5rmW5Y2X55yBMRIw
-EAYDVQQHDAnplb/mspnluIIxHjAcBgNVBAoTFXl1bWF3ay5jaGFpbm1ha2VyLm9y
-ZzEOMAwGA1UECxMFYWRtaW4xKDAmBgNVBAMTH2FkbWluLnRscy55dW1hd2suY2hh
-aW5tYWtlci5vcmcwWTATBgcqhkjOPQIBBggqgRzPVQGCLQNCAAQutORt7aEtluSM
-N0HeTG9qjXIJOSfxgD6US4QtxFYtvPE7r1UjObASi3NgnwbKYuYn7dtNAgW9MbzL
-xjt0QLvpowIwADAKBggqgRzPVQGDdQNJADBGAiEA4UF4/yTdU8qBAZz7gE2/JLjR
-NotNfGmBBcSaavDm4noCIQDKnOWO1CnQa5Ro7Mw1iiphtkRYOefEWLz6mS4G+127
-ow==
------END CERTIFICATE-----

+ 0 - 6
node1/certs/user/admin1/admin1.tls.key

@@ -1,6 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIGTAgEAMBMGByqGSM49AgEGCCqBHM9VAYItBHkwdwIBAQQgN7LpnU+sZv5MuVEs
-bQotsIU+bYoC52XBTmwTq8pHoXagCgYIKoEcz1UBgi2hRANCAAQutORt7aEtluSM
-N0HeTG9qjXIJOSfxgD6US4QtxFYtvPE7r1UjObASi3NgnwbKYuYn7dtNAgW9MbzL
-xjt0QLvp
------END PRIVATE KEY-----

+ 0 - 1
node1/certs/user/client1/client1.addr

@@ -1 +0,0 @@
-DvAVmMxyEgDnKf4QqgDAdaokkPoFoTYTMTz4T2aK5NCv

+ 0 - 15
node1/certs/user/client1/client1.sign.crt

@@ -1,15 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICZzCCAg6gAwIBAgIDBXROMAoGCCqGSM49BAMCMIGKMQswCQYDVQQGEwJDTjEQ
-MA4GA1UECBMHQmVpamluZzEQMA4GA1UEBxMHQmVpamluZzEfMB0GA1UEChMWd3gt
-b3JnMS5jaGFpbm1ha2VyLm9yZzESMBAGA1UECxMJcm9vdC1jZXJ0MSIwIAYDVQQD
-ExljYS53eC1vcmcxLmNoYWlubWFrZXIub3JnMB4XDTIxMDkwNjA4MTg0MFoXDTI2
-MDkwNTA4MTg0MFowgZExCzAJBgNVBAYTAkNOMRAwDgYDVQQIEwdCZWlqaW5nMRAw
-DgYDVQQHEwdCZWlqaW5nMR8wHQYDVQQKExZ3eC1vcmcxLmNoYWlubWFrZXIub3Jn
-MQ8wDQYDVQQLEwZjbGllbnQxLDAqBgNVBAMTI2NsaWVudDEuc2lnbi53eC1vcmcx
-LmNoYWlubWFrZXIub3JnMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEeZFrBAF7
-ZQFkUFKDE5fvWZeoOHmT/+6zHungj+EzHXAPYbB0QGscFEeckkey2/18KLLuq+xu
-Ma/W+1FC7DMsmKNaMFgwKQYDVR0OBCIEIEaLnKNx+KWl8HUECVaSlIPieXrz/y18
-kVwkKhQqnL3yMCsGA1UdIwQkMCKAIJyvKyPKQuyTgAk96NH2QqcLZX9Cchfej++W
-mHbQ6NygMAoGCCqGSM49BAMCA0cAMEQCICgOelNRIbAN/5ceTV9i6aW0lg5iGrrE
-Lhf8I+K0bdrUAiBH03uP3ACDi2NGAF1AUXHZJVGfsDbZEsjbnClGjgSBjg==
------END CERTIFICATE-----

+ 0 - 5
node1/certs/user/client1/client1.sign.key

@@ -1,5 +0,0 @@
------BEGIN EC PRIVATE KEY-----
-MHcCAQEEIM4vdjAnKvzH9POqeR7qIGEdIsinECMtf9KKFki2jYNroAoGCCqGSM49
-AwEHoUQDQgAEeZFrBAF7ZQFkUFKDE5fvWZeoOHmT/+6zHungj+EzHXAPYbB0QGsc
-FEeckkey2/18KLLuq+xuMa/W+1FC7DMsmA==
------END EC PRIVATE KEY-----

+ 0 - 15
node1/certs/user/client1/client1.tls.crt

@@ -1,15 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICZjCCAg2gAwIBAgIDDaJNMAoGCCqGSM49BAMCMIGKMQswCQYDVQQGEwJDTjEQ
-MA4GA1UECBMHQmVpamluZzEQMA4GA1UEBxMHQmVpamluZzEfMB0GA1UEChMWd3gt
-b3JnMS5jaGFpbm1ha2VyLm9yZzESMBAGA1UECxMJcm9vdC1jZXJ0MSIwIAYDVQQD
-ExljYS53eC1vcmcxLmNoYWlubWFrZXIub3JnMB4XDTIxMDkwNjA4MTg0MFoXDTI2
-MDkwNTA4MTg0MFowgZAxCzAJBgNVBAYTAkNOMRAwDgYDVQQIEwdCZWlqaW5nMRAw
-DgYDVQQHEwdCZWlqaW5nMR8wHQYDVQQKExZ3eC1vcmcxLmNoYWlubWFrZXIub3Jn
-MQ8wDQYDVQQLEwZjbGllbnQxKzApBgNVBAMTImNsaWVudDEudGxzLnd4LW9yZzEu
-Y2hhaW5tYWtlci5vcmcwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASpxuxqncxz
-aDdcdbCi3hFmROXgsP5Tqz9gH8mhIfFDqigEQSFm56LCyYIYUXTjAJGfXwJW5VuX
-5YmTaaoST/+Co1owWDApBgNVHQ4EIgQgVZQPq8OCC0EnihzP6Cv2e+9ZubbMvMK3
-BY7ep3uv4pEwKwYDVR0jBCQwIoAgnK8rI8pC7JOACT3o0fZCpwtlf0JyF96P75aY
-dtDo3KAwCgYIKoZIzj0EAwIDRwAwRAIgYjwPSYIwCZooaD+W1x3CsZ1mzMDSAJGq
-DM4Tx/4uhCoCIHvqTzM8xuZa+tRGXa54BvQEX97xsXnOlwnWoa08LsDW
------END CERTIFICATE-----

+ 0 - 5
node1/certs/user/client1/client1.tls.key

@@ -1,5 +0,0 @@
------BEGIN EC PRIVATE KEY-----
-MHcCAQEEIDBbnsjrkAKTbrAOEjrxEjfIERWoxBQSjCfyYeEpT5LcoAoGCCqGSM49
-AwEHoUQDQgAEqcbsap3Mc2g3XHWwot4RZkTl4LD+U6s/YB/JoSHxQ6ooBEEhZuei
-wsmCGFF04wCRn18CVuVbl+WJk2mqEk//gg==
------END EC PRIVATE KEY-----

+ 0 - 15
node1/certs/user/light1/light1.sign.crt

@@ -1,15 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICZzCCAgygAwIBAgIDBd/cMAoGCCqGSM49BAMCMIGKMQswCQYDVQQGEwJDTjEQ
-MA4GA1UECBMHQmVpamluZzEQMA4GA1UEBxMHQmVpamluZzEfMB0GA1UEChMWd3gt
-b3JnMS5jaGFpbm1ha2VyLm9yZzESMBAGA1UECxMJcm9vdC1jZXJ0MSIwIAYDVQQD
-ExljYS53eC1vcmcxLmNoYWlubWFrZXIub3JnMB4XDTIxMDkwNjA4MTg0MFoXDTI2
-MDkwNTA4MTg0MFowgY8xCzAJBgNVBAYTAkNOMRAwDgYDVQQIEwdCZWlqaW5nMRAw
-DgYDVQQHEwdCZWlqaW5nMR8wHQYDVQQKExZ3eC1vcmcxLmNoYWlubWFrZXIub3Jn
-MQ4wDAYDVQQLEwVsaWdodDErMCkGA1UEAxMibGlnaHQxLnNpZ24ud3gtb3JnMS5j
-aGFpbm1ha2VyLm9yZzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABAwZUSoEJ411
-43Ux5xaMHbouL+A23757Rx75eEgcjES4Rtb8c1A0+Su/62woy25uMUe+HX0c89Mn
-1bnw2NE2CSijWjBYMCkGA1UdDgQiBCBo2iGtVs2wzAAo85i0Rl4DhkgKRN8GjjXo
-A+YrosH4rTArBgNVHSMEJDAigCCcrysjykLsk4AJPejR9kKnC2V/QnIX3o/vlph2
-0OjcoDAKBggqhkjOPQQDAgNJADBGAiEA+WlLAuNzPqpHcn2MuknO1Hq3/1nYLJM9
-1WtZLE6VOwECIQC3zYzjTnCgyfYE6WKD7aIW8spN4tPCxIhing+nBrQjJQ==
------END CERTIFICATE-----

+ 0 - 5
node1/certs/user/light1/light1.sign.key

@@ -1,5 +0,0 @@
------BEGIN EC PRIVATE KEY-----
-MHcCAQEEIICyWXU4pOixkuhXa2OLl1rT7LZkW7NhPDwb2ReM+LD0oAoGCCqGSM49
-AwEHoUQDQgAEDBlRKgQnjXXjdTHnFowdui4v4DbfvntHHvl4SByMRLhG1vxzUDT5
-K7/rbCjLbm4xR74dfRzz0yfVufDY0TYJKA==
------END EC PRIVATE KEY-----

+ 0 - 15
node1/certs/user/light1/light1.tls.crt

@@ -1,15 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICZTCCAgugAwIBAgIDCePAMAoGCCqGSM49BAMCMIGKMQswCQYDVQQGEwJDTjEQ
-MA4GA1UECBMHQmVpamluZzEQMA4GA1UEBxMHQmVpamluZzEfMB0GA1UEChMWd3gt
-b3JnMS5jaGFpbm1ha2VyLm9yZzESMBAGA1UECxMJcm9vdC1jZXJ0MSIwIAYDVQQD
-ExljYS53eC1vcmcxLmNoYWlubWFrZXIub3JnMB4XDTIxMDkwNjA4MTg0MFoXDTI2
-MDkwNTA4MTg0MFowgY4xCzAJBgNVBAYTAkNOMRAwDgYDVQQIEwdCZWlqaW5nMRAw
-DgYDVQQHEwdCZWlqaW5nMR8wHQYDVQQKExZ3eC1vcmcxLmNoYWlubWFrZXIub3Jn
-MQ4wDAYDVQQLEwVsaWdodDEqMCgGA1UEAxMhbGlnaHQxLnRscy53eC1vcmcxLmNo
-YWlubWFrZXIub3JnMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEJXWYtKTH3Y5L
-Ec2B0ynlnrpTrusMj1CwS5hCkGE7C0++378xJmFuJ35u51mX+VbaTOlx3lhauSlE
-HEi5Hq+IS6NaMFgwKQYDVR0OBCIEIJcxtxs0wPqIigA2llD8wq1MPPCd00NDVqjA
-CeS51IPxMCsGA1UdIwQkMCKAIJyvKyPKQuyTgAk96NH2QqcLZX9Cchfej++WmHbQ
-6NygMAoGCCqGSM49BAMCA0gAMEUCIF7sFhc3BKZUutO3/4ydgud11ggzXYmbQZ6n
-XwnJEbRPAiEAkwMCsxOT7yHCu1AgAcYLTasx5q8NvUbUWVNZXR2oEnI=
------END CERTIFICATE-----

+ 0 - 5
node1/certs/user/light1/light1.tls.key

@@ -1,5 +0,0 @@
------BEGIN EC PRIVATE KEY-----
-MHcCAQEEIDV4nsQnMPgJDpollWcSbTIZHskA7Sl3Ez3Zn6DMR846oAoGCCqGSM49
-AwEHoUQDQgAEJXWYtKTH3Y5LEc2B0ynlnrpTrusMj1CwS5hCkGE7C0++378xJmFu
-J35u51mX+VbaTOlx3lhauSlEHEi5Hq+ISw==
------END EC PRIVATE KEY-----

+ 0 - 18
node1/chain.yml

@@ -1,9 +1,3 @@
-#
-# Copyright (C) BABEC. All rights reserved.
-# Copyright (C) THL A29 Limited, a Tencent company. All rights reserved.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
 
 log:
   config_file: ./node1/log.yml          # config file of logger configuration.
@@ -11,8 +5,6 @@ log:
 blockchain:
   - chainId: chain1
     genesis: ./node1/chainconfig/bc1.yml
-#  - chainId: chain2
-#    genesis: ../config/{org_path2}/chainconfig/bc2.yml
 
 node:
   # 节点类型:full
@@ -36,7 +28,6 @@ net:
   seeds:
 #    - "/ip4/127.0.0.1/tcp/11301/p2p/QmVHR2DVso55J5ofymsWyVzma9pY2Z2JzsagpASThN1Jsh"
 
-
   tls:
     enabled: true
     priv_key_file: ./node1/certs/node/consensus1/consensus1.tls.key
@@ -47,9 +38,6 @@ txpool:
   max_txpool_size: 50000 # 普通交易池上限
   max_config_txpool_size: 10 # config交易池的上限
   full_notify_again_time: 30 # 交易池溢出后,再次通知的时间间隔(秒)
-#  pool_type: "batch"  # single/batch:single实时进入交易池,batch批量进入交易池
-#  batch_max_size: 30000 # 批次最大大小
-#  batch_create_timeout: 200 # 创建批次超时时间,单位毫秒
 
 rpc:
   provider: grpc
@@ -87,12 +75,6 @@ pprof:
   enabled: false
   port: 24321
 
-consensus:
-  raft:
-    snap_count: 10
-    # 是否异步Wal文件保存,true异步保存,false同步保存
-    async_wal_save: true
-
 storage:
   store_path: ./data/sina.yumawk.com/ledgerData1
   # 最小的不允许归档的区块高度

+ 1 - 1
node1/chainconfig/bc1.yml

@@ -40,7 +40,7 @@ consensus:
 # 信任组织和根证书
 trust_roots:
   - org_id: "sina.yumawk.com"
-    root: "./node1/ca.crt"
+    root: "./node1/certs/ca/ca.crt"
 
 # 权限配置(只能整体添加、修改、删除)
 resource_policies:

+ 16 - 0
node2/certs/ca/ca.crt

@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE-----
+MIICbzCCAhSgAwIBAgIRAPzSShfl3cn+nzsGKH8PJuQwCgYIKoEcz1UBg3UwgZAx
+CzAJBgNVBAYTAkNOMRIwEAYDVQQIDAnmuZbljZfnnIExEjAQBgNVBAcMCemVv+ay
+meW4gjETMBEGA1UEChMKeXVtYXdrLmNvbTEPMA0GA1UECxMGUm9vdENBMTMwMQYD
+VQQDDCrmuZbljZflvqHnoIHnvZHmjqfkv6Hmga/mioDmnK/mnInpmZDlhazlj7gw
+IBcNMjEwOTEwMDY1MzIwWhgPMjA1MTA5MDMwNjUzMjBaMIGQMQswCQYDVQQGEwJD
+TjESMBAGA1UECAwJ5rmW5Y2X55yBMRIwEAYDVQQHDAnplb/mspnluIIxEzARBgNV
+BAoTCnl1bWF3ay5jb20xDzANBgNVBAsTBlJvb3RDQTEzMDEGA1UEAwwq5rmW5Y2X
+5b6h56CB572R5o6n5L+h5oGv5oqA5pyv5pyJ6ZmQ5YWs5Y+4MFkwEwYHKoZIzj0C
+AQYIKoEcz1UBgi0DQgAEF4jzcDaNk0n9sLM9oU++w04Zw7a26emycMnv688xzSXC
+tCupYeBE+dhbLEhUkaGuOpklo8vIqRaCSLNa/KxINKNLMEkwDgYDVR0PAQH/BAQD
+AgEGMA8GA1UdEwEB/wQFMAMBAf8wJgYDVR0RBB8wHYIKeXVtYXdrLmNvbYIJbG9j
+YWxob3N0hwR/AAABMAoGCCqBHM9VAYN1A0kAMEYCIQCFVCY3xRc+PvCmE94yxM/q
+e+w6cUs3Jf7Zo1IWtKQNhgIhAM7adp2l4f5Zal7Hzj0Bfn64Tc41LrA5w+BfDSnZ
+K+2N
+-----END CERTIFICATE-----

+ 0 - 17
node2/certs/ca/wx-org1.chainmaker.org/ca.crt

@@ -1,17 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICnjCCAkSgAwIBAgIDBpdmMAoGCCqGSM49BAMCMIGKMQswCQYDVQQGEwJDTjEQ
-MA4GA1UECBMHQmVpamluZzEQMA4GA1UEBxMHQmVpamluZzEfMB0GA1UEChMWd3gt
-b3JnMS5jaGFpbm1ha2VyLm9yZzESMBAGA1UECxMJcm9vdC1jZXJ0MSIwIAYDVQQD
-ExljYS53eC1vcmcxLmNoYWlubWFrZXIub3JnMB4XDTIxMDkwNjA4MTg0MFoXDTMx
-MDkwNDA4MTg0MFowgYoxCzAJBgNVBAYTAkNOMRAwDgYDVQQIEwdCZWlqaW5nMRAw
-DgYDVQQHEwdCZWlqaW5nMR8wHQYDVQQKExZ3eC1vcmcxLmNoYWlubWFrZXIub3Jn
-MRIwEAYDVQQLEwlyb290LWNlcnQxIjAgBgNVBAMTGWNhLnd4LW9yZzEuY2hhaW5t
-YWtlci5vcmcwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAT9AN8/xv4MDoP+lWco
-1EUcO+xVBunz4kFlwi/iByDbac2x+XfhF6mXtT5mdg5jV6OykqIcqInKidRSIpxy
-Vk4go4GWMIGTMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MCkGA1Ud
-DgQiBCCcrysjykLsk4AJPejR9kKnC2V/QnIX3o/vlph20OjcoDBFBgNVHREEPjA8
-gg5jaGFpbm1ha2VyLm9yZ4IJbG9jYWxob3N0ghljYS53eC1vcmcxLmNoYWlubWFr
-ZXIub3JnhwR/AAABMAoGCCqGSM49BAMCA0gAMEUCIQDNLV6VKCqyd1ZHQbKUaM9G
-D4m5b5WAt2EJpkp7hMz7lgIgKwkOzti6D+kTU0a3LFfbVrMtbeo//hlcS5gwfo6B
-1nU=
------END CERTIFICATE-----

+ 0 - 17
node2/certs/ca/wx-org2.chainmaker.org/ca.crt

@@ -1,17 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICnzCCAkSgAwIBAgIDAubCMAoGCCqGSM49BAMCMIGKMQswCQYDVQQGEwJDTjEQ
-MA4GA1UECBMHQmVpamluZzEQMA4GA1UEBxMHQmVpamluZzEfMB0GA1UEChMWd3gt
-b3JnMi5jaGFpbm1ha2VyLm9yZzESMBAGA1UECxMJcm9vdC1jZXJ0MSIwIAYDVQQD
-ExljYS53eC1vcmcyLmNoYWlubWFrZXIub3JnMB4XDTIxMDkwNjA4MTg0MFoXDTMx
-MDkwNDA4MTg0MFowgYoxCzAJBgNVBAYTAkNOMRAwDgYDVQQIEwdCZWlqaW5nMRAw
-DgYDVQQHEwdCZWlqaW5nMR8wHQYDVQQKExZ3eC1vcmcyLmNoYWlubWFrZXIub3Jn
-MRIwEAYDVQQLEwlyb290LWNlcnQxIjAgBgNVBAMTGWNhLnd4LW9yZzIuY2hhaW5t
-YWtlci5vcmcwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARz7rY9/M1Vn96nc3GJ
-alXLMicCsvS3NBsPDUY4/HlgQzUbaPbyEnaaYZl4vWdJw6dWwpZb+ZjTO2mSsOKd
-YGsRo4GWMIGTMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MCkGA1Ud
-DgQiBCAqlldqcDDrsQX85UGtCpftpNSijKz2Yvu5a5R0MiYyAzBFBgNVHREEPjA8
-gg5jaGFpbm1ha2VyLm9yZ4IJbG9jYWxob3N0ghljYS53eC1vcmcyLmNoYWlubWFr
-ZXIub3JnhwR/AAABMAoGCCqGSM49BAMCA0kAMEYCIQCCcHQ/5E9QbQKgKAo9GdyV
-aUDRhVVcirV2XOPre/+j1gIhAIiOsMvTU3LzrYK8Y3AUf6n9wy3O1uwc4CLNQiLz
-oSS3
------END CERTIFICATE-----

+ 0 - 17
node2/certs/ca/wx-org3.chainmaker.org/ca.crt

@@ -1,17 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICnjCCAkSgAwIBAgIDDKj1MAoGCCqGSM49BAMCMIGKMQswCQYDVQQGEwJDTjEQ
-MA4GA1UECBMHQmVpamluZzEQMA4GA1UEBxMHQmVpamluZzEfMB0GA1UEChMWd3gt
-b3JnMy5jaGFpbm1ha2VyLm9yZzESMBAGA1UECxMJcm9vdC1jZXJ0MSIwIAYDVQQD
-ExljYS53eC1vcmczLmNoYWlubWFrZXIub3JnMB4XDTIxMDkwNjA4MTg0MFoXDTMx
-MDkwNDA4MTg0MFowgYoxCzAJBgNVBAYTAkNOMRAwDgYDVQQIEwdCZWlqaW5nMRAw
-DgYDVQQHEwdCZWlqaW5nMR8wHQYDVQQKExZ3eC1vcmczLmNoYWlubWFrZXIub3Jn
-MRIwEAYDVQQLEwlyb290LWNlcnQxIjAgBgNVBAMTGWNhLnd4LW9yZzMuY2hhaW5t
-YWtlci5vcmcwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATLaUl/2ZknzPMNa2Kd
-QAgkbr0TzIyMnpmUa1hwFLQMpnkHfR6UE4RppgYfhfGqs4Pf2q6+ACSZWcg6E+nu
-bw4no4GWMIGTMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MCkGA1Ud
-DgQiBCDSmEB5xMV6Qv96vQyyn8ANgb11BZFzNQM1XBFW9JRIjjBFBgNVHREEPjA8
-gg5jaGFpbm1ha2VyLm9yZ4IJbG9jYWxob3N0ghljYS53eC1vcmczLmNoYWlubWFr
-ZXIub3JnhwR/AAABMAoGCCqGSM49BAMCA0gAMEUCIHHI0cfmQtkzO9Oc8rDzbIzb
-aKRTDG+bNGNjt/ZnbEFkAiEA12Ahd2jtxtzUO8egORo3dM5Szm8JOMZ79GvoQjd/
-ag4=
------END CERTIFICATE-----

+ 0 - 16
node2/certs/ca/wx-org4.chainmaker.org/ca.crt

@@ -1,16 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICnDCCAkSgAwIBAgIDDdk+MAoGCCqGSM49BAMCMIGKMQswCQYDVQQGEwJDTjEQ
-MA4GA1UECBMHQmVpamluZzEQMA4GA1UEBxMHQmVpamluZzEfMB0GA1UEChMWd3gt
-b3JnNC5jaGFpbm1ha2VyLm9yZzESMBAGA1UECxMJcm9vdC1jZXJ0MSIwIAYDVQQD
-ExljYS53eC1vcmc0LmNoYWlubWFrZXIub3JnMB4XDTIxMDkwNjA4MTg0MFoXDTMx
-MDkwNDA4MTg0MFowgYoxCzAJBgNVBAYTAkNOMRAwDgYDVQQIEwdCZWlqaW5nMRAw
-DgYDVQQHEwdCZWlqaW5nMR8wHQYDVQQKExZ3eC1vcmc0LmNoYWlubWFrZXIub3Jn
-MRIwEAYDVQQLEwlyb290LWNlcnQxIjAgBgNVBAMTGWNhLnd4LW9yZzQuY2hhaW5t
-YWtlci5vcmcwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASwLBQRBswJX7Q/eBba
-I7jyipJLqtu5WECf7cjuwV+3SMvE/YO/wrF8FX37fgvuf6iY5yzmAVXdN0rvtVPW
-w28go4GWMIGTMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MCkGA1Ud
-DgQiBCDf/6SGbIrqJ8omuljlP8QeK5lBpyuSM9TGDLDil6Ct2zBFBgNVHREEPjA8
-gg5jaGFpbm1ha2VyLm9yZ4IJbG9jYWxob3N0ghljYS53eC1vcmc0LmNoYWlubWFr
-ZXIub3JnhwR/AAABMAoGCCqGSM49BAMCA0YAMEMCIAf14LxN5W7T2D19q4F695H/
-DyAc+98S9NJVIr9x9ZmzAh9ApVEvTwgXs60lZMWPuA6zM+Wr5oueUEHNggBZk4zD
------END CERTIFICATE-----

+ 0 - 1
node2/certs/node/common1/common1.nodeid

@@ -1 +0,0 @@
-QmdosSAuZMrXtcbJ5xtkfFgZazTFCDXdaz8XneTvTiXiWP

+ 0 - 16
node2/certs/node/common1/common1.sign.crt

@@ -1,16 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICmjCCAkGgAwIBAgIDB7r3MAoGCCqGSM49BAMCMIGKMQswCQYDVQQGEwJDTjEQ
-MA4GA1UECBMHQmVpamluZzEQMA4GA1UEBxMHQmVpamluZzEfMB0GA1UEChMWd3gt
-b3JnMi5jaGFpbm1ha2VyLm9yZzESMBAGA1UECxMJcm9vdC1jZXJ0MSIwIAYDVQQD
-ExljYS53eC1vcmcyLmNoYWlubWFrZXIub3JnMB4XDTIxMDkwNjA4MTg0MFoXDTI2
-MDkwNTA4MTg0MFowgZExCzAJBgNVBAYTAkNOMRAwDgYDVQQIEwdCZWlqaW5nMRAw
-DgYDVQQHEwdCZWlqaW5nMR8wHQYDVQQKExZ3eC1vcmcyLmNoYWlubWFrZXIub3Jn
-MQ8wDQYDVQQLEwZjb21tb24xLDAqBgNVBAMTI2NvbW1vbjEuc2lnbi53eC1vcmcy
-LmNoYWlubWFrZXIub3JnMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEwern2a9N
-TABtS2Ns1yrUEGwE/iCVxSrbloqXAjKJgxPaL0lyNhxUP3VjtcDnD0otYTIVYA3l
-k9MOu2YFOUQTX6OBjDCBiTApBgNVHQ4EIgQgy7BT3zgIkJAOa2xi9VOsGTpxn6Wh
-/5z9cNQXzoD+lXUwKwYDVR0jBCQwIoAgKpZXanAw67EF/OVBrQqX7aTUooys9mL7
-uWuUdDImMgMwLwYLgSdYj2QLHo9kCwQEIDFkNjE4MTI1MjdkNzQ5N2M4NWQ0ZGI1
-NDBhN2I5ZmMyMAoGCCqGSM49BAMCA0cAMEQCIClZSbwbpyhvW4oDuljX9kv+gEj2
-Hu4g2DqG+cm3cX5JAiAL6YGFnaxW2PryaTk3+iisQV+b6Z3VVko73AsTASzeQw==
------END CERTIFICATE-----

+ 0 - 5
node2/certs/node/common1/common1.sign.key

@@ -1,5 +0,0 @@
------BEGIN EC PRIVATE KEY-----
-MHcCAQEEIFQEnCBAx4jF1auKw0h3KJgJzSR+mcpVji2HojTgPfBboAoGCCqGSM49
-AwEHoUQDQgAEwern2a9NTABtS2Ns1yrUEGwE/iCVxSrbloqXAjKJgxPaL0lyNhxU
-P3VjtcDnD0otYTIVYA3lk9MOu2YFOUQTXw==
------END EC PRIVATE KEY-----

+ 0 - 18
node2/certs/node/common1/common1.tls.crt

@@ -1,18 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIC6zCCApCgAwIBAgIDAXrfMAoGCCqGSM49BAMCMIGKMQswCQYDVQQGEwJDTjEQ
-MA4GA1UECBMHQmVpamluZzEQMA4GA1UEBxMHQmVpamluZzEfMB0GA1UEChMWd3gt
-b3JnMi5jaGFpbm1ha2VyLm9yZzESMBAGA1UECxMJcm9vdC1jZXJ0MSIwIAYDVQQD
-ExljYS53eC1vcmcyLmNoYWlubWFrZXIub3JnMB4XDTIxMDkwNjA4MTg0MFoXDTI2
-MDkwNTA4MTg0MFowgZAxCzAJBgNVBAYTAkNOMRAwDgYDVQQIEwdCZWlqaW5nMRAw
-DgYDVQQHEwdCZWlqaW5nMR8wHQYDVQQKExZ3eC1vcmcyLmNoYWlubWFrZXIub3Jn
-MQ8wDQYDVQQLEwZjb21tb24xKzApBgNVBAMTImNvbW1vbjEudGxzLnd4LW9yZzIu
-Y2hhaW5tYWtlci5vcmcwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQ1flvM0OyM
-pXAozmV4Ckti3udRAN9mo45LQ7XqdFIhAepAFCt4HOxfoRx9X28GJFnbKqvqKuex
-Yi8QES4eASkbo4HcMIHZMCkGA1UdDgQiBCCNqkXjO2/zRC2y+Y3FON/wlfmI/+s3
-kdmzVRAirVSO0TArBgNVHSMEJDAigCAqlldqcDDrsQX85UGtCpftpNSijKz2Yvu5
-a5R0MiYyAzBOBgNVHREERzBFgg5jaGFpbm1ha2VyLm9yZ4IJbG9jYWxob3N0giJj
-b21tb24xLnRscy53eC1vcmcyLmNoYWlubWFrZXIub3JnhwR/AAABMC8GC4EnWI9k
-Cx6PZAsEBCAxZDYxODEyNTI3ZDc0OTdjODVkNGRiNTQwYTdiOWZjMjAKBggqhkjO
-PQQDAgNJADBGAiEA7/nJAp8rbrfYvsqHzhew48fsd2fERVIhbRKbuVpaRYMCIQCF
-1baVWp6/oAUz0s2fCINNTmLCMJhzOMrZhnJ1mlhwbw==
------END CERTIFICATE-----

+ 0 - 5
node2/certs/node/common1/common1.tls.key

@@ -1,5 +0,0 @@
------BEGIN EC PRIVATE KEY-----
-MHcCAQEEIIWiGuTyW9UFAGnmqXtN73SXySZJSy24WduLZQTM3eOYoAoGCCqGSM49
-AwEHoUQDQgAENX5bzNDsjKVwKM5leApLYt7nUQDfZqOOS0O16nRSIQHqQBQreBzs
-X6EcfV9vBiRZ2yqr6irnsWIvEBEuHgEpGw==
------END EC PRIVATE KEY-----

+ 0 - 15
node2/certs/user/admin1/admin1.sign.crt

@@ -1,15 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICZzCCAgygAwIBAgIDDD6/MAoGCCqGSM49BAMCMIGKMQswCQYDVQQGEwJDTjEQ
-MA4GA1UECBMHQmVpamluZzEQMA4GA1UEBxMHQmVpamluZzEfMB0GA1UEChMWd3gt
-b3JnMi5jaGFpbm1ha2VyLm9yZzESMBAGA1UECxMJcm9vdC1jZXJ0MSIwIAYDVQQD
-ExljYS53eC1vcmcyLmNoYWlubWFrZXIub3JnMB4XDTIxMDkwNjA4MTg0MFoXDTI2
-MDkwNTA4MTg0MFowgY8xCzAJBgNVBAYTAkNOMRAwDgYDVQQIEwdCZWlqaW5nMRAw
-DgYDVQQHEwdCZWlqaW5nMR8wHQYDVQQKExZ3eC1vcmcyLmNoYWlubWFrZXIub3Jn
-MQ4wDAYDVQQLEwVhZG1pbjErMCkGA1UEAxMiYWRtaW4xLnNpZ24ud3gtb3JnMi5j
-aGFpbm1ha2VyLm9yZzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABCnDwvPm02ds
-HyvUKKzx4sRWFUuY3Cp/j8FQbO2MDxOKkhJD5d8m06gVhst5m9fxaYDmQCKYFe1v
-7t/PTAlzeGmjWjBYMCkGA1UdDgQiBCD1+afAb7D3zp4gPId+aFg9lUbWnoztSr9v
-cCb1HtEE4jArBgNVHSMEJDAigCAqlldqcDDrsQX85UGtCpftpNSijKz2Yvu5a5R0
-MiYyAzAKBggqhkjOPQQDAgNJADBGAiEAyQZZq7y1+jnDGZgvjzB40gqtaJ92LqWd
-KsVypx1k/1ACIQCTgyj6EC6IEUIkLBCCrqkDtvgNlwqzEDKJw/BWbqfgyQ==
------END CERTIFICATE-----

+ 0 - 5
node2/certs/user/admin1/admin1.sign.key

@@ -1,5 +0,0 @@
------BEGIN EC PRIVATE KEY-----
-MHcCAQEEINwYNMVRCEWwOaCReX+esCu+UHccaHBExyxTZgDp5ZHGoAoGCCqGSM49
-AwEHoUQDQgAEKcPC8+bTZ2wfK9QorPHixFYVS5jcKn+PwVBs7YwPE4qSEkPl3ybT
-qBWGy3mb1/FpgOZAIpgV7W/u389MCXN4aQ==
------END EC PRIVATE KEY-----

+ 0 - 15
node2/certs/user/admin1/admin1.tls.crt

@@ -1,15 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICZjCCAgugAwIBAgIDBVyjMAoGCCqGSM49BAMCMIGKMQswCQYDVQQGEwJDTjEQ
-MA4GA1UECBMHQmVpamluZzEQMA4GA1UEBxMHQmVpamluZzEfMB0GA1UEChMWd3gt
-b3JnMi5jaGFpbm1ha2VyLm9yZzESMBAGA1UECxMJcm9vdC1jZXJ0MSIwIAYDVQQD
-ExljYS53eC1vcmcyLmNoYWlubWFrZXIub3JnMB4XDTIxMDkwNjA4MTg0MFoXDTI2
-MDkwNTA4MTg0MFowgY4xCzAJBgNVBAYTAkNOMRAwDgYDVQQIEwdCZWlqaW5nMRAw
-DgYDVQQHEwdCZWlqaW5nMR8wHQYDVQQKExZ3eC1vcmcyLmNoYWlubWFrZXIub3Jn
-MQ4wDAYDVQQLEwVhZG1pbjEqMCgGA1UEAxMhYWRtaW4xLnRscy53eC1vcmcyLmNo
-YWlubWFrZXIub3JnMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEicDE/nKA1ccM
-H2MsKb9BuEKRUcatSbX7I6cwuC16SLOYqlAa277EGl3/cl+VeW+/IUxMFReIP4x2
-49IWPQh3GaNaMFgwKQYDVR0OBCIEIJ9lzTNKygodamacIeqC9JW3RHyVsIoLIxAZ
-3hqvqMf2MCsGA1UdIwQkMCKAICqWV2pwMOuxBfzlQa0Kl+2k1KKMrPZi+7lrlHQy
-JjIDMAoGCCqGSM49BAMCA0kAMEYCIQDZRcpGySbkUU+qvsFIZJopr4pinoPYpOGs
-ir4FOKA3AwIhAKqB12+ITkWpSFfB9B/JeJh7AKyUsZcNKayOaS80CxlQ
------END CERTIFICATE-----

+ 0 - 5
node2/certs/user/admin1/admin1.tls.key

@@ -1,5 +0,0 @@
------BEGIN EC PRIVATE KEY-----
-MHcCAQEEIKRLeRY9+Jqa8z9ZM0WWuh8SunnWWGpyJiJDvKadoD6+oAoGCCqGSM49
-AwEHoUQDQgAEicDE/nKA1ccMH2MsKb9BuEKRUcatSbX7I6cwuC16SLOYqlAa277E
-Gl3/cl+VeW+/IUxMFReIP4x249IWPQh3GQ==
------END EC PRIVATE KEY-----

+ 0 - 1
node2/certs/user/client1/client1.addr

@@ -1 +0,0 @@
-6SV6kpSsNyaUCAGNVqSHtXBBGBVPyQyG5NiU21NeL57Z

+ 0 - 15
node2/certs/user/client1/client1.sign.crt

@@ -1,15 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICaDCCAg6gAwIBAgIDBEQYMAoGCCqGSM49BAMCMIGKMQswCQYDVQQGEwJDTjEQ
-MA4GA1UECBMHQmVpamluZzEQMA4GA1UEBxMHQmVpamluZzEfMB0GA1UEChMWd3gt
-b3JnMi5jaGFpbm1ha2VyLm9yZzESMBAGA1UECxMJcm9vdC1jZXJ0MSIwIAYDVQQD
-ExljYS53eC1vcmcyLmNoYWlubWFrZXIub3JnMB4XDTIxMDkwNjA4MTg0MFoXDTI2
-MDkwNTA4MTg0MFowgZExCzAJBgNVBAYTAkNOMRAwDgYDVQQIEwdCZWlqaW5nMRAw
-DgYDVQQHEwdCZWlqaW5nMR8wHQYDVQQKExZ3eC1vcmcyLmNoYWlubWFrZXIub3Jn
-MQ8wDQYDVQQLEwZjbGllbnQxLDAqBgNVBAMTI2NsaWVudDEuc2lnbi53eC1vcmcy
-LmNoYWlubWFrZXIub3JnMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEPOZPu7TT
-QbIptJl+uBFGKm1BsmO35fRmd46pZAlZ2pmK2zWlSJg2pmzQV0mGtFzIxDxbPZ++
-z5I0kbJ5MDFGlqNaMFgwKQYDVR0OBCIEIDwoaVR3+bqpx6+0pDD4zzed91ND/N8a
-a5G9Y04NnAvAMCsGA1UdIwQkMCKAICqWV2pwMOuxBfzlQa0Kl+2k1KKMrPZi+7lr
-lHQyJjIDMAoGCCqGSM49BAMCA0gAMEUCIQDUa2j7BbM0Q+G7BOCiHV0bt8+blwPM
-quGH6wnlVZ65xgIgPxa6Pimxk7moB6xq/04/2cuHi7RSkvvdnZyCxYWxP6A=
------END CERTIFICATE-----

+ 0 - 5
node2/certs/user/client1/client1.sign.key

@@ -1,5 +0,0 @@
------BEGIN EC PRIVATE KEY-----
-MHcCAQEEIE3pvzY50IyVPqHPcjwhh4L+T+VIQcYAurbso8ynbWVboAoGCCqGSM49
-AwEHoUQDQgAEPOZPu7TTQbIptJl+uBFGKm1BsmO35fRmd46pZAlZ2pmK2zWlSJg2
-pmzQV0mGtFzIxDxbPZ++z5I0kbJ5MDFGlg==
------END EC PRIVATE KEY-----

+ 0 - 15
node2/certs/user/client1/client1.tls.crt

@@ -1,15 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICZzCCAg2gAwIBAgIDBiFyMAoGCCqGSM49BAMCMIGKMQswCQYDVQQGEwJDTjEQ
-MA4GA1UECBMHQmVpamluZzEQMA4GA1UEBxMHQmVpamluZzEfMB0GA1UEChMWd3gt
-b3JnMi5jaGFpbm1ha2VyLm9yZzESMBAGA1UECxMJcm9vdC1jZXJ0MSIwIAYDVQQD
-ExljYS53eC1vcmcyLmNoYWlubWFrZXIub3JnMB4XDTIxMDkwNjA4MTg0MFoXDTI2
-MDkwNTA4MTg0MFowgZAxCzAJBgNVBAYTAkNOMRAwDgYDVQQIEwdCZWlqaW5nMRAw
-DgYDVQQHEwdCZWlqaW5nMR8wHQYDVQQKExZ3eC1vcmcyLmNoYWlubWFrZXIub3Jn
-MQ8wDQYDVQQLEwZjbGllbnQxKzApBgNVBAMTImNsaWVudDEudGxzLnd4LW9yZzIu
-Y2hhaW5tYWtlci5vcmcwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQHVg2gExpr
-NoZF8OUdQGeHPlPeEePjyHNElODWVoeJeoH3dH1DIm3+S4U6TXQJZKwH9saihhkk
-x4k0tZYVWYKeo1owWDApBgNVHQ4EIgQgl5TmSOe8tayOGBeskTWbS7NLh0hTIgyL
-cuxcNUne7KcwKwYDVR0jBCQwIoAgKpZXanAw67EF/OVBrQqX7aTUooys9mL7uWuU
-dDImMgMwCgYIKoZIzj0EAwIDSAAwRQIhAKH9/Ms0l+eaLqpGbDT1Ad0YuFudCm7N
-g+qvI8FB0KBLAiAzpNSzqSqDzgbls7TEu5ShvwIj/YGwGaQ1uTFmQKEMpg==
------END CERTIFICATE-----

+ 0 - 5
node2/certs/user/client1/client1.tls.key

@@ -1,5 +0,0 @@
------BEGIN EC PRIVATE KEY-----
-MHcCAQEEIFagjiYQC39lkSkgvBZTdfjEQuOor5UsVrS6+dxFulH4oAoGCCqGSM49
-AwEHoUQDQgAEB1YNoBMaazaGRfDlHUBnhz5T3hHj48hzRJTg1laHiXqB93R9QyJt
-/kuFOk10CWSsB/bGooYZJMeJNLWWFVmCng==
------END EC PRIVATE KEY-----

+ 0 - 15
node2/certs/user/light1/light1.sign.crt

@@ -1,15 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICZzCCAgygAwIBAgIDANaYMAoGCCqGSM49BAMCMIGKMQswCQYDVQQGEwJDTjEQ
-MA4GA1UECBMHQmVpamluZzEQMA4GA1UEBxMHQmVpamluZzEfMB0GA1UEChMWd3gt
-b3JnMi5jaGFpbm1ha2VyLm9yZzESMBAGA1UECxMJcm9vdC1jZXJ0MSIwIAYDVQQD
-ExljYS53eC1vcmcyLmNoYWlubWFrZXIub3JnMB4XDTIxMDkwNjA4MTg0MFoXDTI2
-MDkwNTA4MTg0MFowgY8xCzAJBgNVBAYTAkNOMRAwDgYDVQQIEwdCZWlqaW5nMRAw
-DgYDVQQHEwdCZWlqaW5nMR8wHQYDVQQKExZ3eC1vcmcyLmNoYWlubWFrZXIub3Jn
-MQ4wDAYDVQQLEwVsaWdodDErMCkGA1UEAxMibGlnaHQxLnNpZ24ud3gtb3JnMi5j
-aGFpbm1ha2VyLm9yZzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABBLoc2pnHTEF
-pqTquA2G9gThBLTz/C31uBXrpX6aGRodEMm6PwP3KryrraqrpAh0y/nFMtyTJ6fx
-BMYLp+MA8iGjWjBYMCkGA1UdDgQiBCDW40WPIdxBlKre47DJCZhNQNorf7K+MxjF
-nCZi5bqorTArBgNVHSMEJDAigCAqlldqcDDrsQX85UGtCpftpNSijKz2Yvu5a5R0
-MiYyAzAKBggqhkjOPQQDAgNJADBGAiEA4DJCBJpHJ0KwznmXD+YzrPoZTmH/ZZkl
-aK/1xW+y170CIQCWZmMRM+ez4LS7X307nSkwlxBEqrxM08HliNy27o1Wqg==
------END CERTIFICATE-----

+ 0 - 5
node2/certs/user/light1/light1.sign.key

@@ -1,5 +0,0 @@
------BEGIN EC PRIVATE KEY-----
-MHcCAQEEIIO6xT7ef9fU5kYHWLTX4VVTtwxUYalSRqLqda3O48utoAoGCCqGSM49
-AwEHoUQDQgAEEuhzamcdMQWmpOq4DYb2BOEEtPP8LfW4FeulfpoZGh0Qybo/A/cq
-vKutqqukCHTL+cUy3JMnp/EExgun4wDyIQ==
------END EC PRIVATE KEY-----

+ 0 - 15
node2/certs/user/light1/light1.tls.crt

@@ -1,15 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICZDCCAgugAwIBAgIDBGmHMAoGCCqGSM49BAMCMIGKMQswCQYDVQQGEwJDTjEQ
-MA4GA1UECBMHQmVpamluZzEQMA4GA1UEBxMHQmVpamluZzEfMB0GA1UEChMWd3gt
-b3JnMi5jaGFpbm1ha2VyLm9yZzESMBAGA1UECxMJcm9vdC1jZXJ0MSIwIAYDVQQD
-ExljYS53eC1vcmcyLmNoYWlubWFrZXIub3JnMB4XDTIxMDkwNjA4MTg0MFoXDTI2
-MDkwNTA4MTg0MFowgY4xCzAJBgNVBAYTAkNOMRAwDgYDVQQIEwdCZWlqaW5nMRAw
-DgYDVQQHEwdCZWlqaW5nMR8wHQYDVQQKExZ3eC1vcmcyLmNoYWlubWFrZXIub3Jn
-MQ4wDAYDVQQLEwVsaWdodDEqMCgGA1UEAxMhbGlnaHQxLnRscy53eC1vcmcyLmNo
-YWlubWFrZXIub3JnMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAETsxH8vnJh4tA
-562ta1pOdJxwNxTbAV9gaggviYUVBiqotq1d01XtV20JVN8opsCjqFOAnP6yXlaU
-X0hgvt+YCaNaMFgwKQYDVR0OBCIEIHvuLuoxXgneH96dx8GlUNg5yHSpJcdcthE1
-ASgrIVx5MCsGA1UdIwQkMCKAICqWV2pwMOuxBfzlQa0Kl+2k1KKMrPZi+7lrlHQy
-JjIDMAoGCCqGSM49BAMCA0cAMEQCIEI8UEwJeaAqkdBhncUXhWEhcfveSWA3UWmX
-PrFcV0ehAiA2jAeVPH96wvPVK1dewA9Wjmi1hgiQgpLIeBe/0pyQkQ==
------END CERTIFICATE-----

+ 0 - 5
node2/certs/user/light1/light1.tls.key

@@ -1,5 +0,0 @@
------BEGIN EC PRIVATE KEY-----
-MHcCAQEEIONAId8YYjjxe7kTxB6Ua8wKsACjzpuIgOU6hJXWx0pioAoGCCqGSM49
-AwEHoUQDQgAETsxH8vnJh4tA562ta1pOdJxwNxTbAV9gaggviYUVBiqotq1d01Xt
-V20JVN8opsCjqFOAnP6yXlaUX0hgvt+YCQ==
------END EC PRIVATE KEY-----

+ 0 - 13
node2/chainmaker.yml → node2/chain.yml

@@ -5,12 +5,6 @@ log:
 blockchain:
   - chainId: chain1
     genesis: ./node2/chainconfig/bc1.yml
-#  - chainId: chain2
-#    genesis: ../config/{org_path2}/chainconfig/bc2.yml
-#  - chainId: chain3
-#    genesis: ../config/{org_path3}/chainconfig/bc3.yml
-#  - chainId: chain4
-#    genesis: ../config/{org_path4}/chainconfig/bc4.yml
 
 node:
   # 节点类型:full
@@ -31,7 +25,6 @@ node:
 net:
   provider: LibP2P
   listen_addr: /ip4/0.0.0.0/tcp/11302
-
   seeds:
     - "/ip4/124.71.218.7/tcp/11301/p2p/QmVHR2DVso55J5ofymsWyVzma9pY2Z2JzsagpASThN1Jsh"
 
@@ -82,12 +75,6 @@ pprof:
   enabled: false
   port: 24322
 
-consensus:
-  raft:
-    snap_count: 10
-    # 是否异步Wal文件保存,true异步保存,false同步保存
-    async_wal_save: true
-
 storage:
   store_path: ./data/baidu.yumawk.com/ledgerData1
   # 最小的不允许归档的区块高度

+ 1 - 1
node2/chainconfig/bc1.yml

@@ -40,7 +40,7 @@ consensus:
 # 信任组织和根证书
 trust_roots:
   - org_id: "sina.yumawk.com"
-    root: "./node1/ca.crt"
+    root: "./node1/certs/ca/ca.crt"
 
 # 权限配置(只能整体添加、修改、删除)
 resource_policies:

+ 16 - 0
node3/certs/ca/ca.crt

@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE-----
+MIICbzCCAhSgAwIBAgIRAPzSShfl3cn+nzsGKH8PJuQwCgYIKoEcz1UBg3UwgZAx
+CzAJBgNVBAYTAkNOMRIwEAYDVQQIDAnmuZbljZfnnIExEjAQBgNVBAcMCemVv+ay
+meW4gjETMBEGA1UEChMKeXVtYXdrLmNvbTEPMA0GA1UECxMGUm9vdENBMTMwMQYD
+VQQDDCrmuZbljZflvqHnoIHnvZHmjqfkv6Hmga/mioDmnK/mnInpmZDlhazlj7gw
+IBcNMjEwOTEwMDY1MzIwWhgPMjA1MTA5MDMwNjUzMjBaMIGQMQswCQYDVQQGEwJD
+TjESMBAGA1UECAwJ5rmW5Y2X55yBMRIwEAYDVQQHDAnplb/mspnluIIxEzARBgNV
+BAoTCnl1bWF3ay5jb20xDzANBgNVBAsTBlJvb3RDQTEzMDEGA1UEAwwq5rmW5Y2X
+5b6h56CB572R5o6n5L+h5oGv5oqA5pyv5pyJ6ZmQ5YWs5Y+4MFkwEwYHKoZIzj0C
+AQYIKoEcz1UBgi0DQgAEF4jzcDaNk0n9sLM9oU++w04Zw7a26emycMnv688xzSXC
+tCupYeBE+dhbLEhUkaGuOpklo8vIqRaCSLNa/KxINKNLMEkwDgYDVR0PAQH/BAQD
+AgEGMA8GA1UdEwEB/wQFMAMBAf8wJgYDVR0RBB8wHYIKeXVtYXdrLmNvbYIJbG9j
+YWxob3N0hwR/AAABMAoGCCqBHM9VAYN1A0kAMEYCIQCFVCY3xRc+PvCmE94yxM/q
+e+w6cUs3Jf7Zo1IWtKQNhgIhAM7adp2l4f5Zal7Hzj0Bfn64Tc41LrA5w+BfDSnZ
+K+2N
+-----END CERTIFICATE-----

+ 1 - 0
node3/certs/node/consensus1/consensus1.nodeid

@@ -0,0 +1 @@
+QmNToWGh45G39z3Lx8px6SZhSbsAQfB8atjVoh5MVUAqQW

+ 14 - 0
node3/certs/node/consensus1/consensus1.sign.crt

@@ -0,0 +1,14 @@
+-----BEGIN CERTIFICATE-----
+MIICEjCCAbigAwIBAgIIBMFaYSjJlekwCgYIKoEcz1UBg3UwgZAxCzAJBgNVBAYT
+AkNOMRIwEAYDVQQIDAnmuZbljZfnnIExEjAQBgNVBAcMCemVv+aymeW4gjETMBEG
+A1UEChMKeXVtYXdrLmNvbTEPMA0GA1UECxMGUm9vdENBMTMwMQYDVQQDDCrmuZbl
+jZflvqHnoIHnvZHmjqfkv6Hmga/mioDmnK/mnInpmZDlhazlj7gwHhcNMjEwOTE0
+MDcwNTU3WhcNMjYwOTEzMDcwNTU3WjCBiDELMAkGA1UEBhMCQ04xEjAQBgNVBAgM
+Cea5luWNl+ecgTESMBAGA1UEBwwJ6ZW/5rKZ5biCMRYwFAYDVQQKEw1xcS55dW1h
+d2suY29tMRIwEAYDVQQLEwljb25zZW5zdXMxJTAjBgNVBAMTHGNvbnNlbnN1cy5z
+aWduLnFxLnl1bWF3ay5jb20wWTATBgcqhkjOPQIBBggqgRzPVQGCLQNCAATs6ObR
+65/5a07yFQucJ/+t/16r6gku9S++LC4k1NFwvhUONjTLxMKY7rbssLBWE6pwxB5X
+QPIrJrP8ZaJobraNowIwADAKBggqgRzPVQGDdQNIADBFAiAIFFeO/N/0uXA63TE4
+X1HWWAPzX847p7rf3xMcAu4D4wIhAOooH2XK9uoVzqu9EKW++pVsodkywEk7FP5k
+GCZOC6AM
+-----END CERTIFICATE-----

+ 6 - 0
node3/certs/node/consensus1/consensus1.sign.key

@@ -0,0 +1,6 @@
+-----BEGIN PRIVATE KEY-----
+MIGTAgEAMBMGByqGSM49AgEGCCqBHM9VAYItBHkwdwIBAQQgAhRhX5qL8wez7HTJ
+XWnzQ1jbzkqRSnuFY3FKOyHi2TegCgYIKoEcz1UBgi2hRANCAATs6ObR65/5a07y
+FQucJ/+t/16r6gku9S++LC4k1NFwvhUONjTLxMKY7rbssLBWE6pwxB5XQPIrJrP8
+ZaJobraN
+-----END PRIVATE KEY-----

+ 14 - 0
node3/certs/node/consensus1/consensus1.tls.crt

@@ -0,0 +1,14 @@
+-----BEGIN CERTIFICATE-----
+MIICLjCCAdWgAwIBAgIJANU2JW/RSaGgMAoGCCqBHM9VAYN1MIGQMQswCQYDVQQG
+EwJDTjESMBAGA1UECAwJ5rmW5Y2X55yBMRIwEAYDVQQHDAnplb/mspnluIIxEzAR
+BgNVBAoTCnl1bWF3ay5jb20xDzANBgNVBAsTBlJvb3RDQTEzMDEGA1UEAwwq5rmW
+5Y2X5b6h56CB572R5o6n5L+h5oGv5oqA5pyv5pyJ6ZmQ5YWs5Y+4MB4XDTIxMDkx
+NDA3MDU1N1oXDTI2MDkxMzA3MDU1N1owgYcxCzAJBgNVBAYTAkNOMRIwEAYDVQQI
+DAnmuZbljZfnnIExEjAQBgNVBAcMCemVv+aymeW4gjEWMBQGA1UEChMNcXEueXVt
+YXdrLmNvbTESMBAGA1UECxMJY29uc2Vuc3VzMSQwIgYDVQQDExtjb25zZW5zdXMu
+dGxzLnFxLnl1bWF3ay5jb20wWTATBgcqhkjOPQIBBggqgRzPVQGCLQNCAASSclmX
+QvJiidCIhzJXGHjMfTl2QA8LqnznLanZnTjEas1LHUPfjtjpD6WY2Z/nDE8FdmpG
+zoIOb50cl7K+T83Uox8wHTAbBgNVHREEFDASggp5dW1hd2suY29thwR/AAABMAoG
+CCqBHM9VAYN1A0cAMEQCIBrE2mB2BkMEk3EMxhAKOQYNgXgQk3RjWlODrCKUuXiY
+AiBWZgIrr9hYgf8AidjmfoAYEYTk5dALclsSYu/pPz9nCQ==
+-----END CERTIFICATE-----

+ 6 - 0
node3/certs/node/consensus1/consensus1.tls.key

@@ -0,0 +1,6 @@
+-----BEGIN PRIVATE KEY-----
+MIGTAgEAMBMGByqGSM49AgEGCCqBHM9VAYItBHkwdwIBAQQg+kTYVk2LyoWKkCR/
+xbR0faLUhl1PUhMr/i0m0r2GrwmgCgYIKoEcz1UBgi2hRANCAASSclmXQvJiidCI
+hzJXGHjMfTl2QA8LqnznLanZnTjEas1LHUPfjtjpD6WY2Z/nDE8FdmpGzoIOb50c
+l7K+T83U
+-----END PRIVATE KEY-----

+ 110 - 0
node3/chain.yml

@@ -0,0 +1,110 @@
+
+log:
+  config_file: ./node3/log.yml          # config file of logger configuration.
+
+blockchain:
+  - chainId: chain1
+    genesis: ./node3/chainconfig/bc1.yml
+
+node:
+  # 节点类型:full
+  type:              full
+  org_id:            qq.yumawk.com
+  priv_key_file:     ./node3/certs/node/consensus1/consensus1.sign.key
+  cert_file:         ./node3/certs/node/consensus1/consensus1.sign.crt
+  signer_cache_size: 1000
+  cert_cache_size:   1000
+  pkcs11:
+    enabled: false
+    library: # path to the so file of pkcs11 interface
+    label: # label for the slot to be used
+    password: # password to logon the HSM
+    session_cache_size: 10 # size of HSM session cache, default to 10
+    hash: "SHA256" # hash algorithm used to compute SKI
+
+net:
+  provider: LibP2P
+  listen_addr: /ip4/0.0.0.0/tcp/11303
+  seeds:
+    - "/ip4/124.71.218.7/tcp/11301/p2p/QmVHR2DVso55J5ofymsWyVzma9pY2Z2JzsagpASThN1Jsh"
+
+  tls:
+    enabled: true
+    priv_key_file: ./node3/certs/node/consensus1/consensus1.tls.key
+    cert_file: ./node3/certs/node/consensus1/consensus1.tls.crt
+
+
+txpool:
+  max_txpool_size: 50000 # 普通交易池上限
+  max_config_txpool_size: 10 # config交易池的上限
+  full_notify_again_time: 30 # 交易池溢出后,再次通知的时间间隔(秒)
+
+rpc:
+  provider: grpc
+  port: 12303
+  # 检查链配置TrustRoots证书变化时间间隔,单位:s,最小值为10s
+  check_chain_conf_trust_roots_change_interval: 60
+  ratelimit:
+    # 每秒补充令牌数,取值:-1-不受限;0-默认值(10000)
+    token_per_second: -1
+    # 令牌桶大小,取值:-1-不受限;0-默认值(10000)
+    token_bucket_size: -1
+  subscriber:
+    # 历史消息订阅流控,实时消息订阅不会进行流控
+    ratelimit:
+      # 每秒补充令牌数,取值:-1-不受限;0-默认值(1000)
+      token_per_second: 100
+      # 令牌桶大小,取值:-1-不受限;0-默认值(1000)
+      token_bucket_size: 100
+  tls:
+    # TLS模式:
+    #   disable - 不启用TLS
+    #   oneway  - 单向认证
+    #   twoway  - 双向认证
+    #mode: disable
+    #mode: oneway
+    mode:           twoway
+    priv_key_file:  ./node3/certs/node/consensus1/consensus1.tls.key
+    cert_file:      ./node3/certs/node/consensus1/consensus1.tls.crt
+
+monitor:
+  enabled: true
+  port: 14323
+
+pprof:
+  enabled: false
+  port: 24323
+
+storage:
+  store_path: ./data/qq.yumawk.com/ledgerData1
+  # 最小的不允许归档的区块高度
+  unarchive_block_height: 15
+  blockdb_config:
+    provider: leveldb
+    leveldb_config:
+      store_path: ./data/qq.yumawk.com/blocks
+  statedb_config:
+    provider: leveldb # leveldb/sql 二选一
+    leveldb_config: # leveldb config
+      store_path: ./data/qq.yumawk.com/state
+  #    sqldb_config: # sql config,只有provider为sql的时候才需要配置和启用这个配置
+  #      sqldb_type: mysql           #具体的sql db类型,目前支持mysql,sqlite
+  #      dsn: root:password@tcp(127.0.0.1:3306)/  #mysql的连接信息,包括用户名、密码、ip、port等,示例:root:admin@tcp(127.0.0.1:3306)/
+  historydb_config:
+    provider: leveldb
+    leveldb_config:
+      store_path: ./data/qq.yumawk.com/history
+  resultdb_config:
+    provider: leveldb
+    leveldb_config:
+      store_path: ./data/qq.yumawk.com/result
+  disable_contract_eventdb: true  #是否禁止合约事件存储功能,默认为true,如果设置为false,需要配置mysql
+  contract_eventdb_config:
+    provider: sql                 #如果开启contract event db 功能,需要指定provider为sql
+    sqldb_config:
+      sqldb_type: mysql           #contract event db 只支持mysql
+      dsn: root:password@tcp(127.0.0.1:3306)/  #mysql的连接信息,包括用户名、密码、ip、port等,示例:root:admin@tcp(127.0.0.1:3306)/
+core:
+  evidence: false
+scheduler:
+  rwset_log: false #whether log the txRWSet map in the debug mode

+ 81 - 0
node3/chainconfig/bc1.yml

@@ -0,0 +1,81 @@
+chain_id: chain1    # 链标识
+version: v1.0.0         # 链版本
+sequence: 1             # 配置版本
+auth_type: "identity"   # 认证类型
+
+crypto:
+  hash: SHA256
+
+# 合约支持类型的配置
+contract:
+  enable_sql_support: false # 合约是否支持sql,此处若为true,则chainmaker.yml中则需配置storage.statedb_config.provider=sql,否则无法启动
+
+# 交易、区块相关配置
+block:
+  tx_timestamp_verify: true # 是否需要开启交易时间戳校验
+  tx_timeout: 600  # 交易时间戳的过期时间(秒)
+  block_tx_capacity: 100  # 区块中最大交易数
+  block_size: 10  # 区块最大限制,单位MB
+  block_interval: 2000 # 出块间隔,单位:ms
+
+# core模块
+core:
+  tx_scheduler_timeout: 10 #  [0, 60] 交易调度器从交易池拿到交易后, 进行调度的时间
+  tx_scheduler_validate_timeout: 10 # [0, 60] 交易调度器从区块中拿到交易后, 进行验证的超时时间
+
+#共识配置
+consensus:
+  # 共识类型(0-SOLO,1-TBFT,2-MBFT,3-HOTSTUFF,4-RAFT,5-DPOS,10-POW)
+  type: 1
+  # 共识节点列表,组织必须出现在trust_roots的org_id中,每个组织可配置多个共识节点,节点地址采用libp2p格式
+  # 其中node_id为chainmaker.yml中 node.cert_file证书对应的nodeid
+  nodes:
+    - org_id: "sina.yumawk.com"
+      node_id:
+        - "QmVHR2DVso55J5ofymsWyVzma9pY2Z2JzsagpASThN1Jsh"
+#    - org_id: "baidu.yumawk.com"
+#      node_id:
+#        - "QmbvQunyZAoy3PEVvM2ePSwHSfcFq25e3b1ZjbXW7GtA9k"
+
+# 信任组织和根证书
+trust_roots:
+  - org_id: "sina.yumawk.com"
+    root: "./node1/certs/ca/ca.crt"
+
+# 权限配置(只能整体添加、修改、删除)
+resource_policies:
+  - resource_name: NODE_ID_UPDATE
+    policy:
+      rule: SELF # 规则(ANY,MAJORITY...,全部大写,自动转大写)
+      org_list: # 组织名称(组织名称,区分大小写)
+      role_list: # 角色名称(role,自动转大写)
+        - admin
+  - resource_name: TRUST_ROOT_ADD
+    policy:
+      rule: ANY
+      org_list:
+      role_list:
+        - admin
+  - resource_name: CERTS_FREEZE
+    policy:
+      rule: ANY
+      org_list:
+      role_list:
+        - admin
+  - resource_name: INIT_CONTRACT
+    policy:
+      rule: ANY
+      org_list:
+      role_list:
+        - admin
+  - resource_name: NODE_ORG_ADD
+    policy:
+      rule: ANY
+      org_list:
+      role_list:
+        - admin
+  - resource_name: PERMISSION_ADD
+    policy:
+      rule: ANY
+      org_list:
+      role_list:

+ 34 - 0
node3/log.yml

@@ -0,0 +1,34 @@
+#
+# Copyright (C) BABEC. All rights reserved.
+# Copyright (C) THL A29 Limited, a Tencent company. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+log:
+  system: # 链日志配置
+    log_level_default: INFO       # 默认日志级别
+    log_levels:
+      core: INFO                  # 查看commit block落快信息关键字,需将core改为info级别及以下
+      net: INFO
+      vm: INFO                    # 合约中的日志,需将vm改为debug级别
+      storage: INFO               # sql模式查看sql语句,需将storage改为debug级别
+    file_path: ./log/system.log
+    max_age: 365                  # 日志最长保存时间,单位:天
+    rotation_time: 1              # 日志滚动时间,单位:小时
+    log_in_console: true         # 是否展示日志到终端,仅限于调试使用
+    show_color: true              # 是否打印颜色日志
+  brief:
+    log_level_default: INFO
+    file_path: ./log/brief.log
+    max_age: 365                  # 日志最长保存时间,单位:天
+    rotation_time: 1              # 日志滚动时间,单位:小时
+    log_in_console: true         # 是否展示日志到终端,仅限于调试使用
+    show_color: true              # 是否打印颜色日志
+  event:
+    log_level_default: INFO
+    file_path: ./log/event.log
+    max_age: 365                  # 日志最长保存时间,单位:天
+    rotation_time: 1              # 日志滚动间隔,单位:小时
+    log_in_console: true         # 是否展示日志到终端,仅限于调试使用
+    show_color: true              # 是否打印颜色日志

+ 16 - 0
node4/certs/ca/ca.crt

@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE-----
+MIICbzCCAhSgAwIBAgIRAPzSShfl3cn+nzsGKH8PJuQwCgYIKoEcz1UBg3UwgZAx
+CzAJBgNVBAYTAkNOMRIwEAYDVQQIDAnmuZbljZfnnIExEjAQBgNVBAcMCemVv+ay
+meW4gjETMBEGA1UEChMKeXVtYXdrLmNvbTEPMA0GA1UECxMGUm9vdENBMTMwMQYD
+VQQDDCrmuZbljZflvqHnoIHnvZHmjqfkv6Hmga/mioDmnK/mnInpmZDlhazlj7gw
+IBcNMjEwOTEwMDY1MzIwWhgPMjA1MTA5MDMwNjUzMjBaMIGQMQswCQYDVQQGEwJD
+TjESMBAGA1UECAwJ5rmW5Y2X55yBMRIwEAYDVQQHDAnplb/mspnluIIxEzARBgNV
+BAoTCnl1bWF3ay5jb20xDzANBgNVBAsTBlJvb3RDQTEzMDEGA1UEAwwq5rmW5Y2X
+5b6h56CB572R5o6n5L+h5oGv5oqA5pyv5pyJ6ZmQ5YWs5Y+4MFkwEwYHKoZIzj0C
+AQYIKoEcz1UBgi0DQgAEF4jzcDaNk0n9sLM9oU++w04Zw7a26emycMnv688xzSXC
+tCupYeBE+dhbLEhUkaGuOpklo8vIqRaCSLNa/KxINKNLMEkwDgYDVR0PAQH/BAQD
+AgEGMA8GA1UdEwEB/wQFMAMBAf8wJgYDVR0RBB8wHYIKeXVtYXdrLmNvbYIJbG9j
+YWxob3N0hwR/AAABMAoGCCqBHM9VAYN1A0kAMEYCIQCFVCY3xRc+PvCmE94yxM/q
+e+w6cUs3Jf7Zo1IWtKQNhgIhAM7adp2l4f5Zal7Hzj0Bfn64Tc41LrA5w+BfDSnZ
+K+2N
+-----END CERTIFICATE-----

+ 14 - 0
node4/certs/node/client1/client1.sign.crt

@@ -0,0 +1,14 @@
+-----BEGIN CERTIFICATE-----
+MIICDzCCAbWgAwIBAgIJAPsYVITVR4RgMAoGCCqBHM9VAYN1MIGQMQswCQYDVQQG
+EwJDTjESMBAGA1UECAwJ5rmW5Y2X55yBMRIwEAYDVQQHDAnplb/mspnluIIxEzAR
+BgNVBAoTCnl1bWF3ay5jb20xDzANBgNVBAsTBlJvb3RDQTEzMDEGA1UEAwwq5rmW
+5Y2X5b6h56CB572R5o6n5L+h5oGv5oqA5pyv5pyJ6ZmQ5YWs5Y+4MB4XDTIxMDkz
+MDAzMzk1MloXDTI2MDkyOTAzMzk1MlowgYQxCzAJBgNVBAYTAkNOMRIwEAYDVQQI
+DAnmuZbljZfnnIExEjAQBgNVBAcMCemVv+aymeW4gjEXMBUGA1UEChMOaGFvLnl1
+bWF3ay5jb20xDzANBgNVBAsTBmNsaWVudDEjMCEGA1UEAxMaY2xpZW50LnNpZ24u
+aGFvLnl1bWF3ay5jb20wWTATBgcqhkjOPQIBBggqgRzPVQGCLQNCAARqjl778IYj
+q5VrH1uc8Zax4TPEDhyY/pzsuFhaKTwxTUg/uSv1RUm4mVrpVZG9dpW35nixFkSi
+QzCKAScAVXdeowIwADAKBggqgRzPVQGDdQNIADBFAiBMushXD1lyjUnNoCozC3YZ
+OxsM0Q9RlK/GlsqsXyi/2AIhAMu1L2FOfpCzjDOJ5ZeelWeZV3CSUhVP5RU07KSA
+MVk2
+-----END CERTIFICATE-----

+ 6 - 0
node4/certs/node/client1/client1.sign.key

@@ -0,0 +1,6 @@
+-----BEGIN PRIVATE KEY-----
+MIGTAgEAMBMGByqGSM49AgEGCCqBHM9VAYItBHkwdwIBAQQgv/CzuX1YieGxqtZ2
+sLA9F6bTwe58mmKkAylvZnhVbqigCgYIKoEcz1UBgi2hRANCAARqjl778IYjq5Vr
+H1uc8Zax4TPEDhyY/pzsuFhaKTwxTUg/uSv1RUm4mVrpVZG9dpW35nixFkSiQzCK
+AScAVXde
+-----END PRIVATE KEY-----

+ 14 - 0
node4/certs/node/client1/client1.tls.crt

@@ -0,0 +1,14 @@
+-----BEGIN CERTIFICATE-----
+MIICDzCCAbSgAwIBAgIJAP2OzRp88+T/MAoGCCqBHM9VAYN1MIGQMQswCQYDVQQG
+EwJDTjESMBAGA1UECAwJ5rmW5Y2X55yBMRIwEAYDVQQHDAnplb/mspnluIIxEzAR
+BgNVBAoTCnl1bWF3ay5jb20xDzANBgNVBAsTBlJvb3RDQTEzMDEGA1UEAwwq5rmW
+5Y2X5b6h56CB572R5o6n5L+h5oGv5oqA5pyv5pyJ6ZmQ5YWs5Y+4MB4XDTIxMDkz
+MDAzMzk1MloXDTI2MDkyOTAzMzk1MlowgYMxCzAJBgNVBAYTAkNOMRIwEAYDVQQI
+DAnmuZbljZfnnIExEjAQBgNVBAcMCemVv+aymeW4gjEXMBUGA1UEChMOaGFvLnl1
+bWF3ay5jb20xDzANBgNVBAsTBmNsaWVudDEiMCAGA1UEAxMZY2xpZW50LnRscy5o
+YW8ueXVtYXdrLmNvbTBZMBMGByqGSM49AgEGCCqBHM9VAYItA0IABH3ZoaqQVzG5
+r9XBzqlMBqmlwnTp43a5DrYQNutMbNDCepKfziWwmnR7qI9Cg90ZokXWHOpglqBx
+LgY7Z8FBuumjAjAAMAoGCCqBHM9VAYN1A0kAMEYCIQD5SbdR9K8UW3Nf7nX08AOT
+Q5qWYjPxf4iybfd9+RHLpwIhANgQzBLogAeQo9wkJdStXZdE0Hmfn3rkcNyLXAVL
+6gvB
+-----END CERTIFICATE-----

+ 6 - 0
node4/certs/node/client1/client1.tls.key

@@ -0,0 +1,6 @@
+-----BEGIN PRIVATE KEY-----
+MIGTAgEAMBMGByqGSM49AgEGCCqBHM9VAYItBHkwdwIBAQQg07ZnZn4F+OWT0f9B
+NfD1DqNWImrKx/m0dU48WSGgjZygCgYIKoEcz1UBgi2hRANCAAR92aGqkFcxua/V
+wc6pTAappcJ06eN2uQ62EDbrTGzQwnqSn84lsJp0e6iPQoPdGaJF1hzqYJagcS4G
+O2fBQbrp
+-----END PRIVATE KEY-----

+ 1 - 0
node4/certs/node/consensus1/consensus1.nodeid

@@ -0,0 +1 @@
+QmbtDpHU4w2N4LjcHUPMRokrMQE8mA4kZeQzQLHBR6nrj6

+ 14 - 0
node4/certs/node/consensus1/consensus1.sign.crt

@@ -0,0 +1,14 @@
+-----BEGIN CERTIFICATE-----
+MIICFjCCAbugAwIBAgIJAPek4s/EK3PMMAoGCCqBHM9VAYN1MIGQMQswCQYDVQQG
+EwJDTjESMBAGA1UECAwJ5rmW5Y2X55yBMRIwEAYDVQQHDAnplb/mspnluIIxEzAR
+BgNVBAoTCnl1bWF3ay5jb20xDzANBgNVBAsTBlJvb3RDQTEzMDEGA1UEAwwq5rmW
+5Y2X5b6h56CB572R5o6n5L+h5oGv5oqA5pyv5pyJ6ZmQ5YWs5Y+4MB4XDTIxMDkz
+MDAzMzk1MloXDTI2MDkyOTAzMzk1MlowgYoxCzAJBgNVBAYTAkNOMRIwEAYDVQQI
+DAnmuZbljZfnnIExEjAQBgNVBAcMCemVv+aymeW4gjEXMBUGA1UEChMOaGFvLnl1
+bWF3ay5jb20xEjAQBgNVBAsTCWNvbnNlbnN1czEmMCQGA1UEAxMdY29uc2Vuc3Vz
+LnNpZ24uaGFvLnl1bWF3ay5jb20wWTATBgcqhkjOPQIBBggqgRzPVQGCLQNCAASi
+9y5Sx5GZ1vPtAzIK0XI59AhEMI1APdHk0NOsZpvx4H9nICEfOCU3mhi1+DxehUhO
+GVMqkLJHHnAiH50X43xIowIwADAKBggqgRzPVQGDdQNJADBGAiEAijU2Pih30fBZ
+P2vO0UIMseXjIvcSHlY7YBMcTeoa9+0CIQD/fZRZu/KOqe5V4rcjrqo8X64exjNx
+tKYWOMl01KHE7g==
+-----END CERTIFICATE-----

+ 6 - 0
node4/certs/node/consensus1/consensus1.sign.key

@@ -0,0 +1,6 @@
+-----BEGIN PRIVATE KEY-----
+MIGTAgEAMBMGByqGSM49AgEGCCqBHM9VAYItBHkwdwIBAQQg2NGoit/avsugaMbl
+NZsw/GjImtWpHjx7Zg/L6MdZv/GgCgYIKoEcz1UBgi2hRANCAASi9y5Sx5GZ1vPt
+AzIK0XI59AhEMI1APdHk0NOsZpvx4H9nICEfOCU3mhi1+DxehUhOGVMqkLJHHnAi
+H50X43xI
+-----END PRIVATE KEY-----

+ 14 - 0
node4/certs/node/consensus1/consensus1.tls.crt

@@ -0,0 +1,14 @@
+-----BEGIN CERTIFICATE-----
+MIICMDCCAdegAwIBAgIJAOGKhhN7LpIAMAoGCCqBHM9VAYN1MIGQMQswCQYDVQQG
+EwJDTjESMBAGA1UECAwJ5rmW5Y2X55yBMRIwEAYDVQQHDAnplb/mspnluIIxEzAR
+BgNVBAoTCnl1bWF3ay5jb20xDzANBgNVBAsTBlJvb3RDQTEzMDEGA1UEAwwq5rmW
+5Y2X5b6h56CB572R5o6n5L+h5oGv5oqA5pyv5pyJ6ZmQ5YWs5Y+4MB4XDTIxMDkz
+MDAzMzk1MloXDTI2MDkyOTAzMzk1MlowgYkxCzAJBgNVBAYTAkNOMRIwEAYDVQQI
+DAnmuZbljZfnnIExEjAQBgNVBAcMCemVv+aymeW4gjEXMBUGA1UEChMOaGFvLnl1
+bWF3ay5jb20xEjAQBgNVBAsTCWNvbnNlbnN1czElMCMGA1UEAxMcY29uc2Vuc3Vz
+LnRscy5oYW8ueXVtYXdrLmNvbTBZMBMGByqGSM49AgEGCCqBHM9VAYItA0IABCh8
+FZtJ9UKVACCjWl+Fo5ItfS3Rbg6XO/rJk75ANkDJct6v5UaPsj9ja1HL/M1Wtf2e
+6VgZOTK348m0j2UFyCWjHzAdMBsGA1UdEQQUMBKCCnl1bWF3ay5jb22HBH8AAAEw
+CgYIKoEcz1UBg3UDRwAwRAIgbJMEIfDXJ0A+O5drJmZjwo+7lFVOr80zvV9x6wI0
+uM8CIFxlPe601D2Ja6FRhZhSLUI7XY0xR/bKYOdZ1IB9YpUv
+-----END CERTIFICATE-----

+ 6 - 0
node4/certs/node/consensus1/consensus1.tls.key

@@ -0,0 +1,6 @@
+-----BEGIN PRIVATE KEY-----
+MIGTAgEAMBMGByqGSM49AgEGCCqBHM9VAYItBHkwdwIBAQQgo117WZO4BXrivCtt
+dJV001L4mbeBX90szhLpYpiwp1KgCgYIKoEcz1UBgi2hRANCAAQofBWbSfVClQAg
+o1pfhaOSLX0t0W4Olzv6yZO+QDZAyXLer+VGj7I/Y2tRy/zNVrX9nulYGTkyt+PJ
+tI9lBcgl
+-----END PRIVATE KEY-----

+ 110 - 0
node4/chain.yml

@@ -0,0 +1,110 @@
+
+log:
+  config_file: ./node4/log.yml          # config file of logger configuration.
+
+blockchain:
+  - chainId: chain1
+    genesis: ./node4/chainconfig/bc1.yml
+
+node:
+  # 节点类型:full
+  type:              full
+  org_id:            hao.yumawk.com
+  priv_key_file:     ./node4/certs/node/consensus1/consensus1.sign.key
+  cert_file:         ./node4/certs/node/consensus1/consensus1.sign.crt
+  signer_cache_size: 1000
+  cert_cache_size:   1000
+  pkcs11:
+    enabled: false
+    library: # path to the so file of pkcs11 interface
+    label: # label for the slot to be used
+    password: # password to logon the HSM
+    session_cache_size: 10 # size of HSM session cache, default to 10
+    hash: "SHA256" # hash algorithm used to compute SKI
+
+net:
+  provider: LibP2P
+  listen_addr: /ip4/0.0.0.0/tcp/11304
+  seeds:
+    - "/ip4/124.71.218.7/tcp/11301/p2p/QmVHR2DVso55J5ofymsWyVzma9pY2Z2JzsagpASThN1Jsh"
+
+  tls:
+    enabled: true
+    priv_key_file: ./node4/certs/node/consensus1/consensus1.tls.key
+    cert_file: ./node4/certs/node/consensus1/consensus1.tls.crt
+
+
+txpool:
+  max_txpool_size: 50000 # 普通交易池上限
+  max_config_txpool_size: 10 # config交易池的上限
+  full_notify_again_time: 30 # 交易池溢出后,再次通知的时间间隔(秒)
+
+rpc:
+  provider: grpc
+  port: 12304
+  # 检查链配置TrustRoots证书变化时间间隔,单位:s,最小值为10s
+  check_chain_conf_trust_roots_change_interval: 60
+  ratelimit:
+    # 每秒补充令牌数,取值:-1-不受限;0-默认值(10000)
+    token_per_second: -1
+    # 令牌桶大小,取值:-1-不受限;0-默认值(10000)
+    token_bucket_size: -1
+  subscriber:
+    # 历史消息订阅流控,实时消息订阅不会进行流控
+    ratelimit:
+      # 每秒补充令牌数,取值:-1-不受限;0-默认值(1000)
+      token_per_second: 100
+      # 令牌桶大小,取值:-1-不受限;0-默认值(1000)
+      token_bucket_size: 100
+  tls:
+    # TLS模式:
+    #   disable - 不启用TLS
+    #   oneway  - 单向认证
+    #   twoway  - 双向认证
+    #mode: disable
+    #mode: oneway
+    mode:           twoway
+    priv_key_file:  ./node4/certs/node/consensus1/consensus1.tls.key
+    cert_file:      ./node4/certs/node/consensus1/consensus1.tls.crt
+
+monitor:
+  enabled: true
+  port: 14324
+
+pprof:
+  enabled: false
+  port: 24324
+
+storage:
+  store_path: ./data/hao.yumawk.com/ledgerData1
+  # 最小的不允许归档的区块高度
+  unarchive_block_height: 15
+  blockdb_config:
+    provider: leveldb
+    leveldb_config:
+      store_path: ./data/hao.yumawk.com/blocks
+  statedb_config:
+    provider: leveldb # leveldb/sql 二选一
+    leveldb_config: # leveldb config
+      store_path: ./data/hao.yumawk.com/state
+  #    sqldb_config: # sql config,只有provider为sql的时候才需要配置和启用这个配置
+  #      sqldb_type: mysql           #具体的sql db类型,目前支持mysql,sqlite
+  #      dsn: root:password@tcp(127.0.0.1:3306)/  #mysql的连接信息,包括用户名、密码、ip、port等,示例:root:admin@tcp(127.0.0.1:3306)/
+  historydb_config:
+    provider: leveldb
+    leveldb_config:
+      store_path: ./data/hao.yumawk.com/history
+  resultdb_config:
+    provider: leveldb
+    leveldb_config:
+      store_path: ./data/hao.yumawk.com/result
+  disable_contract_eventdb: true  #是否禁止合约事件存储功能,默认为true,如果设置为false,需要配置mysql
+  contract_eventdb_config:
+    provider: sql                 #如果开启contract event db 功能,需要指定provider为sql
+    sqldb_config:
+      sqldb_type: mysql           #contract event db 只支持mysql
+      dsn: root:password@tcp(127.0.0.1:3306)/  #mysql的连接信息,包括用户名、密码、ip、port等,示例:root:admin@tcp(127.0.0.1:3306)/
+core:
+  evidence: false
+scheduler:
+  rwset_log: false #whether log the txRWSet map in the debug mode

+ 81 - 0
node4/chainconfig/bc1.yml

@@ -0,0 +1,81 @@
+chain_id: chain1    # 链标识
+version: v1.0.0         # 链版本
+sequence: 1             # 配置版本
+auth_type: "identity"   # 认证类型
+
+crypto:
+  hash: SHA256
+
+# 合约支持类型的配置
+contract:
+  enable_sql_support: false # 合约是否支持sql,此处若为true,则chainmaker.yml中则需配置storage.statedb_config.provider=sql,否则无法启动
+
+# 交易、区块相关配置
+block:
+  tx_timestamp_verify: true # 是否需要开启交易时间戳校验
+  tx_timeout: 600  # 交易时间戳的过期时间(秒)
+  block_tx_capacity: 100  # 区块中最大交易数
+  block_size: 10  # 区块最大限制,单位MB
+  block_interval: 2000 # 出块间隔,单位:ms
+
+# core模块
+core:
+  tx_scheduler_timeout: 10 #  [0, 60] 交易调度器从交易池拿到交易后, 进行调度的时间
+  tx_scheduler_validate_timeout: 10 # [0, 60] 交易调度器从区块中拿到交易后, 进行验证的超时时间
+
+#共识配置
+consensus:
+  # 共识类型(0-SOLO,1-TBFT,2-MBFT,3-HOTSTUFF,4-RAFT,5-DPOS,10-POW)
+  type: 1
+  # 共识节点列表,组织必须出现在trust_roots的org_id中,每个组织可配置多个共识节点,节点地址采用libp2p格式
+  # 其中node_id为chainmaker.yml中 node.cert_file证书对应的nodeid
+  nodes:
+    - org_id: "sina.yumawk.com"
+      node_id:
+        - "QmVHR2DVso55J5ofymsWyVzma9pY2Z2JzsagpASThN1Jsh"
+#    - org_id: "baidu.yumawk.com"
+#      node_id:
+#        - "QmbvQunyZAoy3PEVvM2ePSwHSfcFq25e3b1ZjbXW7GtA9k"
+
+# 信任组织和根证书
+trust_roots:
+  - org_id: "sina.yumawk.com"
+    root: "./node1/certs/ca/ca.crt"
+
+# 权限配置(只能整体添加、修改、删除)
+resource_policies:
+  - resource_name: NODE_ID_UPDATE
+    policy:
+      rule: SELF # 规则(ANY,MAJORITY...,全部大写,自动转大写)
+      org_list: # 组织名称(组织名称,区分大小写)
+      role_list: # 角色名称(role,自动转大写)
+        - admin
+  - resource_name: TRUST_ROOT_ADD
+    policy:
+      rule: ANY
+      org_list:
+      role_list:
+        - admin
+  - resource_name: CERTS_FREEZE
+    policy:
+      rule: ANY
+      org_list:
+      role_list:
+        - admin
+  - resource_name: INIT_CONTRACT
+    policy:
+      rule: ANY
+      org_list:
+      role_list:
+        - admin
+  - resource_name: NODE_ORG_ADD
+    policy:
+      rule: ANY
+      org_list:
+      role_list:
+        - admin
+  - resource_name: PERMISSION_ADD
+    policy:
+      rule: ANY
+      org_list:
+      role_list:

+ 34 - 0
node4/log.yml

@@ -0,0 +1,34 @@
+#
+# Copyright (C) BABEC. All rights reserved.
+# Copyright (C) THL A29 Limited, a Tencent company. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+log:
+  system: # 链日志配置
+    log_level_default: INFO       # 默认日志级别
+    log_levels:
+      core: INFO                  # 查看commit block落快信息关键字,需将core改为info级别及以下
+      net: INFO
+      vm: INFO                    # 合约中的日志,需将vm改为debug级别
+      storage: INFO               # sql模式查看sql语句,需将storage改为debug级别
+    file_path: ./log/system.log
+    max_age: 365                  # 日志最长保存时间,单位:天
+    rotation_time: 1              # 日志滚动时间,单位:小时
+    log_in_console: true         # 是否展示日志到终端,仅限于调试使用
+    show_color: true              # 是否打印颜色日志
+  brief:
+    log_level_default: INFO
+    file_path: ./log/brief.log
+    max_age: 365                  # 日志最长保存时间,单位:天
+    rotation_time: 1              # 日志滚动时间,单位:小时
+    log_in_console: true         # 是否展示日志到终端,仅限于调试使用
+    show_color: true              # 是否打印颜色日志
+  event:
+    log_level_default: INFO
+    file_path: ./log/event.log
+    max_age: 365                  # 日志最长保存时间,单位:天
+    rotation_time: 1              # 日志滚动间隔,单位:小时
+    log_in_console: true         # 是否展示日志到终端,仅限于调试使用
+    show_color: true              # 是否打印颜色日志