Merge branch 'main' of https://github.com/efdevcon/monorepo

efdevcon · Nov 10, 2024 · 7bcff3d · 7bcff3d
2 parents 115c109 + 9a53d48
commit 7bcff3d
Show file tree

Hide file tree

Showing 17 changed files with 12,680 additions and 14,548 deletions.
diff --git a/.github/workflows/sync-pretalx.yml b/.github/workflows/sync-pretalx.yml
@@ -26,6 +26,7 @@ jobs:
           EMAIL_SECRET: ${{ secrets.EMAIL_SECRET }}
           GOOGLE_CLIENT_EMAIL: ${{ secrets.GOOGLE_CLIENT_EMAIL }}
           GOOGLE_PRIVATE_KEY: ${{ secrets.GOOGLE_PRIVATE_KEY }}
+          WEBHOOK_MEERKAT_SECRET: ${{ secrets.WEBHOOK_MEERKAT_SECRET }}
       - uses: EndBug/add-and-commit@v9
         with:
           add: "devcon-api/data"

diff --git a/devcon-api/data/sessions/devcon-7/epf-nethermindil-evm.json b/devcon-api/data/sessions/devcon-7/epf-nethermindil-evm.json
@@ -17,10 +17,10 @@
     "EVM",
     "Optimization"
   ],
-  "duration": 2721,
+  "duration": 294,
   "language": "en",
   "sources_swarmHash": "",
-  "sources_youtubeId": "7yetoqLLbaQ",
+  "sources_youtubeId": "c72jtSBCM4E",
   "sources_ipfsHash": "",
   "sources_livepeerId": "",
   "sources_streamethId": null,

diff --git a/...a-emersons-legacy-and-the-hope-for-change-in-vulnerable-communities-through-ethereum.json b/...a-emersons-legacy-and-the-hope-for-change-in-vulnerable-communities-through-ethereum.json
@@ -27,6 +27,7 @@
   "language": "en",
   "speakers": [
     "andres-forigua",
+    "william-martinez",
     "mateo-sabogal"
   ],
   "eventId": "devcon-7",

diff --git a/devcon-api/data/sessions/devcon-7/why-defi-matters-on-ethereum.json b/devcon-api/data/sessions/devcon-7/why-defi-matters-on-ethereum.json
@@ -13,6 +13,7 @@
   "tags": [],
   "language": "en",
   "speakers": [
+    "tascha",
     "loi-luu",
     "shuyao-kong",
     "kain-warwick"

diff --git a/devcon-api/data/speakers/bogdan-ursu.json b/devcon-api/data/speakers/bogdan-ursu.json
@@ -4,5 +4,6 @@
   "name": "Bogdan Ursu",
   "avatar": "https://speak.devcon.org/media/avatars/IMG_6334-2_aMsRJz9.jpg",
   "description": "I am a researcher in cryptography at Consensys, where I work on efficient arguments of knowledge for the Linea layer 2, with a focus on both research and engineering aspects. In Spring 2023, I obtained my PhD in Computer Science from ETH Zurich. During my PhD, my main research interests were on foundational cryptography, mainly focused on zero-knowledge, but also delving into topics such as advanced encryption primitives and signatures.",
+  "github": "bogdanbear",
   "hash": "0f53a5007147863756413ee1d5fb9c4cedb808c99ef4174196e4fc35ab3a7011"
 }
diff --git a/devcon-api/data/speakers/hangleang.json b/devcon-api/data/speakers/hangleang.json
@@ -2,8 +2,9 @@
   "id": "hangleang",
   "sourceId": "EG9K7D",
   "name": "Hangleang",
-  "avatar": "",
+  "avatar": "https://speak.devcon.org/media/avatars/gh-profile_iFaFvQv.png",
   "description": "prev. smart contract dev, exploring core protocol development",
+  "twitter": "hangleangs",
   "github": "hangleang",
   "hash": "14ca536d63eefa22a70ca77c8863dfd30051379c8702463fac63091d2cce7310"
 }
