EIP-4844 blob submission and finalization changes (#9)

.eslintrc.js

@@ -5,9 +5,9 @@ module.exports = {
     mocha: true,
     node: true,
   },
-  plugins: ["@typescript-eslint"],
-  extends: ["eslint:recommended", "plugin:@typescript-eslint/recommended", "prettier"],
+  extends: ["eslint:recommended", "plugin:@typescript-eslint/recommended"],
   parser: "@typescript-eslint/parser",
+  plugins: ["@typescript-eslint", "prettier"],
   parserOptions: {
     ecmaVersion: 12,
   },

.gitignore

@@ -7,4 +7,4 @@ typechain-types
 cache
 build
 .openzeppelin
-
+.DS_Store

.prettierrc.json

@@ -1,8 +1,24 @@
 {
-    "trailingComma": "all",
-    "tabWidth": 2,
-    "semi": true,
-    "singleQuote": false,
-    "printWidth": 120,
-    "bracketSpacing": true
+  "plugins": [
+    "prettier-plugin-solidity"
+  ],
+  "trailingComma": "all",
+  "tabWidth": 2,
+  "semi": true,
+  "singleQuote": false,
+  "printWidth": 120,
+  "bracketSpacing": true,
+  "overrides": [
+    {
+      "files": "*.sol",
+      "options": {
+        "parser": "solidity-parse",
+        "bracketSpacing": true,
+        "printWidth": 120,
+        "singleQuote": false,
+        "tabWidth": 2,
+        "useTabs": false
+      }
+    }
+  ]
 }

.solhint.json

@@ -1,10 +1,18 @@
 {
   "extends": "solhint:recommended",
   "rules": {
-    "prettier/prettier": "error",
     "compiler-version": ["error", "^0.8.0"],
     "func-visibility": ["warn", { "ignoreConstructors": true }],
-    "no-inline-assembly": "off"
-  },
-  "plugins": ["prettier"]
+    "no-inline-assembly": "off",
+    "var-name-mixedcase": "off",
+    "const-name-snakecase": "off",
+    "func-name-mixedcase": "off",
+    "custom-errors": "off",
+    "state-visibility": "off",
+    "no-empty-blocks": "off",
+    "avoid-low-level-calls": "off",
+    "reason-string": "off",
+    "check-send-result": "off",
+    "no-unused-import": ["error"]
+  }
 }

.solhintignore

@@ -0,0 +1,2 @@
+node_modules
+contracts/test-contracts

common.ts

@@ -1,42 +1,5 @@
-import fs from "fs";
-
 const MAX_GAS_LIMIT = process.env.TX_GAS_LIMIT ? parseInt(process.env.TX_GAS_LIMIT) : 500000000;
 
-/**
- * Helper function to deal with account JSON files
- * @param {string} filePath full path to file with private key
- */
-function getPrivateKeyFromFile(filePath: string): string {
-  let privateKey;
-  if (fs.existsSync(filePath)) {
-    const account = fs.readFileSync(filePath, "utf8");
-    privateKey = JSON.parse(account).account_key.priv_key;
-  } else {
-    console.warn(`Path ${filePath} with private key does not exist`);
-  }
-  return privateKey;
-}
-
-/**
- * Get private key of contract owner, based on several assumptions
- */
-function getContractOwnerPrivateKey(
-  keyFile: string,
-  bridgeOwnerPathOverride: string,
-  bridgeOwnerPrivateKeyOverride: string,
-): string {
-  let contractOwnerJsonPath;
-
-  if (bridgeOwnerPrivateKeyOverride) {
-    return bridgeOwnerPrivateKeyOverride;
-  } else if (bridgeOwnerPathOverride && fs.existsSync(bridgeOwnerPathOverride)) {
-    contractOwnerJsonPath = bridgeOwnerPathOverride;
-  } else {
-    contractOwnerJsonPath = keyFile;
-  }
-  return getPrivateKeyFromFile(contractOwnerJsonPath);
-}
-
 function getBlockchainNode(): string {
   return process.env.BLOCKCHAIN_NODE || "http://127.0.0.1:8545";
 }
@@ -45,23 +8,4 @@ function getL2BlockchainNode(): string | undefined {
   return process.env.L2_BLOCKCHAIN_NODE;
 }
 
-/**
- * Returns path to JSON file with address of deployed rollup smart config, which contains address and ABI
- * @returns {string}
- */
-function getRollupContractConfigPath(): string {
-  return process.env.SMC_CONFIG_PATH || "/smart_contract/data/smc_config.json";
-}
-
-function getRollupJsonPath(): string {
-  return process.env.ROLLUP_JSON_PATH || "/smart_contract/data/rollup.json";
-}
-
-export {
-  MAX_GAS_LIMIT,
-  getBlockchainNode,
-  getContractOwnerPrivateKey,
-  getL2BlockchainNode,
-  getRollupContractConfigPath,
-  getRollupJsonPath,
-};
+export { MAX_GAS_LIMIT, getBlockchainNode, getL2BlockchainNode };