merge conflict

devcon-api/data/sessions/devcon-7/bridging-tradfi-and-defi-through-ethereum-and-evm-a-pathway-to-innovation.json

@@ -2,7 +2,7 @@
   "id": "bridging-tradfi-and-defi-through-ethereum-and-evm-a-pathway-to-innovation",
   "sourceId": "8N3GEZ",
   "title": "Bridging TradFi and DeFi through Ethereum and EVM: A Pathway to Innovation",
-  "description": "This workshop will explore how Ethereum and EVM-based environments are becoming the critical intersection between traditional finance (TradFi) and decentralized finance (DeFi). It will focus on Ethereum’s maturity for real-world use cases, the role of EVM in regulated environments, and how institutions, governments, and central banks can foster innovation by leveraging permissionless blockchains while maintaining compliance with regulations.",
+  "description": "This workshop will explore how Ethereum and EVM-based environments are becoming the critical intersection between traditional finance (TradFi) and decentralized finance (DeFi). It will focus on Ethereum’s maturity for real-world use cases, the role of EVM in regulated environments, and how  institutions, governments, and central banks can foster innovation by leveraging permissionless blockchains while maintaining compliance with regulations.",
   "track": "Real World Ethereum",
   "type": "Workshop",
   "expertise": "Beginner",
@@ -20,7 +20,8 @@
   ],
   "language": "en",
   "speakers": [
-    "bruno-batavia"
+    "bruno-batavia",
+    "abhinav-goel"
   ],
   "eventId": "devcon-7",
   "slot_start": 1731391200000,

devcon-api/data/sessions/devcon-7/build-an-autonomous-world-with-mud-in-2-hours.json → devcon-api/data/sessions/devcon-7/build-an-autonomous-world-with-mud-in-20-minutes.json

@@ -1,10 +1,10 @@
 {
-  "id": "build-an-autonomous-world-with-mud-in-2-hours",
+  "id": "build-an-autonomous-world-with-mud-in-20-minutes",
   "sourceId": "9VQBCC",
-  "title": "Build an autonomous world with MUD in 2 hours",
+  "title": "Build an autonomous world with MUD in 20 minutes",
   "description": "Have you ever wanted to create an autonomous world or build an onchain game, but didn’t know where to start?\r\n\r\nIn this workshop, code along with Alvarius and Frolic, core devs of MUD, an application framework designed for games and autonomous worlds, and create a new world from scratch to deployment, covering Solidity/MUD development of core logic, onboarding (wallet and gas), instant transactions, and world extension.",
   "track": "[CLS] MUD Community-Led Session, by 0xPARC",
-  "type": "Workshop",
+  "type": "Talk",
   "expertise": "Beginner",
   "audience": "Developer",
   "featured": false,

devcon-api/data/sessions/devcon-7/building-a-social-app-with-spend-permissions.json

@@ -22,7 +22,8 @@
   ],
   "language": "en",
   "speakers": [
-    "lukas-rosario"
+    "lukas-rosario",
+    "conner-swenberg"
   ],
   "eventId": "devcon-7",
   "slot_start": 1731490200000,

devcon-api/data/sessions/devcon-7/can-we-fix-mev.json

@@ -2,7 +2,7 @@
   "id": "can-we-fix-mev",
   "sourceId": "Z3BPXH",
   "title": "Can we fix MEV?",
-  "description": "MEV is problematic today. The MEV supply chain puts centralizing pressure on Ethereum. There is also an Allocation Problem: proposers (not apps or users) earn nearly all MEV, though they are merely protocol agents. Numerous solutions address this (e.g., ePBS, EAs, ETs, FOCIL, BRAID), each with trade-offs and assumptions about whether MEV is intrinsic to blockchains or extrinsic and preventable. Research is challenging to enter w/o continuous engagement. I'll provide an overview of the research.",
+  "description": "MEV is problematic today. The MEV supply chain puts centralizing pressure on Ethereum. There’s also an allocation problem; proposers (not apps or users) earn nearly all MEV, though they’re merely protocol agents. Numerous proposed solutions address this (ePBS, EAs, ETs, FOCIL, BRAID...), each with tradeoffs and assumptions about whether MEV is intrinsic to blockchains or extrinsic & preventable. Research is challenging to enter w/o continuous engagement. I’ll provide an overview of the research.",
   "track": "Cryptoeconomics",
   "type": "Talk",
   "expertise": "Intermediate",

