Skip to content

Commit 066b84d

Browse files
leeduckgoleeduckgo
committed
update requirements and some logic
1 parent fd45da0 commit 066b84d

13 files changed

+185
-230
lines changed

Diff for: ‎__pycache__/evidence_contract.cpython-37.pyc

2.56 KB
Binary file not shown.

Diff for: ‎evidence_contract.py

-92
This file was deleted.

Diff for: ‎evidence_flask_backend.py

-84
This file was deleted.

Diff for: ‎fisco_bcos_python_sdk/bin/ca.crt

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
-----BEGIN CERTIFICATE-----
2-
MIIBsDCCAVagAwIBAgIJAJZVMCc38JgcMAoGCCqGSM49BAMCMDUxDjAMBgNVBAMM
2+
MIIBsDCCAVagAwIBAgIJAIcKYchqDcRYMAoGCCqGSM49BAMCMDUxDjAMBgNVBAMM
33
BWNoYWluMRMwEQYDVQQKDApmaXNjby1iY29zMQ4wDAYDVQQLDAVjaGFpbjAgFw0y
4-
MTAyMTMxMDE3MTlaGA8yMTIxMDEyMDEwMTcxOVowNTEOMAwGA1UEAwwFY2hhaW4x
4+
MDEyMjYwNjExMTJaGA8yMTIwMTIwMjA2MTExMlowNTEOMAwGA1UEAwwFY2hhaW4x
55
EzARBgNVBAoMCmZpc2NvLWJjb3MxDjAMBgNVBAsMBWNoYWluMFYwEAYHKoZIzj0C
6-
AQYFK4EEAAoDQgAEewQgUZbKjxerA0H6FpBG5+9pM0WuGBEFnt3O8LpY9Z7quKm9
7-
bDASbxBT1WOPbPKPJovEiIl0XBj0cMK4A3hsJKNQME4wHQYDVR0OBBYEFCATUrQJ
8-
Iq0/BNIfkMOARyUT/vRNMB8GA1UdIwQYMBaAFCATUrQJIq0/BNIfkMOARyUT/vRN
9-
MAwGA1UdEwQFMAMBAf8wCgYIKoZIzj0EAwIDSAAwRQIgOaWcD/l+UAVCVI1hw6hs
10-
VAVXEtz+mMUMzggKCiG8f5kCIQC7bOjva4wq77ApQr+l6dl+vURvsVTYPPLayY41
11-
cFHNeQ==
6+
AQYFK4EEAAoDQgAEVFnHqYQWgOKha5RT/WHi7k1dmYlO9WEgr89TwM3WZFsZKcJJ
7+
Wog2N890PMeTqBz+6F5Zdb3ZSEnXTNrfwDyK16NQME4wHQYDVR0OBBYEFMz1o31c
8+
Sj3XyaHbVn8wUKf+zjClMB8GA1UdIwQYMBaAFMz1o31cSj3XyaHbVn8wUKf+zjCl
9+
MAwGA1UdEwQFMAMBAf8wCgYIKoZIzj0EAwIDSAAwRQIhAPxdTtHlW64RhitrX0hX
10+
v6aODwvQKx3FWgcU3oNOVA1cAiB2grFJWxSvaeu8GyegEjTtWGjl/0lf4B37g8Wz
11+
BjtTOg==
1212
-----END CERTIFICATE-----

