Merge remote-tracking branch 'origin/feat/mainsail' into refactor/eip-155-support

Author: alexbarnsley

crypto/transactions/builder/validator_registration_builder.py

@@ -13,5 +13,10 @@ def validator_public_key(self, validator_public_key: str):
         self.transaction.refresh_payload_data()
         return self
 
+    def value(self, value: int):
+        self.transaction.data['value'] = int(value)
+        self.transaction.refresh_payload_data()
+        return self
+
     def get_transaction_instance(self, data: dict):
         return ValidatorRegistration(data)

crypto/transactions/deserializer.py

@@ -80,9 +80,6 @@ def __guess_transaction_from_data(self, data: dict) -> AbstractTransaction:
             if function_name == AbiFunction.MULTIPAYMENT.value:
                 return Multipayment(data)
 
-        if data['value'] != '0':
-            return Transfer(data)
-
         consensus_payload_data = self.decode_payload(data)
         if consensus_payload_data is not None:
             function_name = consensus_payload_data.get('functionName')
@@ -107,6 +104,9 @@ def __guess_transaction_from_data(self, data: dict) -> AbstractTransaction:
             if function_name == AbiFunction.USERNAME_RESIGNATION.value:
                 return UsernameResignation(data)
 
+        if data['value'] != '0':
+            return Transfer(data)
+
         return EvmCall(data)
 
     @staticmethod

tests/fixtures/transactions/validator-registration.json

@@ -4,15 +4,15 @@
         "gasPrice": "5000000000",
         "gasLimit": "200000",
         "to": "0x535B3D7A252fa034Ed71F0C53ec0C6F784cB64E1",
-        "value": "0",
+        "value": "250000000000000000000",
         "data": "602a9eee0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003030954f46d6097a1d314e900e66e11e0dad0a57cd03e04ec99f0dedd1c765dcb11e6d7fa02e22cf40f9ee23d9cc1c062400000000000000000000000000000000",
         "network": 11812,
         "v": 0,
-        "r": "047b1a36778d3a7c88b3b00623bf1c2be4875f8220df429ee6f661f8722f6dcd",
-        "s": "484b805c306d017a107b1bd8b46115282b60f956fa04cf9d62a160e6d53a11ef",
+        "r": "c36e366f58d30e34099fdaf2104081bc75aaca456d042618df0e7fdfce48d9a6",
+        "s": "7cc525d7cfa88f83286396b483ef817a9e14cc240ce027ac9bee38c1fdc7e883",
         "senderPublicKey": "0243333347c8cbf4e3cbc7a96964181d02a2b0c854faa2fef86b4b8d92afcf473d",
         "from": "0x1E6747BEAa5B4076a6A98D735DF8c35a70D18Bdd",
-        "hash": "997ffdd531ff879b9cdc8c0f147110c5696b6c5a11607566d846beecaf41b4ed"
+        "hash": "09edf0fcf2af28ff4ad05e0dc831119f25dcdc3261d786b9fa953a227d560b2e"
     },
-    "serialized": "f8ec0185012a05f20083030d4094535b3d7a252fa034ed71f0c53ec0c6f784cb64e180b884602a9eee0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003030954f46d6097a1d314e900e66e11e0dad0a57cd03e04ec99f0dedd1c765dcb11e6d7fa02e22cf40f9ee23d9cc1c062400000000000000000000000000000000825c6ba0047b1a36778d3a7c88b3b00623bf1c2be4875f8220df429ee6f661f8722f6dcda0484b805c306d017a107b1bd8b46115282b60f956fa04cf9d62a160e6d53a11ef"
-}
+    "serialized": "f8f50185012a05f20083030d4094535b3d7a252fa034ed71f0c53ec0c6f784cb64e1890d8d726b7177a80000b884602a9eee0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003030954f46d6097a1d314e900e66e11e0dad0a57cd03e04ec99f0dedd1c765dcb11e6d7fa02e22cf40f9ee23d9cc1c062400000000000000000000000000000000825c6ba0c36e366f58d30e34099fdaf2104081bc75aaca456d042618df0e7fdfce48d9a6a07cc525d7cfa88f83286396b483ef817a9e14cc240ce027ac9bee38c1fdc7e883"
+}

tests/transactions/builder/test_validator_registration_builder.py

@@ -9,6 +9,7 @@ def test_validator_registration_transaction(passphrase, validator_public_key, lo
             .gas_price(fixture['data']['gasPrice'])
             .gas_limit(fixture['data']['gasLimit'])
             .nonce(fixture['data']['nonce'])
+            .value(fixture['data']['value'])
             .validator_public_key(validator_public_key)
             .to(fixture['data']['to'])
             .sign(passphrase)
@@ -37,6 +38,7 @@ def test_validator_registration_transaction_with_default_to(passphrase, validato
             .gas_price(fixture['data']['gasPrice'])
             .gas_limit(fixture['data']['gasLimit'])
             .nonce(fixture['data']['nonce'])
+            .value(fixture['data']['value'])
             .validator_public_key(validator_public_key)
             .sign(passphrase)
     )

tests/transactions/test_deserializer.py

@@ -43,9 +43,10 @@ def test_deserialize_unvote(load_transaction_fixture):
 
 def test_deserialize_validator_registration(load_transaction_fixture):
     fixture = load_transaction_fixture('transactions/validator-registration')
-    transaction = assert_deserialized(fixture, ['hash', 'nonce', 'gasPrice', 'gasLimit', 'v', 'r', 's'])
+    transaction = assert_deserialized(fixture, ['hash', 'nonce', 'gasPrice', 'gasLimit', 'value', 'v', 'r', 's'])
 
     assert isinstance(transaction, ValidatorRegistration)
+    assert transaction.data['value'] == '250000000000000000000'
 
 def test_deserialize_validator_resignation(load_transaction_fixture):
     fixture = load_transaction_fixture('transactions/validator-resignation')