feat: Upgrade to bacalhau 1.6 (#441)

* init * fixed executions issues * commented out spew, added new stack commands, cid generation * prepares tar file from tar.gz for solver- working end to end for cowsay * optimized tar file usage * removed spew, fixed loop bug, added env variables, fixed translator bug * added env variable for bacalhau results directory * updated to latest bacalhau client * rebase, add docker related pieces, fix logging * test fix * fix rebase conflicts * chore: update to bacalhau 1.6 * fix: bacalhau results fetch and CID * fix: integration tests * chore: cleanup * chore: more cleanup * fix: ci sleep time * fix: don't start up an (unused) mediator * fix: CI sleep settings * fix: PR feedback * fix: clean up error message --------- Co-authored-by: James Walker <[email protected]>
Lilypad-Tech · Jan 10, 2025 · 94d7812 · 94d7812
1 parent 0b627ad
commit 94d7812
Show file tree

Hide file tree

Showing 22 changed files with 972 additions and 559 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -39,28 +39,38 @@ jobs:
       - name: Install node
         uses: actions/setup-node@v4
 
-      - name: Build Docker Images
-        run: ./stack compose-build
+      - name: Build Base Docker Images
+        run: ./stack compose-build-services
 
       - name: Initialize chain
         run: ./stack compose-init
 
-      - name: Run stack
-        env:
-          DISABLE_TELEMETRY: true
-          API_HOST: ""
-        run: ./stack compose-up -d
+      - name: Start base services
+        run: |
+          ./stack compose-services -d
+          sleep 5
 
-      - name: Run tests
-        env:
-          LOG_LEVEL: debug
-        run: ./stack integration-tests
+      - name: Start solver
+        run: |
+          ./stack solver --disable-telemetry=true --api-host="" > solver.log &
+          sleep 5
 
-      - name: Display resource provider logs
-        run: docker logs resource-provider
+      - name: Run solver integration tests
+        run: ./stack integration-tests-solver
+
+      - name: Start resource provider
+        run: |
+          ./stack resource-provider --disable-telemetry=true --api-host="" > resource-provider.log &
+          sleep 5
+
+      - name: Run main integration tests
+        run: ./stack integration-tests
 
       - name: Display solver logs
-        run: docker logs solver
+        run: cat solver.log
+
+      - name: Display resource provider logs
+        run: cat resource-provider.log
 
       - name: Display chain logs
         run: docker logs chain
diff --git a/.local.dev b/.local.dev
@@ -26,4 +26,7 @@ WEB3_PAYMENTS_ADDRESS=0x2279B7A0a67DB372996a5FaB50D91eAA73d2eBe6
 WEB3_POW_ADDRESS_=0x4ed7c70F96B99c776995fB64377f0d4aB3B0e1C1
 WEB3_STORAGE_ADDRESS_=0xB7f8BC63BbcaD18155201308C8f3540b07f84F5e
 WEB3_TOKEN_ADDRESS_=0xa513E6E4b8f2a923D98304ec87F64353C4D5C853
-WEB3_USERS_ADDRESS=0x0DCd1Bf9A1b36cE34237eEaFef220932846BCD82
+WEB3_USERS_ADDRESS=0x0DCd1Bf9A1b36cE34237eEaFef220932846BCD82
+BACALHAU_API_HOST=localhost
+BACALHAU_API_PORT=1234
+
diff --git a/cmd/lilypad/mediator.go b/cmd/lilypad/mediator.go
@@ -1,10 +1,7 @@
 package lilypad
 
 import (
-	"fmt"
-
 	"github.com/lilypad-tech/lilypad/pkg/executor/bacalhau"
-	"github.com/lilypad-tech/lilypad/pkg/ipfs"
 	"github.com/lilypad-tech/lilypad/pkg/mediator"
 	optionsfactory "github.com/lilypad-tech/lilypad/pkg/options"
 	"github.com/lilypad-tech/lilypad/pkg/system"
@@ -48,12 +45,8 @@ func runMediator(cmd *cobra.Command, options mediator.MediatorOptions) error {
 		return err
 	}
 
-	ipfsClient, err := ipfs.NewClient(commandCtx.Ctx, options.IPFS.Addr)
-	if err != nil {
-		return fmt.Errorf("error creating IPFS client: %s", err.Error())
-	}
 
-	executor, err := bacalhau.NewBacalhauExecutor(options.Bacalhau, ipfsClient)
+	executor, err := bacalhau.NewBacalhauExecutor(options.Bacalhau)
 	if err != nil {
 		return err
 	}

diff --git a/cmd/lilypad/resource-provider.go b/cmd/lilypad/resource-provider.go
@@ -1,10 +1,7 @@
 package lilypad
 
 import (
-	"fmt"
-
 	"github.com/lilypad-tech/lilypad/pkg/executor/bacalhau"
-	"github.com/lilypad-tech/lilypad/pkg/ipfs"
 	optionsfactory "github.com/lilypad-tech/lilypad/pkg/options"
 	"github.com/lilypad-tech/lilypad/pkg/resourceprovider"
 	"github.com/lilypad-tech/lilypad/pkg/system"
@@ -53,12 +50,7 @@ func runResourceProvider(cmd *cobra.Command, options resourceprovider.ResourcePr
 		return err
 	}
 
-	ipfsClient, err := ipfs.NewClient(commandCtx.Ctx, options.IPFS.Addr)
-	if err != nil {
-		return fmt.Errorf("error creating IPFS client: %s", err.Error())
-	}
-
-	executor, err := bacalhau.NewBacalhauExecutor(options.Bacalhau, ipfsClient)
+	executor, err := bacalhau.NewBacalhauExecutor(options.Bacalhau)
 	if err != nil {
 		return err
 	}

diff --git a/cmd/lilypad/run.go b/cmd/lilypad/run.go
@@ -132,9 +132,7 @@ func runJob(cmd *cobra.Command, options jobcreator.JobCreatorOptions, network st
 			os.Exit(1)
 		}
 
-		// UPDATE FUNCTION
-		// fmt.Printf("evOffer: %s --------------------------------------\n")
-		// spew.Dump(evOffer)
+
 
 	})
 	if err != nil {

diff --git a/docker/bacalhau/Dockerfile b/docker/bacalhau/Dockerfile
@@ -17,8 +17,8 @@ RUN mkdir -pm755 /etc/apt/keyrings && curl -o /etc/apt/keyrings/docker.asc -fsSL
 RUN nvidia-ctk runtime configure --runtime=docker --set-as-default
 
 # Install Bacalhau
-ADD https://github.com/bacalhau-project/bacalhau/releases/download/v1.3.2/bacalhau_v1.3.2_linux_amd64.tar.gz .
-RUN tar xfv bacalhau_v1.3.2_linux_amd64.tar.gz
+ADD https://github.com/bacalhau-project/bacalhau/releases/download/v1.6.0/bacalhau_v1.6.0_linux_amd64.tar.gz .
+RUN tar xfv bacalhau_v1.6.0_linux_amd64.tar.gz
 RUN mv bacalhau /usr/local/bin
 
 ADD https://raw.githubusercontent.com/moby/moby/refs/heads/master/hack/dind /usr/local/bin/dind

diff --git a/docker/docker-compose.base.yml b/docker/docker-compose.base.yml
@@ -48,23 +48,11 @@ services:
       - POSTGRES_USER=postgres
       - POSTGRES_PASSWORD=postgres
       - POSTGRES_DB=solver-db
-  ipfs:
-    image: ipfs/kubo:v0.32.1
-    container_name: ipfs
-    restart: unless-stopped
-    ports:
-      - 127.0.0.1:5001:5001
-      - 127.0.0.1:8080:8080
-    volumes:
-      - ipfs-data:/data/ipfs
   bacalhau:
     image: ghcr.io/lilypad-tech/bacalhau
     container_name: bacalhau
     restart: unless-stopped
     privileged: true
-    depends_on:
-      ipfs:
-        condition: service_healthy
     build:
       context: ..
       dockerfile: ./docker/bacalhau/Dockerfile
@@ -74,23 +62,12 @@ services:
       - BACALHAU_ENVIRONMENT=local
     ports:
       - 1234:1234
-    command:
-      [
-        "bacalhau",
-        "serve",
-        "--node-type",
-        "compute,requester",
-        "--peer",
-        "none",
-        "--private-internal-ipfs=false",
-        "--job-selection-accept-networked",
-        "--ipfs-connect",
-        "/dns4/ipfs/tcp/5001",
-      ]
+      - 6001:6001
+    command: ["bacalhau", "serve", "--orchestrator", "--compute"]
     volumes:
       - bacalhau-data:/root/.bacalhau
 volumes:
+  bacalhau-data:
   chain-data:
   ipfs-data:
-  bacalhau-data:
   postgres-data:
diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml
@@ -50,8 +50,6 @@ services:
     container_name: resource-provider
     restart: unless-stopped
     depends_on:
-      ipfs:
-        condition: service_healthy
       solver:
         condition: service_healthy
       bacalhau:

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -1,41 +1,16 @@
 # This is a docker-compose file for use by Resource Providers
 services:
-  ipfs:
-    image: ipfs/kubo:v0.32.1
-    container_name: ipfs
-    restart: unless-stopped
-    ports:
-      - 4001:4001
-      - 127.0.0.1:5001:5001
-      - 127.0.0.1:8080:8080
-    volumes:
-      - ipfs-data:/data/ipfs
   bacalhau:
     image: ghcr.io/lilypad-tech/bacalhau
     container_name: bacalhau
     restart: unless-stopped
     privileged: true
-    depends_on:
-      ipfs:
-        condition: service_healthy
     build:
       context: ..
       dockerfile: ./docker/bacalhau/Dockerfile
     environment:
       - BACALHAU_ENVIRONMENT=local
-    command:
-      [
-        "bacalhau",
-        "serve",
-        "--node-type",
-        "compute,requester",
-        "--peer",
-        "none",
-        "--private-internal-ipfs=false",
-        "--job-selection-accept-networked",
-        "--ipfs-connect",
-        "/dns4/ipfs/tcp/5001",
-      ]
+    command: ["bacalhau", "serve", "--orchestrator", "--compute"]
     volumes:
       - bacalhau-data:/root/.bacalhau
   resource-provider:
@@ -51,6 +26,7 @@ services:
         - COMPUTE_MODE=gpu
     volumes:
       - lilypad-data:/tmp/lilypad/data
+      - bacalhau-data:/root/.bacalhau
     environment:
       - WEB3_PRIVATE_KEY
       - WEB3_RPC_URL

diff --git a/docker/resource-provider/Dockerfile b/docker/resource-provider/Dockerfile
@@ -1,6 +1,6 @@
 ARG COMPUTE_MODE=gpu
 
-FROM golang:1.22.4 AS base
+FROM golang:latest AS base
 WORKDIR /usr/src/app
 ARG NETWORK=testnet
 ARG VERSION
@@ -33,24 +33,13 @@ RUN mv lilypad /usr/local/bin
 # Install necessary dependencies
 RUN apt update && apt install -y wget bash curl && apt clean
 
-# Install Bacalhau
-RUN cd /tmp && \
-    wget https://github.com/bacalhau-project/bacalhau/releases/download/v1.3.2/bacalhau_v1.3.2_linux_amd64.tar.gz && \
-    tar xfv bacalhau_v1.3.2_linux_amd64.tar.gz && \
-    mv bacalhau /usr/local/bin/bacalhau && \
-    rm bacalhau_v1.3.2_linux_amd64.tar.gz
-
 # Add both lilypad and bacalhau executables to PATH
 ENV PATH="/usr/local/bin:${PATH}"
 
 # Create a startup script to run both services simultaneously
 RUN touch run
 RUN echo "#!/bin/bash" >> run
 
-# Ensure bacalhau is initialized
-RUN echo "export BACALHAU_ENVIRONMENT=local" >> run
-RUN echo "bacalhau id" >> run
-
 # Launch Lilypad
 RUN echo "/usr/local/bin/lilypad resource-provider --network ${NETWORK} --disable-pow=${DISABLE_POW} --disable-telemetry=${DISABLE_TELEMETRY} &" >> run
 RUN echo "wait -n" >> run