devcon-api/data/sessions/devcon-7/hardening-the-commons.json

@@ -0,0 +1,33 @@
+{
+  "id": "hardening-the-commons",
+  "sourceId": "BMTVJK",
+  "title": "Hardening the Commons",
+  "description": "A hands-on workshop for those interested in strengthening the capture resistance and general survivability of commons under their stewardship. This session will be a sequence of guided small group discussions that will flesh out the levels of a <b>capability maturity model</b> for how a commons resource, whether it is a blockchain or a city, can be gradually \"hardened\" by developing and maturing capabilities at material, philosophical, skill, social, and mission levels.",
+  "track": "Coordination",
+  "type": "Workshop",
+  "expertise": "Beginner",
+  "audience": "Community",
+  "featured": false,
+  "doNotRecord": false,
+  "keywords": [
+    "Impact",
+    "Commons",
+    "Adoption"
+  ],
+  "tags": [
+    "adoption",
+    "Censorship Resistance",
+    "Coordination",
+    "Solarpunk"
+  ],
+  "language": "en",
+  "speakers": [
+    "venkatesh-rao",
+    "tim-beiko"
+  ],
+  "eventId": "devcon-7",
+  "slot_start": 1731486600000,
+  "slot_end": 1731497400000,
+  "slot_roomId": "classroom-e",
+  "resources_presentation": "https://docs.google.com/presentation/d/1gO904DKuSqj1sNQuLtbP57gbG3NphApmqMl4sI6azOs"
+}

devcon-api/data/sessions/devcon-7/how-we-use-pprof-grafana-and-prometheus-to-reduce-the-cost-of-running-a-full-node.json → devcon-api/data/sessions/devcon-7/optimizing-full-node-costs-with-monitor-tools.json

@@ -1,7 +1,7 @@
 {
-  "id": "how-we-use-pprof-grafana-and-prometheus-to-reduce-the-cost-of-running-a-full-node",
+  "id": "optimizing-full-node-costs-with-monitor-tools",
   "sourceId": "D9UAVG",
-  "title": "How we use pprof, grafana and prometheus to reduce the cost of running a full node",
+  "title": "Optimizing full node costs with monitor tools",
   "description": "Running a full node is a fundamental component of participating in a decentralized network. However, the operational cost associated with running a full node can be prohibitively high, even for an archive node, it needs a lot of CPU/Memory and SSD disks. At our organization, we have successfully implemented a cost reduction strategy by using the pprof tool, along with grafana and prometheus in our node infrastructure.",
   "track": "Core Protocol",
   "type": "Lightning Talk",

devcon-api/data/sessions/devcon-7/the-dave-fraud-proof-algorithm-triumphing-over-sybils-with-a-laptop-and-a-small-collateral.json

@@ -23,7 +23,8 @@
   ],
   "language": "en",
   "speakers": [
-    "gabriel-coutinho-de-paula"
+    "gabriel-coutinho-de-paula",
+    "augusto-teixeira"
   ],
   "eventId": "devcon-7",
   "slot_start": 1731472200000,

devcon-api/data/speakers/abhinav-goel.json

@@ -0,0 +1,7 @@
+{
+  "id": "abhinav-goel",
+  "sourceId": "8GWPAV",
+  "name": "Abhinav Goel",
+  "avatar": "",
+  "description": ""
+}

devcon-api/data/speakers/alvarius.json

