Stablization of 3.0-beta builds

.github/workflows/release.yml

@@ -19,13 +19,13 @@ on:
         required: false
         default: "holesky"
       provider_version:
-        description: "Provider version (e.g., v0.14.0 or pre-rel-v0.14.1)"
+        description: "Provider version (e.g., v0.15.0 or pre-rel-v0.15.1)"
         required: false
-        default: "v0.14.0"
+        default: "v0.15.0"
       requestor_version:
-        description: "Requestor version (e.g., v0.14.0 or pre-rel-v0.14.1)"
+        description: "Requestor version (e.g., v0.15.0 or pre-rel-v0.15.1)"
         required: false
-        default: "v0.14.0"
+        default: "v0.15.0"
       provider_wasi_version:
         description: "Provider WASI version (e.g., v0.2.2)"
         required: false
@@ -40,8 +40,8 @@ permissions:
   contents: read # for checkout
 
 env:
-  PROVIDER_VERSION: ${{ github.event.inputs.provider_version || 'v0.14.0' }}
-  REQUESTOR_VERSION: ${{ github.event.inputs.requestor_version || 'v0.14.0' }}
+  PROVIDER_VERSION: ${{ github.event.inputs.provider_version || 'v0.15.0' }}
+  REQUESTOR_VERSION: ${{ github.event.inputs.requestor_version || 'v0.15.0' }}
   PROVIDER_WASI_VERSION: ${{ github.event.inputs.provider_wasi_version || 'v0.2.2' }}
   PROVIDER_VM_VERSION: ${{ github.event.inputs.provider_vm_version || 'v0.3.0' }}
   PAYMENT_NETWORK: ${{ github.event.inputs.payment_network || 'holesky' }}

examples/basic/hello-world.ts

@@ -69,6 +69,7 @@ import { pinoPrettyLogger } from "@golem-sdk/pino-logger";
 
     // This will keep the script waiting for payments etc
     await lease.finalize();