Diff for: ‎fisco_bcos_python_sdk/bin/node.crt

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIBdzCCAR6gAwIBAgIJANyHAtSwB/NvMAoGCCqGSM49BAMCMDcxDzANBgNVBAMM
3+
BmFnZW5jeTETMBEGA1UECgwKZmlzY28tYmNvczEPMA0GA1UECwwGYWdlbmN5MCAX
4+
DTIwMTIyNjA2MTExMloYDzIxMjAxMjAyMDYxMTEyWjAxMQwwCgYDVQQDDANzZGsx
5+
EzARBgNVBAoMCmZpc2NvLWJjb3MxDDAKBgNVBAsMA3NkazBWMBAGByqGSM49AgEG
6+
BSuBBAAKA0IABDZSFFWz9EZ+ED2TZcLqKEYyKYbdtM/EYWq7o9OqE4C9TE8UW/uU
7+
2Yl29PKEQ1xN8rhfO4XyhXwZEF2oJlGmIrqjGjAYMAkGA1UdEwQCMAAwCwYDVR0P
8+
BAQDAgXgMAoGCCqGSM49BAMCA0cAMEQCIAVVUUuvVk4btKueS/TJigIfaJh+nbB4
9+
dQenmAkkjd0RAiBAw6tCC78AUzOWuWGAYBORo+UTwPFGh5xCLjP8l9VUsw==
10+
-----END CERTIFICATE-----
11+
-----BEGIN CERTIFICATE-----
12+
MIIBcDCCARagAwIBAgIJAKXXZpoxTt81MAoGCCqGSM49BAMCMDUxDjAMBgNVBAMM
13+
BWNoYWluMRMwEQYDVQQKDApmaXNjby1iY29zMQ4wDAYDVQQLDAVjaGFpbjAeFw0y
14+
MDEyMjYwNjExMTJaFw0zMDEyMjQwNjExMTJaMDcxDzANBgNVBAMMBmFnZW5jeTET
15+
MBEGA1UECgwKZmlzY28tYmNvczEPMA0GA1UECwwGYWdlbmN5MFYwEAYHKoZIzj0C
16+
AQYFK4EEAAoDQgAE6onHABAyVc9oLBzz/AKibXzQPyky+FeHF0NKI2All1Y/6Bs6
17+
q4Pe69dg9QSEaRg227ELx9LVIHqmQIsSqWoI0aMQMA4wDAYDVR0TBAUwAwEB/zAK
18+
BggqhkjOPQQDAgNIADBFAiAYIICVlB1aoQtWqJgsMy9tnr3UaxsW3uJDp7Mjzksh
19+
hQIhAOJj03+lXoMU6/yWpym+0q6N/HeWSxRfU4cydPWGYCeF
20+
-----END CERTIFICATE-----
21+
-----BEGIN CERTIFICATE-----
22+
MIIBsDCCAVagAwIBAgIJAIcKYchqDcRYMAoGCCqGSM49BAMCMDUxDjAMBgNVBAMM
23+
BWNoYWluMRMwEQYDVQQKDApmaXNjby1iY29zMQ4wDAYDVQQLDAVjaGFpbjAgFw0y
24+
MDEyMjYwNjExMTJaGA8yMTIwMTIwMjA2MTExMlowNTEOMAwGA1UEAwwFY2hhaW4x
25+
EzARBgNVBAoMCmZpc2NvLWJjb3MxDjAMBgNVBAsMBWNoYWluMFYwEAYHKoZIzj0C
26+
AQYFK4EEAAoDQgAEVFnHqYQWgOKha5RT/WHi7k1dmYlO9WEgr89TwM3WZFsZKcJJ
27+
Wog2N890PMeTqBz+6F5Zdb3ZSEnXTNrfwDyK16NQME4wHQYDVR0OBBYEFMz1o31c
28+
Sj3XyaHbVn8wUKf+zjClMB8GA1UdIwQYMBaAFMz1o31cSj3XyaHbVn8wUKf+zjCl
29+
MAwGA1UdEwQFMAMBAf8wCgYIKoZIzj0EAwIDSAAwRQIhAPxdTtHlW64RhitrX0hX
30+
v6aODwvQKx3FWgcU3oNOVA1cAiB2grFJWxSvaeu8GyegEjTtWGjl/0lf4B37g8Wz
31+
BjtTOg==
32+
-----END CERTIFICATE-----

Diff for: ‎fisco_bcos_python_sdk/bin/node.key

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
-----BEGIN PRIVATE KEY-----
2+
MIGEAgEAMBAGByqGSM49AgEGBSuBBAAKBG0wawIBAQQgDVqMpoLg2PWhIajvatwc
3+
ZOYXDvWImQ32hbR6Zr+EULWhRANCAAQ2UhRVs/RGfhA9k2XC6ihGMimG3bTPxGFq
4+
u6PTqhOAvUxPFFv7lNmJdvTyhENcTfK4XzuF8oV8GRBdqCZRpiK6
5+
-----END PRIVATE KEY-----

Diff for: ‎fisco_bcos_python_sdk/bin/sdk.crt

