Mirroristas/bigchaindb
2
0
Fork 0
mirror of https://github.com/bigchaindb/bigchaindb.git synced 2024-10-13 13:34:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Problem: Public key format not standardized

Browse Source 
Solution: Add 'type' field to public key so that it can be decoded properly
This commit is contained in:
Vanshdeep Singh 2018-09-03 15:49:31 +02:00
parent 80b6881797
commit 8dda02dc0e
11 changed files with 40 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bigchaindb/commands/bigchaindb.py
View File

@ -124,7 +124,8 @@ def run_upsert_validator_new(args, bigchain):
""" """
new_validator = { new_validator = {
'public_key': public_key_from_base64(args.public_key), 'public_key': {'value': public_key_from_base64(args.public_key),
'type': 'ed25519-base58'},
'power': args.power, 'power': args.power,
'node_id': args.node_id 'node_id': args.node_id
} }
@ -207,7 +208,7 @@ def run_upsert_validator_show(args, bigchain):
new_validator = election.asset['data'] new_validator = election.asset['data']
public_key = public_key_to_base64(new_validator['public_key']) public_key = public_key_to_base64(new_validator['public_key']['value'])
power = new_validator['power'] power = new_validator['power']
node_id = new_validator['node_id'] node_id = new_validator['node_id']
status = election.get_status(bigchain) status = election.get_status(bigchain)

11
bigchaindb/common/schema/transaction_validator_election_v2.0.yaml
View File

@ -23,7 +23,16 @@ properties:
node_id: node_id:
type: string type: string
public_key: public_key:
type: string type: object
additionalProperties: false
required:
- value
- type
properties:
value:
type: string
type:
type: string
power: power:
"$ref": "#/definitions/positiveInteger" "$ref": "#/definitions/positiveInteger"
required: required:

2
bigchaindb/upsert_validator/validator_election.py
View File

@ -64,7 +64,7 @@ class ValidatorElection(Transaction):
validators = {} validators = {}
for validator in bigchain.get_validators(height): for validator in bigchain.get_validators(height):
# NOTE: we assume that Tendermint encodes public key in base64 # NOTE: we assume that Tendermint encodes public key in base64
public_key = public_key_from_ed25519_key(key_from_base64(validator['pub_key']['data'])) public_key = public_key_from_ed25519_key(key_from_base64(validator['pub_key']['value']))
validators[public_key] = validator['voting_power'] validators[public_key] = validator['voting_power']
return validators return validators

12
bigchaindb/upsert_validator/validator_utils.py
View File

@ -6,7 +6,7 @@ from bigchaindb.tendermint_utils import public_key_to_base64
def encode_validator(v): def encode_validator(v):
ed25519_public_key = v['public_key'] ed25519_public_key = v['public_key']['value']
# NOTE: tendermint expects public to be encoded in go-amino format # NOTE: tendermint expects public to be encoded in go-amino format
pub_key = PubKey(type='ed25519', pub_key = PubKey(type='ed25519',
data=bytes.fromhex(ed25519_public_key)) data=bytes.fromhex(ed25519_public_key))
@ -17,20 +17,20 @@ def encode_validator(v):
def decode_validator(v): def decode_validator(v):
return {'pub_key': {'type': v.pub_key.type, return {'pub_key': {'type': v.pub_key.type,
'data': codecs.encode(v.pub_key.data, 'base64').decode().rstrip('\n')}, 'value': codecs.encode(v.pub_key.data, 'base64').decode().rstrip('\n')},
'voting_power': v.power} 'voting_power': v.power}
def new_validator_set(validators, updates): def new_validator_set(validators, updates):
validators_dict = {} validators_dict = {}
for v in validators: for v in validators:
validators_dict[v['pub_key']['data']] = v validators_dict[v['pub_key']['value']] = v
updates_dict = {} updates_dict = {}
for u in updates: for u in updates:
public_key64 = public_key_to_base64(u['public_key']) public_key64 = public_key_to_base64(u['public_key']['value'])
updates_dict[public_key64] = {'pub_key': {'type': 'ed25519', updates_dict[public_key64] = {'pub_key': {'type': 'ed25519-base64',
'data': public_key64}, 'value': public_key64},
'voting_power': u['power']} 'voting_power': u['power']}
new_validators_dict = {**validators_dict, **updates_dict} new_validators_dict = {**validators_dict, **updates_dict}

