Merge branch 'dev' into refactor-spec-builder2

This commit is contained in:
Hsiao-Wei Wang 2021-04-19 23:14:30 +08:00 committed by GitHub
commit f2df4bf5c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions

View File

@ -5,6 +5,7 @@ from distutils import dir_util
from distutils.util import convert_path from distutils.util import convert_path
import os import os
import re import re
import string
from typing import Dict, NamedTuple, List, Sequence from typing import Dict, NamedTuple, List, Sequence
from abc import ABC, abstractmethod from abc import ABC, abstractmethod
@ -109,10 +110,10 @@ def get_spec(file_name: str) -> SpecObject:
if '`' in row[i]: if '`' in row[i]:
row[i] = row[i][:row[i].find('`')] row[i] = row[i][:row[i].find('`')]
is_constant_def = True is_constant_def = True
if row[0][0] not in 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_': if row[0][0] not in string.ascii_uppercase + '_':
is_constant_def = False is_constant_def = False
for c in row[0]: for c in row[0]:
if c not in 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_0123456789': if c not in string.ascii_uppercase + '_' + string.digits:
is_constant_def = False is_constant_def = False
if is_constant_def: if is_constant_def:
if row[1].startswith('get_generalized_index'): if row[1].startswith('get_generalized_index'):

View File

@ -61,7 +61,7 @@ We define the following Python custom types for type hinting and readability:
| Name | Value | | Name | Value |
| - | - | | - | - |
| `MAX_BYTES_PER_OPAQUE_TRANSACTION` | `uint64(2**20)` (= 1,048,576) | | `MAX_BYTES_PER_OPAQUE_TRANSACTION` | `uint64(2**20)` (= 1,048,576) |
| `MAX_APPLICATION_TRANSACTIONS` | `uint64(2**14)` (= 16,384) | | `MAX_EXECUTION_TRANSACTIONS` | `uint64(2**14)` (= 16,384) |
| `BYTES_PER_LOGS_BLOOM` | `uint64(2**8)` (= 256) | | `BYTES_PER_LOGS_BLOOM` | `uint64(2**8)` (= 256) |
## Containers ## Containers
@ -108,7 +108,7 @@ class ExecutionPayload(Container):
timestamp: uint64 timestamp: uint64
receipt_root: Bytes32 receipt_root: Bytes32
logs_bloom: ByteVector[BYTES_PER_LOGS_BLOOM] logs_bloom: ByteVector[BYTES_PER_LOGS_BLOOM]
transactions: List[OpaqueTransaction, MAX_APPLICATION_TRANSACTIONS] transactions: List[OpaqueTransaction, MAX_EXECUTION_TRANSACTIONS]
``` ```
#### `ExecutionPayloadHeader` #### `ExecutionPayloadHeader`