Merge pull request #156 from guydavis/develop

Allow nft create for self-pool.

Author: guydavis

CREDITS.md

@@ -47,6 +47,11 @@ A big thanks to all that contributed with dev and test including:
 * ServantDad
 * efnats
 * myusuf3
+* kahn2k
+* barkcollar
+* dartec
+* elexx
+
 
 ## Trademark Notice
 CHIA NETWORK INC, CHIA™, the CHIA BLOCKCHAIN™, the CHIA PROTOCOL™, CHIALISP™ and the “leaf Logo” (including the leaf logo alone when it refers to or indicates Chia), are trademarks or registered trademarks of Chia Network, Inc., a Delaware corporation.  *There is no affliation between this Machinaris project and the main Chia Network project.*

common/config/globals.py

@@ -63,10 +63,14 @@ def is_setup():
     # First check if plotter and farmer_pk,pool_pk provided.
     if "mode" in os.environ and os.environ['mode'] == 'plotter':
         if "farmer_pk" in os.environ and os.environ['farmer_pk'] != 'null' and \
-                "pool_pk" in os.environ and os.environ['pool_pk'] != 'null':
-            logging.debug(
-                "Found plotter mode with farmer_pk and pool_pk provided.")
-            return True  # When plotting don't need private in mnemonic.txt
+                (("pool_pk" in os.environ and os.environ['pool_pk'] != 'null') or \
+                ("pool_contract_address" in os.environ and os.environ['pool_contract_address'] != 'null')):
+            logging.info(
+                "Found plotter mode with farmer_pk and pool_pk/pool_contract_address provided.")
+        else:
+            logging.error(
+                "Found plotter mode WITHOUT farmer_pk and pool_pk/pool_contract_address provided.")
+        return True  # When plotting don't need private in mnemonic.txt
     if "mode" in os.environ and 'harvester' in os.environ['mode']:
         # Harvester doesn't require a mnemonic private key as farmer's ca already imported.
         return True

dockerfile

@@ -85,9 +85,10 @@ ENV plots_dir="/plots"
 ENV mode="fullnode" 
 # Required is the 'chia' blockchain, but can optionally add 'flax' too. A comma-separated list.
 ENV blockchains="chia"
-# If provided then these optional 2 public keys will be set in your plotman.yaml
+# If provided then these optional 3 public keys will be set in your plotman.yaml
 ENV farmer_pk="null"
 ENV pool_pk="null"
+ENV pool_contract_address="null"
 # If mode=harvester, required for host and port the harvester will your farmer
 ENV farmer_address="null"
 ENV farmer_port="8447"

scripts/chia_launch.sh

@@ -34,8 +34,6 @@ for p in ${plots_dir//:/ }; do
     chia plots add -d ${p}
 done
 
-
-
 sed -i 's/localhost/127.0.0.1/g' ~/.chia/mainnet/config/config.yaml
 
 # Start services based on mode selected. Default is 'fullnode'

scripts/start_machinaris.sh

@@ -13,6 +13,9 @@ fi
 if [ ${pool_pk} != 'null' ]; then
     sed -i "s/^.*pool_pk:.*$/        pool_pk: ${pool_pk}/g" /root/.chia/plotman/plotman.yaml
 fi
+if [ ${pool_contract_address} != 'null' ]; then
+    sed -i "s/^.*pool_contract_address:.*$/        pool_contract_address: ${pool_contract_address}/g" /root/.chia/plotman/plotman.yaml
+fi
 # Import ssh key if exists
 if [ -f "/id_rsa" ]; then
     echo "/id_rsa exists, trying to import private ssh key"

web/actions/chia.py

@@ -299,107 +299,151 @@ def get_first_pool_wallet_id():
 def process_pool_save(choice, pool_url, current_pool_url):
     pool_wallet_id = get_first_pool_wallet_id()
     if choice == "self":
-        if not current_pool_url:
-            flash('Already self pooling your own solo plots.  No changes made.', 'message')
-            return False
-        if pool_wallet_id:
+        if current_pool_url and pool_wallet_id:
             return process_pool_leave(choice, pool_wallet_id)
+        elif not pool_wallet_id:
+            return process_self_pool()
+        else:
+            flash('Already self-pooling your own NFT.  No changes made.', 'message')
+            return False
     elif choice == "join":
         if current_pool_url == pool_url:
             flash('Already pooling with {0}.  No changes made.'.format(pool_url), 'message')
             return False
         return process_pool_join(choice, pool_url, pool_wallet_id)
 
 def process_pool_leave(choice, wallet_id):
-        app.logger.info("Attempting to leave pool.")
-        proc = Popen("{0} plotnft leave -y -i {1}".format(CHIA_BINARY, wallet_id), stdout=PIPE, stderr=PIPE, shell=True)
-        try:
-            outs, errs = proc.communicate(timeout=90)
-        except TimeoutExpired:
-            proc.kill()
-            proc.communicate()
-            app.logger.info(traceback.format_exc())
-            flash('Timed out while leaving Chia pool!', 'danger')
-            flash(str(ex), 'warning')
-            return False
-        if errs:
-            app.logger.info("{0}".format(errs.decode('utf-8')))
-            flash('Error while leaving Chia pool.', 'danger')
-            flash(errs.decode('utf-8'), 'warning')
-            return False
-        if outs:  # Chia outputs their errors to stdout, not stderr, so must check.
-            stdout_lines = outs.decode('utf-8').splitlines()
-            out_file = '/root/.chia/mainnet/log/plotnft.log'
-            with open(out_file, 'a') as f:
-                f.write("\nchia plotnft plotnft leave -y -i 1 --> Executed at: {0}\n".format(time.strftime("%Y%m%d-%H%M%S")))
-                for line in stdout_lines:
-                    f.write(line)
-                f.write("\n**********************************************************************\n")
+    app.logger.info("Attempting to leave pool.")
+    proc = Popen("{0} plotnft leave -y -i {1}".format(CHIA_BINARY, wallet_id), stdout=PIPE, stderr=PIPE, shell=True)
+    try:
+        outs, errs = proc.communicate(timeout=90)
+    except TimeoutExpired:
+        proc.kill()
+        proc.communicate()
+        app.logger.info(traceback.format_exc())
+        flash('Timed out while leaving Chia pool!', 'danger')
+        flash(str(ex), 'warning')
+        return False
+    if errs:
+        app.logger.info("{0}".format(errs.decode('utf-8')))
+        flash('Error while leaving Chia pool.', 'danger')
+        flash(errs.decode('utf-8'), 'warning')
+        return False
+    if outs:  # Chia outputs their errors to stdout, not stderr, so must check.
+        stdout_lines = outs.decode('utf-8').splitlines()
+        out_file = '/root/.chia/mainnet/log/plotnft.log'
+        with open(out_file, 'a') as f:
+            f.write("\nchia plotnft plotnft leave -y -i 1 --> Executed at: {0}\n".format(time.strftime("%Y%m%d-%H%M%S")))
             for line in stdout_lines:
-                if "Error" in line:
-                    flash('Error while leaving Chia pool.', 'danger')
-                    flash(line, 'warning')
-                    return False
-        try: # Trigger a status update
-            requests.get("http://localhost:8927/plotnfts/", timeout=5)
-        except:
-            app.logger.info(traceback.format_exc())
-        time.sleep(5)
-        flash('Successfully left pool, switching to self plotting.  Please wait a while to complete, then refresh page. See below for details.', 'success')
-        return True
+                f.write(line)
+            f.write("\n**********************************************************************\n")
+        for line in stdout_lines:
+            if "Error" in line:
+                flash('Error while leaving Chia pool.', 'danger')
+                flash(line, 'warning')
+                return False
+    time.sleep(15)
+    try: # Trigger a status update
+        requests.get("http://localhost:8927/plotnfts/", timeout=5)
+    except:
+        app.logger.info(traceback.format_exc())
+    time.sleep(5)
+    flash('Successfully left pool, switching to self plotting.  Please wait a while to complete, then refresh page. See below for details.', 'success')
+    return True
 
 def process_pool_join(choice, pool_url, pool_wallet_id):
-        app.logger.info("Attempting to join pool at URL: {0} with wallet_id: {1}".format(pool_url, pool_wallet_id))
-        try:
-            if not pool_url.strip():
-                raise Exception("Empty pool URL provided.")
-            result = urllib.parse.urlparse(pool_url)
-            if result.scheme != 'https':
-                raise Exception("Non-HTTPS scheme provided.")
-            if not result.netloc:
-                raise Exception("No hostname or IP provided.")
-        except Exception as ex:
-            app.logger.info(traceback.format_exc())
-            flash('{0}'.format(str(ex)), 'danger')
-            return False
-        if pool_wallet_id:
-            cmd = "{0} plotnft join -y -u {1} -i {2}".format(CHIA_BINARY, pool_url, pool_wallet_id)
-        else:  # Both creating NFT and joining pool in one setp
-            cmd = "{0} plotnft create -y -u {1} -s pool".format(CHIA_BINARY, pool_url)
-        app.logger.info("Executing: {0}".format(cmd))
-        proc = Popen(cmd, stdout=PIPE, stderr=PIPE, shell=True)
-        try:
-            outs, errs = proc.communicate(timeout=90)
-        except TimeoutExpired:
-            proc.kill()
-            proc.communicate()
-            app.logger.info(traceback.format_exc())
-            flash('Timed out while joining Chia pool!', 'danger')
-            flash(str(ex), 'warning')
-            return False
-        if errs:
-            app.logger.info("{0}".format(errs.decode('utf-8')))
-            flash('Error while joining Chia pool. Please double-check pool URL: {0}'.format(pool_url), 'danger')
-            flash(errs.decode('utf-8'), 'warning')
-            return False
-        if outs:  # Chia outputs their errors to stdout, not stderr, so must check.
-            stdout_lines = outs.decode('utf-8').splitlines()
-            out_file = '/root/.chia/mainnet/log/plotnft.log'
-            with open(out_file, 'a') as f:
-                f.write("\nchia plotnft create -y -u {0} -s pool --> Executed at: {1}\n".format(pool_url, time.strftime("%Y%m%d-%H%M%S")))
-                for line in stdout_lines:
-                    f.write(line)
-                f.write("\n**********************************************************************\n")
+    app.logger.info("Attempting to join pool at URL: {0} with wallet_id: {1}".format(pool_url, pool_wallet_id))
+    try:
+        if not pool_url.strip():
+            raise Exception("Empty pool URL provided.")
+        result = urllib.parse.urlparse(pool_url)
+        if result.scheme != 'https':
+            raise Exception("Non-HTTPS scheme provided.")
+        if not result.netloc:
+            raise Exception("No hostname or IP provided.")
+    except Exception as ex:
+        app.logger.info(traceback.format_exc())
+        flash('{0}'.format(str(ex)), 'danger')
+        return False
+    if pool_wallet_id: # Just joining a pool with existing NFT
+        cmd = "{0} plotnft join -y -u {1} -i {2}".format(CHIA_BINARY, pool_url, pool_wallet_id)
+    else:  # Both creating NFT and joining pool in one setp
+        cmd = "{0} plotnft create -y -u {1} -s pool".format(CHIA_BINARY, pool_url)
+    app.logger.info("Executing: {0}".format(cmd))
+    proc = Popen(cmd, stdout=PIPE, stderr=PIPE, shell=True)
+    try:
+        outs, errs = proc.communicate(timeout=90)
+    except TimeoutExpired:
+        proc.kill()
+        proc.communicate()
+        app.logger.info(traceback.format_exc())
+        flash('Timed out while joining Chia pool!', 'danger')
+        flash(str(ex), 'warning')
+        return False
+    if errs:
+        app.logger.info("{0}".format(errs.decode('utf-8')))
+        flash('Error while joining Chia pool. Please double-check pool URL: {0}'.format(pool_url), 'danger')
+        flash(errs.decode('utf-8'), 'warning')
+        return False
+    if outs:  # Chia outputs their errors to stdout, not stderr, so must check.
+        stdout_lines = outs.decode('utf-8').splitlines()
+        out_file = '/root/.chia/mainnet/log/plotnft.log'
+        with open(out_file, 'a') as f:
+            f.write("\n{0} --> Executed at: {1}\n".format(cmd, time.strftime("%Y%m%d-%H%M%S")))
             for line in stdout_lines:
-                if "Error" in line:
-                    flash('Error while joining Chia pool. Please double-check pool URL: {0}'.format(pool_url), 'danger')
-                    flash(line, 'warning')
-                    return False
-        time.sleep(15)
-        try: # Trigger a status update
-            requests.get("http://localhost:8927/plotnfts/", timeout=5)
-        except:
-            app.logger.info(traceback.format_exc())
-        time.sleep(5)
-        flash('Successfully joined {0} pool by creating Chia NFT.  Please wait a while to complete, then refresh page. See below for details.'.format(pool_url), 'success')
-        return True
+                f.write(line)
+            f.write("\n**********************************************************************\n")
+        for line in stdout_lines:
+            if "Error" in line:
+                flash('Error while joining Chia pool. Please double-check pool URL: {0}'.format(pool_url), 'danger')
+                flash(line, 'warning')
+                return False
+    time.sleep(15)
+    try: # Trigger a status update
+        requests.get("http://localhost:8927/plotnfts/", timeout=5)
+    except:
+        app.logger.info(traceback.format_exc())
+    time.sleep(5)
+    flash('Successfully joined {0} pool by creating Chia NFT.  Please wait a while to complete, then refresh page. See below for details.'.format(pool_url), 'success')
+    return True
+
+def process_self_pool():
+    app.logger.info("Attempting to create NFT for self-pooling.")
+    cmd = "{0} plotnft create -y -s local".format(CHIA_BINARY)
+    app.logger.info("Executing: {0}".format(cmd))
+    proc = Popen(cmd, stdout=PIPE, stderr=PIPE, shell=True)
+    try:
+        outs, errs = proc.communicate(timeout=90)
+    except TimeoutExpired:
+        proc.kill()
+        proc.communicate()
+        app.logger.info(traceback.format_exc())
+        flash('Timed out while creating NFT!', 'danger')
+        flash(str(ex), 'warning')
+        return False
+    if errs:
+        app.logger.info("{0}".format(errs.decode('utf-8')))
+        flash('Error while creating NFT.', 'danger')
+        flash(errs.decode('utf-8'), 'warning')
+        return False
+    if outs:  # Chia outputs their errors to stdout, not stderr, so must check.
+        stdout_lines = outs.decode('utf-8').splitlines()
+        out_file = '/root/.chia/mainnet/log/plotnft.log'
+        with open(out_file, 'a') as f:
+            f.write("\n{0} --> Executed at: {1}\n".format(cmd, time.strftime("%Y%m%d-%H%M%S")))
+            for line in stdout_lines:
+                f.write(line)
+            f.write("\n**********************************************************************\n")
+        for line in stdout_lines:
+            if "Error" in line:
+                flash('Error while creating self-pooling NFT', 'danger')
+                flash(line, 'warning')
+                return False
+    time.sleep(15)
+    try: # Trigger a status update
+        requests.get("http://localhost:8927/plotnfts/", timeout=5)
+    except:
+        app.logger.info(traceback.format_exc())
+    time.sleep(5)
+    flash('Successfully created a NFT for self-pooling.  Please wait a while to complete, then refresh page. See below for details.', 'success')
+    return True

web/actions/plotman.py

@@ -151,7 +151,12 @@ def load_config_replacements():
     return replacements
 
 def load_config(plotter):
-    replacements = load_config_replacements()
+    replacements = []
+    try:
+        replacements = load_config_replacements()
+    except:
+        app.logger.info("Unable to load replacements on install with mode={0}".format(os.environ['mode']))
+        app.logger.info(traceback.format_exc())
     lines = []
     config = utils.send_get(plotter, "/configs/plotting", debug=False).content.decode('utf-8')
     for line in config.splitlines():