latest

ATXDAO · Dec 8, 2023 · 45bebe1 · 45bebe1
1 parent 774ad6a
commit 45bebe1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -36,7 +36,7 @@ jobs:
       - name: Run foundry node, deploy contracts (& generate contracts typescript output)
         env:
           ETHERSCAN_API_KEY: ${{ secrets.ETHERSCAN_API_KEY }}
-        run: yarn chain & yarn deploy-local
+        run: yarn chain & yarn deploy
         id: build
 
       - name: Run tests

diff --git a/package.json b/package.json
@@ -11,7 +11,6 @@
     "account": "yarn workspace @se-2/foundry account",
     "chain": "yarn workspace @se-2/foundry chain",
     "compile": "yarn workspace @se-2/foundry compile",
-    "deploy-local": "yarn workspace @se-2/foundry deploy",
     "deploy": "yarn workspace @se-2/foundry deploy",
     "deploy:verify": "yarn workspace @se-2/foundry deploy:verify",
     "fork": "yarn workspace @se-2/foundry fork",

diff --git a/packages/foundry/package.json b/packages/foundry/package.json
@@ -5,7 +5,6 @@
     "account": "node script/ListAccount.js",
     "chain": "anvil --config-out localhost.json",
     "compile": "forge compile",
-    "deploy-local": "forge build --build-info --build-info-path out/build-info/ && forge script script/Deploy.s.sol --rpc-url ${1:-localhost} --broadcast --legacy && node script/generateTsAbis.js",
     "deploy": "forge build --build-info --build-info-path out/build-info/ && forge script script/Deploy.s.sol --rpc-url ${1:-default_network} --broadcast --legacy && node script/generateTsAbis.js",
     "deploy:verify": "forge build --build-info --build-info-path out/build-info/ && forge script script/Deploy.s.sol --rpc-url ${1:-default_network} --broadcast --legacy --verify ; node script/generateTsAbis.js",
     "fork": "anvil --fork-url ${0:-mainnet} --chain-id 31337 --config-out localhost.json",

diff --git a/packages/foundry/script/DeployRepTokensInstanceWithData.s.sol b/packages/foundry/script/DeployRepTokensInstanceWithData.s.sol
@@ -18,12 +18,14 @@ contract DeployRepTokensInstanceWithData is Script {
         address[] memory admins = new address[](1);
         admins[0] = deployer;
 
-        //uncomment when deploying to localhost
-        // vm.startBroadcast(
-        //     0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80
-        // );
-        uint256 deployerPrivateKey = vm.envUint("DEPLOYER_PRIVATE_KEY");
-        vm.startBroadcast(deployerPrivateKey);
+        if (block.chainId == 31337) {
+            vm.startBroadcast(
+                0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80
+            );
+        } else {
+            uint256 deployerPrivateKey = vm.envUint("DEPLOYER_PRIVATE_KEY");
+            vm.startBroadcast(deployerPrivateKey);
+        }
 
         RepTokensInstance instance = new RepTokensInstance(
             deployer,