update lottFund + deploy scripts

TraitForge · Oct 19, 2024 · 7a0afc5 · 7a0afc5
1 parent 3d34cb1
commit 7a0afc5
Show file tree

Hide file tree

Showing 15 changed files with 684 additions and 571 deletions.
diff --git a/config/ConfigLib.sol b/config/ConfigLib.sol
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity ^0.8.0;
 
-import { console2 } from "@forge-std/console2.sol";
 import { stdJson } from "@forge-std/StdJson.sol";
 
 struct Config {
@@ -23,12 +22,17 @@ library ConfigLib {
     string internal constant ENTITY_FORGING = "$.entityForging";
     string internal constant ENTITY_TRADING = "$.entityTrading";
     string internal constant ENTROPY_GENERATOR = "$.entropyGenerator";
-    string internal constant NUKE_FUND = "$.nukeFund";
+    string internal constant NUKE_ROUTER = "$.nukeRouter";
     string internal constant TRAIT = "$.trait";
     string internal constant TRAIT_FORGE_NFT = "$.traitForgeNft";
     string internal constant ETH_COLLECTOR = "$.ethCollector";
     string internal constant UNISWAP_ROUTER = "$.uniswapRouter";
     string internal constant ROOT_HASH = "$.rootHash";
+    string internal constant SUBSCRIPTIONID = "$.subscriptionId";
+    string internal constant VRFCOORDINATOR = "$.vrfCoordinator";
+
+    string internal constant NUKE_FUND = "$.nukeFund";
+    string internal constant LOTT_FUND = "$.lottFund";
 
     function getAddress(Config storage config, string memory key) internal view returns (address) {
         return config.json.readAddress(string.concat("$.", key));
@@ -97,8 +101,8 @@ library ConfigLib {
         return config.json.readAddress(ENTROPY_GENERATOR);
     }
 
-    function getNukeFundAddress(Config storage config) internal view returns (address) {
-        return config.json.readAddress(NUKE_FUND);
+    function getNukeRouterAddress(Config storage config) internal view returns (address) {
+        return config.json.readAddress(NUKE_ROUTER);
     }
 
     function getTraitAddress(Config storage config) internal view returns (address) {
@@ -120,4 +124,20 @@ library ConfigLib {
     function getRootHash(Config storage config) internal view returns (bytes32) {
         return config.json.readBytes32(ROOT_HASH);
     }
+
+    function getNukeFundAddress(Config storage config) internal view returns (address) {
+        return config.json.readAddress(NUKE_FUND);
+    }
+
+    function getLottFundAddress(Config storage config) internal view returns (address) {
+        return config.json.readAddress(LOTT_FUND);
+    }
+
+    function getSubscriptionId(Config storage config) internal view returns (uint256) {
+        return config.json.readUint(SUBSCRIPTIONID);
+    }
+
+    function getVrfCoordinatorAddress(Config storage config) internal view returns (address) {
+        return config.json.readAddress(VRFCOORDINATOR);
+    }
 }
diff --git a/config/Configured.sol b/config/Configured.sol
@@ -22,17 +22,21 @@ contract Configured is StdChains {
     address internal ethCollector;
     address internal uniswapRouter;
     bytes32 internal rootHash;
+    uint256 internal subscriptionId;
+    address internal vrfCoordinator;
 
     address internal airdrop;
     address internal daoFund;
     address internal devFund;
     address internal entityForging;
     address internal entityTrading;
     address internal entropyGenerator;
-    address internal nukeFund;
+    address internal nukeRouter;
     address internal trait;
     address internal traitForgeNft;
-
+
+    address internal nukeFund;
+    address internal lottFund;
 
     function _network() internal virtual returns (string memory) {
         Chain memory currentChain = getChain(block.chainid);
@@ -62,16 +66,20 @@ contract Configured is StdChains {
         ethCollector = config.getEthCollectorAddress();
         uniswapRouter = config.getUniswapRouterAddress();
         rootHash = config.getRootHash();
+        subscriptionId = config.getSubscriptionId();
+        vrfCoordinator = config.getVrfCoordinatorAddress();
 
         airdrop = config.getAirdropAddress();
         daoFund = config.getDaoFundAddress();
         devFund = config.getDevFundAddress();
         entityForging = config.getEntityForgingAddress();
         entityTrading = config.getEntityTradingAddress();
         entropyGenerator = config.getEntropyGeneratorAddress();
-        nukeFund = config.getNukeFundAddress();
+        nukeRouter = config.getNukeRouterAddress();
         trait = config.getTraitAddress();
         traitForgeNft = config.getTraitForgeNftAddress();
-
+
+        nukeFund = config.getNukeFundAddress();
+        lottFund = config.getLottFundAddress();
     }
 }
diff --git a/config/base.json b/config/base.json
@@ -6,6 +6,8 @@
   "ethCollector": "0x225b791581185B73Eb52156942369843E8B0Eec7",
   "uniswapRouter": "0x4752ba5dbc23f44d87826276bf6fd6b1c372ad24",
   "rootHash": "31d4df6a22416b339b2ef3e122e8b525b3462d51db7202f4f628897c0a9a516a",
+  "subscriptionId": 0,
+  "vrfCoordinator": "0x0000000000000000000000000000000000000000",
 
   "accessController": "0x10B1d1e7b7E2D348D97a51f8116003ecd97548C5",
   "addressProvider": "0xB2aE4f6f69c34111857Bab08ac583381B7b26559",
@@ -15,7 +17,10 @@
   "entityForging": "0xfCC74E0c0f63a6aF6A292fC3cA44C2082C138708",
   "entityTrading": "0x3a61c55bC64B34246A890F3aD5BabC4B74dAb777",
   "entropyGenerator": "0x31248a94C8ec87991834f175b1454D4e0E16D0A0",
-  "nukeFund": "0xb66344cAFaA61d15b7cd6cC68B3BBaADffAbd235",
+  "nukeRouter": "0xb66344cAFaA61d15b7cd6cC68B3BBaADffAbd235",
   "trait": "0x0000000000000000000000000000000000000000",
-  "traitForgeNft": "0xCabF9e769a9Dd211836A0e417f3f5fDF57EF2309"
+  "traitForgeNft": "0xCabF9e769a9Dd211836A0e417f3f5fDF57EF2309",
+
+  "nukeFund": "0xb66344cAFaA61d15b7cd6cC68B3BBaADffAbd235",
+  "lottFund": "0x0000000000000000000000000000000000000000"
 }
diff --git a/config/base_sepolia.json b/config/base_sepolia.json
@@ -6,6 +6,8 @@
   "ethCollector": "0x225b791581185B73Eb52156942369843E8B0Eec7",
   "uniswapRouter": "0x2B480c63bDe7C764cadBaA8b181405D770728128",
   "rootHash": "0xc86c16e17ceec4e4cfe6670bb0b509cd7d6b6e87a19745216fb21219a3886196",
+  "subscriptionId": 0,
+  "vrfCoordinator": "0x0000000000000000000000000000000000000000",
 
   "accessController": "0x0000000000000000000000000000000000000000",
   "addressProvider": "0x0000000000000000000000000000000000000000",
@@ -15,7 +17,10 @@
   "entityForging": "0x0000000000000000000000000000000000000000",
   "entityTrading": "0x0000000000000000000000000000000000000000",
   "entropyGenerator": "0x0000000000000000000000000000000000000000",
-  "nukeFund": "0x0000000000000000000000000000000000000000",
+  "nukeRouter": "0x0000000000000000000000000000000000000000",
   "trait": "0x0000000000000000000000000000000000000000",
-  "traitForgeNft": "0x0000000000000000000000000000000000000000"
+  "traitForgeNft": "0x0000000000000000000000000000000000000000",
+
+  "nukeFund": "0x0000000000000000000000000000000000000000",
+  "lottFund": "0x0000000000000000000000000000000000000000"
 }