+20-20
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
-----BEGIN CERTIFICATE-----
2-
MIIBeDCCAR6gAwIBAgIJAMvs/aOczz80MAoGCCqGSM49BAMCMDcxDzANBgNVBAMM
2+
MIIBdzCCAR6gAwIBAgIJANyHAtSwB/NvMAoGCCqGSM49BAMCMDcxDzANBgNVBAMM
33
BmFnZW5jeTETMBEGA1UECgwKZmlzY28tYmNvczEPMA0GA1UECwwGYWdlbmN5MCAX
4-
DTIxMDIxMzEwMTcxOVoYDzIxMjEwMTIwMTAxNzE5WjAxMQwwCgYDVQQDDANzZGsx
4+
DTIwMTIyNjA2MTExMloYDzIxMjAxMjAyMDYxMTEyWjAxMQwwCgYDVQQDDANzZGsx
55
EzARBgNVBAoMCmZpc2NvLWJjb3MxDDAKBgNVBAsMA3NkazBWMBAGByqGSM49AgEG
6-
BSuBBAAKA0IABAiqgR+aeVnSygNNeMx0bVKrLbmlMovyyewB7FnzEuaoDQsos20L
7-
jFWsNZEcWhWygDMZLCVbDsYjW2rtYG1JyCujGjAYMAkGA1UdEwQCMAAwCwYDVR0P
8-
BAQDAgXgMAoGCCqGSM49BAMCA0gAMEUCIQDSP4dpd75ULhtPg6u5ALEgWeUOuQbw
9-
5lfAJZGOay3PMwIgYc9PczBnbup1Z4NcBioG7GMQcTcXEtSW5noz5D4Hp48=
6+
BSuBBAAKA0IABDZSFFWz9EZ+ED2TZcLqKEYyKYbdtM/EYWq7o9OqE4C9TE8UW/uU
7+
2Yl29PKEQ1xN8rhfO4XyhXwZEF2oJlGmIrqjGjAYMAkGA1UdEwQCMAAwCwYDVR0P
8+
BAQDAgXgMAoGCCqGSM49BAMCA0cAMEQCIAVVUUuvVk4btKueS/TJigIfaJh+nbB4
9+
dQenmAkkjd0RAiBAw6tCC78AUzOWuWGAYBORo+UTwPFGh5xCLjP8l9VUsw==
1010
-----END CERTIFICATE-----
1111
-----BEGIN CERTIFICATE-----
12-
MIIBcDCCARagAwIBAgIJAI07MbbT+Q/eMAoGCCqGSM49BAMCMDUxDjAMBgNVBAMM
12+
MIIBcDCCARagAwIBAgIJAKXXZpoxTt81MAoGCCqGSM49BAMCMDUxDjAMBgNVBAMM
1313
BWNoYWluMRMwEQYDVQQKDApmaXNjby1iY29zMQ4wDAYDVQQLDAVjaGFpbjAeFw0y
14-
MTAyMTMxMDE3MTlaFw0zMTAyMTExMDE3MTlaMDcxDzANBgNVBAMMBmFnZW5jeTET
14+
MDEyMjYwNjExMTJaFw0zMDEyMjQwNjExMTJaMDcxDzANBgNVBAMMBmFnZW5jeTET
1515
MBEGA1UECgwKZmlzY28tYmNvczEPMA0GA1UECwwGYWdlbmN5MFYwEAYHKoZIzj0C
16-
AQYFK4EEAAoDQgAEBxLQIMkf12wXpfecumQWJZvyhsq9//l4HNuWUYxtS3rG3Dd8
17-
9I3TBx+pcncbMAysF8Qi3520ARxRbJFtx2z7/KMQMA4wDAYDVR0TBAUwAwEB/zAK
18-
BggqhkjOPQQDAgNIADBFAiAZa7XoVYoJG806ZifKK66yL+khVMIpAAAiW7t5itt9
19-
CAIhAIb9ekVBKh9JA4wVVktXdyh+4/0mOqAGmAjhwP/umIL6
16+
AQYFK4EEAAoDQgAE6onHABAyVc9oLBzz/AKibXzQPyky+FeHF0NKI2All1Y/6Bs6
17+
q4Pe69dg9QSEaRg227ELx9LVIHqmQIsSqWoI0aMQMA4wDAYDVR0TBAUwAwEB/zAK
18+
BggqhkjOPQQDAgNIADBFAiAYIICVlB1aoQtWqJgsMy9tnr3UaxsW3uJDp7Mjzksh
19+
hQIhAOJj03+lXoMU6/yWpym+0q6N/HeWSxRfU4cydPWGYCeF
2020
-----END CERTIFICATE-----
2121
-----BEGIN CERTIFICATE-----
22-
MIIBsDCCAVagAwIBAgIJAJZVMCc38JgcMAoGCCqGSM49BAMCMDUxDjAMBgNVBAMM
22+
MIIBsDCCAVagAwIBAgIJAIcKYchqDcRYMAoGCCqGSM49BAMCMDUxDjAMBgNVBAMM
2323
BWNoYWluMRMwEQYDVQQKDApmaXNjby1iY29zMQ4wDAYDVQQLDAVjaGFpbjAgFw0y
24-
MTAyMTMxMDE3MTlaGA8yMTIxMDEyMDEwMTcxOVowNTEOMAwGA1UEAwwFY2hhaW4x
24+
MDEyMjYwNjExMTJaGA8yMTIwMTIwMjA2MTExMlowNTEOMAwGA1UEAwwFY2hhaW4x
2525
EzARBgNVBAoMCmZpc2NvLWJjb3MxDjAMBgNVBAsMBWNoYWluMFYwEAYHKoZIzj0C
26-
AQYFK4EEAAoDQgAEewQgUZbKjxerA0H6FpBG5+9pM0WuGBEFnt3O8LpY9Z7quKm9
27-
bDASbxBT1WOPbPKPJovEiIl0XBj0cMK4A3hsJKNQME4wHQYDVR0OBBYEFCATUrQJ
28-
Iq0/BNIfkMOARyUT/vRNMB8GA1UdIwQYMBaAFCATUrQJIq0/BNIfkMOARyUT/vRN
29-
MAwGA1UdEwQFMAMBAf8wCgYIKoZIzj0EAwIDSAAwRQIgOaWcD/l+UAVCVI1hw6hs
30-
VAVXEtz+mMUMzggKCiG8f5kCIQC7bOjva4wq77ApQr+l6dl+vURvsVTYPPLayY41
31-
cFHNeQ==
26+
AQYFK4EEAAoDQgAEVFnHqYQWgOKha5RT/WHi7k1dmYlO9WEgr89TwM3WZFsZKcJJ
27+
Wog2N890PMeTqBz+6F5Zdb3ZSEnXTNrfwDyK16NQME4wHQYDVR0OBBYEFMz1o31c
28+
Sj3XyaHbVn8wUKf+zjClMB8GA1UdIwQYMBaAFMz1o31cSj3XyaHbVn8wUKf+zjCl
29+
MAwGA1UdEwQFMAMBAf8wCgYIKoZIzj0EAwIDSAAwRQIhAPxdTtHlW64RhitrX0hX
30+
v6aODwvQKx3FWgcU3oNOVA1cAiB2grFJWxSvaeu8GyegEjTtWGjl/0lf4B37g8Wz
31+
BjtTOg==
3232
-----END CERTIFICATE-----