diff --git a/devcon-api/data/speakers/miriam-neubauer.json b/devcon-api/data/speakers/miriam-neubauer.json
@@ -3,7 +3,7 @@
   "sourceId": "DV3FAK",
   "name": "Miriam Neubauer",
   "avatar": "https://speak.devcon.org/media/avatars/miriam_bC9VwCA.jpeg",
-  "description": "memecat at meerkat",
+  "description": "memecat at meerkat.events",
   "twitter": "mcnaclh2o",
   "github": "miriamneubauer",
   "hash": "64f3adc3d9c79283ce3321a6a7f7ff1e8424ad74607b01683b86c0f462bc607d"

diff --git a/devcon-api/data/speakers/sudhir-upadhyay.json b/devcon-api/data/speakers/sudhir-upadhyay.json
@@ -1,8 +1,8 @@
 {
   "id": "sudhir-upadhyay",
   "sourceId": "ZJGMKS",
-  "name": "sudhir upadhyay",
+  "name": "Sudhir Upadhyay",
   "avatar": "https://speak.devcon.org/media/avatars/sudhir-profile_YI0KrIs.png",
-  "description": "Sudhir head the Engineering team for Digital Assets and Platform at Onyx, by J.P. Morgan. In this role, in addition to engineering world-class products in the enterprise blockchain ecosystem & digital assets, I mentor and work with some of the most talented engineers.",
+  "description": "Sudhir heads the Engineering team Kinexys ( formerly Onyx), by J.P. Morgan.  During his tenure at J.P. Morgan, Sudhir has been engaged in incubating, designing, developing and delivering several innovative products and solutions across multiple lines of business, including Risk Management, Trading, and Pricing, among others. Prior to joining J.P. Morgan, Sudhir was one of the early joiners at one of the most successful startups (BEA Systems) in Silicon Valley.",
   "hash": "b392d5e4cdbedddc52bcf3ad5b9e4e74f8b4021fe649a0ac7280f92114f92143"
 }
diff --git a/devcon-api/data/speakers/tdot.json b/devcon-api/data/speakers/tdot.json
@@ -2,8 +2,8 @@
   "id": "tdot",
   "sourceId": "HJLU7D",
   "name": "tdot",
-  "avatar": "https://speak.devcon.org/media/avatars/tdot_oU8zheq.webp",
-  "description": "Product Lead of Redstone and Senior Engineer at Lattice\r\n\r\nPreviously at Protocol Labs and CEO of Myel",
+  "avatar": "https://speak.devcon.org/media/avatars/IMG_6481_XNpjdTo.jpg",
+  "description": "Product Lead of Redstone and Senior Engineer at Lattice\r\n\r\nPreviously worked on IPFS, Libp2p, IPLD and Filecoin at Protocol Labs.",
   "twitter": "unsafetdot",
   "github": "tchardin",
   "hash": "f9f905d9388ef9cd17483566e3d31c96926c17d4221e5fe171a1fb53af0fcbb8"

diff --git a/devcon-api/data/speakers/william-martinez.json b/devcon-api/data/speakers/william-martinez.json
@@ -0,0 +1,13 @@
+{
+  "id": "william-martinez",
+  "sourceId": "VF8NV3",
+  "name": "William Martinez",
+  "avatar": "https://speak.devcon.org/media/avatars/IMG_2446_srxWTtT.jpeg",
+  "description": "Building High-techs for LATAM from Colombia | GIVeconomist at Giveth | EthColombia DAO steward | Builder at Ekinoxis",
+  "twitter": "0xwmb",
+  "github": "wmb81321",
+  "farcaster": "wmb.bade.eth",
+  "lens": "littio",
+  "ens": "zkanon.eth",
+  "hash": "cdc7d0a62470aecb00ba56f6c61c6a25aec7d46ef24c21000ebc3ea369e9b1b9"
+}