Merge branch 'main' into tbz-blacklist-upgrade

.github/workflows/eventindexer.yml

@@ -32,7 +32,7 @@ jobs:
 
           # Optional: working directory, useful for monorepos
           working-directory: ./packages/eventindexer
-          args: --config=.golangci.yml --timeout=4m
+          args: --config=.golangci.yml --timeout=10m
 
   test-eventindexer:
     runs-on: [arc-runner-set]

.github/workflows/taiko-client--test.yml

@@ -35,6 +35,10 @@ jobs:
     runs-on: [ubuntu-latest]
     timeout-minutes: 15
 
+    strategy:
+      matrix:
+        execution_node: [l2_geth]
+
     steps:
       - name: Cancel Previous Runs
         uses: styfle/[email protected]
@@ -55,8 +59,10 @@ jobs:
       - name: Install pnpm dependencies
         uses: ./.github/actions/install-pnpm-dependencies
 
-      - name: Test
+      - name: Run Tests on ${{ matrix.execution_node }} execution engine
         working-directory: packages/taiko-client
+        env:
+          L2_NODE: ${{ matrix.execution_node }}
         run: make test
 
       - name: Codecov.io

.release-please-manifest.json

@@ -1,15 +1,15 @@
 {
   "packages/bridge-ui": "2.12.0",
-  "packages/docs-site": "1.12.1",
+  "packages/docs-site": "1.14.0",
   "packages/eventindexer": "0.13.0",
   "packages/fork-diff": "0.6.1",
   "packages/guardian-prover-health-check": "0.1.0",
   "packages/guardian-prover-health-check-ui": "0.2.0",
-  "packages/protocol": "1.9.0",
+  "packages/protocol": "1.10.0",
   "packages/relayer": "0.12.0",
   "packages/snaefell-ui": "1.1.0",
   "packages/supplementary-contracts": "1.0.0",
-  "packages/taiko-client": "0.38.0",
+  "packages/taiko-client": "0.39.2",
   "packages/taikoon-ui": "1.3.0",
   "packages/ui-lib": "1.0.0"
 }

go.mod

@@ -235,13 +235,7 @@ require (
 	sigs.k8s.io/yaml v1.3.0 // indirect
 )
 
-exclude (
-	github.com/ethereum/go-ethereum v1.14.5
-	github.com/ethereum/go-ethereum v1.14.6
-	github.com/ethereum/go-ethereum v1.14.7
-)
-
-replace github.com/ethereum/go-ethereum v1.14.11 => github.com/taikoxyz/taiko-geth v1.8.1-0.20241003040603-5c84a2082747
+replace github.com/ethereum/go-ethereum v1.14.11 => github.com/taikoxyz/taiko-geth v1.11.1
 
 replace github.com/ethereum-optimism/optimism v1.7.4 => github.com/taikoxyz/optimism v0.0.0-20241003061504-cdf8af288f39
 

go.sum

@@ -610,8 +610,8 @@ github.com/taikoxyz/hive v0.0.0-20240827015317-405b241dd082 h1:ymZR+Y88LOnA8i3Ke
 github.com/taikoxyz/hive v0.0.0-20240827015317-405b241dd082/go.mod h1:RHnIu3EFehrWX3JhFAMQSXD5uz7l0xaNroTzXrap7EQ=
 github.com/taikoxyz/optimism v0.0.0-20241003061504-cdf8af288f39 h1:JssMxaDmORjQ9RPZNulVJhAD8zSPd6LZFq5wsr6Nwz8=
 github.com/taikoxyz/optimism v0.0.0-20241003061504-cdf8af288f39/go.mod h1:ym7scR7ZHvEmwx1DLGVDzFlAdR+uhP1+Z4XCiFuSD5s=
