fix: make deployment work for v1.5

microHoffman · microHoffman · commit e3154acf8860 · 2025-09-16T00:24:39.000+02:00
diff --git a/deployments/protocol/v1.5.json b/deployments/protocol/v1.5.json
@@ -1,3 +1,22 @@
 {
-
+    "11155111": {
+        "categoryRegistry": "0xbB2168d5546A94AE2DA9254e63D88F7f137B2534",
+        "chainlinkFeedRegistry": "0x8D5e90706E52a52853dA9A14fA1c63889a412851",
+        "config": "0xd52a2898d61636bB3eEF0d145f05352FF543bdCC",
+        "configSingleton": "0x1f5febF0efA3aD487508b6Cc7f39a0a54DE9De72",
+        "crowdsourceLenderVault": "",
+        "hooks": {
+            "compoundLender": "",
+            "directLenderRepayment": "",
+            "refinanceBorrowerCreate": ""
+        },
+        "hub": "0x37807A2F031b3B44081F4b21500E5D70EbaDAdd5",
+        "loan": "",
+        "loanToken": "0x4440C069272cC34b80C7B11bEE657D0349Ba9C23",
+        "products": {
+            "installments": ""
+        },
+        "revokedNonce": "0x972204fF33348ee6889B2d0A3967dB67d7b08e4c",
+        "utilizedCredit": "0x8E6F44DEa3c11d69C63655BDEcbA25Fa986BCE9D"
+    }
 }
diff --git a/foundry.toml b/foundry.toml
@@ -14,41 +14,41 @@ gas_reports = ["PWNSimpleLoan"]
 
 [rpc_endpoints]
 # Mainnets
-mainnet = "${ETHEREUM_URL}"
-polygon = "${POLYGON_URL}"
-arbitrum = "${ARBITRUM_URL}"
-optimism = "${OPTIMISM_URL}"
-base = "${BASE_URL}"
-cronos = "${CRONOS_URL}"
-mantle = "${MANTLE_URL}"
-bsc = "${BSC_URL}"
-linea = "${LINEA_URL}"
-gnosis = "${GNOSIS_URL}"
-world = "${WORLDCHAIN_URL}"
-unichain = "${UNICHAIN_URL}"
-ink = "${INK_URL}"
-sonic = "${SONIC_URL}"
-celo = "${CELO_URL}"
+#mainnet = "${ETHEREUM_URL}"
+#polygon = "${POLYGON_URL}"
+#arbitrum = "${ARBITRUM_URL}"
+#optimism = "${OPTIMISM_URL}"
+#base = "${BASE_URL}"
+#cronos = "${CRONOS_URL}"
+#mantle = "${MANTLE_URL}"
+#bsc = "${BSC_URL}"
+#linea = "${LINEA_URL}"
+#gnosis = "${GNOSIS_URL}"
+#world = "${WORLDCHAIN_URL}"
+#unichain = "${UNICHAIN_URL}"
+#ink = "${INK_URL}"
+#sonic = "${SONIC_URL}"
+#celo = "${CELO_URL}"
 # Testnets
 sepolia = "${SEPOLIA_URL}"
-unichain-sepolia = "${UNICHAIN_SEPOLIA_URL}"
+#unichain-sepolia = "${UNICHAIN_SEPOLIA_URL}"
 # Devnets
-tenderly = "${TENDERLY_URL}"
-local = "${LOCAL_URL}"
+#tenderly = "${TENDERLY_URL}"
+#local = "${LOCAL_URL}"
 
 
 [etherscan]
-mainnet = { key = "${ETHERSCAN_MAINNET_API_KEY}" }
-polygon = { key = "${POLYGONSCAN_API_KEY}" }
-arbitrum = { key = "${ARBISCAN_API_KEY}" }
-optimism = { key = "${OPTIMISTIC_ETHERSCAN_API_KEY}" }
-base = { key = "${BASESCAN_API_KEY}" }
-cronos = { key = "${CRONOSCAN_API_KEY}" }
-bsc = { key = "${BSCSCAN_API_KEY}" }
-linea = { key = "${LINEASCAN_API_KEY}" }
-gnosis = { key = "${GNOSISSCAN_API_KEY}" }
-world = { key = "${WORLDSCAN_API_KEY}" }
-unichain = { key = "${UNISCAN_API_KEY}", url = "https://api.uniscan.xyz/api", chain = 130 }
-sonic = { key = "${SONICSCAN_API_KEY}", url = "https://api.sonicscan.org/api", chain = 146 }
+#mainnet = { key = "${ETHERSCAN_MAINNET_API_KEY}" }
+#polygon = { key = "${POLYGONSCAN_API_KEY}" }
+# arbitrum = { key = "${ARBISCAN_API_KEY}" }
+# optimism = { key = "${OPTIMISTIC_ETHERSCAN_API_KEY}" }
+# base = { key = "${BASESCAN_API_KEY}" }
+#cronos = { key = "${CRONOSCAN_API_KEY}" }
+#bsc = { key = "${BSCSCAN_API_KEY}" }
+#linea = { key = "${LINEASCAN_API_KEY}" }
+#gnosis = { key = "${GNOSISSCAN_API_KEY}" }
+#world = { key = "${WORLDSCAN_API_KEY}" }
+#unichain = { key = "${UNISCAN_API_KEY}", url = "https://api.uniscan.xyz/api", chain = 130 }
+#sonic = { key = "${SONICSCAN_API_KEY}", url = "https://api.sonicscan.org/api", chain = 146 }
 
 sepolia = { key = "${ETHERSCAN_MAINNET_API_KEY}" }
diff --git a/script/PWN.s.sol b/script/PWN.s.sol
@@ -21,9 +21,11 @@ import {
     MultiTokenCategoryRegistry,
     IChainlinkFeedRegistryLike,
     PWNStableProduct,
-    PWNWorldStableProduct
+    PWNInstallmentsProduct
 } from "pwn/Deployments.sol";
 
+import { PWNCrowdsourceLenderVault } from "pwn/periphery/crowdsource/PWNCrowdsourceLenderVault.sol";
+
 
 library PWNContractDeployerSalt {
 
@@ -44,7 +46,10 @@ library PWNContractDeployerSalt {
     bytes32 internal constant FIXED_PRODUCT = keccak256("PWNFixedProduct");
     bytes32 internal constant UNISWAP_V3_INDIVIDUAL_PRODUCT = keccak256("PWNUniswapV3IndividualProduct");
     bytes32 internal constant UNISWAP_V3_SET_PRODUCT = keccak256("PWNUniswapV3SetProduct");
+    bytes32 internal constant INSTALLMENTS_PRODUCT = keccak256("PWNInstallmentsProduct");
 
+    // Others
+    bytes32 internal constant CROWDSOURCE_LENDER_VAULT = keccak256("PWNCrowdsourceLenderVault");
 }
 
 using GnosisSafeUtils for GnosisSafeLike;
@@ -100,36 +105,75 @@ forge script script/PWN.s.sol:Deploy --sig "deploy()" \
                 PWNContractDeployerSalt.LOAN,
                 abi.encodePacked(
                     type(PWNLoan).creationCode,
-                    abi.encode(address(__d.hub), address(__d.loanToken), address(__d.config), address(__d.categoryRegistry), __e.permit2)
+                    abi.encode(address(__d.loanToken), address(__d.config), address(__d.categoryRegistry))
                 )
             )
         );
 
