Merge pull request #28 from ZeroDAO/main

Milestone 2
ZeroDAO · Oct 3, 2023 · 7ccf2f9 · 7ccf2f9
2 parents 5788e9e + 984fd12
commit 7ccf2f9
Show file tree

Hide file tree

Showing 93 changed files with 13,788 additions and 2,157 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -6,10 +6,11 @@
     "lldb.executable": "/usr/bin/lldb"
   },
   "extensions": [
-    "rust-lang.rust",
-    "bungcip.better-toml",
-    "vadimcn.vscode-lldb"
-  ],
+	"rust-lang.rust",
+	"bungcip.better-toml",
+	"vadimcn.vscode-lldb",
+	"rust-lang.rust-analyzer"
+],
   "forwardPorts": [
     3000,
     9944

diff --git a/.gitignore b/.gitignore
@@ -4,9 +4,10 @@
 # These are backup files generated by rustfmt
 **/*.rs.bk
 
+.cargo/
+
 .DS_Store
 
 # direnv files
 .envrc
-.direnv
-
+.direnv
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -0,0 +1,5 @@
+{
+    "recommendations": [
+        "rust-lang.rust-analyzer"
+    ]
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,5 +1,5 @@
 {
-    "rust-analyzer.linkedProjects": [
-        "./crates/melo-erasure-coding/Cargo.toml"
-    ]
+    "rust-analyzer.server.path": null,
+    "rust-analyzer.showUnlinkedFileNotification": false,
+    "commentTranslate.multiLineMerge": true
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json