-github.com/taikoxyz/taiko-geth v1.8.1-0.20241003040603-5c84a2082747 h1:QRB8VHGmlRgm7ze/4Fzuce08Ypbq5Mr5q/piTfsck1A=
-github.com/taikoxyz/taiko-geth v1.8.1-0.20241003040603-5c84a2082747/go.mod h1:+l/fr42Mma+xBnhefL/+z11/hcmJ2egl+ScIVPjhc7E=
+github.com/taikoxyz/taiko-geth v1.11.1 h1:pur1WP6YJkwKhLVeN3Zf7dOwbPq6tS88gYod6QKlJc4=
+github.com/taikoxyz/taiko-geth v1.11.1/go.mod h1:+l/fr42Mma+xBnhefL/+z11/hcmJ2egl+ScIVPjhc7E=
 github.com/testcontainers/testcontainers-go v0.30.0 h1:jmn/XS22q4YRrcMwWg0pAwlClzs/abopbsBzrepyc4E=
 github.com/testcontainers/testcontainers-go v0.30.0/go.mod h1:K+kHNGiM5zjklKjgTtcrEetF3uhWbMUyqAQoyoh8Pf0=
 github.com/thomaso-mirodin/intmath v0.0.0-20160323211736-5dc6d854e46e h1:cR8/SYRgyQCt5cNCMniB/ZScMkhI9nk8U5C7SbISXjo=

packages/docs-site/CHANGELOG.md

@@ -1,5 +1,33 @@
 # Changelog
 
