Skip to content
Snippets Groups Projects
Commit 108e2e25 authored by Holger's avatar Holger
Browse files

More robust HIVE_CHAIN_ID detection

parent e30f95fc
No related branches found
No related tags found
1 merge request!11Changes specific to HF25 done in https://github.com/holgern/beem master branch
Changelog Changelog
======== ========
0.24.25
-------
* More robust HIVE_CHAIN_ID detection
0.24.24 0.24.24
------- -------
* Prioritize HIVE_CHAIN_ID property for the chain selection (@emre) * Prioritize HIVE_CHAIN_ID property for the chain selection (@emre)
......
"""THIS FILE IS GENERATED FROM beem SETUP.PY.""" """THIS FILE IS GENERATED FROM beem SETUP.PY."""
version = '0.24.24' version = '0.24.25'
...@@ -304,15 +304,35 @@ class GrapheneRPC(object): ...@@ -304,15 +304,35 @@ class GrapheneRPC(object):
prefix = None prefix = None
symbols = [] symbols = []
chain_assets = [] chain_assets = []
if 'HIVE_CHAIN_ID' in props and 'STEEM_CHAIN_ID' in props:
prefix_count = {}
for key in props:
if key.split("_")[0] in prefix_count:
prefix_count[key.split("_")[0]] += 1
else:
prefix_count[key.split("_")[0]] = 1
if len(prefix_count) > 0:
sorted_prefix_count = sorted(prefix_count.items(), key=lambda x: x[1], reverse=True)
if sorted_prefix_count[0][1] > 1:
blockchain_name = sorted_prefix_count[0][0]
if blockchain_name is None and 'HIVE_CHAIN_ID' in props and 'STEEM_CHAIN_ID' in props:
del props['STEEM_CHAIN_ID'] del props['STEEM_CHAIN_ID']
for key in props: for key in props:
if key[-8:] == "CHAIN_ID":
if key[-8:] == "CHAIN_ID" and blockchain_name is None:
chain_id = props[key] chain_id = props[key]
blockchain_name = key.split("_")[0] blockchain_name = key.split("_")[0]
elif key[-13:] == "CHAIN_VERSION": elif key[-8:] == "CHAIN_ID" and key.split("_")[0] == blockchain_name:
chain_id = props[key]
elif key[-13:] == "CHAIN_VERSION" and blockchain_name is None:
network_version = props[key] network_version = props[key]
elif key[-14:] == "ADDRESS_PREFIX": elif key[-13:] == "CHAIN_VERSION" and key.split("_")[0] == blockchain_name:
network_version = props[key]
elif key[-14:] == "ADDRESS_PREFIX" and blockchain_name is None:
prefix = props[key]
elif key[-14:] == "ADDRESS_PREFIX" and key.split("_")[0] == blockchain_name:
prefix = props[key] prefix = props[key]
elif key[-6:] == "SYMBOL": elif key[-6:] == "SYMBOL":
value = {} value = {}
......
"""THIS FILE IS GENERATED FROM beem SETUP.PY.""" """THIS FILE IS GENERATED FROM beem SETUP.PY."""
version = '0.24.24' version = '0.24.25'
"""THIS FILE IS GENERATED FROM beem SETUP.PY.""" """THIS FILE IS GENERATED FROM beem SETUP.PY."""
version = '0.24.24' version = '0.24.25'
"""THIS FILE IS GENERATED FROM beem SETUP.PY.""" """THIS FILE IS GENERATED FROM beem SETUP.PY."""
version = '0.24.24' version = '0.24.25'
...@@ -16,7 +16,7 @@ except LookupError: ...@@ -16,7 +16,7 @@ except LookupError:
ascii = codecs.lookup('ascii') ascii = codecs.lookup('ascii')
codecs.register(lambda name, enc=ascii: {True: enc}.get(name == 'mbcs')) codecs.register(lambda name, enc=ascii: {True: enc}.get(name == 'mbcs'))
VERSION = '0.24.24' VERSION = '0.24.25'
tests_require = ['mock >= 2.0.0', 'pytest', 'pytest-mock', 'parameterized'] tests_require = ['mock >= 2.0.0', 'pytest', 'pytest-mock', 'parameterized']
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment