Merge branch 'dev' into uniswap-v4

nayms · Aug 29, 2024 · 818ef7c · 818ef7c
2 parents ea27ba6 + 19a7faa
commit 818ef7c
Show file tree

Hide file tree

Showing 12 changed files with 243 additions and 148 deletions.
diff --git a/.gitignore b/.gitignore
@@ -62,6 +62,7 @@ cov-html
 
 # Gemforge
 # gemforge.deployments.json
+.gemforge/*.json
 
 # Generated files
 script/deployment/S03UpgradeDiamond.s.sol
diff --git a/.gitmodules b/.gitmodules
@@ -20,10 +20,6 @@
 	path = lib/oz
 	url = https://github.com/openzeppelin/openzeppelin-contracts
 	branch = merge/release-v5.0
-[submodule "lib/diamond-2-hardhat"]
-	path = lib/diamond-2-hardhat
-	url = https://github.com/gemstation/diamond-2-hardhat
-	branch = gemforge-2
 [submodule "lib/solady"]
 	path = lib/solady
 	url = https://github.com/Vectorized/solady
@@ -33,3 +29,6 @@
 [submodule "lib/v4-core"]
 	path = lib/v4-core
 	url = https://github.com/Uniswap/v4-core
+[submodule "lib/diamond-2-hardhat"]
+	path = lib/diamond-2-hardhat
+	url = https://github.com/nayms/diamond-2-hardhat
diff --git a/gemforge.config.cjs b/gemforge.config.cjs
@@ -55,6 +55,10 @@ module.exports = {
   },
   // generator options
   generator: {
+    proxy: {
+      // custom template to use instead of the Gemforge default one
+      template: "templates/DiamondProxy.sol",
+    },
     // proxy interface options
     proxyInterface: {
       // imports to include in the generated IDiamondProxy interface
@@ -156,17 +160,18 @@ module.exports = {
     },
   },
   targets: {
+    // `governance` attribute is only releveant for testnets, it's a wallet to use to auto approve the upgrade ID within the script
     local: { network: "local", wallet: "devOwnerWallet", governance: "devSysAdminWallet", initArgs: [sysAdminAddress] },
     sepolia: { network: "sepolia", wallet: "devOwnerWallet", governance: "devSysAdminWallet", initArgs: [sysAdminAddress] },
     sepoliaFork: { network: "local", wallet: "devOwnerWallet", governance: "devSysAdminWallet", initArgs: [sysAdminAddress] },
     mainnet: { network: "mainnet", wallet: "wallet3", initArgs: [sysAdminAddress] },
-    mainnetFork: { network: "local", wallet: "devOwnerWallet", governance: "devSysAdminWallet", initArgs: [sysAdminAddress] },
+    mainnetFork: { network: "local", wallet: "devOwnerWallet", initArgs: [sysAdminAddress] },
     baseSepolia: { network: "baseSepolia", wallet: "devOwnerWallet", governance: "devSysAdminWallet", initArgs: [sysAdminAddress] },
     baseSepoliaFork: { network: "local", wallet: "devOwnerWallet", governance: "devSysAdminWallet", initArgs: [sysAdminAddress] },
     base: { network: "base", wallet: "wallet3", initArgs: [sysAdminAddress] },
-    baseFork: { network: "local", wallet: "devOwnerWallet", governance: "devSysAdminWallet", initArgs: [sysAdminAddress] },
-    aurora: { network: "aurora", wallet: "devOwnerWallet", initArgs: [sysAdminAddress] },
-    auroraFork: { network: "local", wallet: "devOwnerWallet", governance: "devSysAdminWallet", initArgs: [sysAdminAddress] },
+    baseFork: { network: "local", wallet: "devOwnerWallet", initArgs: [sysAdminAddress] },
+    aurora: { network: "aurora", wallet: "wallet3", initArgs: [sysAdminAddress] },
+    auroraFork: { network: "local", wallet: "wallet3", initArgs: [sysAdminAddress] },
     auroraTestnet: { network: "auroraTestnet", wallet: "devOwnerWallet", governance: "devSysAdminWallet", initArgs: [sysAdminAddress] },
     auroraTestnetFork: { network: "local", wallet: "devOwnerWallet", governance: "devSysAdminWallet", initArgs: [sysAdminAddress] },
   },