Merge pull request #32 from gnosis/final-mastercopies

minor tooling fixes
gnosisguild · Jan 3, 2024 · 391ca03 · 391ca03 · vercel · Jan 3, 2024
2 parents a6b4621 + 8cff1ea
commit 391ca03
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -6,7 +6,7 @@
   "typescript.tsdk": "node_modules/typescript/lib",
   "typescript.enablePromptUseWorkspaceTsdk": true,
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true
+    "source.fixAll.eslint": "explicit"
   },
   "search.exclude": {
     "**/.yarn": true,

diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -8,18 +8,22 @@ import { HardhatUserConfig, HttpNetworkUserConfig } from "hardhat/types"
 dotenv.config()
 const {
   INFURA_KEY,
+  PK,
   MNEMONIC,
   ETHERSCAN_API_KEY,
   GNOSISSCAN_API_KEY,
   POLYGONSCAN_API_KEY,
 } = process.env
-const DEFAULT_MNEMONIC =
-  "candy maple cake sugar pudding cream honey rich smooth crumble sweet treat"
 
 const sharedNetworkConfig: HttpNetworkUserConfig = {}
-
-sharedNetworkConfig.accounts = {
-  mnemonic: MNEMONIC || DEFAULT_MNEMONIC,
+if (PK) {
+  sharedNetworkConfig.accounts = [PK]
+} else {
+  sharedNetworkConfig.accounts = {
+    mnemonic:
+      MNEMONIC ||
+      "candy maple cake sugar pudding cream honey rich smooth crumble sweet treat",
+  }
 }
 
 const { INTEGRATION_TEST } = process.env

diff --git a/sdk/src/deploy/deployERC721TokenboundMech.ts b/sdk/src/deploy/deployERC721TokenboundMech.ts
@@ -14,7 +14,7 @@ import {
   ERC6551_REGISTRY_ADDRESS,
 } from "../constants"
 
-import { deployMastercopy, erc6551ProxyBytecode } from "./factory"
+import { erc6551ProxyBytecode } from "./factory"
 
 export const calculateERC721TokenboundMechAddress = (context: {
   /** Address of the ERC721 token contract */