Skip to content

Commit

Permalink
Merge branch 'main' into relayer_api_tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@dantaik
dantaik authored Jun 5, 2023
2 parents 97fe258 + c17e31c commit 3edf959
Show file tree
Hide file tree
Showing 21 changed files with 2,207 additions and 2,613 deletions.
153 changes: 20 additions & 133 deletions packages/eventindexer/TaikoL1.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,21 +66,6 @@
"name": "L1_FORK_CHOICE_NOT_FOUND",
"type": "error"
},
{
"inputs": [],
"name": "L1_INSUFFICIENT_TOKEN",
"type": "error"
},
{
"inputs": [],
"name": "L1_INSUFFICIENT_TOKEN",
"type": "error"
},
{
"inputs": [],
"name": "L1_INSUFFICIENT_TOKEN",
"type": "error"
},
{
"inputs": [],
"name": "L1_INVALID_CONFIG",
Expand Down Expand Up @@ -246,11 +231,6 @@
"name": "L1_TX_LIST_RANGE",
"type": "error"
},
{
"inputs": [],
"name": "Overflow",
"type": "error"
},
{
"inputs": [],
"name": "RESOLVER_DENIED",
Expand Down Expand Up @@ -367,6 +347,11 @@
"internalType": "uint96",
"name": "amount",
"type": "uint96"
},
{
"internalType": "uint64",
"name": "id",
"type": "uint64"
}
],
"internalType": "struct TaikoData.EthDeposit[]",
Expand Down Expand Up @@ -496,6 +481,11 @@
"internalType": "uint96",
"name": "amount",
"type": "uint96"
},
{
"internalType": "uint64",
"name": "id",
"type": "uint64"
}
],
"indexed": false,
Expand Down Expand Up @@ -590,19 +580,6 @@
"stateMutability": "payable",
"type": "function"
},
{
"inputs": [
{
"internalType": "uint256",
"name": "amount",
"type": "uint256"
}
],
"name": "depositTaikoToken",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [
{
Expand Down Expand Up @@ -849,25 +826,6 @@
"stateMutability": "view",
"type": "function"
},
{
"inputs": [
{
"internalType": "uint64",
"name": "proofTime",
"type": "uint64"
}
],
"name": "getProofReward",
"outputs": [
{
"internalType": "uint64",
"name": "",
"type": "uint64"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "getStateVariables",
Expand All @@ -879,11 +837,6 @@
"name": "blockFee",
"type": "uint64"
},
{
"internalType": "uint64",
"name": "accBlockFees",
"type": "uint64"
},
{
"internalType": "uint64",
"name": "genesisHeight",
Expand All @@ -899,26 +852,11 @@
"name": "numBlocks",
"type": "uint64"
},
{
"internalType": "uint64",
"name": "proofTimeIssued",
"type": "uint64"
},
{
"internalType": "uint64",
"name": "proofTimeTarget",
"type": "uint64"
},
{
"internalType": "uint64",
"name": "lastVerifiedBlockId",
"type": "uint64"
},
{
"internalType": "uint64",
"name": "accProposedAt",
"type": "uint64"
},
{
"internalType": "uint64",
"name": "nextEthDepositToProcess",
Expand Down Expand Up @@ -992,21 +930,6 @@
"internalType": "uint64",
"name": "_initBlockFee",
"type": "uint64"
},
{
"internalType": "uint64",
"name": "_initProofTimeTarget",
"type": "uint64"
},
{
"internalType": "uint64",
"name": "_initProofTimeIssued",
"type": "uint64"
},
{
"internalType": "uint16",
"name": "_adjustmentQuotient",
"type": "uint16"
}
],
"name": "init",
Expand Down Expand Up @@ -1110,6 +1033,11 @@
"internalType": "uint96",
"name": "amount",
"type": "uint96"
},
{
"internalType": "uint64",
"name": "id",
"type": "uint64"
}
],
"internalType": "struct TaikoData.EthDeposit[]",
Expand Down Expand Up @@ -1216,34 +1144,6 @@
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [
{
"internalType": "uint64",
"name": "newProofTimeTarget",
"type": "uint64"
},
{
"internalType": "uint64",
"name": "newProofTimeIssued",
"type": "uint64"
},
{
"internalType": "uint64",
"name": "newBlockFee",
"type": "uint64"
},
{
"internalType": "uint16",
"name": "newAdjustmentQuotient",
"type": "uint16"
}
],
"name": "setProofParams",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [],
"name": "state",
Expand All @@ -1260,7 +1160,7 @@
},
{
"internalType": "uint16",
"name": "adjustmentQuotient",
"name": "__reserved70",
"type": "uint16"
},
{
Expand All @@ -1275,12 +1175,12 @@
},
{
"internalType": "uint64",
"name": "accProposedAt",
"name": "__reserved80",
"type": "uint64"
},
{
"internalType": "uint64",
"name": "accBlockFees",
"name": "__reserved81",
"type": "uint64"
},
{
Expand All @@ -1300,7 +1200,7 @@
},
{
"internalType": "uint64",
"name": "proofTimeIssued",
"name": "__reserved90",
"type": "uint64"
},
{
Expand All @@ -1310,7 +1210,7 @@
},
{
"internalType": "uint64",
"name": "proofTimeTarget",
"name": "__reserved91",
"type": "uint64"
}
],
Expand Down Expand Up @@ -1343,19 +1243,6 @@
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [
{
"internalType": "uint256",
"name": "amount",
"type": "uint256"
}
],
"name": "withdrawTaikoToken",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
},
{
"stateMutability": "payable",
"type": "receive"
Expand Down
217 changes: 60 additions & 157 deletions packages/eventindexer/contracts/taikol1/TaikoL1.go
View file

Large diffs are not rendered by default.

52 changes: 26 additions & 26 deletions packages/website/components/BlogSection.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,47 +1,47 @@
const posts = [
{
title: "Taiko Community Update — Q1/2023",
href: "https://taiko.mirror.xyz/IoEGEzlf0aJAtF31YgHHLOa5dSoetLfpIfb7lRaRiCE",
title: "Community invite: help craft the ZK-research digest",
href: "https://taiko.mirror.xyz/lezTMMMoog57VnYwiUWiw4Ng_mX19WCMOpPW-W-xcM0",
description:
"Below is a summary of Taiko’s Q1 2023. Consider this Q1.5 as we’ll include updates that happened post-Q1 but before this update.",
date: "May 19, 2023",
datetime: "2023-05-19",
"We are starting an open research community to collaborate on the creation of the ZK research digest and share rare discoveries and valuable content to learn, grow and build together.",
date: "May 29, 2023",
datetime: "2023-05-29",
imageUrl:
"https://mirror-media.imgix.net/publication-images/TOXeVr7_rtitwDoja4vFR.png?height=512&width=1024&h=512&w=1024&auto=compress",
readingTime: "6 min",
"https://mirror-media.imgix.net/publication-images/8RANXhY7FVaW8C9acbamg.png?height=512&width=1024&h=512&w=1024&auto=compress",
readingTime: "3 min",
author: {
name: "finestone",
imageUrl: "https://avatars.githubusercontent.com/u/36642873?v=4",
name: "Lisa A.",
imageUrl: "https://avatars.githubusercontent.com/u/106527861?v=4",
},
},
{
title: "ZK-Roller-Coaster #4",
href: "https://taiko.mirror.xyz/OCkE3gMDKixWYC-mlX7wAqDNJaUEpm3yeDAYJygyxkg",
title: "ZK-Roller-Coaster #5",
href: "https://taiko.mirror.xyz/D9hurhYWGpVbFosu8KYsr0FeYcbi4wB0rt67hbXD_zk",
description:
"This is the 4th edition of ZK-Roller-Coaster where we track and investigate the most exciting, meaningful, and crazy ZK-stuff of the prior two weeks.",
date: "May 06, 2023",
datetime: "2023-05-06",
"This is the 5th edition of ZK-Roller-Coaster where we track and investigate the most exciting, meaningful, and crazy ZK-stuff of the prior two weeks.",
date: "May 22, 2023",
datetime: "2023-05-22",
imageUrl:
"https://mirror-media.imgix.net/publication-images/Myf4VHMd1ACmqL0jmYHWe.png?height=512&width=1024&h=512&w=1024&auto=compress",
readingTime: "4 min",
"https://mirror-media.imgix.net/publication-images/aqZ6LByfP5NL675mThlf-.png?height=512&width=1024&h=512&w=1024&auto=compress",
readingTime: "3 min",
author: {
name: "Lisa A.",
imageUrl: "https://avatars.githubusercontent.com/u/106527861?v=4",
},
},
{
title: "Taiko Protocol Overview",
href: "https://taiko.mirror.xyz/y_47kIOL5kavvBmG0zVujD2TRztMZt-xgM5d4oqp4_Y",
title: "Taiko Community Update — Q1/2023",
href: "https://taiko.mirror.xyz/IoEGEzlf0aJAtF31YgHHLOa5dSoetLfpIfb7lRaRiCE",
description:
"Taiko follows the “decentralized from day 1” approach. Below is the protocol description. Taiko protocol consists of three stages: block proposal, validation, and proving.",
date: "May 02, 2023",
datetime: "2023-05-02",
"Below is a summary of Taiko’s Q1 2023. Consider this Q1.5 as we’ll include updates that happened post-Q1 but before this update.",
date: "May 19, 2023",
datetime: "2023-05-19",
imageUrl:
"https://mirror-media.imgix.net/publication-images/o_qvD7XIAPSjiqlvvodoj.png?height=512&width=1024&h=512&w=1024&auto=compress",
"https://mirror-media.imgix.net/publication-images/TOXeVr7_rtitwDoja4vFR.png?height=512&width=1024&h=512&w=1024&auto=compress",
readingTime: "6 min",
author: {
name: "Lisa A.",
imageUrl: "https://avatars.githubusercontent.com/u/106527861?v=4",
name: "finestone",
imageUrl: "https://avatars.githubusercontent.com/u/36642873?v=4",
},
},
];
Expand All @@ -54,7 +54,7 @@ export default function BlogSection() {
</div>
<div className="relative mx-auto max-w-7xl">
<div className="text-center">
<h2 className="font-oxanium text-3xl font-bold tracking-tight text-neutral-900 sm:text-4xl dark:text-neutral-100">
<h2 className="font-grotesk text-3xl tracking-tight text-neutral-900 sm:text-4xl dark:text-neutral-100">
Latest blog posts
</h2>
<div className="mx-auto mt-3 max-w-2xl text-xl text-neutral-500 sm:mt-4 dark:text-neutral-300">
Expand Down Expand Up @@ -107,7 +107,7 @@ export default function BlogSection() {
/>
</div>
<div className="ml-3">
<div className="text-sm font-medium text-[#fc0fc0]">
<div className="text-sm font-medium text-[#e81899]">
{post.author.name}
</div>
<div className="flex space-x-1 text-sm text-neutral-500 dark:text-neutral-400">
Expand Down
4 changes: 2 additions & 2 deletions packages/website/components/CareerSection.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ export default function CareerSection() {
return (
<div className="bg-white dark:bg-neutral-900">
<div className="mx-auto max-w-7xl py-12 px-4 text-center sm:px-6 lg:py-16 lg:px-8">
<h2 className="font-oxanium text-3xl font-bold tracking-tight text-gray-900 sm:text-4xl dark:text-neutral-100">
<h2 className="font-grotesk text-3xl tracking-tight text-gray-900 sm:text-4xl dark:text-neutral-100">
<span className="block">Join the community 💪</span>
</h2>
<section className="bg-white dark:bg-neutral-900 py-12">
Expand All @@ -28,7 +28,7 @@ export default function CareerSection() {
href="https://taikoxyz.notion.site/Taiko-Jobs-828fd7232d2c4150a11e10c8baa910a2"
target={"_blank"}
rel={"noreferrer"}
className="inline-flex items-center justify-center w-64 md:w-72 px-4 md:px-6 py-2 md:py-3 mb-4 mx-2 text-base md:text-lg font-semibold text-white bg-[#fc0fc0] hover:bg-[#e30ead] dark:hover:bg-[#e30ead] rounded-md shadow-md"
className="inline-flex items-center justify-center w-64 md:w-72 px-4 md:px-6 py-2 md:py-3 mb-4 mx-2 text-base md:text-lg font-semibold text-white bg-[#e81899] hover:bg-[#d1168a] dark:hover:bg-[#ea2fa3] rounded-md shadow-md"
>
Explore open positions &#8599;
</a>
Expand Down
4 changes: 2 additions & 2 deletions packages/website/components/FeaturesSection.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {

const features = [
{
name: "Type 1 (Ethereum-equivalent)",
name: "Ethereum-equivalent",
description:
"A Type 1 (Ethereum-equivalent) ZK-EVM aims for maximum compatibility. This results in a seamless developer experience.",
icon: ArrowPathIcon,
Expand Down Expand Up @@ -42,7 +42,7 @@ export default function FeaturesSection() {
/>
</span>
</div>
<h3 className="font-oxanium mt-8 text-lg font-semibold leading-8 tracking-tight text-neutral-900 dark:text-neutral-100">
<h3 className="font-groteskmedium mt-8 text-lg leading-8 tracking-tight text-neutral-900 dark:text-neutral-100">
{feature.name}
</h3>
<p className="mt-5 text-base leading-7 text-neutral-600 dark:text-neutral-300">
Expand Down
Loading

0 comments on commit 3edf959

Please sign in to comment.