-        __d.products.stable = PWNStableProduct(
+        __d.products.installments = PWNInstallmentsProduct(
             _deploy(
-                PWNContractDeployerSalt.STABLE_PRODUCT,
+                PWNContractDeployerSalt.INSTALLMENTS_PRODUCT,
                 abi.encodePacked(
-                    type(PWNWorldStableProduct).creationCode,
-                    abi.encode(address(__d.hub), address(__d.revokedNonce), address(__d.utilizedCredit), address(__d.chainlinkFeedRegistry), __e.chainlinkL2SequencerUptimeFeed, __e.weth, 0x17B354dD2595411ff79041f930e491A4Df39A278, "app_17abe44eaf47c99566f5378aa4e19463", "verify-humanness")
+                    type(PWNInstallmentsProduct).creationCode,
+                    abi.encode(address(__d.hub), address(__d.revokedNonce), address(__d.utilizedCredit), address(__d.chainlinkFeedRegistry), __e.chainlinkL2SequencerUptimeFeed, __e.weth)
                 )
             )
         );
 
         console2.log("PWNLoan:", address(__d.loan));
-        console2.log("PWNStableProduct:", address(__d.products.stable));
+        console2.log("PWNInstallmentsProduct:", address(__d.products.installments));
 
-        address[] memory addrs = new address[](3);
+        address[] memory addrs = new address[](2);
         addrs[0] = address(__d.loan);
-        addrs[1] = address(__d.products.stable);
-        addrs[2] = address(__d.products.stable);
+        addrs[1] = address(__d.products.installments);
 
-        bytes32[] memory tags = new bytes32[](3);
+        bytes32[] memory tags = new bytes32[](2);
         tags[0] = PWNHubTags.ACTIVE_LOAN;
         tags[1] = PWNHubTags.LOAN_PROPOSAL;
-        tags[2] = PWNHubTags.NONCE_MANAGER;
 
+        // TODO on what contract this should be called?
         console2.logBytes(abi.encodeWithSignature("setTags(address[],bytes32[],bool)", addrs, tags, true));
 
+        address[] memory feedIntermediaryDenominations = new address[](1);
+        // USDC / USD feed + ETH / USD feed
+        feedIntermediaryDenominations[0] = address(840); // USD representation in chainlink
+        bool[] memory feedInvertFlags = new bool[](2);
+        feedInvertFlags[0] = false;
+        feedInvertFlags[1] = true;
+
+        __d.crowdsourceLenderVault = PWNCrowdsourceLenderVault(
+            _deploy(
+                PWNContractDeployerSalt.CROWDSOURCE_LENDER_VAULT,
+                abi.encodePacked(
+                    type(PWNCrowdsourceLenderVault).creationCode,
+                    // TODO Terms terms parameter
+                    abi.encode(
+                        address(__d.loan), 
+                        address(__d.products.installments), 
+                        address(__e.aave), 
+                        "PWNInstallmentsProduct", 
+                        "PWNInstallmentsProduct",
+                        PWNCrowdsourceLenderVault.Terms({
+                            collateralAddress: address(0x7b79995e5f793A07Bc00c21412e50Ecae098E7f9),
+                            creditAddress: address(0x94a9D9AC8a22534E3FaCa9F4e7F2E2cf85d5E4C8),
+                            feedIntermediaryDenominations: feedIntermediaryDenominations,
+                            feedInvertFlags: feedInvertFlags,
+                            loanToValue: 7500, // 75%
+                            interestAPR: 1000, // 10%
+                            postponement: 2592000, // 30 days in seconds
+                            duration: 63072000, // 730 days (2 years) in seconds
+                            minCreditAmount: 5000000000, // 5000 tokens (assuming 6 decimals)
+                            expiration: block.timestamp + 10368000 // 120 days from now
+                        })
+                    )
+                )
+            )
+        );
+
+        console2.log("PWNCrowdsourceLenderVault:", address(__d.crowdsourceLenderVault));
+
+        // TODO anything else to do here?
+
         vm.stopBroadcast();
     }
 
diff --git a/src/Deployments.sol b/src/Deployments.sol
@@ -31,6 +31,8 @@ import { PWNDirectLenderRepaymentHook } from "pwn/periphery/hook/lender/PWNDirec
 import { PWNRevokedNonce } from "pwn/periphery/auxiliary/PWNRevokedNonce.sol";
 import { PWNUtilizedCredit } from "pwn/periphery/auxiliary/PWNUtilizedCredit.sol";
 
+import { PWNCrowdsourceLenderVault } from "pwn/periphery/crowdsource/PWNCrowdsourceLenderVault.sol";
+
 
 interface IPWNDeployer {
     function owner() external returns (address);
@@ -72,6 +74,7 @@ abstract contract Deployments is CommonBase {
         IChainlinkFeedRegistryLike chainlinkFeedRegistry;
         PWNConfig config;
         PWNConfig configSingleton;
+        PWNCrowdsourceLenderVault crowdsourceLenderVault;
         Hooks hooks;
         PWNHub hub;
         PWNLoan loan;
