From 4674a184ce8cb07dcee739ca3b7bdfbbff3dc66b Mon Sep 17 00:00:00 2001
From: Ladd Hoffman <laddhoffman@gmail.com>
Date: Sun, 17 Mar 2024 13:35:51 -0500
Subject: [PATCH] Stop sharing code and just make copies of contract addresses
 json

---
 client/package.json                                   |  1 -
 .../src/contract-addresses.json                       |  4 ++--
 client/src/contract-config.js                         |  2 +-
 contract-config/package.json                          | 11 -----------
 ethereum/contract-addresses.json                      | 10 ++++++++++
 ethereum/package.json                                 |  1 -
 ethereum/scripts/contract-config.js                   |  2 +-
 ethereum/scripts/deploy.js                            | 10 ++++++----
 8 files changed, 20 insertions(+), 21 deletions(-)
 rename contract-config/addresses.json => client/src/contract-addresses.json (57%)
 delete mode 100644 contract-config/package.json
 create mode 100644 ethereum/contract-addresses.json

diff --git a/client/package.json b/client/package.json
index 6e85e30..b6d5b10 100644
--- a/client/package.json
+++ b/client/package.json
@@ -10,7 +10,6 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "contract-config": "file://../contract-config",
     "@metamask/sdk-react": "^0.16.0",
     "@tanstack/react-table": "^8.13.2",
     "axios": "^1.6.7",
diff --git a/contract-config/addresses.json b/client/src/contract-addresses.json
similarity index 57%
rename from contract-config/addresses.json
rename to client/src/contract-addresses.json
index cc35870..70caddd 100644
--- a/contract-config/addresses.json
+++ b/client/src/contract-addresses.json
@@ -1,7 +1,7 @@
 {
   "localhost": {
-    "DAO": "0xfc7E3bdF321821fF045Dde1586909AbBCC8D5d44",
-    "Work1": "0x89D456aF8A192B3D305007E1e94bFC2153Ead86B"
+    "DAO": "0x74DD88A13804003bDD1EBB41ebEE47EA145B8E46",
+    "Work1": "0x0bB2b52F9E4068E99038E0A9B86D337461926F17"
   },
   "sepolia": {
     "DAO": "0xA4Cb4d99be0Fef3e59dCaE909D6E8ef46EF07257",
diff --git a/client/src/contract-config.js b/client/src/contract-config.js
index ef066ff..3bd8299 100644
--- a/client/src/contract-config.js
+++ b/client/src/contract-config.js
@@ -1,4 +1,4 @@
-import contractAddresses from 'contract-config/addresses.json';
+import contractAddresses from './contract-addresses.json';
 
 const networks = {
   localhost: '0x539',
diff --git a/contract-config/package.json b/contract-config/package.json
deleted file mode 100644
index a06a93c..0000000
--- a/contract-config/package.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "name": "contract-config",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "",
-  "license": "ISC"
-}
diff --git a/ethereum/contract-addresses.json b/ethereum/contract-addresses.json
new file mode 100644
index 0000000..70caddd
--- /dev/null
+++ b/ethereum/contract-addresses.json
@@ -0,0 +1,10 @@
+{
+  "localhost": {
+    "DAO": "0x74DD88A13804003bDD1EBB41ebEE47EA145B8E46",
+    "Work1": "0x0bB2b52F9E4068E99038E0A9B86D337461926F17"
+  },
+  "sepolia": {
+    "DAO": "0xA4Cb4d99be0Fef3e59dCaE909D6E8ef46EF07257",
+    "Work1": "0xdB3b37B555c980617140C8d8687a19B8381F374d"
+  }
+}
\ No newline at end of file
diff --git a/ethereum/package.json b/ethereum/package.json
index a070033..583dc99 100644
--- a/ethereum/package.json
+++ b/ethereum/package.json
@@ -13,7 +13,6 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "contract-config": "file://../contract-config",
     "@nomicfoundation/hardhat-chai-matchers": "^2.0.6",
     "@nomicfoundation/hardhat-toolbox": "^4.0.0",
     "@nomicfoundation/hardhat-verify": "^2.0.5",
diff --git a/ethereum/scripts/contract-config.js b/ethereum/scripts/contract-config.js
index f879eef..76a829a 100644
--- a/ethereum/scripts/contract-config.js
+++ b/ethereum/scripts/contract-config.js
@@ -1,4 +1,4 @@
-const contractAddresses = require('contract-config/addresses.json');
+const contractAddresses = require('../contract-addresses.json');
 
 const networks = {
   localhost: '0x539',
diff --git a/ethereum/scripts/deploy.js b/ethereum/scripts/deploy.js
index 45517c9..17ea49e 100644
--- a/ethereum/scripts/deploy.js
+++ b/ethereum/scripts/deploy.js
@@ -1,9 +1,8 @@
 const { ethers } = require('hardhat');
 const fs = require('fs');
 
-const contractAddresses = require('contract-config/addresses.json');
+const contractAddresses = require('../contract-addresses.json');
 
-const contractAddressesWritePath = '../contract-config/addresses.json';
 const network = process.env.HARDHAT_NETWORK;
 
 async function main() {
@@ -20,8 +19,11 @@ async function main() {
   console.log(`Work1 deployed to ${work1.target}`);
   contractAddresses[network].Work1 = work1.target;
 
-  fs.writeFileSync(contractAddressesWritePath, JSON.stringify(contractAddresses, null, 2));
-  console.log('Wrote file', fs.realpathSync(contractAddressesWritePath));
+  fs.writeFileSync('../client/src/contract-addresses.json', JSON.stringify(contractAddresses, null, 2));
+  console.log('Wrote file', fs.realpathSync('../client/src/contract-addresses.json'));
+
+  fs.writeFileSync('./contract-addresses.json', JSON.stringify(contractAddresses, null, 2));
+  console.log('Wrote file', fs.realpathSync('./contract-addresses.json'));
 
   fs.copyFileSync('./artifacts/contracts/DAO.sol/DAO.json', '../client/src/assets/DAO.json');
   fs.copyFileSync('./artifacts/contracts/Work1.sol/Work1.json', '../client/src/assets/Work1.json');