Skip to content

refactor: add chain id to networks #156

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

Merged
ItsANameToo merged 2 commits into from
Mar 6, 2025
Merged

refactor: add chain id to networks #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
134ee7f
refactor: add chain id
alexbarnsley Mar 6, 2025
c25d05a
remove version
alexbarnsley Mar 6, 2025
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
12 changes: 6 additions & 6 deletions crypto/configuration/network.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@

class NetworkType(TypedDict):
epoch: datetime
version: int
wif: int
chain_id: int

network: NetworkType = {
'epoch': Testnet.epoch,
'version': Testnet.version,
'wif': Testnet.wif,
'chain_id': Testnet.chain_id,
}

def set_network(network_object: Union[Type[Mainnet], Type[Testnet]]) -> None:
Expand All @@ -24,8 +24,8 @@ def set_network(network_object: Union[Type[Mainnet], Type[Testnet]]) -> None:

network = {
'epoch': network_object.epoch,
'version': network_object.version,
'wif': network_object.wif,
'chain_id': network_object.chain_id,
}

def get_network() -> NetworkType:
Expand All @@ -36,18 +36,18 @@ def get_network() -> NetworkType:
"""
return network

def set_custom_network(epoch: datetime, version: int, wif: int) -> None:
def set_custom_network(epoch: datetime, wif: int, chain_id: int) -> None:
"""Set custom network

Args:
epoch (datetime): chains epoch time
version (int): chains version
wif (int): chains wif
chain_id (int): chain id
"""
global network

network = {
'epoch': epoch,
'version': version,
'wif': wif,
'chain_id': chain_id
}
2 changes: 1 addition & 1 deletion crypto/networks/mainnet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@

class Mainnet(object):
epoch = datetime(2017, 3, 21, 13, 00, 00)
version = 30
wif = 186
chain_id = 10000
2 changes: 1 addition & 1 deletion crypto/networks/testnet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@

class Testnet(object):
epoch = datetime(2017, 3, 21, 13, 00, 00)
version = 30
wif = 186
chain_id = 10000
2 changes: 1 addition & 1 deletion crypto/transactions/builder/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ def __init__(self, data: dict):
'senderPublicKey': '',
'gasPrice': '5',
'nonce': '1',
'network': get_network()['version'],
'network': get_network()['chain_id'],
'gasLimit': 1_000_000,
'data': '',

Expand Down
12 changes: 5 additions & 7 deletions tests/configuration/test_network.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,31 +8,29 @@

def test_get_network():
result = get_network()
assert result['version'] == 30

assert result['chain_id'] == 10000

def test_set_network():
# mainnet
set_network(Mainnet)
result = get_network()
assert result['version'] == 30
assert result['wif'] == 186
assert result['chain_id'] == 10000

# testnet
set_network(Testnet)
result = get_network()
assert result['version'] == 30
assert result['wif'] == 186
assert result['chain_id'] == 10000

set_network(Testnet) # set back to Testnet so other tests don't fail


def test_set_custom_network():
epoch_time = datetime(2017, 1, 1, 13, 00, 00)
set_custom_network(epoch_time, 11, 130)
set_custom_network(epoch_time, 130, 10000)
result = get_network()
assert result['version'] == 11
assert result['wif'] == 130
assert result['epoch'] == epoch_time
assert result['chain_id'] == 10000

set_network(Testnet) # set back to Testnet so other tests don't fail