[METADATA] added gda addresses and new loaders (#1811)

* added gda addresses and new loaders * updated changelog * fix flakey test * fix warnings --------- Co-authored-by: 0xdavinchee <[email protected]>
superfluid-finance · Jan 25, 2024 · 977e20d · 977e20d
1 parent b1a8acf
commit 977e20d
Show file tree

Hide file tree

Showing 14 changed files with 81 additions and 33 deletions.
diff --git a/packages/automation-contracts/autowrap/package.json b/packages/automation-contracts/autowrap/package.json
@@ -15,6 +15,6 @@
     "dependencies": {
         "@openzeppelin/contracts": "4.9.3",
         "@superfluid-finance/ethereum-contracts": "1.9.0",
-        "@superfluid-finance/metadata": "1.1.25"
+        "@superfluid-finance/metadata": "1.1.26"
     }
 }
diff --git a/packages/automation-contracts/scheduler/package.json b/packages/automation-contracts/scheduler/package.json
@@ -15,6 +15,6 @@
     "dependencies": {
         "@openzeppelin/contracts": "4.9.3",
         "@superfluid-finance/ethereum-contracts": "1.9.0",
-        "@superfluid-finance/metadata": "1.1.25"
+        "@superfluid-finance/metadata": "1.1.26"
     }
 }
diff --git a/packages/ethereum-contracts/contracts/agreements/gdav1/GeneralDistributionAgreementV1.sol b/packages/ethereum-contracts/contracts/agreements/gdav1/GeneralDistributionAgreementV1.sol
@@ -131,6 +131,7 @@ contract GeneralDistributionAgreementV1 is AgreementBase, TokenMonad, IGeneralDi
         rtb += fromPools;
 
         buf = uint256(universalIndexData.totalBuffer.toInt256()); // upcasting to uint256 is safe
+        owedBuffer = 0;
     }
 
     /// @dev ISuperAgreement.realtimeBalanceOf implementation

diff --git a/packages/ethereum-contracts/package.json b/packages/ethereum-contracts/package.json
@@ -91,7 +91,7 @@
         "@safe-global/safe-service-client": "^2.0.3",
         "@safe-global/safe-web3-lib": "^1.9.4",
         "@superfluid-finance/js-sdk": "0.6.3",
-        "@superfluid-finance/metadata": "1.1.25",
+        "@superfluid-finance/metadata": "1.1.26",
         "async": "^3.2.5",
         "csv-writer": "^1.6.0",
         "ethers": "^5.7.2",

diff --git a/packages/ethereum-contracts/test/foundry/agreements/gdav1/GeneralDistributionAgreement.t.sol b/packages/ethereum-contracts/test/foundry/agreements/gdav1/GeneralDistributionAgreement.t.sol
@@ -243,11 +243,10 @@ contract GeneralDistributionAgreementV1IntegrationTest is FoundrySuperfluidTeste
         vm.stopPrank();
     }
 