@@ -1,9 +1,7 @@
 {
   "id": "alvarius",
-  "sourceId": "WNRMFX",
+  "sourceId": "X3R8UY",
   "name": "Alvarius",
-  "avatar": "https://speak.devcon.org/media/avatars/alvarius_1_aX07Eog.webp",
-  "description": "Co-founder of Lattice; creator and core dev of MUD",
-  "twitter": "_alvarius",
-  "github": "alvrs"
+  "avatar": "",
+  "description": ""
 }

devcon-api/data/speakers/augusto-teixeira.json

@@ -0,0 +1,7 @@
+{
+  "id": "augusto-teixeira",
+  "sourceId": "MMGQBY",
+  "name": "Augusto Teixeira",
+  "avatar": "https://speak.devcon.org/media/avatars/avatar_rYXGM3s.png",
+  "description": "Augusto holds a PhD in Mathematics from ETH-Zürich and a degree in Physics; he is also a Professor at the Institute of Pure and Applied Mathematics (IMPA) in Rio de Janeiro. Augusto is one of the co-founders of the crypto project Cartesi, an L2 solution empowering computationally intensive DApp chains."
+}

devcon-api/data/speakers/conner-swenberg.json

@@ -0,0 +1,8 @@
+{
+  "id": "conner-swenberg",
+  "sourceId": "9WNAYG",
+  "name": "Conner Swenberg",
+  "avatar": "https://speak.devcon.org/media/avatars/f57134c47a6a8e91ea859040fe4490e1_KfgkgIL.jpg",
+  "description": "Onchain @Base.",
+  "twitter": "ilikesymmetry"
+}

devcon-api/data/speakers/jesse-pollak.json

@@ -3,7 +3,7 @@
   "sourceId": "CCBLBF",
   "name": "Jesse Pollak",
   "avatar": "https://speak.devcon.org/media/avatars/Jesse_Pollak_punk_E1qn7Gk.png",
-  "description": "Jesse Pollak is the Creator of Base. Prior to creating Base, Jesse led all of Coinbase’s consumer-facing engineering from early 2017 to middle 2021, including building Coinbase, Coinbase Pro, and Coinbase Wallet. Jesse joined Coinbase through the acquisition of Clef, a company he founded and ran for 5 years that built passwordless identity solutions for crypto companies.",
+  "description": "Jesse Pollak serves as VP, Engineering at Coinbase, where he works on Ethereum L1, L2, and new onchain efforts. He is the Creator of Base, a decentralized Ethereum L2 incubated by Coinbase offering a secure, low-cost, builder-friendly way for anyone, anywhere, to build onchain apps. Prior to building Base, Jesse led all of Coinbase’s consumer-facing engineering from early 2017 to middle 2021, including building Coinbase, Coinbase Pro, and Coinbase Wallet.",
   "twitter": "jessepollak",
   "github": "jessepollak",
   "farcaster": "jessepollak"

devcon-api/data/speakers/juli-corti.json

@@ -3,7 +3,7 @@
   "sourceId": "DTJSCE",
   "name": "Juli Corti",
   "avatar": "https://speak.devcon.org/media/avatars/juli_avatar_soopsfv.png",
-  "description": "Head of Comms at Mimic Finance",
+  "description": "PR & Comms at Mimic",
   "twitter": "juliicorti",
   "farcaster": "julicorti",
   "ens": "masvinito.eth"

devcon-api/data/speakers/lukas-rosario.json

@@ -2,6 +2,9 @@
   "id": "lukas-rosario",
   "sourceId": "SYTNAZ",
   "name": "Lukas Rosario",
-  "avatar": "",
-  "description": ""
+  "avatar": "https://speak.devcon.org/media/avatars/pic_S7eiRR1.jpeg",
+  "description": "Lukas is a Software Engineer at Coinbase working on account abstraction on the Base team.",
+  "twitter": "0xlsr",
+  "github": "lukasrosario",
+  "farcaster": "lsr"
 }

devcon-api/data/speakers/marc-harvey-hill.json

