Fix dev node and simulate eigen (skip deploy)

consensusnetworks · Nov 5, 2023 · cd55eb7 · cd55eb7
1 parent f2ed3ce
commit cd55eb7
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 39 deletions.
diff --git a/common/env/src/index.ts b/common/env/src/index.ts
@@ -40,7 +40,7 @@ enum ETHEREUM_NETWORK_NAME {
 }
 
 enum ETHEREUM_RPC_URL {
-    TESTNET = 'https://goerli.infura.io/v3/46a379ac6895489f812f33beb726b03b'
+    TESTNET = 'https://goerli.infura.io/v3/46a379ac6895489f812f33beb726b03b' // 'https://nodes.casimir.co/eth/goerli/limited'
 }
 
 const ETHEREUM_SIGNERS = {
@@ -51,10 +51,6 @@ const ETHEREUM_SIGNERS = {
     }
 }
 
-enum ETHEREUM_WS_URL {
-    TESTNET = 'wss://goerli.infura.io/ws/v3/46a379ac6895489f812f33beb726b03b'
-}
-
 enum HARDHAT_NETWORK_KEY {
     GOERLI = 'TESTNET',
     HARDHAT = 'TESTNET',
@@ -66,7 +62,6 @@ export {
     ETHEREUM_NETWORK_NAME,
     ETHEREUM_RPC_URL,
     ETHEREUM_SIGNERS,
-    ETHEREUM_WS_URL,
     HARDHAT_NETWORK_KEY,
     MOCK_OPERATORS,
     MOCK_RESHARES,

diff --git a/contracts/ethereum/package.json b/contracts/ethereum/package.json
@@ -7,7 +7,7 @@
         "deploy": "npx hardhat run scripts/deploy.ts",
         "dev": "npx hardhat run scripts/dev.ts",
         "docgen": "npx hardhat docgen",
-        "predev": "npx hardhat node",
+        "predev": "npx hardhat node &",
         "report": "npx hardhat run scripts/report.ts",
         "size": "npx hardhat size-contracts",
         "test": "npx esno -r dotenv/config -r scripts/test.ts",

diff --git a/package-lock.json b/package-lock.json
diff --git a/scripts/root/dev.ts b/scripts/root/dev.ts
@@ -93,7 +93,6 @@ async function root() {
     process.env.FACTORY_ADDRESS = ETHEREUM_CONTRACTS[networkKey]?.FACTORY_ADDRESS
     process.env.SSV_NETWORK_ADDRESS = ETHEREUM_CONTRACTS[networkKey]?.SSV_NETWORK_ADDRESS
     process.env.SSV_VIEWS_ADDRESS = ETHEREUM_CONTRACTS[networkKey]?.SSV_VIEWS_ADDRESS
-    process.env.SWAP_FACTORY_ADDRESS = ETHEREUM_CONTRACTS[networkKey]?.SWAP_FACTORY_ADDRESS
     if (apps[app].contracts) {
         if (process.env.NETWORK) {
             const networkName = ETHEREUM_NETWORK_NAME[networkKey]
@@ -111,7 +110,7 @@ async function root() {
 
             process.env.TUNNEL = process.env.TUNNEL || 'false'
             process.env.MINING_INTERVAL = '12'
-            process.env.SIMULATE_EIGENS = 'true'
+            process.env.SIMULATE_EIGEN = 'true'
             process.env.SIMULATE_REWARDS = 'true'
 
             run('npm run dev --workspace @casimir/ethereum -- --network localhost')
@@ -125,7 +124,6 @@ async function root() {
     process.env.PUBLIC_FACTORY_ADDRESS = process.env.FACTORY_ADDRESS
     process.env.PUBLIC_SSV_NETWORK_ADDRESS = process.env.SSV_NETWORK_ADDRESS
     process.env.PUBLIC_SSV_VIEWS_ADDRESS = process.env.SSV_VIEWS_ADDRESS
-    process.env.PUBLIC_SWAP_FACTORY_ADDRESS = process.env.SWAP_FACTORY_ADDRESS
     process.env.PUBLIC_CRYPTO_COMPARE_API_KEY = process.env.CRYPTO_COMPARE_API_KEY
     process.env.PUBLIC_ETHEREUM_FORK_BLOCK = process.env.ETHEREUM_FORK_BLOCK
     process.env.PUBLIC_WALLET_CONNECT_PROJECT_ID = process.env.WALLET_CONNECT_PROJECT_ID