Deploy v1 public beta contracts

.eslintrc

@@ -26,8 +26,7 @@
         "quotes": ["error", "single"]
     },
     "ignorePatterns": [
-        "contracts/**/scripts/resources",
-        "scripts/**/resources",
+        "lib",
         "cdk.out",
         "*.js"
     ]

.gitmodules

@@ -1,10 +1,11 @@
-[submodule "contracts/ethereum/scripts/resources/ssv-network"]
-	path = contracts/ethereum/scripts/resources/ssv-network
-	url = https://github.com/bloxapp/ssv-network.git
-	branch = jato-v2
 [submodule "contracts/ethereum/lib/forge-std"]
 	path = contracts/ethereum/lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
-[submodule "services/oracle/scripts/resources/rockx-dkg-cli"]
-	path = services/oracle/scripts/resources/rockx-dkg-cli
-	url = https://github.com/consensusnetworks/rockx-dkg-cli.git
+[submodule "contracts/ethereum/lib/ssv-network"]
+	path = contracts/ethereum/lib/ssv-network
+	url = https://github.com/bloxapp/ssv-network.git
+	branch = jato-v2
+[submodule "services/oracle/lib/dkg"]
+	path = services/oracle/lib/dkg
+	url = https://github.com/consensusnetworks/ssv-dkg.git
+	branch = feature/operator-env

.vscode/settings.json

@@ -19,6 +19,5 @@
         "typescript"
     ],
     "css.lint.unknownAtRules": "ignore",
-    "jupyter.notebookFileRoot": "${fileDirname}",
     "volar.inlayHints.eventArgumentInInlineHandlers": false
 }

README.md

@@ -121,8 +121,7 @@ echo "USE_SECRETS=false" > .env
 | `ETHEREUM_RPC_URL` | Ethereum RPC network URL | `http://127.0.0.1:8545` |
 | `NETWORK` | Network name (`mainnet || testnet || hardhat || localhost`) | `localhost` |
 | `FORK` | Fork network name (`mainnet || testnet || hardhat`) | `testnet` |
-| `MANAGER_ADDRESS` | Manager contract address | (predicted manager address) |
-| `VIEWS_ADDRESS` | Views contract address | (predicted views address) |
+| `FACTORY_ADDRESS` | Base factory contract address | (predicted factory address) |
 | `CRYPTO_COMPARE_API_KEY` | CryptoCompare API key | `` |
 | `TUNNEL` | Whether to tunnel local network RPC URLs (for remote wallets) | `false` |
 | `MOCK_SERVICES` | Whether to mock backend services | `true` |

apps/landing/package.json

@@ -2,7 +2,6 @@
   "name": "@casimir/landing",
   "description": "Casimir landing page",
   "private": true,
