Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ECHOT-298] Up library patch version >> 0.1.52: Update fee types, update sidechain config #4

Merged
merged 14 commits into from
Dec 18, 2019
Merged

[ECHOT-298] Up library patch version >> 0.1.52: Update fee types, update sidechain config #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
8acbe9b
Update auto expiration setter
Dec 9, 2019
162645b
Update sidechain config
Dec 9, 2019
5045bdc
Add unsubscribe_contract_logs db api method
Dec 9, 2019
45d4e3e
Update sidechain config
Dec 9, 2019
9a44b8c
Add get_relative_contract_history history api method
Dec 9, 2019
f9930f3
Update database api
Dec 9, 2019
2e1f98b
Rename committee_freeze_duration_seconds
Dec 9, 2019
bd7079e
Remove get_block_reward db api method
Dec 9, 2019
c74924c
Update operations order
Dec 9, 2019
6c26dc6
Update object types
Dec 10, 2019
00f1eb6
Update library patch version >> 0.1.51
Dec 10, 2019
9144302
Merge branch 'develop' into ECHOT-298
Dec 18, 2019
e788378
Update feetypes
Dec 18, 2019
8e64d17
Up library patch version >> 0.1.52
Dec 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions echopy/echobase/feetypes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,13 +157,18 @@ def __init__(self, *args, **kwargs):
operations["sidechain_eth_create_address"]: DefaultFee,
operations["sidechain_eth_approve_address"]: DefaultFee,
operations["sidechain_eth_deposit"]: DefaultFee,
operations["sidechain_eth_send_deposit"]: DefaultFee,
operations["sidechain_eth_withdraw"]: DefaultFee,
operations["sidechain_eth_send_withdraw"]: DefaultFee,
operations["sidechain_eth_approve_withdraw"]: DefaultFee,
operations["sidechain_eth_update_contract_address"]: DefaultFee,
operations["sidechain_issue"]: DefaultFee,
operations["sidechain_burn"]: DefaultFee,
operations["sidechain_erc20_register_token"]: Erc20RegisterToken,
operations["sidechain_erc20_deposit_token"]: DefaultFee,
operations["sidechain_erc20_send_deposit_token"]: DefaultFee,
operations["sidechain_erc20_withdraw_token"]: DefaultFee,
operations["sidechain_erc20_send_withdraw_token"]: DefaultFee,
operations["sidechain_erc20_approve_token_withdraw"]: DefaultFee,
operations["sidechain_erc20_issue"]: DefaultFee,
operations["sidechain_erc20_burn"]: DefaultFee,
Expand Down
2 changes: 1 addition & 1 deletion echopy/echobase/objects.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ def __init__(self, *args, **kwargs):
super().__init__(
OrderedDict(
[
("generate_eth_address", Int64(kwargs["generate_eth_address"]))
("create_eth_address", Int64(kwargs["create_eth_address"]))
]
)
)
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

from setuptools import setup, find_packages

VERSION = "0.1.51"
VERSION = "0.1.52"
packages = find_packages()
packages.remove('test')

Expand Down