Merge branch 'Layr-Labs:master' into master

Layr-Labs · Feb 6, 2024 · acce480 · acce480
2 parents 9f1c480 + ff3a002
commit acce480
Show file tree

Hide file tree

Showing 173 changed files with 20,385 additions and 7,123 deletions.
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -51,7 +51,7 @@ jobs:
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1
         with:
-          version: nightly
+          version: nightly-293fad73670b7b59ca901c7f2105bf7a29165a90
 
       - name: Install graph cli
         run: |
@@ -83,7 +83,7 @@ jobs:
         run: make build && go test -v ./core/thegraph
 
       - name: Inabox E2E
-        run: make build && cd inabox && make run-e2e-nochurner
+        run: make build && cd inabox && make run-e2e
 
       - name: Save logs
         if: always()

diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,5 @@ inabox/resources/kzg/SRSTables/*
 
 **/bin/*
 coverage.*
+
+contracts/broadcast
diff --git a/Makefile b/Makefile
@@ -25,7 +25,7 @@ protoc: clean
 	--go-grpc_opt=paths=source_relative \
 	$(PROTOS)/**/*.proto
 	# Generate Protobuf for sub directories of ./api/proto/disperser
-	protoc -I $(PROTOS_DISPERSER) \
+	protoc -I $(PROTOS_DISPERSER) -I $(PROTOS) \
 	--go_out=$(PROTO_GEN_DISPERSER_PATH) \
 	--go_opt=paths=source_relative \
 	--go-grpc_out=$(PROTO_GEN_DISPERSER_PATH) \

diff --git a/api/grpc/churner/churner.pb.go b/api/grpc/churner/churner.pb.go
diff --git a/api/grpc/common/common.pb.go b/api/grpc/common/common.pb.go
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,3 +6,5 @@ inabox/resources/kzg/SRSTables/*

		*/bin/
		coverage.*

		contracts/broadcast