+    await allocation.release();
   } catch (err) {
     console.error("Failed to run example on Golem", err);
   } finally {

examples/deployment/new-api.ts

@@ -25,9 +25,9 @@ async function main() {
           // image: "golem/node:20",
           // image: "http://golem.io/node:20",
           // imageHash: "0x30984084039480493840",
-          minCpuCores: 4,
-          minMemGib: 8,
-          minStorageGib: 16,
+          minCpuCores: 1,
+          minMemGib: 2,
+          minStorageGib: 10,
         },
         market: {
           rentHours: 12,
@@ -49,8 +49,8 @@ async function main() {
       .createActivityPool("db", {
         demand: {
           imageTag: "golem/alpine:latest",
-          minCpuCores: 2,
-          minMemGib: 16,
+          minCpuCores: 1,
+          minMemGib: 2,
           minStorageGib: 4,
         },
         market: {

examples/pool/hello-world.ts

@@ -22,9 +22,9 @@ import { pinoPrettyLogger } from "@golem-sdk/pino-logger";
     const demandOptions = {
       demand: {
         imageTag: "golem/alpine:latest",
-        minCpuCores: 4,
-        minMemGib: 8,
-        minStorageGib: 16,
+        minCpuCores: 1,
+        minMemGib: 1,
+        minStorageGib: 2,
       },
       market: {
         rentHours: 12,

src/golem-network.ts

@@ -156,7 +156,7 @@ export class GolemNetwork {
           agreementRepository,
           this.logger,
         ),
-        marketApi: new MarketApiAdapter(this.yagna),
+        marketApi: new MarketApiAdapter(this.yagna, this.logger),
         fileServer: new GftpServerAdapter(this.storageProvider),
       };
 

src/market/market.module.ts

@@ -1,28 +1,11 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { EventEmitter } from "eventemitter3";
-import {
-  DemandConfig,
-  DemandNew,
-  DraftOfferProposalPool,
-  GolemMarketError,
-  MarketApi,
-  MarketErrorCode,
-  NewProposalEvent,
-  ProposalFilter,
-} from "./index";
-import {
-  Agreement,
-  LegacyAgreementServiceOptions,
-  LeaseProcess,
-  IPaymentApi,
-  IActivityApi,
-  AgreementPool,
-  AgreementPoolOptions,
-} from "../agreement";
+import { DemandConfig, DemandNew, DraftOfferProposalPool, MarketApi, NewProposalEvent, ProposalFilter } from "./index";
+import { Agreement, AgreementPool, AgreementPoolOptions, IActivityApi, IPaymentApi, LeaseProcess } from "../agreement";
 import { defaultLogger, Logger, YagnaApi } from "../shared/utils";
-import { Allocation, PaymentModule } from "../payment";
+import { Allocation } from "../payment";
 import { Package } from "./package";
-import { bufferTime, filter, map, Observable, switchMap, tap, OperatorFunction } from "rxjs";
+import { bufferTime, filter, map, Observable, OperatorFunction, switchMap, tap } from "rxjs";
 import { IProposalRepository, ProposalNew } from "./proposal";
 import { ComparisonOperator, DecorationsBuilder } from "./builder";
 import { ProposalFilterNew } from "./service";
@@ -237,8 +220,8 @@ export class MarketModuleImpl implements MarketModule {
     // Configure payment platform
     builder
       .addProperty(`golem.com.payment.platform.${payerDetails.getPaymentPlatform()}.address`, payerDetails.address)
-      .addProperty("golem.com.payment.protocol.version", "2")
       .addConstraint(`golem.com.payment.platform.${payerDetails.getPaymentPlatform()}.address`, "*")
+      .addProperty("golem.com.payment.protocol.version", "2")
       .addConstraint("golem.com.payment.protocol.version", "1", ComparisonOperator.Gt);
 
     return builder.getDemandSpecification(payerDetails.getPaymentPlatform(), demandSpecificConfig.expirationSec);
@@ -416,7 +399,6 @@ export class MarketModuleImpl implements MarketModule {
         const subscription = source.subscribe((proposal) => {
           if (proposal.isInitial()) {
             proposalsBatch.addProposal(proposal);
-            this.logger.debug("Added initial proposal to batch", { proposal: proposal.id });
           } else {
             destination.next(proposal);
           }

src/shared/yagna/adapters/market-api-adapter.test.ts

@@ -4,6 +4,7 @@ import { YagnaApi } from "../yagnaApi";
 import { MarketApiAdapter } from "./market-api-adapter";
 import { DemandNew, DemandSpecification, ProposalNew } from "../../../market";
 import { take, takeUntil, timer } from "rxjs";
+import { Logger } from "../../utils";
 
 const mockMarket = mock(YaTsClient.MarketApi.RequestorService);
 const mockYagna = mock(YagnaApi);
@@ -14,7 +15,7 @@ beforeEach(() => {
   reset(mockYagna);
   reset(mockMarket);
   when(mockYagna.market).thenReturn(instance(mockMarket));
-  api = new MarketApiAdapter(instance(mockYagna));
+  api = new MarketApiAdapter(instance(mockYagna), instance(imock<Logger>()));
 });
 
 describe("Market Api Adapter", () => {

src/shared/yagna/adapters/market-api-adapter.ts

@@ -1,12 +1,15 @@
 import { Observable } from "rxjs";
-import { MarketApi, ProposalEvent } from "../../../market/api";
+import { DemandNew, DemandSpecification, MarketApi, ProposalEvent, ProposalNew } from "../../../market";
 import { YagnaApi } from "../yagnaApi";
 import YaTsClient from "ya-ts-client";
-import { DemandNew, DemandSpecification, ProposalNew } from "../../../market";
 import { GolemInternalError } from "../../error/golem-error";
+import { Logger } from "../../utils";
 
 export class MarketApiAdapter implements MarketApi {
-  constructor(private readonly yagnaApi: YagnaApi) {}
+  constructor(
+    private readonly yagnaApi: YagnaApi,
+    private readonly logger: Logger,
+  ) {}
 
   async publishDemandSpecification(specification: DemandSpecification): Promise<DemandNew> {
     const idOrError = await this.yagnaApi.market.subscribeDemand(specification.decoration);
@@ -21,6 +24,7 @@ export class MarketApiAdapter implements MarketApi {
     if (result?.message) {
       throw new Error(`Failed to unsubscribe from demand: ${result.message}`);
     }
+    this.logger.info("Demand unsubscribed", { demand: demand.id });
   }
 
   observeProposalEvents(demand: DemandNew): Observable<ProposalEvent> {
@@ -58,6 +62,7 @@ export class MarketApiAdapter implements MarketApi {
       };
     });
   }
+
   async counterProposal(receivedProposal: ProposalNew, specification: DemandSpecification): Promise<ProposalNew> {
     const decorationClone = structuredClone(specification.decoration);
     decorationClone.properties["golem.com.payment.chosen-platform"] = specification.paymentPlatform;

src/shared/yagna/yagna.spec.ts

@@ -7,8 +7,8 @@ const mockIdentityModel = imock<IdentityApi.IdentityDTO>();
 
 describe("Yagna Utils", () => {
   describe("Yagna version support checking", () => {
-    describe("Positive cases - given min supported version is 0.13.2", () => {
-      it.each(["0.13.2", "0.15.0-rc5", "pre-rel-v0.15.0-rc5"])(
+    describe("Positive cases - given min supported version is 0.15.0", () => {
+      it.each(["0.15.0", "0.15.2", "0.15.3-rc5", "pre-rel-v0.15.3-rc5"])(
         "should not throw when connect is called and the yagna version is %s",
         async (version) => {
           const mockVersionResponse = {

src/shared/yagna/yagnaApi.ts

@@ -16,7 +16,7 @@ export type YagnaOptions = {
   logger?: Logger;
 };
 
-export const MIN_SUPPORTED_YAGNA = "0.13.2";
+export const MIN_SUPPORTED_YAGNA = "0.15.0";
 
 // Workarounds for an issue with missing support for discriminators
 // {@link https://github.com/ferdikoomen/openapi-typescript-codegen/issues/985}

tests/docker/Provider.Dockerfile

@@ -1,5 +1,5 @@
 ARG UBUNTU_VERSION=22.04
-ARG YA_CORE_PROVIDER_VERSION=v0.12.3
+ARG YA_CORE_PROVIDER_VERSION=v0.15.0
 ARG YA_WASI_VERSION=v0.2.2
 ARG YA_VM_VERSION=v0.3.0
 

tests/docker/Requestor.Dockerfile

@@ -1,5 +1,5 @@
 ARG UBUNTU_VERSION=22.04
-ARG YA_CORE_REQUESTOR_VERSION=v0.12.3
+ARG YA_CORE_REQUESTOR_VERSION=v0.15.0
 
 FROM node:18.18.2
 ARG YA_CORE_REQUESTOR_VERSION

tests/docker/data-node/ya-provider/presets.json

@@ -1,34 +1,32 @@
 {
+  "ver": "V1",
   "active": ["wasmtime", "vm"],
   "presets": [
     {
       "name": "default",
       "exeunit-name": "wasmtime",
       "pricing-model": "linear",
-      "usage-coeffs": {
-        "cpu": 0.100000001,
-        "duration": 0.0,
-        "initial": 0.0
-      }
+      "initial-price": 0.0,
+      "usage-coeffs": {}
     },
     {
       "name": "vm",
       "exeunit-name": "vm",
       "pricing-model": "linear",
+      "initial-price": 0.0,
       "usage-coeffs": {
-        "cpu": 0.100000001,
-        "duration": 0.0,
-        "initial": 0.0
+        "golem.usage.cpu_sec": 0.100000001,
+        "golem.usage.duration_sec": 0.0
       }
     },
     {
       "name": "wasmtime",
       "exeunit-name": "wasmtime",
       "pricing-model": "linear",
+      "initial-price": 0.0,
       "usage-coeffs": {
-        "cpu": 0.100000001,
-        "duration": 0.0,
-        "initial": 0.0
+        "golem.usage.cpu_sec": 0.100000001,
+        "golem.usage.duration_sec": 0.0
       }
     }
   ]

tests/e2e/activityPool.spec.ts

@@ -51,7 +51,7 @@ describe("ActivityPool", () => {
   afterEach(async () => {
     await proposalSubscription.unsubscribe();
     await agreementPool.drainAndClear();
-    proposalPool.clear();
+    await proposalPool.clear();
   });
 
   it("should run a simple script on the activity from the pool", async () => {