-    function testRevertIfNotAdminOrGDAUpdatesMemberUnitsViaPool(address caller) public {
-        vm.assume(caller != alice);
-        vm.startPrank(caller);
+    function testRevertIfNotAdminOrGDAUpdatesMemberUnitsViaPool() public {
+        vm.startPrank(bob);
         vm.expectRevert(ISuperfluidPool.SUPERFLUID_POOL_NOT_POOL_ADMIN_OR_GDA.selector);
-        freePool.updateMemberUnits(caller, 69);
+        freePool.updateMemberUnits(bob, 69);
         vm.stopPrank();
     }
 

diff --git a/packages/ethereum-contracts/test/foundry/utils/BatchLiquidator.t.sol b/packages/ethereum-contracts/test/foundry/utils/BatchLiquidator.t.sol
@@ -28,7 +28,7 @@ contract NonTransferableST is SuperToken {
             // no-empty-blocks
     { }
 
-    function transferFrom(address holder, address recipient, uint256 amount) public override returns (bool) {
+    function transferFrom(address, address, uint256) public pure override returns (bool) {
         revert();
     }
 

diff --git a/packages/js-sdk/package.json b/packages/js-sdk/package.json
@@ -43,7 +43,7 @@
         "cloc": "sh tasks/cloc.sh"
     },
     "dependencies": {
-        "@superfluid-finance/metadata": "1.1.25",
+        "@superfluid-finance/metadata": "1.1.26",
         "@truffle/contract": "4.6.29",
         "auto-bind": "4.0.0",
         "node-fetch": "2.7.0"

diff --git a/packages/metadata/CHANGELOG.md b/packages/metadata/CHANGELOG.md
@@ -3,6 +3,12 @@ All notable changes to the metadata will be documented in this file.
 
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [v1.1.26]
+### Added
+- gdaV1 and gdaV1Forwarder for several mainnets
+### Changed
+- loader on those networks (now also loads the gda)
+
 ## [v1.1.25]
 ### Changed
 - updated gov contract of scroll-mainnet

diff --git a/packages/metadata/main/networks/list.cjs b/packages/metadata/main/networks/list.cjs
@@ -403,7 +403,9 @@ module.exports =
             "name": "protocol-v1-optimism-sepolia",
             "hostedEndpoint": "https://api.thegraph.com/subgraphs/name/superfluid-finance/protocol-v1-optimism-sepolia"
         },
-        "publicRPCs": ["https://sepolia.optimism.io"],
+        "publicRPCs": [
+            "https://sepolia.optimism.io"
+        ],
         "trustedForwarders": []
     },
     {
@@ -459,10 +461,12 @@ module.exports =
             "cfaV1": "0xEbdA4ceF883A7B12c4E669Ebc58927FBa8447C7D",
             "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125",
             "idaV1": "0x7888ac96F987Eb10E291F34851ae0266eF912081",
+            "gdaV1": "0xd7992D358A20478c82dDEd98B3D8A9da46e99b82",
+            "gdaV1Forwarder": "0x6DA13Bde224A05a288748d857b9e7DDEffd1dE08",
             "superTokenFactory": "0x23410e2659380784498509698ed70E414D384880",
             "constantOutflowNFT": "0xfC00dEE8a980110c5608A823a5B3af3872635456",
             "constantInflowNFT": "0x1497440B4E92DC4ca0F76223b28C20Cb9cB8a0f1",
-            "superfluidLoader": "0xf941528d82D0eD2314FaBBA8bC8f285D1956A657",
+            "superfluidLoader": "0xb688e4Da3100Bcec4b5B3140C8Fb482ad15D2013",
             "toga": "0xb7DE52F4281a7a276E18C40F94cd93159C4A2d22",
             "batchLiquidator": "0x27636F8E129cdd4ccA0F30E2b4C116DDaC773bE5",
             "superSpreader": "0x74CDF863b00789c29734F8dFd9F83423Bc55E4cE",
@@ -579,10 +583,12 @@ module.exports =
             "cfaV1": "0x204C6f131bb7F258b2Ea1593f5309911d8E458eD",
             "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125",
             "idaV1": "0xc4ce5118C3B20950ee288f086cb7FC166d222D4c",
+            "gdaV1": "0x68Ae17fa7a31b86F306c383277552fd4813b0d35",
+            "gdaV1Forwarder": "0x6DA13Bde224A05a288748d857b9e7DDEffd1dE08",
             "superTokenFactory": "0x8276469A443D5C6B7146BED45e2abCaD3B6adad9",
             "constantOutflowNFT": "0xFb2b126660BE2fdEBa254b1F6e4348644E8482e7",
             "constantInflowNFT": "0x0C6D90a98426bfD572a5c5Be572a7f6Bd1C5ED76",
-            "superfluidLoader": "0x8E310ce29Ab7Fa2878944A65BB0eaF97B1853d40",
+            "superfluidLoader": "0xe8B40071df98bBEe23833905AFcF7b28fC7Ca3cb",
             "toga": "0xA3c8502187fD7a7118eAD59dc811281448946C8f",
             "batchLiquidator": "0x36Df169DBf5CE3c6f58D46f0addeF58F01381232",
             "flowScheduler": "0x55c8fc400833eEa791087cF343Ff2409A39DeBcC",
@@ -637,10 +643,12 @@ module.exports =
             "cfaV1": "0x731FdBB12944973B500518aea61942381d7e240D",
             "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125",
             "idaV1": "0x2319C7e07EB063340D2a0E36709B0D65fda75986",
+            "gdaV1": "0x1e299701792a2aF01408B122419d65Fd2dF0Ba02",
+            "gdaV1Forwarder": "0x6DA13Bde224A05a288748d857b9e7DDEffd1dE08",
             "superTokenFactory": "0x1C21Ead77fd45C84a4c916Db7A6635D0C6FF09D6",
             "constantOutflowNFT": "0x051e766e2d8dc65ae2bFCF084A50AD0447634227",
             "constantInflowNFT": "0x0043d7c85C8b96a49A72A92C0B48CdC4720437d7",
-            "superfluidLoader": "0xB99cA401e10D277345BcFb281AC148a2e16Db466",
+            "superfluidLoader": "0xe8B40071df98bBEe23833905AFcF7b28fC7Ca3cb",
             "toga": "0xFC63B7C762B10670Eda15cF3ca3970bCDB28C9eF",
             "batchLiquidator": "0x6C66e5c5D201A753ff497F2e9eC5D545631854d0",
             "flowScheduler": "0x3fA8B653F9abf91428800C0ba0F8D145a71F97A1",
@@ -695,10 +703,12 @@ module.exports =
             "cfaV1": "0x6946c5B38Ffea373b0a2340b4AEf0De8F6782e58",
             "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125",
             "idaV1": "0x1fA9fFe8Db73F701454B195151Db4Abb18423cf2",
+            "gdaV1": "0xA7b197cD5b0cEF6d62c4A0a851E3581f5E62e4D2",
+            "gdaV1Forwarder": "0x6DA13Bde224A05a288748d857b9e7DDEffd1dE08",
             "superTokenFactory": "0x464AADdBB2B80f3Cb666522EB7381bE610F638b4",
             "constantOutflowNFT": "0x4247bA6C3658Fa5C0F523BAcea8D0b97aF1a175e",
             "constantInflowNFT": "0x82b9D8A91A5b333b5A6e78439551ea0E7da153E3",
-            "superfluidLoader": "0x2601E69a2D16C8Ccc8aEe8cE9F59d24a59986B9E",
+            "superfluidLoader": "0x42B709822F18595443c308c1BE5E63CbFEf06481",
             "toga": "0x3D9A67D5ec1E72CEcA8157e028855056786b6159",
             "batchLiquidator": "0xdddaD64A9Fe7709A729C4a5428617e369278e0b6",
             "flowScheduler": "0xF7AfF590E9DE493D7ACb421Fca7f1E35C1ad4Ce5",
@@ -869,10 +879,12 @@ module.exports =
             "cfaV1": "0x9d369e78e1a682cE0F8d9aD849BeA4FE1c3bD3Ad",
             "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125",
             "idaV1": "0x26747Fe93fAC8bF28E1e24A558a2bC7E4d9846cA",
+            "gdaV1": "0x308b7405272d11494716e30C6E972DbF6fb89555",
+            "gdaV1Forwarder": "0x6DA13Bde224A05a288748d857b9e7DDEffd1dE08",
             "superTokenFactory": "0x36be86dEe6BC726Ed0Cbd170ccD2F21760BC73D9",
             "constantOutflowNFT": "0xbe49ac1EadAc65dccf204D4Df81d650B50122aB2",
             "constantInflowNFT": "0x0FB7694c990CF19001127391Dbe53924dd7a61c7",
-            "superfluidLoader": "0xAd6e6849d8eEa62AF9271808afb726610fB451a6",
+            "superfluidLoader": "0xF0d7d1D47109bA426B9D8A3Cde1941327af1eea3",
             "toga": "0x9bCa3a623e7b2e248510d88B2894F54898d88F91",
             "batchLiquidator": "0x21d4E9fbB9DB742E6ef4f29d189a7C18B0b59136",
             "existentialNFTCloneFactory": "0x051e766e2d8dc65ae2bFCF084A50AD0447634227"
@@ -906,10 +918,12 @@ module.exports =
             "cfaV1": "0x19ba78B9cDB05A877718841c574325fdB53601bb",
             "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125",
             "idaV1": "0x66DF3f8e14CF870361378d8F61356D15d9F425C4",
+            "gdaV1": "0xfE6c87BE05feDB2059d2EC41bA0A09826C9FD7aa",
+            "gdaV1Forwarder": "0x6DA13Bde224A05a288748d857b9e7DDEffd1dE08",
             "superTokenFactory": "0xe20B9a38E0c96F61d1bA6b42a61512D56Fea1Eb3",
             "constantOutflowNFT": "0xD3C78bb5a16Ea4ab584844eeb8F90Ac710c16355",
             "constantInflowNFT": "0x2d51962A9EE4D3C2819EF585eab7412c2a2C31Ac",
-            "superfluidLoader": "0x6B24A6F34ab96267Fef9F8AC9fe6CC104C228127",
+            "superfluidLoader": "0x9F9EEd9Bbc38E9e0514fD9dFcc0Bca9869A9c534",
             "toga": "0xA87F76e99f6C8Ff8996d14f550ceF47f193D9A09",
             "batchLiquidator": "0x889ebeCaD5F8C34Fd96023456d0fC5cE54eb74Cb",
             "existentialNFTCloneFactory": "0x642332562BC60a4Bd9681E7bb1588f7456A497aC"

diff --git a/packages/metadata/module/networks/list.js b/packages/metadata/module/networks/list.js
@@ -403,7 +403,9 @@ export default
             "name": "protocol-v1-optimism-sepolia",
             "hostedEndpoint": "https://api.thegraph.com/subgraphs/name/superfluid-finance/protocol-v1-optimism-sepolia"
         },
-        "publicRPCs": ["https://sepolia.optimism.io"],
+        "publicRPCs": [
+            "https://sepolia.optimism.io"
+        ],
         "trustedForwarders": []
     },
     {
@@ -459,10 +461,12 @@ export default
             "cfaV1": "0xEbdA4ceF883A7B12c4E669Ebc58927FBa8447C7D",
             "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125",
             "idaV1": "0x7888ac96F987Eb10E291F34851ae0266eF912081",
+            "gdaV1": "0xd7992D358A20478c82dDEd98B3D8A9da46e99b82",
+            "gdaV1Forwarder": "0x6DA13Bde224A05a288748d857b9e7DDEffd1dE08",
             "superTokenFactory": "0x23410e2659380784498509698ed70E414D384880",
             "constantOutflowNFT": "0xfC00dEE8a980110c5608A823a5B3af3872635456",
             "constantInflowNFT": "0x1497440B4E92DC4ca0F76223b28C20Cb9cB8a0f1",
-            "superfluidLoader": "0xf941528d82D0eD2314FaBBA8bC8f285D1956A657",
+            "superfluidLoader": "0xb688e4Da3100Bcec4b5B3140C8Fb482ad15D2013",
             "toga": "0xb7DE52F4281a7a276E18C40F94cd93159C4A2d22",
             "batchLiquidator": "0x27636F8E129cdd4ccA0F30E2b4C116DDaC773bE5",
             "superSpreader": "0x74CDF863b00789c29734F8dFd9F83423Bc55E4cE",
@@ -579,10 +583,12 @@ export default
             "cfaV1": "0x204C6f131bb7F258b2Ea1593f5309911d8E458eD",
             "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125",
             "idaV1": "0xc4ce5118C3B20950ee288f086cb7FC166d222D4c",
+            "gdaV1": "0x68Ae17fa7a31b86F306c383277552fd4813b0d35",
+            "gdaV1Forwarder": "0x6DA13Bde224A05a288748d857b9e7DDEffd1dE08",
             "superTokenFactory": "0x8276469A443D5C6B7146BED45e2abCaD3B6adad9",
             "constantOutflowNFT": "0xFb2b126660BE2fdEBa254b1F6e4348644E8482e7",
             "constantInflowNFT": "0x0C6D90a98426bfD572a5c5Be572a7f6Bd1C5ED76",
-            "superfluidLoader": "0x8E310ce29Ab7Fa2878944A65BB0eaF97B1853d40",
+            "superfluidLoader": "0xe8B40071df98bBEe23833905AFcF7b28fC7Ca3cb",
             "toga": "0xA3c8502187fD7a7118eAD59dc811281448946C8f",
             "batchLiquidator": "0x36Df169DBf5CE3c6f58D46f0addeF58F01381232",
             "flowScheduler": "0x55c8fc400833eEa791087cF343Ff2409A39DeBcC",
@@ -637,10 +643,12 @@ export default
             "cfaV1": "0x731FdBB12944973B500518aea61942381d7e240D",
             "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125",
             "idaV1": "0x2319C7e07EB063340D2a0E36709B0D65fda75986",
+            "gdaV1": "0x1e299701792a2aF01408B122419d65Fd2dF0Ba02",
+            "gdaV1Forwarder": "0x6DA13Bde224A05a288748d857b9e7DDEffd1dE08",
             "superTokenFactory": "0x1C21Ead77fd45C84a4c916Db7A6635D0C6FF09D6",
             "constantOutflowNFT": "0x051e766e2d8dc65ae2bFCF084A50AD0447634227",
             "constantInflowNFT": "0x0043d7c85C8b96a49A72A92C0B48CdC4720437d7",
-            "superfluidLoader": "0xB99cA401e10D277345BcFb281AC148a2e16Db466",
+            "superfluidLoader": "0xe8B40071df98bBEe23833905AFcF7b28fC7Ca3cb",
             "toga": "0xFC63B7C762B10670Eda15cF3ca3970bCDB28C9eF",
             "batchLiquidator": "0x6C66e5c5D201A753ff497F2e9eC5D545631854d0",
             "flowScheduler": "0x3fA8B653F9abf91428800C0ba0F8D145a71F97A1",
@@ -695,10 +703,12 @@ export default
             "cfaV1": "0x6946c5B38Ffea373b0a2340b4AEf0De8F6782e58",
             "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125",
             "idaV1": "0x1fA9fFe8Db73F701454B195151Db4Abb18423cf2",
+            "gdaV1": "0xA7b197cD5b0cEF6d62c4A0a851E3581f5E62e4D2",
+            "gdaV1Forwarder": "0x6DA13Bde224A05a288748d857b9e7DDEffd1dE08",
             "superTokenFactory": "0x464AADdBB2B80f3Cb666522EB7381bE610F638b4",
             "constantOutflowNFT": "0x4247bA6C3658Fa5C0F523BAcea8D0b97aF1a175e",
             "constantInflowNFT": "0x82b9D8A91A5b333b5A6e78439551ea0E7da153E3",
-            "superfluidLoader": "0x2601E69a2D16C8Ccc8aEe8cE9F59d24a59986B9E",
+            "superfluidLoader": "0x42B709822F18595443c308c1BE5E63CbFEf06481",
             "toga": "0x3D9A67D5ec1E72CEcA8157e028855056786b6159",
             "batchLiquidator": "0xdddaD64A9Fe7709A729C4a5428617e369278e0b6",
             "flowScheduler": "0xF7AfF590E9DE493D7ACb421Fca7f1E35C1ad4Ce5",
@@ -869,10 +879,12 @@ export default
             "cfaV1": "0x9d369e78e1a682cE0F8d9aD849BeA4FE1c3bD3Ad",
             "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125",
             "idaV1": "0x26747Fe93fAC8bF28E1e24A558a2bC7E4d9846cA",
+            "gdaV1": "0x308b7405272d11494716e30C6E972DbF6fb89555",
+            "gdaV1Forwarder": "0x6DA13Bde224A05a288748d857b9e7DDEffd1dE08",
             "superTokenFactory": "0x36be86dEe6BC726Ed0Cbd170ccD2F21760BC73D9",
             "constantOutflowNFT": "0xbe49ac1EadAc65dccf204D4Df81d650B50122aB2",
             "constantInflowNFT": "0x0FB7694c990CF19001127391Dbe53924dd7a61c7",
-            "superfluidLoader": "0xAd6e6849d8eEa62AF9271808afb726610fB451a6",
+            "superfluidLoader": "0xF0d7d1D47109bA426B9D8A3Cde1941327af1eea3",
             "toga": "0x9bCa3a623e7b2e248510d88B2894F54898d88F91",
             "batchLiquidator": "0x21d4E9fbB9DB742E6ef4f29d189a7C18B0b59136",
             "existentialNFTCloneFactory": "0x051e766e2d8dc65ae2bFCF084A50AD0447634227"
@@ -906,10 +918,12 @@ export default
             "cfaV1": "0x19ba78B9cDB05A877718841c574325fdB53601bb",
             "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125",
             "idaV1": "0x66DF3f8e14CF870361378d8F61356D15d9F425C4",
+            "gdaV1": "0xfE6c87BE05feDB2059d2EC41bA0A09826C9FD7aa",
+            "gdaV1Forwarder": "0x6DA13Bde224A05a288748d857b9e7DDEffd1dE08",
             "superTokenFactory": "0xe20B9a38E0c96F61d1bA6b42a61512D56Fea1Eb3",
             "constantOutflowNFT": "0xD3C78bb5a16Ea4ab584844eeb8F90Ac710c16355",
             "constantInflowNFT": "0x2d51962A9EE4D3C2819EF585eab7412c2a2C31Ac",
-            "superfluidLoader": "0x6B24A6F34ab96267Fef9F8AC9fe6CC104C228127",
+            "superfluidLoader": "0x9F9EEd9Bbc38E9e0514fD9dFcc0Bca9869A9c534",
             "toga": "0xA87F76e99f6C8Ff8996d14f550ceF47f193D9A09",
             "batchLiquidator": "0x889ebeCaD5F8C34Fd96023456d0fC5cE54eb74Cb",
             "existentialNFTCloneFactory": "0x642332562BC60a4Bd9681E7bb1588f7456A497aC"