Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
wslyvh committed Oct 30, 2024
2 parents fe7c58b + caeb8d9 commit 91c33bf
Show file tree
Hide file tree
Showing 244 changed files with 7,619 additions and 2,607 deletions.
22 changes: 5 additions & 17 deletions devcon-api/data/sessions/devcon-7/0xparc-panel.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,13 @@
"audience": "Engineering",
"featured": false,
"doNotRecord": false,
"tags": [
""
],
"keywords": [
"Programmable Cryptography",
"Panel",
"0xPARC"
],
"duration": 120,
"keywords": ["Programmable Cryptography", "Panel", "0xPARC"],
"tags": [],
"language": "en",
"sources_swarmHash": "swarmHash",
"sources_youtubeId": "youtubeId",
"sources_ipfsHash": "ipfsTestHash",
"sources_livepeerId": "lp01Id",
"speakers": ["janmajaya-mall", "veronica-zheng", "eduard-sanou", "0xparc"],
"eventId": "devcon-7",
"slot_start": 1731661200000,
"slot_end": 1731664800000,
"slot_roomId": "main-stage",
"resources_presentation": "https://docs.google.com/presentation/d/15PuLJuxsNX_SplHtSilFiq69bAFCp-tGDBM9VNXWwm4",
"resources_slides": null,
"speakers": []
}
"resources_presentation": "https://docs.google.com/presentation/d/15PuLJuxsNX_SplHtSilFiq69bAFCp-tGDBM9VNXWwm4"
}
23 changes: 4 additions & 19 deletions devcon-api/data/sessions/devcon-7/building-a-future-proof-l2.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,28 +9,13 @@
"audience": "Engineering",
"featured": false,
"doNotRecord": false,
"keywords": [
"Bitcoin",
"next-generation zkProofs"
],
"tags": [
"Layer 2s",
"Zk Rollups",
"Use Cases",
"starknet",
"next-gen",
"zkproofs",
"Layer 2s",
"Use Cases",
"Zk Rollups"
],
"keywords": ["Bitcoin", "next-generation zkProofs"],
"tags": ["Layer 2s", "Zk Rollups", "Use Cases", "starknet", "next-gen", "zkproofs", "Layer 2s", "Use Cases", "Zk Rollups"],
"language": "en",
"speakers": [
"oren-katz"
],
"speakers": ["oren-katz"],
"eventId": "devcon-7",
"slot_start": "2024-11-13T06:00:00.000Z",
"slot_end": "2024-11-13T06:30:00.000Z",
"slot_roomId": "main-stage",
"resources_presentation": "https://docs.google.com/presentation/d/14QG3jNVI1Dkw_-jw6BLW28LVEfOTx51EPqm3Dradf3o"
}
}
2 changes: 1 addition & 1 deletion devcon-api/data/sessions/devcon-7/closing-ceremonies.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
"slot_end": "2024-11-15T11:00:00.000Z",
"slot_roomId": "main-stage",
"resources_presentation": "https://docs.google.com/presentation/d/1zk6NkmsduzkZUpci9G4Ulqy-v_Ab9pktxWiTS7fPEh4"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,13 @@
"audience": "Engineering",
"featured": false,
"doNotRecord": false,
"keywords": [
"Forking"
],
"tags": [
"fork",
"Collective Intelligence",
"Consensus",
"Coordination"
],
"keywords": ["Forking"],
"tags": ["fork", "Collective Intelligence", "Consensus", "Coordination"],
"language": "en",
"speakers": [
"sreeram-kannan"
],
"speakers": ["sreeram-kannan"],
"eventId": "devcon-7",
"slot_start": "2024-11-14T04:30:00.000Z",
"slot_end": "2024-11-14T05:00:00.000Z",
"slot_roomId": "main-stage",
"resources_presentation": "https://docs.google.com/presentation/d/1pAUfWWkDdvSVfjG3UFm9ChrQDu1XE0Ae1vmkkLNxV3A"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,13 @@
"audience": "Engineering",
"featured": false,
"doNotRecord": false,
"keywords": [
"superchain",
"OP Stack",
"optimism"
],
"tags": [
"optimism"
],
"keywords": ["superchain", "OP Stack", "optimism"],
"tags": ["optimism"],
"language": "en",
"speakers": [
"karl-floersch"
],
"speakers": ["karl-floersch"],
"eventId": "devcon-7",
"slot_start": "2024-11-13T11:00:00.000Z",
"slot_end": "2024-11-13T11:30:00.000Z",
"slot_roomId": "main-stage",
"resources_presentation": "https://docs.google.com/presentation/d/18NUBFhBTGUc1VCTGb7xM78rgqQTtMu78w-hWIYbTYxA"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,13 @@
"audience": "Community",
"featured": false,
"doNotRecord": false,
"keywords": [
"TEE",
"hardware",
"decentralization"
],
"tags": [
"Protocol Design",
"Censorship Resistance",
"Decentralization",
"MEV",
"Censorship Resistance",
"MEV",
"Protocol Design"
],
"keywords": ["TEE", "hardware", "decentralization"],
"tags": ["Protocol Design", "Censorship Resistance", "Decentralization", "MEV", "Censorship Resistance", "MEV", "Protocol Design"],
"language": "en",
"speakers": [
"philip-daian"
],
"speakers": ["philip-daian"],
"eventId": "devcon-7",
"slot_start": "2024-11-12T09:30:00.000Z",
"slot_end": "2024-11-12T10:00:00.000Z",
"slot_roomId": "main-stage",
"resources_presentation": "https://docs.google.com/presentation/d/1bcWYCRlknrhBAHOizptWAGujiHHrSU_sAh9xh-oi1js"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,12 @@
"featured": false,
"doNotRecord": false,
"keywords": [],
"tags": [
"Censorship Resistance",
"Decentralization",
"Ethereum Roadmap"
],
"tags": ["Censorship Resistance", "Decentralization", "Ethereum Roadmap"],
"language": "en",
"speakers": [
"mike-neuder"
],
"speakers": ["mike-neuder"],
"eventId": "devcon-7",
"slot_start": "2024-11-14T07:30:00.000Z",
"slot_end": "2024-11-14T08:00:00.000Z",
"slot_roomId": "main-stage",
"resources_presentation": "https://docs.google.com/presentation/d/1BKehfujLaDakbU2-PjgsWO9PzcaHlv5FlzNG5PlH6zY"
}
}
23 changes: 4 additions & 19 deletions devcon-api/data/sessions/devcon-7/ethereum-a-force-of-good.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,28 +9,13 @@
"audience": "Product",
"featured": false,
"doNotRecord": false,
"keywords": [
"stablecoins",
"supply chain",
"agriculture",
"scalability"
],
"tags": [
"RWA",
"Ethereum for Good",
"Economics",
"micropayments",
"Economics",
"Ethereum for Good",
"RWA"
],
"keywords": ["stablecoins", "supply chain", "agriculture", "scalability"],
"tags": ["RWA", "Ethereum for Good", "Economics", "micropayments", "Economics", "Ethereum for Good", "RWA"],
"language": "en",
"speakers": [
"stani-kulechov"
],
"speakers": ["stani-kulechov"],
"eventId": "devcon-7",
"slot_start": "2024-11-14T09:30:00.000Z",
"slot_end": "2024-11-14T10:00:00.000Z",
"slot_roomId": "main-stage",
"resources_presentation": "https://docs.google.com/presentation/d/1zwoxKxRNSg1zW4w3I3Ad1I6aSDAtCo3sBRkenui4eQ4"
}
}
10 changes: 3 additions & 7 deletions devcon-api/data/sessions/devcon-7/ethereum-and-robots.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@
"audience": "Product",
"featured": false,
"doNotRecord": false,
"keywords": [
"Robots"
],
"keywords": ["Robots"],
"tags": [
"Collective Intelligence",
"Civil Resistance",
Expand All @@ -24,12 +22,10 @@
"DePIN"
],
"language": "en",
"speakers": [
"tomasz-stanczak"
],
"speakers": ["tomasz-stanczak"],
"eventId": "devcon-7",
"slot_start": "2024-11-14T09:00:00.000Z",
"slot_end": "2024-11-14T09:30:00.000Z",
"slot_roomId": "main-stage",
"resources_presentation": "https://docs.google.com/presentation/d/1s1aFTwzOBXNg9v3Cu1EnNW22GUWNxNYFneRubREaJXE"
}
}
24 changes: 4 additions & 20 deletions devcon-api/data/sessions/devcon-7/ethereum-real-world-economy.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,29 +9,13 @@
"audience": "Engineering",
"featured": false,
"doNotRecord": false,
"keywords": [
"stablecoins",
"real-world-use",
"use-cases"
],
"tags": [
"Ethereum Roadmap",
"Use Cases",
"e/acc",
"case",
"use",
"e/acc",
"Ethereum Roadmap",
"Use Cases"
],
"keywords": ["stablecoins", "real-world-use", "use-cases"],
"tags": ["Ethereum Roadmap", "Use Cases", "e/acc", "case", "use", "e/acc", "Ethereum Roadmap", "Use Cases"],
"language": "en",
"speakers": [
"nalin-b",
"dc-posch"
],
"speakers": ["nalin-b", "dc-posch"],
"eventId": "devcon-7",
"slot_start": "2024-11-14T08:00:00.000Z",
"slot_end": "2024-11-14T09:00:00.000Z",
"slot_roomId": "main-stage",
"resources_presentation": "https://docs.google.com/presentation/d/1UVP1zLQ1cszDLmjMKl61KN2rP616jJTze1YhwSPWhms"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,31 +9,13 @@
"audience": "Community",
"featured": false,
"doNotRecord": false,
"keywords": [
"ethos",
"values",
"alignment"
],
"tags": [
"Layer 1",
"Ethereum Roadmap",
"Coordination",
"alignment",
"Coordination",
"Ethereum Roadmap",
"Layer 1"
],
"keywords": ["ethos", "values", "alignment"],
"tags": ["Layer 1", "Ethereum Roadmap", "Coordination", "alignment", "Coordination", "Ethereum Roadmap", "Layer 1"],
"language": "en",
"speakers": [
"peter-szilagyi",
"phil-ngo",
"marek-moraczynski",
"nixo",
"mark-tyneway"
],
"speakers": ["peter-szilagyi", "phil-ngo", "marek-moraczynski", "nixo", "mark-tyneway"],
"eventId": "devcon-7",
"slot_start": "2024-11-14T06:00:00.000Z",
"slot_end": "2024-11-14T07:00:00.000Z",
"slot_roomId": "main-stage",
"resources_presentation": "https://docs.google.com/presentation/d/1pDeSitEvmVhEFya_w3q8q2Uq4_YVvfaQsg5BA5nTUaI"
}
}
19 changes: 4 additions & 15 deletions devcon-api/data/sessions/devcon-7/glass-houses-and-tornados.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,13 @@
"audience": "Lobby",
"featured": true,
"doNotRecord": false,
"keywords": [
"Legal",
"Government",
"Regulation"
],
"tags": [
"Governance",
"Mixers",
"Open Source Software",
"Privacy"
],
"keywords": ["Legal", "Government", "Regulation"],
"tags": ["Governance", "Mixers", "Open Source Software", "Privacy"],
"language": "en",
"speakers": [
"peter-van-valkenburgh"
],
"speakers": ["peter-van-valkenburgh"],
"eventId": "devcon-7",
"slot_start": "2024-11-15T05:30:00.000Z",
"slot_end": "2024-11-15T05:50:00.000Z",
"slot_roomId": "main-stage",
"resources_presentation": "https://docs.google.com/presentation/d/1Xs3Tvj3iPf9ArWjPRjf3e7zXu_JG8R-eXuI5yEgHV6c"
}
}
16 changes: 4 additions & 12 deletions devcon-api/data/sessions/devcon-7/how-to-hallucinate-a-server.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,13 @@
"audience": "Engineering",
"featured": false,
"doNotRecord": false,
"keywords": [
"MPFHE",
"Hallucinated Server"
],
"tags": [
"Homomorphic Encryption",
"MPC"
],
"keywords": ["MPFHE", "Hallucinated Server"],
"tags": ["Homomorphic Encryption", "MPC"],
"language": "en",
"speakers": [
"gubsheep"
],
"speakers": ["gubsheep"],
"eventId": "devcon-7",
"slot_start": "2024-11-14T02:45:00.000Z",
"slot_end": "2024-11-14T03:15:00.000Z",
"slot_roomId": "main-stage",
"resources_presentation": "https://docs.google.com/presentation/d/1wOtuuxn-pV_UdYT74yaBeuoxLyXyxkk_KW0-5GBqLJk"
}
}
Loading

0 comments on commit 91c33bf

Please sign in to comment.