Skip to content

refactor: change internal deserializer methods to protected #164

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
Apr 3, 2025
Merged

refactor: change internal deserializer methods to protected #164

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
b3295d5
refactor: change internal deserializer methods to protected
alexbarnsley Apr 3, 2025
16e4f0a
test
alexbarnsley Apr 3, 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
64 changes: 32 additions & 32 deletions crypto/transactions/deserializer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,21 +36,21 @@ def deserialize(self) -> AbstractTransaction:
decoded_rlp = RlpDecoder.decode(self.encoded_rlp)

data = {
'network': Deserializer.parse_number(decoded_rlp[0]),
'nonce': Deserializer.parse_big_number(decoded_rlp[1]),
'gasPrice': Deserializer.parse_number(decoded_rlp[3]),
'gasLimit': Deserializer.parse_number(decoded_rlp[4]),
'recipientAddress': Deserializer.parse_address(decoded_rlp[5]),
'value': Deserializer.parse_big_number(decoded_rlp[6]),
'data': Deserializer.parse_hex(decoded_rlp[7]),
'network': Deserializer.__parse_number(decoded_rlp[0]),
'nonce': Deserializer.__parse_big_number(decoded_rlp[1]),
'gasPrice': Deserializer.__parse_number(decoded_rlp[3]),
'gasLimit': Deserializer.__parse_number(decoded_rlp[4]),
'recipientAddress': Deserializer.__parse_address(decoded_rlp[5]),
'value': Deserializer.__parse_big_number(decoded_rlp[6]),
'data': Deserializer.__parse_hex(decoded_rlp[7]),
}

if len(decoded_rlp) == 12:
data['v'] = Deserializer.parse_number(decoded_rlp[9]) + Constants.ETHEREUM_RECOVERY_ID_OFFSET.value
data['r'] = Deserializer.parse_hex(decoded_rlp[10])
data['s'] = Deserializer.parse_hex(decoded_rlp[11])
data['v'] = Deserializer.__parse_number(decoded_rlp[9]) + Constants.ETHEREUM_RECOVERY_ID_OFFSET.value
data['r'] = Deserializer.__parse_hex(decoded_rlp[10])
data['s'] = Deserializer.__parse_hex(decoded_rlp[11])

transaction = self.guess_transaction_from_data(data)
transaction = self.__guess_transaction_from_data(data)

transaction.data = data
transaction.recover_sender()
Expand All @@ -59,7 +59,22 @@ def deserialize(self) -> AbstractTransaction:

return transaction

def guess_transaction_from_data(self, data: dict) -> AbstractTransaction:
@staticmethod
def decode_payload(data: dict, abi_type: ContractAbiType = ContractAbiType.CONSENSUS) -> Optional[dict]:
payload = data.get('data', '')

if payload == '':
return None

decoder = AbiDecoder(abi_type)
try:
return decoder.decode_function_data(payload)
except Exception as e:
print(f"Error decoding payload: {str(e)}")

return None

def __guess_transaction_from_data(self, data: dict) -> AbstractTransaction:
multipayment_payload_data = self.decode_payload(data, ContractAbiType.MULTIPAYMENT)
if multipayment_payload_data is not None:
function_name = multipayment_payload_data.get('functionName')
Expand Down Expand Up @@ -96,32 +111,17 @@ def guess_transaction_from_data(self, data: dict) -> AbstractTransaction:
return EvmCall(data)

@staticmethod
def decode_payload(data: dict, abi_type: ContractAbiType = ContractAbiType.CONSENSUS) -> Optional[dict]:
payload = data.get('data', '')

if payload == '':
return None

decoder = AbiDecoder(abi_type)
try:
return decoder.decode_function_data(payload)
except Exception as e:
print(f"Error decoding payload: {str(e)}")

return None

@staticmethod
def parse_number(value: str) -> int:
def __parse_number(value: str) -> int:
return 0 if value == '0x' else int(value, 16)

@staticmethod
def parse_big_number(value: str) -> str:
return str(Deserializer.parse_number(value))
def __parse_big_number(value: str) -> str:
return str(Deserializer.__parse_number(value))

@staticmethod
def parse_hex(value: str) -> str:
def __parse_hex(value: str) -> str:
return TransactionUtils.parse_hex_from_str(value)

@staticmethod
def parse_address(value: str) -> Optional[str]:
def __parse_address(value: str) -> Optional[str]:
return None if value == '0x' else value
32 changes: 16 additions & 16 deletions tests/transactions/test_deserializer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,25 +69,25 @@ def test_deserialize_multipayment(load_transaction_fixture):
assert isinstance(transaction, Multipayment)

def test_parse_number():
assert Deserializer.parse_number('0x01') == 1
assert Deserializer.parse_number('0x0100') == 256
assert Deserializer.parse_number('0x010000') == 65536
assert Deserializer.parse_number('0x') == 0
assert Deserializer._Deserializer__parse_number('0x01') == 1
assert Deserializer._Deserializer__parse_number('0x0100') == 256
assert Deserializer._Deserializer__parse_number('0x010000') == 65536
assert Deserializer._Deserializer__parse_number('0x') == 0

def test_parse_hex():
assert Deserializer.parse_hex('0x01') == '01'
assert Deserializer.parse_hex('0x0100') == '0100'
assert Deserializer.parse_hex('0x010000') == '010000'
assert Deserializer.parse_hex('0x') == ''
assert Deserializer.parse_hex('0x52B7D2DCC80CD2E4000000') == '52B7D2DCC80CD2E4000000'
assert Deserializer._Deserializer__parse_hex('0x01') == '01'
assert Deserializer._Deserializer__parse_hex('0x0100') == '0100'
assert Deserializer._Deserializer__parse_hex('0x010000') == '010000'
assert Deserializer._Deserializer__parse_hex('0x') == ''
assert Deserializer._Deserializer__parse_hex('0x52B7D2DCC80CD2E4000000') == '52B7D2DCC80CD2E4000000'

def test_parse_big_number():
assert Deserializer.parse_big_number('0x01') == '1'
assert Deserializer.parse_big_number('0x0100') == '256'
assert Deserializer.parse_big_number('0x010000') == '65536'
assert Deserializer.parse_big_number('0x') == '0'
assert Deserializer.parse_big_number('0x52B7D2DCC80CD2E4000000') == '100000000000000000000000000'
assert Deserializer._Deserializer__parse_big_number('0x01') == '1'
assert Deserializer._Deserializer__parse_big_number('0x0100') == '256'
assert Deserializer._Deserializer__parse_big_number('0x010000') == '65536'
assert Deserializer._Deserializer__parse_big_number('0x') == '0'
assert Deserializer._Deserializer__parse_big_number('0x52B7D2DCC80CD2E4000000') == '100000000000000000000000000'

def test_parse_address():
assert Deserializer.parse_address('0x52B7D2DCC80CD2E4000000') == '0x52B7D2DCC80CD2E4000000'
assert Deserializer.parse_address('0x') is None
assert Deserializer._Deserializer__parse_address('0x52B7D2DCC80CD2E4000000') == '0x52B7D2DCC80CD2E4000000'
assert Deserializer._Deserializer__parse_address('0x') is None