Merge pull request #947 from golemfactory/mgordel/env-vars

fix: ability to load env variables for subnet tag and payment network
golemfactory · May 31, 2024 · 5627620 · 5627620
2 parents 9425cda + 1a4cc90
commit 5627620
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/market/demand/directors/basic-demand-director-config.ts b/src/market/demand/directors/basic-demand-director-config.ts
@@ -1,5 +1,6 @@
 import { BaseConfig } from "./base-config";
 import { GolemConfigError } from "../../../shared/error/golem-error";
+import * as EnvUtils from "../../../shared/utils/env";
 
 export interface BasicDemandDirectorConfigOptions {
   expirationSec: number;
@@ -8,7 +9,7 @@ export interface BasicDemandDirectorConfigOptions {
 
 export class BasicDemandDirectorConfig extends BaseConfig implements BasicDemandDirectorConfigOptions {
   public readonly expirationSec = 30 * 60; // 30 minutes
-  public readonly subnetTag: string = "public";
+  public readonly subnetTag: string = EnvUtils.getYagnaSubnet();
 
   constructor(options?: Partial<BasicDemandDirectorConfigOptions>) {
     super();

diff --git a/src/payment/payment.module.ts b/src/payment/payment.module.ts
@@ -9,6 +9,7 @@ import { PayerDetails } from "./PayerDetails";
 import { CreateAllocationParams } from "./types";
 import { AgreementPaymentProcess, PaymentProcessOptions } from "./agreement_payment_process";
 import { Agreement } from "../market";
+import * as EnvUtils from "../shared/utils/env";
 
 export interface PaymentModuleOptions {
   /**
@@ -81,7 +82,7 @@ export class PaymentModuleImpl implements PaymentModule {
 
   private readonly options: Required<PaymentModuleOptions> = {
     driver: "erc20",
-    network: "holesky",
+    network: EnvUtils.getPaymentNetwork(),
     token: "tglm",
   };