Diff for: ‎fisco_bcos_python_sdk/bin/sdk.key

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
-----BEGIN PRIVATE KEY-----
2-
MIGEAgEAMBAGByqGSM49AgEGBSuBBAAKBG0wawIBAQQgU2L853FdONO//8Out8o/
3-
dAyFFwPinkTq1Y7Y4k8MRJuhRANCAAQIqoEfmnlZ0soDTXjMdG1Sqy25pTKL8sns
4-
AexZ8xLmqA0LKLNtC4xVrDWRHFoVsoAzGSwlWw7GI1tq7WBtScgr
2+
MIGEAgEAMBAGByqGSM49AgEGBSuBBAAKBG0wawIBAQQgDVqMpoLg2PWhIajvatwc
3+
ZOYXDvWImQ32hbR6Zr+EULWhRANCAAQ2UhRVs/RGfhA9k2XC6ihGMimG3bTPxGFq
4+
u6PTqhOAvUxPFFv7lNmJdvTyhENcTfK4XzuF8oV8GRBdqCZRpiK6
55
-----END PRIVATE KEY-----

Diff for: ‎fisco_bcos_python_sdk/bin/sdk.publickey

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
08aa811f9a7959d2ca034d78cc746d52ab2db9a5328bf2c9ec01ec59f312e6a80d0b28b36d0b8c55ac35911c5a15b28033192c255b0ec6235b6aed606d49c82b
1+
36521455b3f4467e103d9365c2ea2846322986ddb4cfc4616abba3d3aa1380bd4c4f145bfb94d98976f4f284435c4df2b85f3b85f2857c19105da82651a622ba

Diff for: ‎fisco_bcos_python_sdk/client_config.py.template

