Merge pull request #542 from superform-xyz/rewardsDistributorToProd

feat: rewardDistributor ready to be added to prod SUP-6630
superform-xyz · Jun 3, 2024 · 68981ef · 68981ef
2 parents a2c788a + 62cec6c
commit 68981ef
Show file tree

Hide file tree

Showing 23 changed files with 190 additions and 36 deletions.
diff --git a/script/deployments/v1_deployment/1/Ethereum-latest.json b/script/deployments/v1_deployment/1/Ethereum-latest.json
@@ -10,6 +10,7 @@
   "PayMaster": "0xF1b9e0E57D134B7dFede001ccE5e879D8C2b8C1B",
   "PayloadHelper": "0x92f98d698d2c8E0f29D1bb4d75C3A03e05e811bc",
   "PaymentHelper": "0x722669cbE532F08bb4EB81127e6Ef386627E90be",
+  "RewardsDistributor": "0xce23bD7205bF2B543F6B4eeC00Add0C111FEFc3B",
   "SocketOneInchValidator": "0x9B1dE8d1Fbf77Ca949f944F718D93fdC48f218C8",
   "SocketValidator": "0x7483486862BDa9BA68Be4923E7E9945c2771Ec28",
   "SuperPositions": "0x01dF6fb6a28a89d6bFa53b2b3F20644AbF417678",

diff --git a/script/deployments/v1_deployment/10/Optimism-latest.json b/script/deployments/v1_deployment/10/Optimism-latest.json
@@ -10,6 +10,7 @@
   "PayMaster": "0xF1b9e0E57D134B7dFede001ccE5e879D8C2b8C1B",
   "PayloadHelper": "0x92f98d698d2c8E0f29D1bb4d75C3A03e05e811bc",
   "PaymentHelper": "0x722669cbE532F08bb4EB81127e6Ef386627E90be",
+  "RewardsDistributor": "0xce23bD7205bF2B543F6B4eeC00Add0C111FEFc3B",
   "SocketOneInchValidator": "0x9B1dE8d1Fbf77Ca949f944F718D93fdC48f218C8",
   "SocketValidator": "0x7483486862BDa9BA68Be4923E7E9945c2771Ec28",
   "SuperPositions": "0x01dF6fb6a28a89d6bFa53b2b3F20644AbF417678",

diff --git a/script/deployments/v1_deployment/137/Polygon-latest.json b/script/deployments/v1_deployment/137/Polygon-latest.json
@@ -10,6 +10,7 @@
   "PayMaster": "0xF1b9e0E57D134B7dFede001ccE5e879D8C2b8C1B",
   "PayloadHelper": "0x92f98d698d2c8E0f29D1bb4d75C3A03e05e811bc",
   "PaymentHelper": "0x722669cbE532F08bb4EB81127e6Ef386627E90be",
+  "RewardsDistributor": "0xce23bD7205bF2B543F6B4eeC00Add0C111FEFc3B",
   "SocketOneInchValidator": "0x9B1dE8d1Fbf77Ca949f944F718D93fdC48f218C8",
   "SocketValidator": "0x7483486862BDa9BA68Be4923E7E9945c2771Ec28",
   "SuperPositions": "0x01dF6fb6a28a89d6bFa53b2b3F20644AbF417678",

diff --git a/script/deployments/v1_deployment/250/Fantom-latest.json b/script/deployments/v1_deployment/250/Fantom-latest.json
@@ -10,6 +10,7 @@
   "PayMaster": "0xeE8695cDa4697987e1Fcd191F3c69FFF5Ef02eD0",
   "PayloadHelper": "0xEBDf673A9A0c40149641E50244415C67DD2B5CE8",
   "PaymentHelper": "0xA7fEEE543b40d9Ca37722A8bda03D1fff4b2EE53",
+  "RewardsDistributor": "0xd6cea5c8853c3fb4bbd77ef5e924c4e647c03a94",
   "SocketOneInchValidator": "0xeb077f9CB0406667DDD7BE945f393297578372F1",
   "SocketValidator": "0xfDf661e1e7e8F617b383516688A8aFC9c6176A04",
   "SuperPositions": "0x7F1535FF0f0A099eb7D314e1655BD4dC92986aAD",

