status-im
/
eth2.0-specs
mirror of https://github.com/status-im/eth2.0-specs.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1551 from ethereum/carl_Bytes_hex 

PySpec SSZ Bytes instantiated from hex string
This commit is contained in:
Diederik Loerakker 2019-12-30 18:59:46 +01:00 committed by GitHub
parent b698eff2a7 e70863ca93
commit d3c2dd029b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/build_spec.py
View File

@ -163,8 +163,6 @@ def objects_to_spec(functions: Dict[str, str],
del functions[k] del functions[k]
functions_spec = '\n\n'.join(functions.values()) functions_spec = '\n\n'.join(functions.values())
for k in list(constants.keys()): for k in list(constants.keys()):
if k.startswith('DOMAIN_'):
constants[k] = f"DomainType(({constants[k]}).to_bytes(length=4, byteorder='little'))"
if k == "BLS12_381_Q": if k == "BLS12_381_Q":
constants[k] += " # noqa: E501" constants[k] += " # noqa: E501"
constants_spec = '\n'.join(map(lambda x: '%s = %s' % (x, constants[x]), constants)) constants_spec = '\n'.join(map(lambda x: '%s = %s' % (x, constants[x]), constants))

14
specs/core/0_beacon-chain.md
View File

@ -199,7 +199,7 @@ The following values are (non-configurable) constants used throughout the specif
| - | - | | - | - |
| `GENESIS_SLOT` | `Slot(0)` | | `GENESIS_SLOT` | `Slot(0)` |
| `GENESIS_EPOCH` | `Epoch(0)` | | `GENESIS_EPOCH` | `Epoch(0)` |
| `BLS_WITHDRAWAL_PREFIX` | `Bytes1(b'\x00')` | | `BLS_WITHDRAWAL_PREFIX` | `Bytes1('0x00')` |
### Time parameters ### Time parameters
@ -249,15 +249,13 @@ The following values are (non-configurable) constants used throughout the specif
### Domain types ### Domain types
The following types are defined, mapping into `DomainType` (little endian):
| Name | Value | | Name | Value |
| - | - | | - | - |
| `DOMAIN_BEACON_PROPOSER` | `0` | | `DOMAIN_BEACON_PROPOSER` | `DomainType('0x00000000')` |
| `DOMAIN_BEACON_ATTESTER` | `1` | | `DOMAIN_BEACON_ATTESTER` | `DomainType('0x01000000')` |
| `DOMAIN_RANDAO` | `2` | | `DOMAIN_RANDAO` | `DomainType('0x02000000')` |
| `DOMAIN_DEPOSIT` | `3` | | `DOMAIN_DEPOSIT` | `DomainType('0x03000000')` |
| `DOMAIN_VOLUNTARY_EXIT` | `4` | | `DOMAIN_VOLUNTARY_EXIT` | `DomainType('0x04000000')` |
## Containers ## Containers

2
specs/core/1_custody-game.md
View File

@ -131,7 +131,7 @@ The following types are defined, mapping into `DomainType` (little endian):
| Name | Value | | Name | Value |
| - | - | | - | - |
| `DOMAIN_CUSTODY_BIT_CHALLENGE` | `6` | | `DOMAIN_CUSTODY_BIT_CHALLENGE` | `DomainType('0x06000000')` |
### TODO PLACEHOLDER ### TODO PLACEHOLDER

4
specs/core/1_shard-data-chains.md
View File

@ -101,8 +101,8 @@ This document describes the shard transition function (data layer only) and the
| Name | Value | | Name | Value |
| - | - | | - | - |
| `DOMAIN_SHARD_PROPOSER` | `128` | | `DOMAIN_SHARD_PROPOSER` | `DomainType('0x80000000')` |
| `DOMAIN_SHARD_ATTESTER` | `129` | | `DOMAIN_SHARD_ATTESTER` | `DomainType('0x81000000')` |
## Containers ## Containers

7
test_libs/pyspec/eth2spec/utils/ssz/ssz_typing.py
View File

@ -451,10 +451,15 @@ class BaseBytes(bytes, Elements, metaclass=BytesType):
@classmethod @classmethod
def extract_args(cls, *args): def extract_args(cls, *args):
x = args x = args
if len(x) == 1 and isinstance(x[0], (GeneratorType, bytes)): if len(x) == 1 and isinstance(x[0], (GeneratorType, bytes, str)):
x = x[0] x = x[0]
if isinstance(x, bytes): # Includes BytesLike if isinstance(x, bytes): # Includes BytesLike
return x return x
if isinstance(x, str):
if x[:2] == '0x':
return bytes.fromhex(x[2:])
else:
return bytes.fromhex(x)
else: else:
return bytes(x) # E.g. GeneratorType put into bytes. return bytes(x) # E.g. GeneratorType put into bytes.