From 3abab0ec1768d965f2114cdcc3b6554bca64ff16 Mon Sep 17 00:00:00 2001
From: Mantas S <mantas487@gmail.com>
Date: Tue, 22 Aug 2023 09:57:58 +0300
Subject: [PATCH] feat: changes for deployment

asd
---
 .env.example                                | 7 +------
 .github/workflows/test.yml                  | 6 +-----
 solidity/scripts/MultichainCreateXERC20.sol | 8 ++++----
 solidity/scripts/MultichainDeploy.sol       | 2 +-
 solidity/test/e2e/Common.sol                | 2 +-
 5 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/.env.example b/.env.example
index a04ccc5..af63dd1 100644
--- a/.env.example
+++ b/.env.example
@@ -1,8 +1,3 @@
-MAINNET_RPC=
-OPTIMISM_RPC=
-POLYGON_RPC=
-GOERLI_RPC=
-
+GOERLI_RPC=https://ethereum-goerli.publicnode.com
 ETHERSCAN_API_KEY=
-
 DEPLOYER_PRIVATE_KEY=
\ No newline at end of file
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 048b4cd..7fafa0f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -56,8 +56,7 @@ jobs:
       - name: "Create env file"
         run: |
           touch .env
-          echo MAINNET_RPC="${{ secrets.MAINNET_RPC }}" >> .env
-          echo RINKEBY_RPC="${{ secrets.RINKEBY_RPC }}" >> .env
+          echo GOERLI_RPC="${{ secrets.GOERLI_RPC }}" >> .env
           cat .env
 
       - name: Run tests
@@ -85,15 +84,12 @@ jobs:
 
       - name: Run tests
         run: yarn test:unit
-
   # coverage:
   #   name: Run Coverage Tests
   #   runs-on: ubuntu-latest
-
   #   strategy:
   #     matrix:
   #       node-version: [16.x]
-
   #   steps:
   #     - uses: actions/checkout@v3
   #     - name: Use Node.js
diff --git a/solidity/scripts/MultichainCreateXERC20.sol b/solidity/scripts/MultichainCreateXERC20.sol
index 9ce9eb9..ae50d86 100644
--- a/solidity/scripts/MultichainCreateXERC20.sol
+++ b/solidity/scripts/MultichainCreateXERC20.sol
@@ -11,14 +11,14 @@ import {ScriptingLibrary} from './ScriptingLibrary/ScriptingLibrary.sol';
 
 contract MultichainCreateXERC20 is Script, ScriptingLibrary {
   uint256 public deployer = vm.envUint('DEPLOYER_PRIVATE_KEY');
-  string[] public chains = ['POLYGON_RPC', 'OPTIMISM_RPC', 'GOERLI_RPC'];
+  string[] public chains = ['GOERLI_RPC'];
   string public temp = vm.readLine('./solidity/scripts/ScriptingLibrary/FactoryAddress.txt');
 
   address public fact = toAddress(temp);
   XERC20Factory public factory = XERC20Factory(fact);
   // NOTE: This is an array of the addresses of the ERC20 contract you are deploying the lockbox for, if you dont want to deploy a lockbox leave this as is
   // NOTE: You must add the token address of your token for each chain you are deploying to in order of how the chains are listed in chains.txt, if no address is listed we will not deplyo a lockbox
-  address[] public erc20 = [address(0)];
+  address[] public erc20 = [address(0x718BAD5717932fd30Bf37804332c4db69c840A8E)];
   // NOTE: Please also for each add a boolean to this array, if you are deploying a lockbox for the native token set it to true, if not set it to false for each iteration of an erc20
   bool[] public isNative = [false];
 
@@ -29,8 +29,8 @@ contract MultichainCreateXERC20 is Script, ScriptingLibrary {
     uint256[][] memory burnLimits = new uint256[][](chains.length);
 
     // Below are all the variables you need to change when deploying your XERC20 token
-    string memory name = 'Test Token';
-    string memory symbol = 'TST';
+    string memory name = 'DappRadar';
+    string memory symbol = 'RADAR';
 
     for (uint256 i; i < chains.length; i++) {
       bridges[i] = new address[](0);
diff --git a/solidity/scripts/MultichainDeploy.sol b/solidity/scripts/MultichainDeploy.sol
index a63d401..269efb5 100644
--- a/solidity/scripts/MultichainDeploy.sol
+++ b/solidity/scripts/MultichainDeploy.sol
@@ -10,7 +10,7 @@ import {ScriptingLibrary} from './ScriptingLibrary/ScriptingLibrary.sol';
 contract MultichainDeploy is Script, ScriptingLibrary {
   uint256 public deployer = vm.envUint('DEPLOYER_PRIVATE_KEY');
   address constant CREATE2 = 0x4e59b44847b379578588920cA78FbF26c0B4956C;
-  string[] public chains = ['POLYGON_RPC', 'OPTIMISM_RPC', 'GOERLI_RPC'];
+  string[] public chains = ['GOERLI_RPC'];
 
   function run() public {
     //TODO: Change salt from this test to prod before release
diff --git a/solidity/test/e2e/Common.sol b/solidity/test/e2e/Common.sol
index bbb5c43..8599c06 100644
--- a/solidity/test/e2e/Common.sol
+++ b/solidity/test/e2e/Common.sol
@@ -23,7 +23,7 @@ contract CommonE2EBase is Test {
   XERC20Factory internal _xerc20Factory;
 
   function setUp() public virtual {
-    vm.createSelectFork(vm.rpcUrl(vm.envString('MAINNET_RPC')), _FORK_BLOCK);
+    vm.createSelectFork(vm.rpcUrl(vm.envString('GOERLI_RPC')), _FORK_BLOCK);
     uint256[] memory _minterLimits = new uint256[](1);
     uint256[] memory _burnerLimits = new uint256[](1);
     address[] memory _bridges = new address[](1);