-  "version": "0.0.1",
   "scripts": {
     "dev": "vite",
     "build": "vite build",

apps/landing/src/App.vue

@@ -1,12 +1,7 @@
 <script lang="ts" setup>
 // Initalize blogs here for least amount of fetch calls
-import useBlogs from '@/composables/blogs.ts'
-
-const {
-  activeBlog,
-  allBlogs,
-  loadingBlogs,
-} = useBlogs()
+import useBlog from '@/composables/blog'
+useBlog()
 </script>
 
 <template>
@@ -16,4 +11,4 @@ const {
 </template>
 
 
-<style scoped></style>
+<style scoped></style>@/composables/blog

apps/landing/src/composables/blog.ts

@@ -0,0 +1,60 @@
+import { onMounted, onUnmounted, readonly, ref } from 'vue'
+import snarkdown from 'snarkdown'
+import { Article } from '@casimir/types'
+
+const initializeComposable = ref(false)
+
+const blogUrl = import.meta.env.PUBLIC_BLOG_URL || 'http://localhost:4001'
+const articles = ref([] as Article[])
+const loadingArticles = ref(true)
+
+export default function useBlog() {
+    async function getArticleContent(itemId: string) {
+        const response = await fetch(`${blogUrl}/articles/${itemId}`)
+        const json = await response.json()
+        const md = snarkdown(json.content)
+        return md
+    }
+
+    onMounted(async () => {
+        if (!initializeComposable.value) {
+            loadingArticles.value = true
+            try {
+                const response = await fetch(`${blogUrl}/articles`)
+                const jsonList = await response.json()
+                const articleList = []
+
+                for (let i = 0; i < jsonList.length; i++) {
+                    const title = jsonList[i].title
+                    const content = await getArticleContent(jsonList[i].id)
+                    const timestamp = jsonList[i].publishedAt
+                    const id = jsonList[i].id
+                    articleList.push({
+                        title: title,
+                        content: content,
+                        timestamp: timestamp,
+                        type: 'Blog',
+                        id: id,
+                    })
+                }
+
+                articles.value = articleList
+                loadingArticles.value = false
+            } catch (error) {
+                console.log('Error fetching article', error)
+                loadingArticles.value = false
+            }
+
+            initializeComposable.value = true
+        }
+    })
+
+    onUnmounted(() => {
+        initializeComposable.value = false
+    })
+
+    return {
+        articles: readonly(articles),
+        loadingArticles: readonly(loadingArticles),
+    }
+}

apps/landing/src/composables/router.ts

@@ -2,35 +2,35 @@ import { createWebHistory, createRouter } from 'vue-router'
 import Landing from '@/pages/landing/Landing.vue'
 import Changelog from '@/pages/changelog/Changelog.vue'
 import Blog from '@/pages/blog/Blog.vue'
-import SingleBlog from '@/pages/blog/components/SingleBlog.vue'
+import Article from '@/pages/blog/components/Article.vue'
 const routes = [
-  {
-    path: '/',
-    name: Landing,
-    component: Landing,
-  },
-  {
-    path: '/blogs',
-    name: Blog,
-    component: Blog,
-  },
-  {
-    path: '/blog/:id',
-    component: SingleBlog,
-    children: [{ path: '', name: SingleBlog, component: SingleBlog }],
-  },
-  {
-    path: '/changelog',
-    name: Changelog,
-    component: Changelog,
-  },
+    {
+        path: '/',
+        name: Landing,
+        component: Landing,
+    },
+    {
+        path: '/blogs',
+        name: Blog,
+        component: Blog,
+    },
+    {
+        path: '/blog/:id',
+        component: Article,
+        children: [{ path: '', name: Article, component: Article }],
+    },
+    {
+        path: '/changelog',
+        name: Changelog,
+        component: Changelog,
+    },
 ]
 
 const router = createRouter({
-  history: createWebHistory(),
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-  // @ts-ignore
-  routes,
+    history: createWebHistory(),
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    routes,
 })
 
 export default router

apps/landing/src/pages/blog/Blog.vue

@@ -1,12 +1,11 @@
-<script setup>
-import { onMounted, ref, computed, watch } from 'vue'
+<script lang="ts" setup>
 import VueFeather from 'vue-feather'
-import useBlogs from '@/composables/blogs.ts'
+import useBlog from '@/composables/blog.ts'
 
 const {
-  allBlogs,
-  loadingBlogs,
-} = useBlogs()
+    articles,
+    loadingArticle,
+} = useBlog()
 
 </script>
 
@@ -44,35 +43,35 @@ const {
     </nav>
     <section class="max-w-[960px] mx-auto mt-[60px] min-h-[650px] relative overflow-auto">
       <div
-        v-if="loadingBlogs"
+        v-if="loadingArticle"
         class="absolute top-0 left-0 w-full h-full z-[2] rounded-[3px] overflow-hidden"
       >
         <div class="skeleton_box" />
       </div>
       <router-link
-        v-for="blog in allBlogs"
-        :key="blog"
-        :to="`/blog/${blog.id}`"
+        v-for="article in articles"
+        :key="article"
+        :to="`/blog/${article.id}`"
         class="blog_card flex flex-col mb-[50px]"
       >
         <div class="flex items-center gap-5">
           <span class="text-[0.833rem] font-[500]">
-            {{ blog.type }} •
+            {{ article.type }} •
           </span>
           <span class="text-8">
-            {{ new Date(blog.timestamp).toDateString() }}
+            {{ new Date(article.timestamp).toDateString() }}
           </span>
         </div>
 
         <div class="text-[1.574rem] font-[600] py-10">
-          {{ blog.title }}
+          {{ article.title }}
         </div>
 
 
         <div class="h-full  w-full overflow-hidden  ">
           <div
             class="overview_blog_content"
-            v-html="blog.content"
+            v-html="article.content"
           />
         </div>
 
@@ -125,33 +124,33 @@ const {
 
 <style lang="scss">
 .blog_card {
-  background-color: rgb(242, 242, 245);
-  border: 1px solid hsl(236, 10.6%, 87.9%);
-  width: 100%;
-  height: 320px;
-  overflow: hidden;
-  cursor: pointer;
-  border-radius: 8px;
-  padding: 30px 30px 30px 30px;
+    background-color: rgb(242, 242, 245);
+    border: 1px solid hsl(236, 10.6%, 87.9%);
+    width: 100%;
+    height: 320px;
+    overflow: hidden;
+    cursor: pointer;
+    border-radius: 8px;
+    padding: 30px 30px 30px 30px;
 }
 
 .blog_card:hover {
-  box-shadow: inset 0px 1px 0px rgba(0, 0, 0, 0.1),
-    inset 0px -1px 0px 1px rgba(0, 0, 0, 0.1);
+    box-shadow: inset 0px 1px 0px rgba(0, 0, 0, 0.1),
+        inset 0px -1px 0px 1px rgba(0, 0, 0, 0.1);
 }
 
 .overview_blog_content {
-  font-size: 1.074rem;
-  font-weight: 300;
+    font-size: 1.074rem;
+    font-weight: 300;
 
-  h1,
-  ul,
-  il,
-  img {
-    display: none;
-    width: 0;
-    height: 0;
-  }
+    h1,
+    ul,
+    il,
+    img {
+        display: none;
+        width: 0;
+        height: 0;
+    }
 
 }
 </style>