Merge pull request #914 from makerdao/new-vnet

Update tenderly chain id
makerdao · Sep 26, 2024 · d70b7fd · d70b7fd
2 parents cf83ee4 + 540bb34
commit d70b7fd
Show file tree

Hide file tree

Showing 7 changed files with 123 additions and 8 deletions.
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -14,7 +14,7 @@ jobs:
         include:
           - test: executives.spec
           - test: delegates.spec
-          - test: esmodule.spec
+          # - test: esmodule.spec
           - test: polling.spec
     runs-on: ubuntu-latest
     env:

diff --git a/modules/tags/constants/poll-tags-mapping.json b/modules/tags/constants/poll-tags-mapping.json
@@ -4465,5 +4465,119 @@
     "risk-parameter",
     "d3m",
     "spark"
+  ],
+  "1120": [
+    "high-impact",
+    "risk-parameter",
+    "spark"
+  ],
+  "1121": [
+    "high-impact",
+    "mips"
+  ],
+  "1122": [
+    "high-impact",
+    "mips"
+  ],
+  "1124": [
+    "high-impact",
+    "collateral-onboard",
+    "risk-parameter",
+    "psm"
+  ],
+  "1125": [
+    "medium-impact",
+    "collateral-onboard",
+    "risk-parameter",
+    "d3m",
+    "spark"
+  ],
+  "1126": [
+    "high-impact",
+    "risk-parameter",
+    "spark"
+  ],
+  "1127": [
+    "high-impact",
+    "mips"
+  ],
+  "1128": [
+    "high-impact",
+    "risk-parameter",
+    "psm"
+  ],
+  "1129": [
+    "high-impact",
+    "ratification",
+    "mips"
+  ],
+  "1130": [
+    "high-impact",
+    "mips"
+  ],
+  "1131": [
+    "medium-impact",
+    "spark"
+  ],
+  "1132": [
+    "high-impact",
+    "oracle",
+    "spark"
+  ],
+  "1133": [
+    "high-impact",
+    "misc-governance",
+    "risk-parameter",
+    "endgame"
+  ],
+  "1134": [
+    "high-impact",
+    "technical",
+    "endgame",
+    "spark"
+  ],
+  "1135": [
+    "high-impact",
+    "collateral-offboard"
+  ],
+  "1136": [
+    "high-impact",
+    "collateral-offboard"
+  ],
+  "1137": [
+    "high-impact",
+    "collateral-offboard"
+  ],
+  "1138": [
+    "high-impact",
+    "collateral-offboard"
+  ],
+  "1139": [
+    "high-impact",
+    "collateral-offboard"
+  ],
+  "1140": [
+    "high-impact",
+    "risk-parameter"
+  ],
+  "1141": [
+    "high-impact",
+    "collateral-onboard",
+    "spark"
+  ],
+  "1142": [
+    "high-impact",
+    "mips"
+  ],
+  "1143": [
+    "high-impact",
+    "collateral-onboard",
+    "collateral-offboard",
+    "risk-parameter",
+    "psm"
+  ],
+  "1144": [
+    "high-impact",
+    "endgame"
   ]
 }
diff --git a/modules/web3/connections/CustomizedBridge.ts b/modules/web3/connections/CustomizedBridge.ts
@@ -13,7 +13,8 @@ import logger from 'lib/logger';
 
 export class CustomizedBridge extends Eip1193Bridge {
   chainId = SupportedChainId.TENDERLY;
-  chainIdHex = '0x1df2041';
+  chainIdHex = `0x${this.chainId.toString(16)}`;
+
   address: string;
 
   setAddress(add: string) {

diff --git a/modules/web3/constants/chainID.ts b/modules/web3/constants/chainID.ts
@@ -10,5 +10,5 @@ export enum SupportedChainId {
   MAINNET = 1,
   ARBITRUM = 42161,
   ARBITRUMTESTNET = 421614,
-  TENDERLY = 31400001
+  TENDERLY = 314311
 }
diff --git a/modules/web3/constants/networks.ts b/modules/web3/constants/networks.ts
@@ -102,7 +102,7 @@ export const CHAIN_INFO: ChainInfo = {
     defaultRpc: NodeProviders.TENDERLY,
     spockUrl: TENDERLY_SPOCK_URL,
     rpcs: {
-      [NodeProviders.TENDERLY]: TENDERLY_RPC_URL || `https://virtual.mainnet.rpc.tenderly.co/${config.TENDERLY_RPC_KEY}`
+      [NodeProviders.TENDERLY]: config.USE_MOCK_WALLET && TENDERLY_RPC_URL ? TENDERLY_RPC_URL : `https://virtual.mainnet.rpc.tenderly.co/${config.TENDERLY_RPC_KEY}`
     },
     showInProduction: false
   }

diff --git a/playwright/esmodule.spec.ts b/playwright/esmodule.spec.ts
@@ -2,7 +2,7 @@ import { test, expect } from '@playwright/test';
 import { connectWallet, closeModal } from './shared';
 import './forkVnet';
 
-test('Input 150,000MKR and burn it', async ({ page }) => {
+test.skip('Input 150,000MKR and burn it', async ({ page }) => {
   await page.goto('/esmodule');
 
   await expect(page.locator('text=Emergency Shutdown Module')).toBeVisible();

diff --git a/playwright/forkVnet.ts b/playwright/forkVnet.ts
@@ -27,7 +27,7 @@ test.afterAll(async () => {
 export const setEthBalance = async (address: string, amount: string) => {
   const file = await readFile('./tenderlyTestnetData.json', 'utf-8');
   const { TENDERLY_RPC_URL } = JSON.parse(file);
-
+  const hexAmount = hexlify(parseEther(amount)).replace(/^0x0/, '0x');
   const response = await fetch(TENDERLY_RPC_URL, {
     method: 'POST',
     headers: {
@@ -36,7 +36,7 @@ export const setEthBalance = async (address: string, amount: string) => {
     },
     body: JSON.stringify({
       method: 'tenderly_setBalance',
-      params: [[address], hexlify(parseEther(amount))],
+      params: [[address], hexAmount],
       id: 42,
       jsonrpc: '2.0'
     })
@@ -88,7 +88,7 @@ const forkVnet = async (displayName: string) => {
       ],
       method: 'POST',
       body: JSON.stringify({
-        srcContainerId: '15f151cf-8db9-4eca-bb64-ff557c753605', //id for mainnet-fork (https://api.tenderly.co/api/v1/makerdao/testnets)
+        srcContainerId: 'a3cdcbc9-56a7-4583-bb2d-705f3bd58e43', //id for e2e-testing-aug-28-fork
         dstContainerDisplayName: displayName
       })
     }