+## [1.14.0](https://github.com/taikoxyz/taiko-mono/compare/docs-site-v1.13.0...docs-site-v1.14.0) (2024-10-25)
+
+
+### Features
+
+* **docs-site:** add banner for mainnet protocol upgrade ([#18306](https://github.com/taikoxyz/taiko-mono/issues/18306)) ([550dda3](https://github.com/taikoxyz/taiko-mono/commit/550dda334dfa2d53a757ce46091acaba4248371a))
+
+## [1.13.0](https://github.com/taikoxyz/taiko-mono/compare/docs-site-v1.12.3...docs-site-v1.13.0) (2024-10-25)
+
+
+### Features
+
+* **docs-site:** add pyth to taiko docs ([#18294](https://github.com/taikoxyz/taiko-mono/issues/18294)) ([59832f1](https://github.com/taikoxyz/taiko-mono/commit/59832f1324cbf98de339552fd8d5039afe3d0e9c))
+
+## [1.12.3](https://github.com/taikoxyz/taiko-mono/compare/docs-site-v1.12.2...docs-site-v1.12.3) (2024-10-20)
+
+
+### Chores
+
+* **docs-site:** remove banner ([#18267](https://github.com/taikoxyz/taiko-mono/issues/18267)) ([1a46093](https://github.com/taikoxyz/taiko-mono/commit/1a460932a704d3660269336540812f33d7e8cbc4))
+
+## [1.12.2](https://github.com/taikoxyz/taiko-mono/compare/docs-site-v1.12.1...docs-site-v1.12.2) (2024-10-14)
+
+
+### Bug Fixes
+
+* **docs-site:** fix edit link ([#18243](https://github.com/taikoxyz/taiko-mono/issues/18243)) ([ea55bc2](https://github.com/taikoxyz/taiko-mono/commit/ea55bc24ea7184655804b88cc3c424b69fc87103))
+
 ## [1.12.1](https://github.com/taikoxyz/taiko-mono/compare/docs-site-v1.12.0...docs-site-v1.12.1) (2024-09-30)
 
 

packages/docs-site/astro.config.ts

@@ -42,7 +42,7 @@ export default defineConfig({
       title: "Docs",
       editLink: {
         baseUrl:
-          "https://github.com/taikoxyz/taiko-mono/tree/main/packages/docs-site",
+          "https://github.com/taikoxyz/taiko-mono/edit/main/packages/docs-site",
       },
       customCss: ["./src/styles/custom.css"],
       logo: {

packages/docs-site/package.json

@@ -1,7 +1,7 @@
 {
   "name": "docs-site",
   "type": "module",
-  "version": "1.12.1",
+  "version": "1.14.0",
   "scripts": {
     "dev": "astro dev",
     "start": "astro dev",

packages/docs-site/src/content/config.ts

@@ -9,7 +9,7 @@ export const collections = {
           .string()
           .max(160, { message: "Must be 160 characters or less." }).optional(),
       banner: z.object({ content: z.string() }).default({
-        content: 'All Hekla Node Runners: Imminent Ontake fork Sep 30th, upgrade needed. Please update your provers to raiko 1.2.0! Click <a href="https://discord.com/channels/984015101017346058/984087180739768331/1284040980084817931">here</a> for more info',
+        content: 'All Mainnet Node Runners: Protocol upgrade on Oct 31st in preparation for Ontake fork, upgrade needed. Please ensure your nodes are using the software tags listed in the announcement! Click <a href="https://taiko.mirror.xyz/OJA4SwCqHjF32Zz0GkNJvnHWlsRYzdJ6hcO9FXVOpLs">here</a> for more info',
         }),
       }),
     }),

packages/docs-site/src/content/docs/resources/developer-tools.mdx

@@ -38,6 +38,11 @@ import { LinkCard, CardGrid } from "@astrojs/starlight/components";
     description="API3 offers over 200 first-party, OEV-enabled price feeds on Taiko Mainnet and Testnet, providing reliable and decentralized data through the API3 Market."
     href="https://market.api3.org/taiko"
   />
+  <LinkCard
+    title="Pyth Network"
+    description="Pyth Network is the largest first-party Oracle network, delivering real-time data across a vast number of chains. Pyth introduces an innovative low-latency pull oracle design, where users can pull price updates on-chain when needed, enabling everyone in the blockchain environment to access that data point most efficiently. Pyth network updates the prices every 400ms, making Pyth the fastest on-chain oracle."
+    href="https://docs.pyth.network/price-feeds/use-real-time-data/evm"
+  />
 </CardGrid>
 
 ## Node Providers

packages/eventindexer/.golangci.yml

@@ -9,7 +9,7 @@
 # ],
 
 output:
-  format: colored-line-number
+  formats: colored-line-number
 
 linters:
   enable:

packages/nfts/package.json

@@ -35,7 +35,9 @@
     "pfp:deploy:hekla": "forge clean && pnpm compile && forge script script/profile/Deploy.s.sol --rpc-url https://rpc.hekla.taiko.xyz --broadcast   --gas-estimate-multiplier 200",
     "pfp:deploy:mainnet": "forge clean && pnpm compile && forge script script/profile/Deploy.s.sol --rpc-url https://rpc.mainnet.taiko.xyz --broadcast   --gas-estimate-multiplier 200",
     "tbz:airdrop:hekla": "forge clean && pnpm compile && forge script script/trailblazers-airdrop/Deploy.s.sol --rpc-url https://rpc.hekla.taiko.xyz --broadcast   --gas-estimate-multiplier 200",
-    "tbz:airdrop:mainnet": "forge clean && pnpm compile && forge script script/trailblazers-airdrop/Deploy.s.sol --rpc-url https://rpc.mainnet.taiko.xyz --broadcast   --gas-estimate-multiplier 100"
+    "tbz:airdrop:mainnet": "forge clean && pnpm compile && forge script script/trailblazers-airdrop/Deploy.s.sol --rpc-url https://rpc.mainnet.taiko.xyz --broadcast   --gas-estimate-multiplier 100",
+    "tbz:upgradeV3:hekla": "forge clean && pnpm compile && forge script script/trailblazers-badges/sol/UpgradeV3.s.sol --rpc-url https://rpc.hekla.taiko.xyz --broadcast   --gas-estimate-multiplier 200",
+    "tbz:upgradeV3:mainnet": "forge clean && pnpm compile && forge script script/trailblazers-badges/sol/UpgradeV3.s.sol --rpc-url https://rpc.mainnet.taiko.xyz --broadcast   --gas-estimate-multiplier 100"
   },
   "devDependencies": {
     "@types/node": "^20.11.30",

packages/nfts/script/trailblazers-badges/sol/UpgradeV3.sol → packages/nfts/script/trailblazers-badges/sol/UpgradeV3.s.sol

@@ -10,7 +10,7 @@ import { IMinimalBlacklist } from "@taiko/blacklist/IMinimalBlacklist.sol";
 import { TrailblazersBadgesV3 } from
     "../../../contracts/trailblazers-badges/TrailblazersBadgesV3.sol";
 
-contract UpgradeV2 is Script {
+contract UpgradeV3 is Script {
     UtilsScript public utils;
     string public jsonLocation;
     uint256 public deployerPrivateKey;
@@ -37,7 +37,7 @@ contract UpgradeV2 is Script {
             address(new TrailblazersBadgesV3()), abi.encodeCall(TrailblazersBadgesV3.version, ())
         );
 
-        tokenV3 = TrailblazersBadgesV3(tokenV3);
+        tokenV3 = TrailblazersBadgesV3(address(tokenV2));
 
         console.log("Upgraded TrailblazersBadgesV3 to:", address(tokenV3));
     }