From 946e4760aeb055a69288917da6e02f5eb7b0f49b Mon Sep 17 00:00:00 2001
From: Daniel Sanchez Quiros <sanchez.quiros.daniel@gmail.com>
Date: Mon, 12 Feb 2024 12:26:35 +0100
Subject: [PATCH] Remove node id dep from mixnet and fix columns access

---
 da/common.py    | 11 +++++++++--
 da/dispersal.py |  5 ++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/da/common.py b/da/common.py
index 507e6b5..bd4b58f 100644
--- a/da/common.py
+++ b/da/common.py
@@ -1,9 +1,12 @@
 from dataclasses import dataclass
-from typing import List
+from typing import List, Generator
 
 from eth2spec.eip7594.mainnet import Bytes32
 
 
+class NodeId(Bytes32):
+    pass
+
 class Chunk(Bytes32):
     pass
 
@@ -17,7 +20,11 @@ class Row(List[Chunk]):
 
 
 class ChunksMatrix(List[Row]):
-    pass
+    def columns(self) -> Generator[List[Chunk], None, None]:
+        # TODO: yield columns
+        yield None
+
+
 
 
 @dataclass
diff --git a/da/dispersal.py b/da/dispersal.py
index 9c71751..6419100 100644
--- a/da/dispersal.py
+++ b/da/dispersal.py
@@ -1,9 +1,8 @@
 from typing import List, Optional, Generator
 
-from da.common import Certificate
+from da.common import Certificate, NodeId
 from da.encoder import EncodedData
 from da.verifier import DABlob, Attestation
-from mixnet.node import NodeId
 
 
 class Dispersal:
@@ -14,7 +13,7 @@ class Dispersal:
     def _prepare_data(self, encoded_data: EncodedData) -> Generator[DABlob, None, None]:
         assert len(encoded_data.row_commitments) == len(self.nodes)
         assert len(encoded_data.row_proofs) == len(self.nodes)
-        columns = encoded_data.columns
+        columns = encoded_data.extended_matrix.columns()
         column_commitments = encoded_data.column_commitments
         row_commitments = encoded_data.row_commitments
         rows_proofs = encoded_data.row_proofs