[Chore] - First pass contracts and makefile cleanup (#276)

* first pass contracts and makefile cleanup

* remove unused 4844 test files

* Remove Goerli references

* lint fixing

* lint fixing

* remove more Goerli references

* correct folder paths for L2 service tests

* fix pathing and hardhat version

* reinstate deleted file

* correct file pathing

.github/ISSUE_TEMPLATE/operational_task_template.md

@@ -13,7 +13,6 @@ assignees: ''
 - Network scope: Select those that apply, or select All
 - [ ] All
 - [ ] Mainnet
-- [ ] Testnet - Goerli
 - [ ] Testnet - Sepolia
 - [ ] Devnet
 

Makefile

@@ -80,7 +80,6 @@ deploy-linea-rollup-v5:
 		LINEA_ROLLUP_GENESIS_TIMESTAMP=1683325137 \
 		npx ts-node local-deployments-artifacts/deployPlonkVerifierAndLineaRollupV5.ts
 
-
 deploy-linea-rollup-v6:
 		# WARNING: FOR LOCAL DEV ONLY - DO NOT REUSE THESE KEYS ELSEWHERE
 		cd contracts/; \
@@ -155,13 +154,6 @@ deploy-l2-test-erc20:
 		TEST_ERC20_INITIAL_SUPPLY=100000 \
 		npx ts-node local-deployments-artifacts/deployTestERC20.ts
 
-upgrade-linea-rollup-on-uat:
-		cd contracts/; \
-		rm -f .openzeppelin/goerli.json; \
-		sed "s/BLOCKCHAIN_NODE=.*/BLOCKCHAIN_NODE=https:\/\/goerli.infura.io\/v3\/${INFURA_KEY}/" .env.template.uat > .env; \
-		sed -i~ "s/PRIVATE_KEY=.*/PRIVATE_KEY=${PRIVATE_KEY}/" .env; \
-		npx hardhat run ./scripts/upgrades/upgradeZkEVM.ts --network zkevm_dev
-
 fresh-start-l2-blockchain-only:
 		make clean-environment
 		make start-l2-blockchain-only
@@ -183,22 +175,13 @@ fresh-start-all-traces-v2:
 		make clean-environment
 		make start-all-traces-v2
 
-start-all-smc-v4:
-		L1_GENESIS_TIME=$(get_future_time) make start-whole-environment
-		make deploy-contracts-v4
-
 start-all:
 		L1_GENESIS_TIME=$(get_future_time) make start-whole-environment
 		make deploy-contracts
 
 start-all-traces-v2:
 		L1_GENESIS_TIME=$(get_future_time) make start-whole-environment-traces-v2
 		make deploy-contracts
-
-deploy-contracts-v4:
-	make compile-contracts
-	$(MAKE) -j2 deploy-linea-rollup-v4 deploy-l2messageservice
-
 deploy-contracts:
 	cd contracts/; \
 	export L1_NONCE=$$(npx ts-node local-deployments-artifacts/get-wallet-nonce.ts --wallet-priv-key 0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80 --rpc-url http://localhost:8445) && \

contracts/.env.template

@@ -11,8 +11,8 @@ L2MSGSERVICE_L1L2_MESSAGE_SETTER="0x90F79bf6EB2c4f870365E785982E1f101E93b906"
 L2MSGSERVICE_RATE_LIMIT_PERIOD="86400" #24Hours in seconds
 L2MSGSERVICE_RATE_LIMIT_AMOUNT="1000000000000000000000" #1000ETH
 
-BLOCKCHAIN_NODE="https://goerli.infura.io/v3/<infura_key>"
-L2_BLOCKCHAIN_NODE="https://linea-goerli.infura.io/v3/<infura_key>"
+BLOCKCHAIN_NODE="https://sepolia.infura.io/v3/<infura_key>"
+L2_BLOCKCHAIN_NODE="https://linea-sepolia.infura.io/v3/<infura_key>"
 DEPLOYMOCKVERIFIER="FALSE"
 PRIVATE_KEY=
 

contracts/.env.template.ci

@@ -11,8 +11,8 @@ L2MSGSERVICE_L1L2_MESSAGE_SETTER="0x90F79bf6EB2c4f870365E785982E1f101E93b906"
 L2MSGSERVICE_RATE_LIMIT_PERIOD="86400" #24Hours in seconds
 L2MSGSERVICE_RATE_LIMIT_AMOUNT="1000000000000000000000" #1000ETH
 
-BLOCKCHAIN_NODE="https://goerli.infura.io/v3/<infura_key>"
-L2_BLOCKCHAIN_NODE="https://linea-goerli.infura.io/v3/<infura_key>"
+BLOCKCHAIN_NODE="https://sepolia.infura.io/v3/<infura_key>"
+L2_BLOCKCHAIN_NODE="https://linea-sepolia.infura.io/v3/<infura_key>"
 DEPLOYMOCKVERIFIER="FALSE"
 PRIVATE_KEY=0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80
 

contracts/common/supportedNetworks.ts

@@ -1,6 +1,6 @@
 export enum SupportedChainIds {
   MAINNET = 1,
-  GOERLI = 5,
+  SEPOLIA = 11155111,
   LINEA_TESTNET = 59140,
   LINEA = 59144,
 }