Merge branch 'master' of github.com:OffchainLabs/arbitrum-token-bridg…

…e into non18-dec-e2e
OffchainLabs · Oct 22, 2024 · ba25cb5 · ba25cb5
2 parents 2340fdb + 5730043
commit ba25cb5
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/packages/arb-token-bridge-ui/synpress.config.ts b/packages/arb-token-bridge-ui/synpress.config.ts
@@ -72,6 +72,10 @@ export default defineConfig({
 
       await registerLocalNetwork()
 
+      const erc20Bridger = await Erc20Bridger.fromProvider(childProvider)
+      const ethBridger = await EthBridger.fromProvider(childProvider)
+      const isCustomFeeToken = isNonZeroAddress(ethBridger.nativeToken)
+
       if (!ethRpcUrl && !isOrbitTest) {
         throw new Error('NEXT_PUBLIC_LOCAL_ETHEREUM_RPC_URL variable missing.')
       }
@@ -87,10 +91,6 @@ export default defineConfig({
         )
       }
 
-      const erc20Bridger = await Erc20Bridger.fromProvider(childProvider)
-      const ethBridger = await EthBridger.fromProvider(childProvider)
-      const isCustomFeeToken = isNonZeroAddress(ethBridger.nativeToken)
-
       console.log({ isCustomFeeToken })
 
       const userWalletAddress = await userWallet.getAddress()

diff --git a/packages/scripts/src/addOrbitChain/index.ts b/packages/scripts/src/addOrbitChain/index.ts
@@ -8,6 +8,7 @@ import {
   updateAndValidateOrbitChainsList,
   commitChangesAndCreatePR,
   setOutputs,
+  runPrettier,
 } from "./transforms";
 
 /**
@@ -36,6 +37,8 @@ export async function addOrbitChain(targetJsonPath: string): Promise<void> {
       targetJsonPath
     );
 
+    await runPrettier(targetJsonPath);
+
     await commitChangesAndCreatePR(
       branchName,
       targetJsonPath,

diff --git a/packages/scripts/src/addOrbitChain/transforms.ts b/packages/scripts/src/addOrbitChain/transforms.ts
@@ -8,6 +8,7 @@ import { JsonRpcProvider } from "@ethersproject/providers";
 import axios from "axios";
 import * as fs from "fs";
 import sharp from "sharp";
+import prettier from "prettier";
 
 import {
   commitChanges,
@@ -437,3 +438,18 @@ export const updateOrbitChainsFile = (
 
   return orbitChains;
 };
+
+export async function runPrettier(targetJsonPath: string): Promise<void> {
+  try {
+    const fileContent = fs.readFileSync(targetJsonPath, "utf8");
+    const prettierConfig = await prettier.resolveConfig(targetJsonPath);
+    const formattedContent = await prettier.format(fileContent, {
+      ...prettierConfig,
+      filepath: targetJsonPath,
+    });
+    fs.writeFileSync(targetJsonPath, formattedContent);
+    console.log(`Prettier formatting applied to ${targetJsonPath}`);
+  } catch (error) {
+    warning(`Failed to run Prettier: ${error}`);
+  }
+}