Merge branch 'main' of ssh://github.com/taikoxyz/taiko-mono

taikoxyz · Oct 11, 2024 · 439b237 · 439b237
2 parents 6178142 + c7f74b7
commit 439b237
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/packages/nfts/package.json b/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",

diff --git a/...ipt/trailblazers-badges/sol/UpgradeV3.sol → ...t/trailblazers-badges/sol/UpgradeV3.s.sol b/...ipt/trailblazers-badges/sol/UpgradeV3.sol → ...t/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));
     }

diff --git a/packages/protocol/contracts/layer1/based/TaikoL1.sol b/packages/protocol/contracts/layer1/based/TaikoL1.sol
@@ -77,8 +77,10 @@ contract TaikoL1 is EssentialContract, ITaikoL1, TaikoEvents {
         returns (TaikoData.BlockMetadata memory meta_, TaikoData.EthDeposit[] memory deposits_)
     {
         TaikoData.Config memory config = getConfig();
-        (meta_,) = LibProposing.proposeBlock(state, config, this, _params, _txList);
-        if (meta_.id >= config.ontakeForkHeight) revert L1_FORK_ERROR();
+
+        TaikoData.BlockMetadataV2 memory metaV2;
+        (meta_, metaV2) = LibProposing.proposeBlock(state, config, this, _params, _txList);
+        if (metaV2.id >= config.ontakeForkHeight) revert L1_FORK_ERROR();
         deposits_ = new TaikoData.EthDeposit[](0);
     }