Skip to content
This repository was archived by the owner on May 23, 2023. It is now read-only.

Commit 8417328

Browse files
author
Jan Xie
committed
Merge branch 'state_revamp' into develop_with_state_revamp
2 parents b4dcb30 + 3145405 commit 8417328

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+144083
-5047
lines changed

.release_notify.sh

100755100644
File mode changed.

ethereum/__init__.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# -*- coding: utf-8 -*-
22
# ############# version ##################
3-
from pkg_resources import get_distribution, DistributionNotFound
3+
try:
4+
from pkg_resources import get_distribution, DistributionNotFound
5+
except:
6+
DistributionNotFound = Exception
47
import os.path
58
import subprocess
69
import re

ethereum/abi.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@
1212
from ethereum import utils
1313
from ethereum.utils import (
1414
big_endian_to_int, ceil32, int_to_big_endian, encode_int, is_numeric, is_string,
15-
rzpad, TT255, TT256, zpad,
15+
rzpad, zpad, str_to_bytes
1616
)
17+
from ethereum.utils import TT256, TT255
1718

1819
# The number of bytes is encoded as a uint256
1920
# Type used to encode a string/bytes length
@@ -417,24 +418,25 @@ def __init__(self, contract_interface):
417418
if entry_type != 'fallback' and 'inputs' in description:
418419
encode_types = [
419420
element['type']
420-
for element in description.get('inputs')
421+
for element in description.get('inputs', [])
421422
]
422423

423424
signature = [
424425
(element['type'], element['name'])
425-
for element in description.get('inputs')
426+
for element in description.get('inputs', [])
426427
]
427428

428429
if entry_type == 'function':
429430
normalized_name = normalize_name(description['name'])
431+
prefix = method_id(normalized_name, encode_types)
430432

431433
decode_types = [
432434
element['type']
433-
for element in description['outputs']
435+
for element in description.get('outputs', [])
434436
]
435437

436438
self.function_data[normalized_name] = {
437-
'prefix': method_id(normalized_name, encode_types),
439+
'prefix': prefix,
438440
'encode_types': encode_types,
439441
'decode_types': decode_types,
440442
'is_constant': description.get('constant', False),

ethereum/block_creation.py

Lines changed: 0 additions & 63 deletions
This file was deleted.

0 commit comments

Comments
 (0)