Merge branch 'develop' into simonerom-update_QUICK_START.md

iotexproject · Nov 25, 2024 · 705c04c · 705c04c
2 parents 9e69651 + d1dd439
commit 705c04c
Show file tree

Hide file tree

Showing 112 changed files with 16,898 additions and 4,448 deletions.
diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml
@@ -14,14 +14,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        name: [apinode, bootnode, prover, sequencer]
+        name: [apinode, prover, sequencer]
         include:
           - name: apinode
             image_name: iotexproject/w3bstream-apinode
             dockerfile: build/apinode.Dockerfile
-          - name: bootnode
-            image_name: iotexproject/w3bstream-bootnode
-            dockerfile: build/bootnode.Dockerfile
           - name: prover
             image_name: iotexproject/w3bstream-prover
             dockerfile: build/prover.Dockerfile

diff --git a/.gitignore b/.gitignore
@@ -46,3 +46,4 @@ clients/contracts/ioid
 node_modules
 
 examples/halo2-circuit/contracts/.*.sol
+bin
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 # Variables
-BUILD_DIR=build
+BUILD_DIR=bin
 DOCKER_APINODE_TARGET=ghcr.io/iotexproject/w3bstream-apinode:latest
 DOCKER_PROVER_TARGET=ghcr.io/iotexproject/w3bstream-prover:latest
 DOCKER_BOOTNODE_TARGET=ghcr.io/iotexproject/w3bstream-bootnode:latest

diff --git a/block/block.go b/block/block.go
diff --git a/build/bootnode.Dockerfile b/build/bootnode.Dockerfile
diff --git a/cmd/apinode/api/http.go b/cmd/apinode/api/http.go
Original file line number	Diff line number	Diff line change
Expand Up		@@ -46,3 +46,4 @@ clients/contracts/ioid
		node_modules

		examples/halo2-circuit/contracts/.*.sol
		bin