4
tests/commands/test_commands.py
View File

@ -523,8 +523,8 @@ def mock_get_validators(height):
keys = node_keys() keys = node_keys()
pub_key = list(keys.keys())[0] pub_key = list(keys.keys())[0]
return [ return [
{'pub_key': {'data': pub_key, {'pub_key': {'value': pub_key,
'type': 'tendermint/PubKeyEd25519'}, 'type': 'ed25519-base64'},
'voting_power': 10} 'voting_power': 10}
] ]

3
tests/conftest.py
View File

@ -681,6 +681,7 @@ def new_validator():
power = 1 power = 1
node_id = 'fake_node_id' node_id = 'fake_node_id'
return {'public_key': public_key, return {'public_key': {'value': public_key,
'type': 'ed25519-base58'},
'power': power, 'power': power,
'node_id': node_id} 'node_id': node_id}

14
tests/tendermint/test_core.py
View File

@ -227,12 +227,14 @@ def test_store_pre_commit_state_in_end_block(b, alice, init_chain_request):
def test_new_validator_set(b): def test_new_validator_set(b):
node1 = {'pub_key': {'type': 'ed25519', node1 = {'pub_key': {'type': 'ed25519-base64',
'data': 'FxjS2/8AFYoIUqF6AcePTc87qOT7e4WGgH+sGCpTUDQ='}, 'value': 'FxjS2/8AFYoIUqF6AcePTc87qOT7e4WGgH+sGCpTUDQ='},
'voting_power': 10} 'voting_power': 10}
node1_new_power = {'public_key': '1718D2DBFF00158A0852A17A01C78F4DCF3BA8E4FB7B8586807FAC182A535034', node1_new_power = {'public_key': {'value': '1718D2DBFF00158A0852A17A01C78F4DCF3BA8E4FB7B8586807FAC182A535034',
'type': 'ed25519-base58'},
'power': 20} 'power': 20}
node2 = {'public_key': '1888A353B181715CA2554701D06C1665BC42C5D936C55EA9C5DBCBDB8B3F02A3', node2 = {'public_key': {'value': '1888A353B181715CA2554701D06C1665BC42C5D936C55EA9C5DBCBDB8B3F02A3',
'type': 'ed25519-base58'},
'power': 10} 'power': 10}
validators = [node1] validators = [node1]
@ -242,8 +244,8 @@ def test_new_validator_set(b):
updated_validators = [] updated_validators = []
for u in updates: for u in updates:
updated_validators.append({'pub_key': {'type': 'ed25519', updated_validators.append({'pub_key': {'type': 'ed25519-base64',
'data': public_key_to_base64(u['public_key'])}, 'value': public_key_to_base64(u['public_key']['value'])},
'voting_power': u['power']}) 'voting_power': u['power']})
assert updated_validator_set == updated_validators assert updated_validator_set == updated_validators

2
tests/tendermint/test_integration.py
View File

@ -40,7 +40,7 @@ def test_app(b, init_chain_request):
pk = codecs.encode(init_chain_request.validators[0].pub_key.data, 'base64').decode().strip('\n') pk = codecs.encode(init_chain_request.validators[0].pub_key.data, 'base64').decode().strip('\n')
[validator] = b.get_validators(height=1) [validator] = b.get_validators(height=1)
assert validator['pub_key']['data'] == pk assert validator['pub_key']['value'] == pk
assert validator['voting_power'] == 10 assert validator['voting_power'] == 10
alice = generate_key_pair() alice = generate_key_pair()

2
tests/upsert_validator/conftest.py
View File