+55
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
#!/usr/bin/env python
2+
# - * - coding: utf - 8 -
3+
# 2019.12.28 update gm config
4+
import os
5+
from eth_utils.crypto import set_crypto_type, CRYPTO_TYPE_GM, CRYPTO_TYPE_ECDSA
6+
7+
8+
class client_config:
9+
"""
10+
类成员常量和变量，便于用.调用和区分命名空间
11+
"""
12+
# keyword used to represent the RPC Protocol
13+
PROTOCOL_RPC = "rpc"
14+
# keyword used to represent the Channel Protocol
15+
PROTOCOL_CHANNEL = "channel"
16+
17+
# ---------crypto_type config--------------
18+
# crypto_type : 大小写不敏感："GM" for 国密, "ECDSA" 或其他是椭圆曲线默认实现。
19+
crypto_type = "ECDSA"
20+
crypto_type = crypto_type.upper()
21+
set_crypto_type(crypto_type) # 使密码算法模式全局生效，切勿删除此行
22+
23+
# --------------------------------------
24+
# configure below
25+
# ---------client communication config--------------
26+
client_protocol = "channel" # or PROTOCOL_CHANNEL to use channel prototol
27+
# client_protocol = PROTOCOL_CHANNEL
28+
remote_rpcurl = "http://127.0.0.1:8545" # 采用rpc通信时，节点的rpc端口,和要通信的节点*必须*一致,如采用channel协议通信，这里可以留空
29+
channel_host = "127.0.0.1" # 采用channel通信时，节点的channel ip地址,如采用rpc协议通信，这里可以留空
30+
channel_port = 20200 # 节点的channel 端口,如采用rpc协议通信，这里可以留空
31+
channel_ca = "bin/ca.crt" # 采用channel协议时，需要设置链证书,如采用rpc协议通信，这里可以留空
32+
channel_node_cert = "bin/sdk.crt" # 采用channel协议时，需要设置sdk证书,如采用rpc协议通信，这里可以留空
33+
channel_node_key = "bin/sdk.key" # 采用channel协议时，需要设置sdk私钥,如采用rpc协议通信，这里可以留空
34+
fiscoChainId = 1 # 链ID，和要通信的节点*必须*一致
35+
groupid = 1 # 群组ID，和要通信的节点*必须*一致，如和其他群组通信，修改这一项，或者设置bcosclient.py里对应的成员变量
36+
37+
# ---------account &keyfile config--------------
38+
# 注意账号部分，国密和ECDSA采用不同的配置
39+
contract_info_file = "bin/contract.ini" # 保存已部署合约信息的文件
40+
account_keyfile_path = "bin/accounts" # 保存keystore文件的路径，在此路径下,keystore文件以 [name].keystore命名
41+
account_keyfile = "pyaccount.keystore"
42+
account_password = "123456" # 实际使用时建议改为复杂密码
43+
gm_account_keyfile = "gm_account.json" # 国密账号的存储文件，可以加密存储,如果留空则不加载gm_account_password = "123456"
44+
gm_account_password = "123456"
45+
# ---------console mode, support user input--------------
46+
background = True
47+
48+
# ---------runtime related--------------
49+
# path of solc compiler
50+
# solc_path = "./bin/solc/v0.4.25/solc"
51+
# solc_path = "C:\\Users\\DELL\\AppData\\Local\\Programs\\Python\\Python37-32\Lib\\site-packages\\fiscobcos\\bin\\solc.exe"
52+
# gm_solc_path = "./bin/solc/v0.4.25/solc-gm"
53+
# solcjs_path = "./solcjs"
54+
55+
logdir = "bin/logs" # 默认日志输出目录，该目录必须先建立

Diff for: ‎fisco_bcos_python_sdk/eth_account/__init__.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
'''
21
from eth_account.account import ( # noqa: F401
3-
Account,
4-
)'''
2+
Account
3+
)

Diff for: ‎fisco_bcos_python_sdk/evidence_flask_backend.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
import json
55

66
app = Flask(__name__)
7-
contract_address = "0xa2a9d06c3478778e2302bac12115c128334915f4"
8-
fengfeng_privkey = "d6f8c8f9106835ccc8f8d0bbc4b5bf32ff5f8941e69f9f50d075684d10dda7be"
9-
fengfeng2_privkey = "619834a32f41fc9dce7809c3063070af3d78fac577a0c12705984eed0b1a3cb"
7+
contract_address = "0x53d2f44e016dac19dfacf8558ec6271c4d3f567c"
8+
fengfeng_privkey = "e068297cf199346d4a77f5deb763a44e950593dec25af6a6f643d73490f4b14a"
9+
fengfeng2_privkey = "9fc25dcb2a006fb9ecf3f2e54c2e6bd741ef84f82b69264a338b400b78c51e62"
1010
CORS(app)
1111

1212
@app.route("/new_evidence", methods=["GET", "POST"])

0 commit comments

Comments
 (0)