Inphi · dgcoffman · Oct 27, 2022 · Oct 18, 2022 · Oct 18, 2022 · Oct 18, 2022
diff --git a/lodestar/.dockerignore b/lodestar/.dockerignore
@@ -1,3 +1,4 @@
 .git
 .github
 node_modules
+**/node_modules
diff --git a/lodestar/Dockerfile.lodestar b/lodestar/Dockerfile.lodestar
@@ -5,7 +5,7 @@ RUN apt-get update && \
 
 COPY ./lodestar/package.json /app/lodestar/package.json
 COPY ./lodestar/yarn.lock /app/lodestar/yarn.lock
-COPY ./lodestar/trusted_setup.txt /app/lodestar/trusted_setup.txt
+COPY ./lodestar/testing_trusted_setups.json /app/lodestar/testing_trusted_setups.json
 
 COPY ./lodestar/packages/api/package.json /app/lodestar/packages/api/package.json
 COPY ./lodestar/packages/beacon-node/package.json /app/lodestar/packages/beacon-node/package.json

diff --git a/lodestar/lodestar b/lodestar/lodestar
diff --git a/prysm/prysm b/prysm/prysm
diff --git a/tests/fee-market/main.go b/tests/fee-market/main.go
@@ -247,6 +247,8 @@ func FindBlocksWithBlobs(ctx context.Context, client *beacon.Client, startSlot c
 			log.Fatalf("Failed to GetBlock: %v", err)
 		}
 
+		log.Println("Found block with KZG commitments", len(block.Data.Message.Body.BlobKzgs))
+
 		if len(block.Data.Message.Body.BlobKzgs) != 0 {
 			blocks = append(blocks, block)
 		}

diff --git a/tests/util/util.go b/tests/util/util.go
@@ -51,7 +51,9 @@ func WaitForNextSlots(ctx context.Context, client *beacon.Client, slots consensu
 }
 
 type Body struct {
-	BlobKzgs []string `json:"blob_kzgs"`
+	// Does Prysm call this "blob_kzgs"? That's wrong.
+	// BlobKzgs []string `json:"blob_kzgs"`
+	BlobKzgs []string `json:"blob_kzg_commitments"`
 }
 
 type Message struct {
+1 −1		beacon-chain/blockchain/log.go
+1 −1		beacon-chain/core/blob/sidecar.go
+1 −1		beacon-chain/core/transition/BUILD.bazel
+6 −6		beacon-chain/core/transition/transition_no_verify_sig.go
+1 −1		beacon-chain/node/node.go
+12 −12		beacon-chain/rpc/apimiddleware/structs.go
+11 −11		beacon-chain/rpc/prysm/v1alpha1/validator/proposer_eip4844.go
+2 −2		beacon-chain/sync/initial-sync/blocks_fetcher.go
+1 −1		beacon-chain/sync/pending_blocks_queue.go
+1 −1		beacon-chain/sync/validate_beacon_blocks.go
+2 −2		beacon-chain/sync/validate_beacon_blocks_test.go
+3 −3		consensus-types/blocks/getters.go
+24 −24		consensus-types/blocks/proto.go
+1 −1		consensus-types/blocks/types.go
+0 −14		consensus-types/forks/eip4844/BUILD.bazel
+1 −1		consensus-types/interfaces/beacon_block.go
+1 −1		consensus-types/mock/block.go
+2 −2		deps.bzl
+1 −1		proto/eth/v1/generated.ssz.go
+82 −79		proto/eth/v2/beacon_block.pb.go
+2 −2		proto/eth/v2/beacon_block.proto
+45 −45		proto/eth/v2/generated.ssz.go
+1 −1		proto/migration/v1alpha1_to_v2.go
+127 −124		proto/prysm/v1alpha1/beacon_block.pb.go
+2 −2		proto/prysm/v1alpha1/beacon_block.proto
+11 −11		proto/prysm/v1alpha1/cloners.go
+45 −45		proto/prysm/v1alpha1/generated.ssz.go