Merge branch 'eigenda-v3.2.1' of github.com:Layr-Labs/nitro into epoc…

…iask--chore-imported-proxy-client
Layr-Labs · Dec 13, 2024 · 91459fd · 91459fd
2 parents 82f3bc7 + bf639c5
commit 91459fd
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/cmd/nitro/nitro.go b/cmd/nitro/nitro.go
@@ -593,7 +593,7 @@ func mainImpl() int {
 			return 1
 		}
 
-		if !nodeConfig.Node.BatchPoster.EnableEigenDAFailover && nodeConfig.Node.Dangerous.DisableBlobReader {
+		if !nodeConfig.Node.BatchPoster.EnableEigenDAFailover && !nodeConfig.Node.Dangerous.DisableBlobReader {
 			log.Error("4844 must be disabled if using EigenDA without failover enabled")
 			return 1
 		}

diff --git a/contracts b/contracts
diff --git a/docs/Sigma_Prime_EigenLayer_EigenDA_Arbitrum_Security_Assessment_Report_December_2024.pdf b/docs/Sigma_Prime_EigenLayer_EigenDA_Arbitrum_Security_Assessment_Report_December_2024.pdf
diff --git a/nitro-testnode b/nitro-testnode
+23 −1		scripts/rollupCreation.ts
+1 −1		src/bridge/EigenDABlobVerifierL1.sol
+4 −0		src/bridge/SequencerInbox.sol
+28 −7		src/rollup/RollupCreator.sol
+106 −10		test/foundry/RollupCreator.t.sol
+7 −7		docker-compose.yaml
+1 −1		rollupcreator/Dockerfile
+1 −0		scripts/config.ts
+1 −1		test-node.bash