@ -22,7 +22,7 @@ def mock_get_validators(network_validators):
validators = [] validators = []
for public_key, power in network_validators.items(): for public_key, power in network_validators.items():
validators.append({ validators.append({
'pub_key': {'type': 'AC26791624DE60', 'data': public_key}, 'pub_key': {'type': 'AC26791624DE60', 'value': public_key},
'voting_power': power 'voting_power': power
}) })
return validators return validators

2
tests/upsert_validator/test_validator_election.py
View File

@ -147,7 +147,7 @@ def test_upsert_validator_show(caplog, ongoing_election, b):
from bigchaindb.commands.bigchaindb import run_upsert_validator_show from bigchaindb.commands.bigchaindb import run_upsert_validator_show
election_id = ongoing_election.id election_id = ongoing_election.id
public_key = public_key_to_base64(ongoing_election.asset['data']['public_key']) public_key = public_key_to_base64(ongoing_election.asset['data']['public_key']['value'])
power = ongoing_election.asset['data']['power'] power = ongoing_election.asset['data']['power']
node_id = ongoing_election.asset['data']['node_id'] node_id = ongoing_election.asset['data']['node_id']
status = ValidatorElection.ONGOING status = ValidatorElection.ONGOING

10
tests/upsert_validator/test_validator_election_vote.py
View File

@ -239,7 +239,7 @@ def test_upsert_validator(b, node_key, node_keys, ed25519_node_keys):
power = 1 power = 1
public_key = '9B3119650DF82B9A5D8A12E38953EA47475C09F0C48A4E6A0ECE182944B24403' public_key = '9B3119650DF82B9A5D8A12E38953EA47475C09F0C48A4E6A0ECE182944B24403'
public_key64 = public_key_to_base64(public_key) public_key64 = public_key_to_base64(public_key)
new_validator = {'public_key': public_key, new_validator = {'public_key': {'value': public_key, 'type': 'ed25519-base58'},
'node_id': 'some_node_id', 'node_id': 'some_node_id',
'power': power} 'power': power}
@ -281,7 +281,7 @@ def test_get_validator_update(b, node_keys, node_key, ed25519_node_keys):
power = 1 power = 1
public_key = '9B3119650DF82B9A5D8A12E38953EA47475C09F0C48A4E6A0ECE182944B24403' public_key = '9B3119650DF82B9A5D8A12E38953EA47475C09F0C48A4E6A0ECE182944B24403'
public_key64 = public_key_to_base64(public_key) public_key64 = public_key_to_base64(public_key)
new_validator = {'public_key': public_key, new_validator = {'public_key': {'value': public_key, 'type': 'ed25519-base58'},
'node_id': 'some_node_id', 'node_id': 'some_node_id',
'power': power} 'power': power}
voters = ValidatorElection.recipients(b) voters = ValidatorElection.recipients(b)
@ -316,7 +316,7 @@ def test_get_validator_update(b, node_keys, node_key, ed25519_node_keys):
# remove validator # remove validator
power = 0 power = 0
new_validator = {'public_key': public_key, new_validator = {'public_key': {'value': public_key, 'type': 'ed25519-base58'},
'node_id': 'some_node_id', 'node_id': 'some_node_id',
'power': power} 'power': power}
voters = ValidatorElection.recipients(b) voters = ValidatorElection.recipients(b)
@ -339,7 +339,7 @@ def test_get_validator_update(b, node_keys, node_key, ed25519_node_keys):
# assert that the public key is not a part of the current validator set # assert that the public key is not a part of the current validator set
for v in b.get_validators(10): for v in b.get_validators(10):
assert not v['pub_key']['data'] == public_key64 assert not v['pub_key']['value'] == public_key64
# ============================================================================ # ============================================================================
@ -366,6 +366,6 @@ def reset_validator_set(b, node_keys, height):
validators = [] validators = []
for (node_pub, _) in node_keys.items(): for (node_pub, _) in node_keys.items():
validators.append({'pub_key': {'type': 'ed25519', validators.append({'pub_key': {'type': 'ed25519',
'data': node_pub}, 'value': node_pub},
'voting_power': 10}) 'voting_power': 10})
b.store_validator_set(height, validators, 'election_id') b.store_validator_set(height, validators, 'election_id')