Merge pull request #2936 from dusk-network/neotamandua/change_sqlite_…

…schema Change SQLite schema & adjust archive to it
dusk-network · Nov 13, 2024 · 72ac19e · 72ac19e
2 parents 3f3f1a4 + 650fbd7
commit 72ac19e
Show file tree

Hide file tree

Showing 29 changed files with 784 additions and 360 deletions.
diff --git a/node-data/src/events/contract.rs b/node-data/src/events/contract.rs
@@ -28,6 +28,27 @@ pub struct ContractTxEvent {
 #[repr(C)]
 pub struct WrappedContractId(pub ContractId);
 
+impl TryFrom<String> for WrappedContractId {
+    type Error = anyhow::Error;
+
+    fn try_from(value: String) -> std::result::Result<Self, Self::Error> {
+        let source_bytes = hex::decode(value)?;
+        let mut source_array = [0u8; CONTRACT_ID_BYTES];
+
+        if source_bytes.len() != CONTRACT_ID_BYTES {
+            return Err(anyhow::anyhow!(
+                "Invalid length: expected {} bytes, got {}",
+                CONTRACT_ID_BYTES,
+                source_bytes.len()
+            ));
+        } else {
+            source_array.copy_from_slice(&source_bytes);
+        }
+
+        Ok(WrappedContractId(ContractId::from_bytes(source_array)))
+    }
+}
+
 impl Serialize for WrappedContractId {
     fn serialize<S>(&self, s: S) -> Result<S::Ok, S::Error>
     where
@@ -54,9 +75,10 @@ impl<'de> Deserialize<'de> for WrappedContractId {
                 CONTRACT_ID_BYTES,
                 source_bytes.len()
             )));
+        } else {
+            source_array.copy_from_slice(&source_bytes);
         }
 
-        source_array.copy_from_slice(&source_bytes);
         Ok(WrappedContractId(ContractId::from_bytes(source_array)))
     }
 }

diff --git a/...f66138a9e1a0f14967134e3f2370d12d3173.json → ...2464bbdae93841b19e103928364e2b60ddf0.json b/...f66138a9e1a0f14967134e3f2370d12d3173.json → ...2464bbdae93841b19e103928364e2b60ddf0.json
diff --git a/...82fa3cbfec4846f2a7cdd02099f4b5f5509a.json → ...1e5aabc27309200949081fe2bd153421ef7e.json b/...82fa3cbfec4846f2a7cdd02099f4b5f5509a.json → ...1e5aabc27309200949081fe2bd153421ef7e.json
diff --git a/node/.sqlx/query-2e969dc8fe8501fa7e09dbcccd849f7fd2ce8e48926ff1cd218b465fae74968c.json b/node/.sqlx/query-2e969dc8fe8501fa7e09dbcccd849f7fd2ce8e48926ff1cd218b465fae74968c.json
diff --git a/node/.sqlx/query-6c94f167efd5efed0ad4467a8e70242c67cce76460cee23eb2a86c62954bad34.json b/node/.sqlx/query-6c94f167efd5efed0ad4467a8e70242c67cce76460cee23eb2a86c62954bad34.json
diff --git a/node/.sqlx/query-73c5109243d2b9b862901f7d5f926fcb91d0a52d5f5cd7afd591bfb2c40b08e6.json b/node/.sqlx/query-73c5109243d2b9b862901f7d5f926fcb91d0a52d5f5cd7afd591bfb2c40b08e6.json
diff --git a/node/.sqlx/query-7682947ac9f1cd27e40469508cc2a0655d38b6dbc75aa3e0e4c2e16b3e51b047.json b/node/.sqlx/query-7682947ac9f1cd27e40469508cc2a0655d38b6dbc75aa3e0e4c2e16b3e51b047.json
diff --git a/node/.sqlx/query-92b10bb32c1ff3780695268d17b1e88cfbc31fa40b351455bf770d4526ff2f9d.json b/node/.sqlx/query-92b10bb32c1ff3780695268d17b1e88cfbc31fa40b351455bf770d4526ff2f9d.json
diff --git a/node/.sqlx/query-92d1fbef465114b1b5cf9fd4bd2c5de7cf64f166957e61082f1a02b9b1988ae2.json b/node/.sqlx/query-92d1fbef465114b1b5cf9fd4bd2c5de7cf64f166957e61082f1a02b9b1988ae2.json
diff --git a/node/.sqlx/query-961a637bd4e5213548bc28bf778886a299f35fa14aa4cfd8b4757c6eb194b94f.json b/node/.sqlx/query-961a637bd4e5213548bc28bf778886a299f35fa14aa4cfd8b4757c6eb194b94f.json
diff --git a/node/.sqlx/query-9e14c9a194a6f2ee32003bef28c1cd10fd4c7258dae6dd385816af598a7076a0.json b/node/.sqlx/query-9e14c9a194a6f2ee32003bef28c1cd10fd4c7258dae6dd385816af598a7076a0.json
diff --git a/...4e0e0e8d5404de9fc039c3597f86cd175424.json → ...440275a51a91b52a02eafa9c0894aa9bde3a.json b/...4e0e0e8d5404de9fc039c3597f86cd175424.json → ...440275a51a91b52a02eafa9c0894aa9bde3a.json
diff --git a/node/.sqlx/query-bdfc254c48369ea7ce173127a9a042188298ee4523aecb6587d4d661be4de4a9.json b/node/.sqlx/query-bdfc254c48369ea7ce173127a9a042188298ee4523aecb6587d4d661be4de4a9.json
diff --git a/node/.sqlx/query-c3207b9139137f86573f37893130985499d99040c00551afe21b68f3b63a5707.json b/node/.sqlx/query-c3207b9139137f86573f37893130985499d99040c00551afe21b68f3b63a5707.json
diff --git a/node/.sqlx/query-d9caf75d1a861747219f81ab0badbd7f8c96b61ba05f051db1ca653618cf7ae2.json b/node/.sqlx/query-d9caf75d1a861747219f81ab0badbd7f8c96b61ba05f051db1ca653618cf7ae2.json
diff --git a/node/.sqlx/query-dc26b939ccb3e41feb116ab755f1c3d2fbb65ba7dd4c35e67c8c017567c2f4ec.json b/node/.sqlx/query-dc26b939ccb3e41feb116ab755f1c3d2fbb65ba7dd4c35e67c8c017567c2f4ec.json
diff --git a/node/.sqlx/query-dc6d1bfa595b7545e8a1bfdaa68f8b408b2bda1142934f2e36bd81135ab7b5c5.json b/node/.sqlx/query-dc6d1bfa595b7545e8a1bfdaa68f8b408b2bda1142934f2e36bd81135ab7b5c5.json