records wants string

stack_orchestrator/data/container-build/cerc-nextjs-base/scripts/build-app.sh

@@ -26,14 +26,8 @@ fi
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 WORK_DIR="${1:-/app}"
 
-if [ -f "${WORK_DIR}/build-webapp.sh" ]; then
-  echo "Building webapp with ${WORK_DIR}/build-webapp.sh ..."
 cd "${WORK_DIR}" || exit 1
 
-  ./build-webapp.sh || exit 1
-  exit 0
-fi
-
 if [ -f "next.config.mjs" ]; then
   NEXT_CONFIG_JS="next.config.mjs"
   IMPORT_OR_REQUIRE="import"

stack_orchestrator/data/container-build/cerc-nextjs-base/scripts/start-serving-app.sh

@@ -30,13 +30,6 @@ fi
 CERC_WEBAPP_FILES_DIR="${CERC_WEBAPP_FILES_DIR:-/app}"
 cd "$CERC_WEBAPP_FILES_DIR"
 
-if [ -f "./run-webapp.sh" ]; then
-  echo "Running webapp with run-webapp.sh ..."
-  cd "${WORK_DIR}" || exit 1
-  ./run-webapp.sh &
-  tpid=$!
-  wait $tpid
-else 
 "$SCRIPT_DIR/apply-runtime-env.sh" "`pwd`" .next .next-r
 mv .next .next.old
 mv .next-r/.next .
@@ -70,4 +63,3 @@ else
 fi
 
 $CERC_BUILD_TOOL start . -- -p ${CERC_LISTEN_PORT:-80}
-fi

stack_orchestrator/deploy/webapp/deploy_webapp_from_registry.py

@@ -342,6 +342,17 @@ def dump_known_requests(filename, requests, status="SEEN"):
     help="Requests must have a minimum payment to be processed (in alnt)",
     default=0,
 )
+@click.option(
+    "--atom-payment-address",
+    help="Cosmos ATOM address to receive payments",
+    default=None,
+)
+@click.option(
+    "--min-atom-payment",
+    help="Minimum required ATOM payment amount",
+    default=1,
+    type=float,
+)
 @click.option("--lrn", help="The LRN of this deployer.", required=True)
 @click.option(
     "--all-requests",
@@ -394,6 +405,8 @@ def command(  # noqa: C901
     recreate_on_deploy,
     log_dir,
     min_required_payment,
+    atom_payment_address,
+    min_atom_payment,
     lrn,
     config_upload_dir,
     private_key_file,
@@ -630,6 +643,8 @@ def command(  # noqa: C901
                     payment_address,
                     min_required_payment,
                     main_logger,
+                    atom_payment_address,
+                    min_atom_payment,
                 ):
                     main_logger.log(f"{r.id}: Payment confirmed.")
                     requests_to_execute.append(r)

stack_orchestrator/deploy/webapp/publish_webapp_deployer.py

@@ -46,6 +46,17 @@ from stack_orchestrator.deploy.webapp.util import LaconicRegistryClient
     help="List the minimum required payment (in alnt) to process a deployment request.",
     default=0,
 )
+@click.option(
+    "--atom-payment-address",
+    help="The Cosmos ATOM address to which payments should be made.",
+    default=None,
+)
+@click.option(
+    "--min-atom-payment",
+    help="List the minimum required payment (in uatom) to process a deployment request.",
+    default="1000000uatom",
+    type=str,
+)
 @click.option(
     "--dry-run",
     help="Don't publish anything, just report what would be done.",
@@ -60,6 +71,8 @@ def command(  # noqa: C901
     lrn,
     payment_address,
     min_required_payment,
+    atom_payment_address,
+    min_atom_payment,
     dry_run,
 ):
     laconic = LaconicRegistryClient(laconic_config)
@@ -84,6 +97,10 @@ def command(  # noqa: C901
             "minimumPayment"
         ] = f"{min_required_payment}alnt"
         
+    if atom_payment_address:
+        webapp_deployer_record["record"]["atomPaymentAddress"] = atom_payment_address
+        webapp_deployer_record["record"]["minimumAtomPayment"] = min_atom_payment
+
     if dry_run:
         yaml.dump(webapp_deployer_record, sys.stdout)
         return

stack_orchestrator/deploy/webapp/util.py

@@ -801,7 +801,7 @@ def skip_by_tag(r, include_tags, exclude_tags):
     return False
 
 
-def confirm_payment(laconic: LaconicRegistryClient, record, payment_address, min_amount, logger):
+def confirm_payment(laconic: LaconicRegistryClient, record, payment_address, min_amount, logger, atom_payment_address=None, atom_min_amount=None):
     req_owner = laconic.get_owner(record)
     if req_owner == payment_address:
         # No need to confirm payment if the sender and recipient are the same account.
@@ -811,11 +811,9 @@ def confirm_payment(laconic: LaconicRegistryClient, record, payment_address, min
         logger.log(f"{record.id}: no payment tx info")
         return False
 
+    # Try to verify as a laconic payment first
     tx = laconic.get_tx(record.attributes.payment)
-    if not tx:
-        logger.log(f"{record.id}: cannot locate payment tx")
-        return False
-
+    if tx:
         if tx.code != 0:
             logger.log(
                 f"{record.id}: payment tx {tx.hash} was not successful - code: {tx.code}, log: {tx.log}"
@@ -873,6 +871,55 @@ def confirm_payment(laconic: LaconicRegistryClient, record, payment_address, min
 
         return True
     
+    # If we get here, the transaction hash wasn't found in the laconic testnet
+    # Let's check if it's a valid Cosmos ATOM payment if configuration is available
+    if atom_payment_address:
+        logger.log(f"{record.id}: checking if payment is a valid Cosmos ATOM transaction")
+        
+        try:
+            import requests
+            
+            # Use the webapp-deployment-status-api to verify the ATOM payment
+            deployer_record = laconic.get_record(record.attributes.deployer)
+            if not deployer_record or not deployer_record.attributes.apiUrl:
+                logger.log(f"{record.id}: cannot find deployer API URL to verify ATOM payment")
+                return False
+                
+            api_url = deployer_record.attributes.apiUrl
+            verify_url = f"{api_url}/verify/atom-payment"
+            
+            # Make a request to the API to verify the ATOM payment
+            # Pass markAsUsed=true to prevent this transaction from being used again
+            response = requests.post(
+                verify_url,
+                json={
+                    "txHash": record.attributes.payment,
+                    "minAmount": atom_min_amount,
+                    "markAsUsed": True
+                },
+                timeout=10
+            )
+            
+            if response.status_code != 200:
+                logger.log(f"{record.id}: ATOM payment verification API request failed with status {response.status_code}")
+                return False
+                
+            result = response.json()
+            if not result.get("valid", False):
+                logger.log(f"{record.id}: ATOM payment verification failed: {result.get('reason', 'unknown reason')}")
+                return False
+                
+            # Payment is valid
+            logger.log(f"{record.id}: ATOM payment verified successfully, amount: {result.get('amount')} ATOM")
+            return True
+            
+        except Exception as e:
+            logger.log(f"{record.id}: error verifying ATOM payment: {str(e)}")
+            return False
+    
+    logger.log(f"{record.id}: payment tx {record.attributes.payment} not found in laconic testnet and ATOM payment verification not configured")
+    return False
+
 
 def confirm_auction(laconic: LaconicRegistryClient, record, deployer_lrn, payment_address, logger):
     auction_id = record.attributes.auction