refactor: schema changes (#171)

Author: alexbarnsley

crypto/transactions/builder/abstract_transaction_builder.py

@@ -11,7 +11,7 @@ def __init__(self, data: dict):
             'gasPrice': '5',
             'nonce': '1',
             'network': Network.get_network().chain_id(),
-            'gasLimit': 1_000_000,
+            'gas': 1_000_000,
             'data': '',
 
             **data,
@@ -26,12 +26,12 @@ def __str__(self):
     def new(cls):
         return cls({})
 
-    def gas_limit(self, gas_limit: int):
-        self.transaction.data['gasLimit'] = int(gas_limit)
+    def gas(self, gas: int):
+        self.transaction.data['gas'] = int(gas)
         return self
 
-    def recipient_address(self, recipient_address: str):
-        self.transaction.data['recipientAddress'] = recipient_address
+    def to(self, to: str):
+        self.transaction.data['to'] = to
         return self
 
     def gas_price(self, gas_price: int):
@@ -50,7 +50,7 @@ def sign(self, passphrase: str):
         keys = PrivateKey.from_passphrase(passphrase)
         self.transaction.data['senderPublicKey'] = keys.public_key
         self.transaction = self.transaction.sign(keys)
-        self.transaction.data['id'] = self.transaction.get_id()
+        self.transaction.data['hash'] = self.transaction.get_id()
         return self
 
     def verify(self):

crypto/transactions/builder/multipayment_builder.py

@@ -8,16 +8,16 @@ def __init__(self, data: dict):
 
         self.transaction.data['pay'] = [[], []]
 
-        self.recipient_address(ContractAddresses.MULTIPAYMENT.value)
+        self.to(ContractAddresses.MULTIPAYMENT.value)
         self.transaction.refresh_payload_data()
 
-    def pay(self, address: str, amount: str):
+    def pay(self, address: str, value: str):
         self.transaction.data['pay'][0].append(address)
-        self.transaction.data['pay'][1].append(amount)
+        self.transaction.data['pay'][1].append(value)
 
         self.transaction.refresh_payload_data()
 
-        self.transaction.data['value'] = str(int(self.transaction.data['value']) + int(amount))
+        self.transaction.data['value'] = str(int(self.transaction.data['value']) + int(value))
 
         return self
 

crypto/transactions/builder/unvote_builder.py

@@ -6,7 +6,7 @@ class UnvoteBuilder(AbstractTransactionBuilder):
     def __init__(self, data: dict):
         super().__init__(data)
 
-        self.recipient_address(ContractAddresses.CONSENSUS.value)
+        self.to(ContractAddresses.CONSENSUS.value)
 
     def get_transaction_instance(self, data: dict):
         return Unvote(data)

crypto/transactions/builder/username_registration_builder.py

@@ -8,7 +8,7 @@ class UsernameRegistrationBuilder(AbstractTransactionBuilder):
     def __init__(self, data: dict):
         super().__init__(data)
 
-        self.recipient_address(ContractAddresses.USERNAMES.value)
+        self.to(ContractAddresses.USERNAMES.value)
 
     def username(self, username: str):
         self.is_valid_username(username)

crypto/transactions/builder/username_resignation_builder.py

@@ -6,7 +6,7 @@ class UsernameResignationBuilder(AbstractTransactionBuilder):
     def __init__(self, data: dict):
         super().__init__(data)
 
-        self.recipient_address(ContractAddresses.USERNAMES.value)
+        self.to(ContractAddresses.USERNAMES.value)
 
     def get_transaction_instance(self, data: dict):
         return UsernameResignation(data)

crypto/transactions/builder/validator_registration_builder.py

@@ -6,7 +6,7 @@ class ValidatorRegistrationBuilder(AbstractTransactionBuilder):
     def __init__(self, data: dict):
         super().__init__(data)
 
-        self.recipient_address(ContractAddresses.CONSENSUS.value)
+        self.to(ContractAddresses.CONSENSUS.value)
 
     def validator_public_key(self, validator_public_key: str):
         self.transaction.data['validatorPublicKey'] = validator_public_key

crypto/transactions/builder/validator_resignation_builder.py

@@ -6,7 +6,7 @@ class ValidatorResignationBuilder(AbstractTransactionBuilder):
     def __init__(self, data: dict):
         super().__init__(data)
 
-        self.recipient_address(ContractAddresses.CONSENSUS.value)
+        self.to(ContractAddresses.CONSENSUS.value)
 
     def get_transaction_instance(self, data: dict):
         return ValidatorResignation(data)

crypto/transactions/builder/vote_builder.py

@@ -6,7 +6,7 @@ class VoteBuilder(AbstractTransactionBuilder):
     def __init__(self, data: dict):
         super().__init__(data)
 
-        self.recipient_address(ContractAddresses.CONSENSUS.value)
+        self.to(ContractAddresses.CONSENSUS.value)
 
     def vote(self, vote: str):
         self.transaction.data['vote'] = vote

crypto/transactions/deserializer.py

@@ -39,8 +39,8 @@ def deserialize(self) -> AbstractTransaction:
             '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]),
+            'gas': Deserializer.__parse_number(decoded_rlp[4]),
+            'to': Deserializer.__parse_address(decoded_rlp[5]),
             'value': Deserializer.__parse_big_number(decoded_rlp[6]),
             'data': Deserializer.__parse_hex(decoded_rlp[7]),
         }
@@ -55,7 +55,7 @@ def deserialize(self) -> AbstractTransaction:
         transaction.data = data
         transaction.recover_sender()
 
-        transaction.data['id'] = transaction.get_id()
+        transaction.data['hash'] = transaction.get_id()
 
         return transaction
 

crypto/transactions/types/abstract_transaction.py

@@ -43,7 +43,7 @@ def recover_sender(self):
         hash_ = bytes.fromhex(self.hash(skip_signature=True))
         public_key = self.__recover_public_key(signature_with_recid, hash_)
         self.data['senderPublicKey'] = public_key.public_key
-        self.data['senderAddress'] = Address.from_public_key(self.data['senderPublicKey'])
+        self.data['from'] = Address.from_public_key(self.data['senderPublicKey'])
 
     def verify(self) -> bool:
         signature_with_recid = self._get_signature()