diff --git a/script/deployments/v1_deployment/42161/Arbitrum-latest.json b/script/deployments/v1_deployment/42161/Arbitrum-latest.json
@@ -10,6 +10,7 @@
   "PayMaster": "0xF1b9e0E57D134B7dFede001ccE5e879D8C2b8C1B",
   "PayloadHelper": "0x92f98d698d2c8E0f29D1bb4d75C3A03e05e811bc",
   "PaymentHelper": "0x722669cbE532F08bb4EB81127e6Ef386627E90be",
+  "RewardsDistributor": "0xce23bD7205bF2B543F6B4eeC00Add0C111FEFc3B",
   "SocketOneInchValidator": "0x9B1dE8d1Fbf77Ca949f944F718D93fdC48f218C8",
   "SocketValidator": "0x7483486862BDa9BA68Be4923E7E9945c2771Ec28",
   "SuperPositions": "0x01dF6fb6a28a89d6bFa53b2b3F20644AbF417678",

diff --git a/script/deployments/v1_deployment/43114/Avalanche-latest.json b/script/deployments/v1_deployment/43114/Avalanche-latest.json
@@ -10,6 +10,7 @@
   "PayMaster": "0xF1b9e0E57D134B7dFede001ccE5e879D8C2b8C1B",
   "PayloadHelper": "0x92f98d698d2c8E0f29D1bb4d75C3A03e05e811bc",
   "PaymentHelper": "0x722669cbE532F08bb4EB81127e6Ef386627E90be",
+  "RewardsDistributor": "0xce23bD7205bF2B543F6B4eeC00Add0C111FEFc3B",
   "SocketOneInchValidator": "0x9B1dE8d1Fbf77Ca949f944F718D93fdC48f218C8",
   "SocketValidator": "0x7483486862BDa9BA68Be4923E7E9945c2771Ec28",
   "SuperPositions": "0x01dF6fb6a28a89d6bFa53b2b3F20644AbF417678",

diff --git a/script/deployments/v1_deployment/56/Binance-latest.json b/script/deployments/v1_deployment/56/Binance-latest.json
@@ -10,6 +10,7 @@
   "PayMaster": "0xF1b9e0E57D134B7dFede001ccE5e879D8C2b8C1B",
   "PayloadHelper": "0x92f98d698d2c8E0f29D1bb4d75C3A03e05e811bc",
   "PaymentHelper": "0x722669cbE532F08bb4EB81127e6Ef386627E90be",
+  "RewardsDistributor": "0xce23bD7205bF2B543F6B4eeC00Add0C111FEFc3B",
   "SocketOneInchValidator": "0x9B1dE8d1Fbf77Ca949f944F718D93fdC48f218C8",
   "SocketValidator": "0x7483486862BDa9BA68Be4923E7E9945c2771Ec28",
   "SuperPositions": "0x01dF6fb6a28a89d6bFa53b2b3F20644AbF417678",

diff --git a/script/deployments/v1_deployment/8453/Base-latest.json b/script/deployments/v1_deployment/8453/Base-latest.json
@@ -10,6 +10,7 @@
   "PayMaster": "0xF1b9e0E57D134B7dFede001ccE5e879D8C2b8C1B",
   "PayloadHelper": "0x92f98d698d2c8E0f29D1bb4d75C3A03e05e811bc",
   "PaymentHelper": "0x722669cbE532F08bb4EB81127e6Ef386627E90be",
+  "RewardsDistributor": "0xce23bD7205bF2B543F6B4eeC00Add0C111FEFc3B",
   "SocketOneInchValidator": "0x0000000000000000000000000000000000000000",
   "SocketValidator": "0x7483486862BDa9BA68Be4923E7E9945c2771Ec28",
   "SuperPositions": "0x01dF6fb6a28a89d6bFa53b2b3F20644AbF417678",

diff --git a/script/forge-scripts/EnvironmentUtils.s.sol b/script/forge-scripts/EnvironmentUtils.s.sol
@@ -35,6 +35,7 @@ abstract contract EnvironmentUtils is AbstractDeploySingle {
             TARGET_CHAINS.push(ARBI);
             TARGET_CHAINS.push(OP);
             TARGET_CHAINS.push(BASE);
+            TARGET_CHAINS.push(FANTOM);
 
             if (useNewSalt) {
                 salt = "SunNeverSetsOnSuperformRealmV2";

diff --git a/script/forge-scripts/misc/Abstract.Deploy.RewardsDistributor.s.sol b/script/forge-scripts/misc/Abstract.Deploy.RewardsDistributor.s.sol
@@ -30,9 +30,17 @@ abstract contract AbstractDeployRewardsDistributor is EnvironmentUtils {
         cycle == Cycle.Dev ? vm.startBroadcast(deployerPrivateKey) : vm.startBroadcast();
 
         address superRegistry = _readContractsV1(env, chainNames[trueIndex], vars.chainId, "SuperRegistry");
-        address expectedSr = env == 0
-            ? 0x17A332dC7B40aE701485023b219E9D6f493a2514
-            : vars.chainId == 250 ? 0x7B8d68f90dAaC67C577936d3Ce451801864EF189 : 0xB2C097ac459aFAc892ae5b35f6bd6a9Dd3071F47;
+        address expectedSr;
+        if (env == 0) {
+            expectedSr = vars.chainId == 250
+                ? 0x7feB31d18E43E2faeC718EEd2D7f34402c3e27b4
+                : 0x17A332dC7B40aE701485023b219E9D6f493a2514;
+        } else {
+            expectedSr = vars.chainId == 250
+                ? 0x7B8d68f90dAaC67C577936d3Ce451801864EF189
+                : 0xB2C097ac459aFAc892ae5b35f6bd6a9Dd3071F47;
+        }
+
         assert(superRegistry == expectedSr);
 
         address rewards = address(new RewardsDistributor{ salt: salt }(superRegistry));
@@ -69,9 +77,9 @@ abstract contract AbstractDeployRewardsDistributor is EnvironmentUtils {
 
         vars.superRegistryC =
             SuperRegistry(payable(_readContractsV1(env, chainNames[trueIndex], vars.chainId, "SuperRegistry")));
-        address expectedSr = env == 0
-            ? 0x17A332dC7B40aE701485023b219E9D6f493a2514
-            : vars.chainId == 250 ? 0x7B8d68f90dAaC67C577936d3Ce451801864EF189 : 0xB2C097ac459aFAc892ae5b35f6bd6a9Dd3071F47;
+        address expectedSr = vars.chainId == 250
+            ? 0x7B8d68f90dAaC67C577936d3Ce451801864EF189
+            : 0xB2C097ac459aFAc892ae5b35f6bd6a9Dd3071F47;
         assert(address(vars.superRegistryC) == expectedSr);
 
         address rewards = _readContractsV1(env, chainNames[trueIndex], vars.chainId, "RewardsDistributor");
@@ -100,9 +108,10 @@ abstract contract AbstractDeployRewardsDistributor is EnvironmentUtils {
         }
 
         /// @dev rewards admin has already been set on staging
-        /*
-        address expectedSrbac =
-            env == 0 ? 0x480bec236e3d3AE33789908BF024850B2Fe71258 : 0x9736b60c4f749232d400B5605f21AE137a5Ebb71;
+
+        address expectedSrbac = vars.chainId == 250
+            ? 0xFFe9AFe35806F3fc1Df81188953ADb72f0B22F2A
+            : 0x9736b60c4f749232d400B5605f21AE137a5Ebb71;
 
         assert(address(vars.superRBACC) == expectedSrbac);
 
@@ -111,7 +120,6 @@ abstract contract AbstractDeployRewardsDistributor is EnvironmentUtils {
 
         vars.superRBACC.setRoleAdmin(role, vars.superRBACC.PROTOCOL_ADMIN_ROLE());
         vars.superRBACC.grantRole(role, REWARDS_ADMIN);
-        */
 
         vm.stopBroadcast();
     }
@@ -135,8 +143,10 @@ abstract contract AbstractDeployRewardsDistributor is EnvironmentUtils {
 
         vars.superRegistryC =
             SuperRegistry(payable(_readContractsV1(env, chainNames[trueIndex], vars.chainId, "SuperRegistry")));
-        address expectedSr =
-            env == 0 ? 0x17A332dC7B40aE701485023b219E9D6f493a2514 : 0xB2C097ac459aFAc892ae5b35f6bd6a9Dd3071F47;
+        address expectedSr = vars.chainId == 250
+            ? 0x7feB31d18E43E2faeC718EEd2D7f34402c3e27b4
+            : 0x17A332dC7B40aE701485023b219E9D6f493a2514;
+
         assert(address(vars.superRegistryC) == expectedSr);
 
         address rewards = _readContractsV1(env, chainNames[trueIndex], vars.chainId, "RewardsDistributor");
@@ -148,8 +158,9 @@ abstract contract AbstractDeployRewardsDistributor is EnvironmentUtils {
 
         vars.superRBACC = SuperRBAC(payable(_readContractsV1(env, chainNames[trueIndex], vars.chainId, "SuperRBAC")));
 
-        address expectedSrbac =
-            env == 0 ? 0x480bec236e3d3AE33789908BF024850B2Fe71258 : 0x9736b60c4f749232d400B5605f21AE137a5Ebb71;
+        address expectedSrbac = vars.chainId == 250
+            ? 0xd831b4ba49852F6E7246Fe7f4A7DABB5b0C56e1F
+            : 0x480bec236e3d3AE33789908BF024850B2Fe71258;
 
         assert(address(vars.superRBACC) == expectedSrbac);
 

diff --git a/script/forge-scripts/misc/Mainnet.Deploy.RewardsDistributor.s.sol b/script/forge-scripts/misc/Mainnet.Deploy.RewardsDistributor.s.sol
@@ -4,8 +4,8 @@ pragma solidity ^0.8.23;
 import { AbstractDeployRewardsDistributor } from "./Abstract.Deploy.RewardsDistributor.s.sol";
 
 contract MainnetDeployRewardsDistributor is AbstractDeployRewardsDistributor {
-    function deployRewardsDistributor(uint256 env, uint256 selectedChainIndex) external {
-        _setEnvironment(env, false);
+    function deployRewardsDistributor(uint256 env, uint256 selectedChainIndex, uint256 useNewSalt) external {
+        _setEnvironment(env, useNewSalt == 1 ? true : false);
 
         uint256 trueIndex;
         for (uint256 i = 0; i < chainIds.length; i++) {

diff --git a/script/output/1/Ethereum-latest.json b/script/output/1/Ethereum-latest.json
@@ -9,8 +9,7 @@
   "LiFiValidator": "0x0000000000000000000000000000000000000000",
   "PayMaster": "0x0000000000000000000000000000000000000000",
   "PayloadHelper": "0x0000000000000000000000000000000000000000",
-  "PaymentHelper": "0x722669cbE532F08bb4EB81127e6Ef386627E90be",
-  "RewardsDistributor": "0x0000000000000000000000000000000000000000",
+  "PaymentHelper": "0x0000000000000000000000000000000000000000",
   "SocketOneInchValidator": "0x0000000000000000000000000000000000000000",
   "SocketValidator": "0x0000000000000000000000000000000000000000",
   "SuperPositions": "0x0000000000000000000000000000000000000000",
@@ -20,5 +19,7 @@
   "SuperformRouter": "0x0000000000000000000000000000000000000000",
   "VaultClaimer": "0x0000000000000000000000000000000000000000",
   "WormholeARImplementation": "0x0000000000000000000000000000000000000000",
-  "WormholeSRImplementation": "0x0000000000000000000000000000000000000000"
+  "WormholeSRImplementation": "0x0000000000000000000000000000000000000000",
+  "RewardsDistributor": "0xce23bD7205bF2B543F6B4eeC00Add0C111FEFc3B"
+
 }
diff --git a/script/output/10/Optimism-latest.json b/script/output/10/Optimism-latest.json
@@ -10,7 +10,6 @@
   "PayMaster": "0x0000000000000000000000000000000000000000",
   "PayloadHelper": "0x0000000000000000000000000000000000000000",
   "PaymentHelper": "0x0000000000000000000000000000000000000000",
-  "RewardsDistributor": "0xCE0D4e1c23CD166f84e5746c6833e8bc762F3456",
   "SocketOneInchValidator": "0x0000000000000000000000000000000000000000",
   "SocketValidator": "0x0000000000000000000000000000000000000000",
   "SuperPositions": "0x0000000000000000000000000000000000000000",
@@ -20,5 +19,6 @@
   "SuperformRouter": "0x0000000000000000000000000000000000000000",
   "VaultClaimer": "0x0000000000000000000000000000000000000000",
   "WormholeARImplementation": "0x0000000000000000000000000000000000000000",
-  "WormholeSRImplementation": "0x0000000000000000000000000000000000000000"
+  "WormholeSRImplementation": "0x0000000000000000000000000000000000000000",
+  "RewardsDistributor": "0xce23bD7205bF2B543F6B4eeC00Add0C111FEFc3B"
 }
diff --git a/script/output/137/Polygon-latest.json b/script/output/137/Polygon-latest.json
@@ -9,8 +9,7 @@
   "LiFiValidator": "0x0000000000000000000000000000000000000000",
   "PayMaster": "0x0000000000000000000000000000000000000000",
   "PayloadHelper": "0x0000000000000000000000000000000000000000",
-  "PaymentHelper": "0x722669cbE532F08bb4EB81127e6Ef386627E90be",
-  "RewardsDistributor": "0x0000000000000000000000000000000000000000",
+  "PaymentHelper": "0x0000000000000000000000000000000000000000",
   "SocketOneInchValidator": "0x0000000000000000000000000000000000000000",
   "SocketValidator": "0x0000000000000000000000000000000000000000",
   "SuperPositions": "0x0000000000000000000000000000000000000000",
@@ -20,5 +19,6 @@
   "SuperformRouter": "0x0000000000000000000000000000000000000000",
   "VaultClaimer": "0x0000000000000000000000000000000000000000",
   "WormholeARImplementation": "0x0000000000000000000000000000000000000000",
-  "WormholeSRImplementation": "0x0000000000000000000000000000000000000000"
+  "WormholeSRImplementation": "0x0000000000000000000000000000000000000000",
+  "RewardsDistributor": "0xce23bD7205bF2B543F6B4eeC00Add0C111FEFc3B"
 }
diff --git a/script/output/250/Fantom-latest.json b/script/output/250/Fantom-latest.json
@@ -10,7 +10,6 @@
   "PayMaster": "0x0000000000000000000000000000000000000000",
   "PayloadHelper": "0x0000000000000000000000000000000000000000",
   "PaymentHelper": "0x0000000000000000000000000000000000000000",
-  "RewardsDistributor": "0x92C0A5f9DF2c9DD99DCC27801aa75b0634689e53",
   "SocketOneInchValidator": "0x0000000000000000000000000000000000000000",
   "SocketValidator": "0x0000000000000000000000000000000000000000",
   "SuperPositions": "0x0000000000000000000000000000000000000000",
@@ -20,5 +19,6 @@
   "SuperformRouter": "0x0000000000000000000000000000000000000000",
   "VaultClaimer": "0x0000000000000000000000000000000000000000",
   "WormholeARImplementation": "0x0000000000000000000000000000000000000000",
-  "WormholeSRImplementation": "0x0000000000000000000000000000000000000000"
+  "WormholeSRImplementation": "0x0000000000000000000000000000000000000000",
+  "RewardsDistributor": "0xd6cea5c8853c3fb4bbd77ef5e924c4e647c03a94"
 }
diff --git a/script/output/42161/Arbitrum-latest.json b/script/output/42161/Arbitrum-latest.json
@@ -10,7 +10,6 @@
   "PayMaster": "0x0000000000000000000000000000000000000000",
   "PayloadHelper": "0x0000000000000000000000000000000000000000",
   "PaymentHelper": "0x0000000000000000000000000000000000000000",
-  "RewardsDistributor": "0xCE0D4e1c23CD166f84e5746c6833e8bc762F3456",
   "SocketOneInchValidator": "0x0000000000000000000000000000000000000000",
   "SocketValidator": "0x0000000000000000000000000000000000000000",
   "SuperPositions": "0x0000000000000000000000000000000000000000",
@@ -20,5 +19,6 @@
   "SuperformRouter": "0x0000000000000000000000000000000000000000",
   "VaultClaimer": "0x0000000000000000000000000000000000000000",
   "WormholeARImplementation": "0x0000000000000000000000000000000000000000",
-  "WormholeSRImplementation": "0x0000000000000000000000000000000000000000"
+  "WormholeSRImplementation": "0x0000000000000000000000000000000000000000",
+  "RewardsDistributor": "0xce23bD7205bF2B543F6B4eeC00Add0C111FEFc3B"
 }
diff --git a/script/output/43114/Avalanche-latest.json b/script/output/43114/Avalanche-latest.json
@@ -9,8 +9,7 @@
   "LiFiValidator": "0x0000000000000000000000000000000000000000",
   "PayMaster": "0x0000000000000000000000000000000000000000",
   "PayloadHelper": "0x0000000000000000000000000000000000000000",
-  "PaymentHelper": "0x722669cbE532F08bb4EB81127e6Ef386627E90be",
-  "RewardsDistributor": "0x0000000000000000000000000000000000000000",
+  "PaymentHelper": "0x0000000000000000000000000000000000000000",
   "SocketOneInchValidator": "0x0000000000000000000000000000000000000000",
   "SocketValidator": "0x0000000000000000000000000000000000000000",
   "SuperPositions": "0x0000000000000000000000000000000000000000",
@@ -20,5 +19,6 @@
   "SuperformRouter": "0x0000000000000000000000000000000000000000",
   "VaultClaimer": "0x0000000000000000000000000000000000000000",
   "WormholeARImplementation": "0x0000000000000000000000000000000000000000",
-  "WormholeSRImplementation": "0x0000000000000000000000000000000000000000"
+  "WormholeSRImplementation": "0x0000000000000000000000000000000000000000",
+  "RewardsDistributor": "0xce23bD7205bF2B543F6B4eeC00Add0C111FEFc3B"
 }
diff --git a/script/output/56/Binance-latest.json b/script/output/56/Binance-latest.json
@@ -10,7 +10,6 @@
   "PayMaster": "0x0000000000000000000000000000000000000000",
   "PayloadHelper": "0x0000000000000000000000000000000000000000",
   "PaymentHelper": "0x0000000000000000000000000000000000000000",
-  "RewardsDistributor": "0xCE0D4e1c23CD166f84e5746c6833e8bc762F3456",
   "SocketOneInchValidator": "0x0000000000000000000000000000000000000000",
   "SocketValidator": "0x0000000000000000000000000000000000000000",
   "SuperPositions": "0x0000000000000000000000000000000000000000",
@@ -20,5 +19,6 @@
   "SuperformRouter": "0x0000000000000000000000000000000000000000",
   "VaultClaimer": "0x0000000000000000000000000000000000000000",
   "WormholeARImplementation": "0x0000000000000000000000000000000000000000",
-  "WormholeSRImplementation": "0x0000000000000000000000000000000000000000"
+  "WormholeSRImplementation": "0x0000000000000000000000000000000000000000",
+  "RewardsDistributor": "0xce23bD7205bF2B543F6B4eeC00Add0C111FEFc3B"
 }
diff --git a/script/output/8453/Base-latest.json b/script/output/8453/Base-latest.json
@@ -10,7 +10,6 @@
   "PayMaster": "0x0000000000000000000000000000000000000000",
   "PayloadHelper": "0x0000000000000000000000000000000000000000",
   "PaymentHelper": "0x0000000000000000000000000000000000000000",
-  "RewardsDistributor": "0xCE0D4e1c23CD166f84e5746c6833e8bc762F3456",
   "SocketOneInchValidator": "0x0000000000000000000000000000000000000000",
   "SocketValidator": "0x0000000000000000000000000000000000000000",
   "SuperPositions": "0x0000000000000000000000000000000000000000",
@@ -20,5 +19,6 @@
   "SuperformRouter": "0x0000000000000000000000000000000000000000",
   "VaultClaimer": "0x0000000000000000000000000000000000000000",
   "WormholeARImplementation": "0x0000000000000000000000000000000000000000",
-  "WormholeSRImplementation": "0x0000000000000000000000000000000000000000"
+  "WormholeSRImplementation": "0x0000000000000000000000000000000000000000",
+  "RewardsDistributor": "0xce23bD7205bF2B543F6B4eeC00Add0C111FEFc3B"
 }