Hard fork changes

Author: cyyber

.gitignore

@@ -12,6 +12,7 @@ __pycache__/*
 .DS_Store
 .*.swp
 */.ipynb_checkpoints/*
+*_trial_temp
 
 # Project files
 .ropeproject

requirements.txt

@@ -15,8 +15,9 @@ six==1.11
 click==6.7
 pyqrllib>=0.99.3,<1.1.0
 pyqryptonight>=0.99.3,<1.1.0
+pyqrandomx>=0.0.0,<1.0.0
 Flask==0.12.3
 json-rpc==1.10.8
 cryptography==2.3
 mock==2.0.0
-daemonize==2.4.7
+daemonize==2.4.7

setup.cfg

@@ -41,6 +41,7 @@ install_requires =
     click==6.7
     pyqrllib>=0.99.3,<1.1.0
     pyqryptonight>=0.99.3,<1.1.0
+    pyqrandomx>=0.0.0,<1.0.0
     Flask==0.12.3
     json-rpc==1.10.8
     cryptography==2.3

src/qrl/cli.py

@@ -14,12 +14,15 @@
 from qrl.core import config
 from qrl.core.Wallet import Wallet, WalletDecryptionError
 from qrl.core.misc.helper import parse_hexblob, parse_qaddress
+from qrl.core.MultiSigAddressState import MultiSigAddressState
 from qrl.core.txs.MessageTransaction import MessageTransaction
 from qrl.core.txs.SlaveTransaction import SlaveTransaction
 from qrl.core.txs.TokenTransaction import TokenTransaction
 from qrl.core.txs.Transaction import Transaction
 from qrl.core.txs.TransferTokenTransaction import TransferTokenTransaction
 from qrl.core.txs.TransferTransaction import TransferTransaction
+from qrl.core.txs.multisig.MultiSigCreate import MultiSigCreate
+from qrl.core.txs.multisig.MultiSigSpend import MultiSigSpend
 from qrl.crypto.xmss import XMSS, hash_functions
 from qrl.generated import qrl_pb2_grpc, qrl_pb2
 
@@ -181,15 +184,15 @@ def _quanta_to_shor(x: Decimal, base=Decimal(config.dev.shor_per_quanta)) -> int
     return int(Decimal(x * base).to_integral_value())
 
 
-def _parse_dsts_amounts(addresses: str, amounts: str, token_decimals: int = 0):
+def _parse_dsts_amounts(addresses: str, amounts: str, token_decimals: int = 0, check_multi_sig_address=False):
     """
     'Qaddr1 Qaddr2...' -> [\\xcx3\\xc2, \\xc2d\\xc3]
     '10 10' -> [10e9, 10e9] (in shor)
     :param addresses:
     :param amounts:
     :return:
     """
-    addresses_split = [parse_qaddress(addr) for addr in addresses.split(' ')]
+    addresses_split = [parse_qaddress(addr, check_multi_sig_address) for addr in addresses.split(' ')]
 
     if token_decimals != 0:
         multiplier = Decimal(10 ** int(token_decimals))
@@ -471,11 +474,12 @@ def tx_push(ctx, txblob):
 @qrl.command()
 @click.option('--src', type=str, default='', prompt=True, help='signer QRL address')
 @click.option('--master', type=str, default='', prompt=True, help='master QRL address')
+@click.option('--addr_to', type=str, default='', prompt=True, help='QRL Address receiving this message (optional)')
 @click.option('--message', type=str, prompt=True, help='Message (max 80 bytes)')
 @click.option('--fee', type=Decimal, default=0.0, prompt=True, help='fee in Quanta')
 @click.option('--ots_key_index', default=1, prompt=True, help='OTS key Index (1..XMSS num signatures)')
 @click.pass_context
-def tx_message(ctx, src, master, message, fee, ots_key_index):
+def tx_message(ctx, src, master, addr_to, message, fee, ots_key_index):
     """
     Message Transaction
     """
@@ -491,6 +495,7 @@ def tx_message(ctx, src, master, message, fee, ots_key_index):
         src_xmss.set_ots_index(ots_key_index)
 
         message = message.encode()
+        addr_to = parse_qaddress(addr_to, False)
 
         master_addr = None
         if master:
@@ -503,6 +508,7 @@ def tx_message(ctx, src, master, message, fee, ots_key_index):
     try:
         stub = ctx.obj.get_stub_public_api()
         tx = MessageTransaction.create(message_hash=message,
+                                       addr_to=addr_to,
                                        fee=fee_shor,
                                        xmss_pk=address_src_pk,
                                        master_addr=master_addr)
@@ -516,6 +522,159 @@ def tx_message(ctx, src, master, message, fee, ots_key_index):
         print("Error {}".format(str(e)))
 
 
+@qrl.command()
+@click.option('--src', type=str, default='', prompt=True, help='source QRL address')
+@click.option('--master', type=str, default='', prompt=True, help='master QRL address')
+@click.option('--threshold', default=0, prompt=True, help='Threshold')
+@click.option('--fee', type=Decimal, default=0.0, prompt=True, help='fee in Quanta')
+@click.option('--ots_key_index', default=1, prompt=True, help='OTS key Index (1..XMSS num signatures)')
+@click.pass_context
+def tx_multi_sig_create(ctx, src, master, threshold, fee, ots_key_index):
+    """
+    Creates Multi Sig Create Transaction, that results into the formation of new multi_sig_address if accepted.
+    """
+    signatories = []
+    weights = []
+    while True:
+        address = click.prompt('Address of Signatory ', default='')
+        if address == '':
+            break
+        weight = int(click.prompt('Weight '))
+        signatories.append(parse_qaddress(address))
+        weights.append(weight)
+
+    try:
+        _, src_xmss = _select_wallet(ctx, src)
+        if not src_xmss:
+            click.echo("A local wallet is required to sign the transaction")
+            quit(1)
+
+        address_src_pk = src_xmss.pk
+
+        ots_key_index = validate_ots_index(ots_key_index, src_xmss)
+        src_xmss.set_ots_index(ots_key_index)
+
+        master_addr = None
+        if master_addr:
+            master_addr = parse_qaddress(master)
+        # FIXME: This could be problematic. Check
+        fee_shor = _quanta_to_shor(fee)
+
+    except KeyboardInterrupt:
+        click.echo("Terminated by user")
+        quit(1)
+    except Exception as e:
+        click.echo("Error validating arguments: {}".format(e))
+        quit(1)
+
+    try:
+        stub = ctx.obj.get_stub_public_api()
+        tx = MultiSigCreate.create(signatories=signatories,
+                                   weights=weights,
+                                   threshold=threshold,
+                                   fee=fee_shor,
+                                   xmss_pk=address_src_pk,
+                                   master_addr=master_addr)
+
+        tx.sign(src_xmss)
+
+        push_transaction_req = qrl_pb2.PushTransactionReq(transaction_signed=tx.pbdata)
+        push_transaction_resp = stub.PushTransaction(push_transaction_req, timeout=CONNECTION_TIMEOUT)
+
+        print(push_transaction_resp.error_code)
+        print('Multi sig Address Q{}'.format(bin2hstr(MultiSigAddressState.generate_multi_sig_address(tx.txhash))))
+    except Exception as e:
+        print("Error {}".format(str(e)))
+
+
+@qrl.command()
+@click.option('--src', type=str, default='', prompt=True, help='signer QRL address')
+@click.option('--master', type=str, default='', help='master QRL address')
+@click.option('--multi_sig_address', type=str, default='', prompt=True, help='signer Multi Sig Address')
+@click.option('--dsts', type=str, prompt=True, help='List of destination addresses')
+@click.option('--amounts', type=str, prompt=True, help='List of amounts to transfer (Quanta)')
+@click.option('--expiry_block_number', type=int, prompt=True, help='Expiry Blocknumber')
+@click.option('--fee', type=Decimal, default=0.0, prompt=True, help='fee in Quanta')
+@click.option('--ots_key_index', default=1, help='OTS key Index (1..XMSS num signatures)')
+@click.pass_context
+def tx_multi_sig_spend(ctx, src, master, multi_sig_address, dsts, amounts, expiry_block_number, fee, ots_key_index):
+    """
+    Transfer coins from src to dsts
+    """
+    address_src_pk = None
+    master_addr = None
+
+    addresses_dst = []
+    shor_amounts = []
+    fee_shor = []
+
+    signing_object = None
+
+    try:
+        # Retrieve signing object
+        selected_wallet = _select_wallet(ctx, src)
+        if selected_wallet is None or len(selected_wallet) != 2:
+            click.echo("A wallet was not found")
+            quit(1)
+
+        _, src_xmss = selected_wallet
+
+        if not src_xmss:
+            click.echo("A local wallet is required to sign the transaction")
+            quit(1)
+
+        address_src_pk = src_xmss.pk
+
+        ots_key_index = validate_ots_index(ots_key_index, src_xmss)
+        src_xmss.set_ots_index(ots_key_index)
+
+        signing_object = src_xmss
+
+        # Get and validate other inputs
+        if master:
+            master_addr = parse_qaddress(master)
+
+        addresses_dst, shor_amounts = _parse_dsts_amounts(dsts, amounts, check_multi_sig_address=True)
+        fee_shor = _quanta_to_shor(fee)
+    except Exception as e:
+        click.echo("Error validating arguments: {}".format(e))
+        quit(1)
+    multi_sig_address = bytes(hstr2bin(multi_sig_address[1:]))
+    try:
+        # MultiSigSpend transaction
+        tx = MultiSigSpend.create(multi_sig_address=multi_sig_address,
+                                  addrs_to=addresses_dst,
+                                  amounts=shor_amounts,
+                                  expiry_block_number=expiry_block_number,
+                                  fee=fee_shor,
+                                  xmss_pk=address_src_pk,
+                                  master_addr=master_addr)
+
+        # Sign transaction
+        tx.sign(signing_object)
+
+        if not tx.validate():
+            print("It was not possible to validate the signature")
+            quit(1)
+
+        print("\nTransaction Blob (signed): \n")
+        txblob = tx.pbdata.SerializeToString()
+        txblobhex = hexlify(txblob).decode()
+        print(txblobhex)
+
+        # Push transaction
+        print()
+        print("Sending to a QRL Node...")
+        stub = ctx.obj.get_stub_public_api()
+        push_transaction_req = qrl_pb2.PushTransactionReq(transaction_signed=tx.pbdata)
+        push_transaction_resp = stub.PushTransaction(push_transaction_req, timeout=CONNECTION_TIMEOUT)
+
+        # Print result
+        print(push_transaction_resp)
+    except Exception as e:
+        print("Error {}".format(str(e)))
+
+
 def base64tohex(data):
     return hexlify(a2b_base64(data))
 
@@ -534,10 +693,11 @@ def tx_unbase64(tx_json_str):
 @click.option('--master', type=str, default='', help='master QRL address')
 @click.option('--dsts', type=str, prompt=True, help='List of destination addresses')
 @click.option('--amounts', type=str, prompt=True, help='List of amounts to transfer (Quanta)')
+@click.option('--message_data', type=str, prompt=True, help='Message (Optional)')
 @click.option('--fee', type=Decimal, default=0.0, prompt=True, help='fee in Quanta')
 @click.option('--ots_key_index', default=1, help='OTS key Index (1..XMSS num signatures)')
 @click.pass_context
-def tx_transfer(ctx, src, master, dsts, amounts, fee, ots_key_index):
+def tx_transfer(ctx, src, master, dsts, amounts, message_data, fee, ots_key_index):
     """
     Transfer coins from src to dsts
     """
@@ -549,6 +709,7 @@ def tx_transfer(ctx, src, master, dsts, amounts, fee, ots_key_index):
     fee_shor = []
 
     signing_object = None
+    message_data = message_data.encode()
 
     try:
         # Retrieve signing object
@@ -573,8 +734,7 @@ def tx_transfer(ctx, src, master, dsts, amounts, fee, ots_key_index):
         # Get and validate other inputs
         if master:
             master_addr = parse_qaddress(master)
-
-        addresses_dst, shor_amounts = _parse_dsts_amounts(dsts, amounts)
+        addresses_dst, shor_amounts = _parse_dsts_amounts(dsts, amounts, check_multi_sig_address=True)
         fee_shor = _quanta_to_shor(fee)
     except Exception as e:
         click.echo("Error validating arguments: {}".format(e))
@@ -584,6 +744,7 @@ def tx_transfer(ctx, src, master, dsts, amounts, fee, ots_key_index):
         # Create transaction
         tx = TransferTransaction.create(addrs_to=addresses_dst,
                                         amounts=shor_amounts,
+                                        message_data=message_data,
                                         fee=fee_shor,
                                         xmss_pk=address_src_pk,
                                         master_addr=master_addr)
@@ -605,7 +766,6 @@ def tx_transfer(ctx, src, master, dsts, amounts, fee, ots_key_index):
         print(txblobhex)
 
         # Push transaction
-        print()
         print("Sending to a QRL Node...")
         stub = ctx.obj.get_stub_public_api()
         push_transaction_req = qrl_pb2.PushTransactionReq(transaction_signed=tx.pbdata)
@@ -877,3 +1037,4 @@ def main():
 
 if __name__ == '__main__':
     main()
+

src/qrl/core/AddressState.py

@@ -5,6 +5,7 @@
 from pyqrllib.pyqrllib import QRLHelper, bin2hstr
 
 from qrl.core import config
+from qrl.core.State import State
 from qrl.generated import qrl_pb2
 
 
@@ -234,3 +235,42 @@ def address_is_valid(address: bytes) -> bool:
 
     def serialize(self):
         return self._data.SerializeToString()
+
+    @staticmethod
+    def put_addresses_state(state: State, addresses_state: dict, batch=None):
+        """
+        :param addresses_state:
+        :param batch:
+        :return:
+        """
+        for address in addresses_state:
+            address_state = addresses_state[address]
+            AddressState.put_address_state(state, address_state, batch)
+
+    @staticmethod
+    def put_address_state(state: State, address_state, batch=None):
+        data = address_state.pbdata.SerializeToString()
+        state._db.put_raw(address_state.address, data, batch)
+
+    @staticmethod
+    def get_address_state(state: State, address: bytes):
+        try:
+            data = state._db.get_raw(address)
+            pbdata = qrl_pb2.AddressState()
+            pbdata.ParseFromString(bytes(data))
+            address_state = AddressState(pbdata)
+            return address_state
+        except KeyError:
+            return AddressState.get_default(address)
+
+    @staticmethod
+    def return_all_addresses(state: State) -> list:
+        addresses = []
+        for key, data in state._db.db:
+            if key[0] != b'Q':
+                continue
+            pbdata = qrl_pb2.AddressState()
+            pbdata.ParseFromString(bytes(data))
+            address_state = AddressState(pbdata)
+            addresses.append(address_state)
+        return addresses