Merge branch 'main' into feat/blobstorage-tests

taikoxyz · May 1, 2024 · a54386f · a54386f
2 parents 7e9de27 + 215a600
commit a54386f
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 243 deletions.
diff --git a/packages/protocol/contracts/team/airdrop/ERC721Airdrop.sol b/packages/protocol/contracts/team/airdrop/ERC721Airdrop.sol
diff --git a/packages/protocol/genesis/mainnet.js b/packages/protocol/genesis/mainnet.js
@@ -0,0 +1,55 @@
+"use strict";
+const ADDRESS_LENGTH = 40;
+
+module.exports = {
+  contractOwner: "0xf8ff2AF0DC1D5BA4811f22aCb02936A1529fd2Be",
+  l1ChainId: 1,
+  chainId: 167000,
+  seedAccounts: [
+    {
+      "0x69AA0361Dbb0527d4F1e5312403Bd41788fe61Fe": 199,
+    },
+    {
+      "0x00000968bfe78aa27cd380d629d61c89bd6b03e8": 1,
+    },
+  ],
+  get contractAddresses() {
+    return {
+      // ============ Implementations ============
+      // Shared Contracts
+      BridgeImpl: getConstantAddress(`0${this.chainId}`, 1),
+      ERC20VaultImpl: getConstantAddress(`0${this.chainId}`, 2),
+      ERC721VaultImpl: getConstantAddress(`0${this.chainId}`, 3),
+      ERC1155VaultImpl: getConstantAddress(`0${this.chainId}`, 4),
+      SignalServiceImpl: getConstantAddress(`0${this.chainId}`, 5),
+      SharedAddressManagerImpl: getConstantAddress(`0${this.chainId}`, 6),
+      BridgedERC20Impl: getConstantAddress(`0${this.chainId}`, 10096),
+      BridgedERC721Impl: getConstantAddress(`0${this.chainId}`, 10097),
+      BridgedERC1155Impl: getConstantAddress(`0${this.chainId}`, 10098),
+      // Rollup Contracts
+      TaikoL2Impl: getConstantAddress(`0${this.chainId}`, 10001),
+      RollupAddressManagerImpl: getConstantAddress(`0${this.chainId}`, 10002),
+      // ============ Proxies ============
+      // Shared Contracts
+      Bridge: getConstantAddress(this.chainId, 1),
+      ERC20Vault: getConstantAddress(this.chainId, 2),
+      ERC721Vault: getConstantAddress(this.chainId, 3),
+      ERC1155Vault: getConstantAddress(this.chainId, 4),
+      SignalService: getConstantAddress(this.chainId, 5),
+      SharedAddressManager: getConstantAddress(this.chainId, 6),
+      // Rollup Contracts
+      TaikoL2: getConstantAddress(this.chainId, 10001),
+      RollupAddressManager: getConstantAddress(this.chainId, 10002),
+    };
+  },
+  param1559: {
+    gasExcess: 1,
+  },
+  predeployERC20: false,
+};
+
+function getConstantAddress(prefix, suffix) {
+  return `0x${prefix}${"0".repeat(
+    ADDRESS_LENGTH - String(prefix).length - String(suffix).length,
+  )}${suffix}`;
+}
diff --git a/packages/protocol/package.json b/packages/protocol/package.json
@@ -7,7 +7,7 @@
     "clean": "rm -rf abis cache* && forge clean",
     "compile": "forge build --build-info --extra-output storage-layout",
     "test:deploy": "./script/download_solc.sh && ./script/test_deploy_on_l1.sh",
-    "eslint": "pnpm exec eslint --ignore-path .eslintignore --ext .js,.ts .",
+    "eslint": "pnpm exec eslint --fix --ignore-path .eslintignore --ext .js,.ts .",
     "fmt:sol": "forge fmt",
     "generate:genesis": "ts-node ./utils/generate_genesis/main.ts",
     "lint:sol": "forge fmt && pnpm solhint 'contracts/**/*.sol'",

diff --git a/packages/protocol/test/TaikoTest.sol b/packages/protocol/test/TaikoTest.sol
@@ -22,7 +22,6 @@ import "../contracts/L2/DelegateOwner.sol";
 
 import "../contracts/team/airdrop/ERC20Airdrop.sol";
 import "../contracts/team/airdrop/ERC20Airdrop2.sol";
-import "../contracts/team/airdrop/ERC721Airdrop.sol";
 
 import "../test/common/erc20/FreeMintERC20.sol";
 import "../test/L2/TaikoL2EIP1559Configurable.sol";

diff --git a/packages/protocol/test/team/airdrop/ERC721Airdrop.t.sol b/packages/protocol/test/team/airdrop/ERC721Airdrop.t.sol
diff --git a/packages/protocol/utils/generate_genesis/taikoL2.ts b/packages/protocol/utils/generate_genesis/taikoL2.ts
@@ -18,8 +18,8 @@ export async function deployTaikoL2(
 
     const alloc: any = {};
 
-    // Premint 1 billion ethers to the bridge, current Ethereum's supply is ~120.27M.
-    let bridgeInitialEtherBalance = ethers.utils.parseEther(`${1_000_000_000}`);
+    // Premint 999_999_800 ethers to the bridge, current Ethereum's supply is ~120.27M.
+    let bridgeInitialEtherBalance = ethers.utils.parseEther(`${999_999_800}`);
 
     for (const seedAccount of seedAccounts) {
         const accountAddress = Object.keys(seedAccount)[0];