@@ -2,7 +2,7 @@
   "id": "marc-harvey-hill",
   "sourceId": "8XWHME",
   "name": "Marc Harvey-Hill",
-  "avatar": "https://speak.devcon.org/media/avatars/IMG_0556_SO6NFrx.jpg",
+  "avatar": "https://speak.devcon.org/media/avatars/DD9C3AA6-716F-4435-A774-1E808690626A_LkrGINh.JPG",
   "description": "I work for Nethermind as an Ethereum core developer, and am interested in protocol research, applying cryptoeconomics to keep Ethereum censorship resistant. Recently, I have worked on implementing support for the Shutter encrypted mempool in the Nethermind client.",
   "twitter": "marchhill1",
   "github": "marchhill",

devcon-api/data/speakers/maria-milagros-santamaria.json

@@ -3,7 +3,7 @@
   "sourceId": "HEVDUM",
   "name": "Maria Milagros Santamaria",
   "avatar": "https://speak.devcon.org/media/avatars/photo_2024-07-29_07.44.17_7Xb57V7.jpeg",
-  "description": "Lawyer and web3 consultant. Currently working in the Sandbox and Regulatory Department at Crecimiento and part of Crecimientos Core Organization. Milagros also works as Compliance Coordinator at August One Capital, an Investment Fund and Family Office from Singapore and Portugal.\r\n\r\nProfessor and lecturer at international business schools such as IAE, ADEN, and Austral University, and TOTH Compliance.Part of the Texas Department of Agriculture as delegate member of the OIV.",
+  "description": "Head of Regulatory Department at Crecimiento and Lead of Ops at Architect Systems.",
   "twitter": "fortuna45873748",
   "ens": "fortunata.eth"
 }

devcon-api/data/speakers/max-hampshire.json

@@ -2,7 +2,7 @@
   "id": "max-hampshire",
   "sourceId": "KS8R7M",
   "name": "Max Hampshire",
-  "avatar": "https://speak.devcon.org/media/avatars/max_devrel_3MCNMFH.jpg",
+  "avatar": "https://speak.devcon.org/media/avatars/maxpolis_kd8Ezmx.png",
   "description": "Max is Senior Developer Relations at Nym Technologies, building developer tooling, SDKs, and example projects for developers who wish to build the new internet free from mass surveillance. Prior to joining Nym he was a Smart Contract developer and artist with an academic background in Political Philosophy and the Philosophy of Technology.",
   "twitter": "_wjth",
   "github": "mfahampshire"

devcon-api/data/speakers/pavle-drobnjak.json

@@ -3,5 +3,6 @@
   "sourceId": "7LX9CK",
   "name": "Pavle Drobnjak",
   "avatar": "",
-  "description": ""
+  "description": "",
+  "github": "pdrobnjak"
 }

devcon-api/data/speakers/tomo-saito.json

@@ -2,6 +2,9 @@
   "id": "tomo-saito",
   "sourceId": "R3UWTJ",
   "name": "Tomo Saito",
-  "avatar": "",
-  "description": ""
+  "avatar": "https://speak.devcon.org/media/avatars/Tomo-2024-03_ZwMcyze.jpg",
+  "description": "Tomo is a designer at the Ethereum Foundation. Creating the world of the Infinite Garden and more!",
+  "twitter": "tomosaito",
+  "farcaster": "tomosaito",
+  "lens": "tomosaito"
 }

devcon-api/data/speakers/venkatesh-rao.json

@@ -3,5 +3,7 @@
   "sourceId": "GQRU9W",
   "name": "Venkatesh Rao",
   "avatar": "https://speak.devcon.org/media/avatars/vgrHeli_HcooTuk.jpeg",
-  "description": "Blogger at Ribbonfarm. Program director of Summer of Protocols."
+  "description": "Blogger at Ribbonfarm. Program director of Summer of Protocols.",
+  "github": "vgururao",
+  "farcaster": "vgr"
 }