diff --git a/lodestar/.dockerignore b/lodestar/.dockerignore index ad7c440..48f6af3 100644 --- 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 index 70617a0..e5e1236 100644 --- 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 index 513b873..dec9841 160000 --- a/lodestar/lodestar +++ b/lodestar/lodestar @@ -1 +1 @@ -Subproject commit 513b8731eb4735122972e86c2c13dbd21001fe92 +Subproject commit dec9841c553081efea38b75ebaed7a094a0789f6 diff --git a/prysm/prysm b/prysm/prysm index e25840e..a0c49f1 160000 --- a/prysm/prysm +++ b/prysm/prysm @@ -1 +1 @@ -Subproject commit e25840ee7e2e8a84e1bbdb9f094ac6e8656629cd +Subproject commit a0c49f12a7039e6d95aeccb30743d86fd02fff76 diff --git a/tests/fee-market/main.go b/tests/fee-market/main.go index cf140ce..82feee9 100644 --- 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 index 113394a..f7dcb28 100644 --- 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 {