Merge pull request #1158 from golemfactory/beta

Beta

Author: SewerynKras

package-lock.json

@@ -72,7 +72,7 @@
     "flatbuffers": "^24.3.25",
     "ip-num": "^1.5.1",
     "js-sha3": "^0.9.3",
-    "rxjs": "^7.8.1",
+    "rxjs": "^7.8.2",
     "semver": "^7.6.3",
     "tmp": "^0.2.3",
     "uuid": "^10.0.0",

package.json

@@ -72,12 +72,36 @@ export class AgreementPaymentProcess {
     const invoiceSubscription = this.paymentModule
       .observeInvoices()
       .pipe(filter((invoice) => invoice.agreementId === this.agreement.id))
-      .subscribe((invoice) => this.addInvoice(invoice));
+      .subscribe({
+        next: async (invoice) => {
+          try {
+            await this.addInvoice(invoice);
+          } catch (error) {
+            this.logger.error(`Error processing invoice`, error);
+          }
+        },
+        error: (error) => {
+          this.logger.error(`Invoice subscription error`, error);
+          this.stop();
+        },
+      });
 
     const debitNoteSubscription = this.paymentModule
       .observeDebitNotes()
       .pipe(filter((debitNote) => debitNote.agreementId === this.agreement.id))
-      .subscribe((debitNote) => this.addDebitNote(debitNote));
+      .subscribe({
+        next: async (debitNote) => {
+          try {
+            await this.addDebitNote(debitNote);
+          } catch (error) {
+            this.logger.error(`Error processing debit note`, error);
+          }
+        },
+        error: (error) => {
+          this.logger.error(`Debit note subscription error`, error);
+          this.stop();
+        },
+      });
 
     this.cleanupSubscriptions = () => {
       invoiceSubscription.unsubscribe();

src/payment/agreement_payment_process.ts

@@ -149,7 +149,7 @@ export class PaymentModuleImpl implements PaymentModule {
       this.logger.info("Created allocation", {
         allocationId: allocation.id,
         budget: allocation.totalAmount,
-        platform: this.getPaymentPlatform(),
+        platform: allocation.paymentPlatform,
       });
       this.logger.debug("Created allocation", allocation);
       return allocation;

src/payment/payment.module.ts

@@ -25,7 +25,7 @@ services:
       - NODE_NAME=provider-1
       - SUBNET=${YAGNA_SUBNET:-golemjstest}
       - YA_NET_BIND_URL=udp://0.0.0.0:0
-      - YA_NET_RELAY_HOST=63.34.24.27:7477
+      # - YA_NET_RELAY_HOST=63.34.24.27:7477
   provider-2:
     build:
       context: .
@@ -51,7 +51,7 @@ services:
       - NODE_NAME=provider-2
       - SUBNET=${YAGNA_SUBNET:-golemjstest}
       - YA_NET_BIND_URL=udp://0.0.0.0:0
-      - YA_NET_RELAY_HOST=63.34.24.27:7477
+      # - YA_NET_RELAY_HOST=63.34.24.27:7477
   requestor:
     build:
       context: .
@@ -71,7 +71,7 @@ services:
       - YAGNA_APPKEY=try_golem
       - PAYMENT_NETWORK=${PAYMENT_NETWORK}
       - YA_NET_BIND_URL=udp://0.0.0.0:0
-      - YA_NET_RELAY_HOST=63.34.24.27:7477
+      # - YA_NET_RELAY_HOST=63.34.24.27:7477
     healthcheck:
       test: ["CMD-SHELL", "curl -s -o /dev/null -w '%{http_code}' http://localhost:7465 | grep -q 401"]
       interval: 10s