@superfluid-finance/ethereum-contracts 1.2.2-dev.ec379f7.0 → 1.2.3-dev.c960cdd.0

package/build/contracts/UUPSUtils.json

@@ -7,30 +7,30 @@
   "immutableReferences": {},
   "generatedSources": [],
   "deployedGeneratedSources": [],
-  "sourceMap": "137:933:100:-:0;;;;;;;;;;;;;;;-1:-1:-1;;;137:933:100;;;;;;;;;;;;;;;;;",
-  "deployedSourceMap": "137:933:100:-:0;;;;;;;;",
+  "sourceMap": "137:933:101:-:0;;;;;;;;;;;;;;;-1:-1:-1;;;137:933:101;;;;;;;;;;;;;;;;;",
+  "deployedSourceMap": "137:933:101:-:0;;;;;;;;",
   "source": "// SPDX-License-Identifier: AGPLv3\npragma solidity 0.8.13;\n\n/**\n * @title UUPS (Universal Upgradeable Proxy Standard) Shared Library\n */\nlibrary UUPSUtils {\n\n    /**\n     * @dev Implementation slot constant.\n     * Using https://eips.ethereum.org/EIPS/eip-1967 standard\n     * Storage slot 0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc\n     * (obtained as bytes32(uint256(keccak256('eip1967.proxy.implementation')) - 1)).\n     */\n    bytes32 internal constant _IMPLEMENTATION_SLOT = 0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc;\n\n    /// @dev Get implementation address.\n    function implementation() internal view returns (address impl) {\n        assembly { // solium-disable-line\n            impl := sload(_IMPLEMENTATION_SLOT)\n        }\n    }\n\n    /// @dev Set new implementation address.\n    function setImplementation(address codeAddress) internal {\n        assembly {\n            // solium-disable-line\n            sstore(\n                _IMPLEMENTATION_SLOT,\n                codeAddress\n            )\n        }\n    }\n\n}\n",
   "sourcePath": "/home/runner/work/protocol-monorepo/protocol-monorepo/packages/ethereum-contracts/contracts/upgradability/UUPSUtils.sol",
   "ast": {
     "absolutePath": "project:/contracts/upgradability/UUPSUtils.sol",
     "exportedSymbols": {
       "UUPSUtils": [
-        36399
+        36415
       ]
     },
-    "id": 36400,
+    "id": 36416,
     "license": "AGPLv3",
     "nodeType": "SourceUnit",
     "nodes": [
       {
-        "id": 36377,
+        "id": 36393,
         "literals": [
           "solidity",
           "0.8",
           ".13"
         ],
         "nodeType": "PragmaDirective",
-        "src": "35:23:100"
+        "src": "35:23:101"
       },
       {
         "abstract": false,
@@ -39,35 +39,35 @@
         "contractDependencies": [],
         "contractKind": "library",
         "documentation": {
-          "id": 36378,
+          "id": 36394,
           "nodeType": "StructuredDocumentation",
-          "src": "60:76:100",
+          "src": "60:76:101",
           "text": " @title UUPS (Universal Upgradeable Proxy Standard) Shared Library"
         },
         "fullyImplemented": true,
-        "id": 36399,
+        "id": 36415,
         "linearizedBaseContracts": [
-          36399
+          36415
         ],
         "name": "UUPSUtils",
-        "nameLocation": "145:9:100",
+        "nameLocation": "145:9:101",
         "nodeType": "ContractDefinition",
         "nodes": [
           {
             "constant": true,
             "documentation": {
-              "id": 36379,
+              "id": 36395,
               "nodeType": "StructuredDocumentation",
-              "src": "162:288:100",
+              "src": "162:288:101",
               "text": " @dev Implementation slot constant.\n Using https://eips.ethereum.org/EIPS/eip-1967 standard\n Storage slot 0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc\n (obtained as bytes32(uint256(keccak256('eip1967.proxy.implementation')) - 1))."
             },
-            "id": 36382,
+            "id": 36398,
             "mutability": "constant",
             "name": "_IMPLEMENTATION_SLOT",
-            "nameLocation": "481:20:100",
+            "nameLocation": "481:20:101",
             "nodeType": "VariableDeclaration",
-            "scope": 36399,
-            "src": "455:115:100",
+            "scope": 36415,
+            "src": "455:115:101",
             "stateVariable": true,
             "storageLocation": "default",
             "typeDescriptions": {
@@ -75,10 +75,10 @@
               "typeString": "bytes32"
             },
             "typeName": {
-              "id": 36380,
+              "id": 36396,
               "name": "bytes32",
               "nodeType": "ElementaryTypeName",
-              "src": "455:7:100",
+              "src": "455:7:101",
               "typeDescriptions": {
                 "typeIdentifier": "t_bytes32",
                 "typeString": "bytes32"
@@ -86,14 +86,14 @@
             },
             "value": {
               "hexValue": "307833363038393461313362613161333231303636376338323834393264623938646361336532303736636333373335613932306133636135303564333832626263",
-              "id": 36381,
+              "id": 36397,
               "isConstant": false,
               "isLValue": false,
               "isPure": true,
               "kind": "number",
               "lValueRequested": false,
               "nodeType": "Literal",
-              "src": "504:66:100",
+              "src": "504:66:101",
               "typeDescriptions": {
                 "typeIdentifier": "t_rational_24440054405305269366569402256811496959409073762505157381672968839269610695612_by_1",
                 "typeString": "int_const 2444...(69 digits omitted)...5612"
@@ -104,39 +104,39 @@
           },
           {
             "body": {
-              "id": 36389,
+              "id": 36405,
               "nodeType": "Block",
-              "src": "681:107:100",
+              "src": "681:107:101",
               "statements": [
                 {
                   "AST": {
                     "nodeType": "YulBlock",
-                    "src": "700:82:100",
+                    "src": "700:82:101",
                     "statements": [
                       {
                         "nodeType": "YulAssignment",
-                        "src": "737:35:100",
+                        "src": "737:35:101",
                         "value": {
                           "arguments": [
                             {
                               "name": "_IMPLEMENTATION_SLOT",
                               "nodeType": "YulIdentifier",
-                              "src": "751:20:100"
+                              "src": "751:20:101"
                             }
                           ],
                           "functionName": {
                             "name": "sload",
                             "nodeType": "YulIdentifier",
-                            "src": "745:5:100"
+                            "src": "745:5:101"
                           },
                           "nodeType": "YulFunctionCall",
-                          "src": "745:27:100"
+                          "src": "745:27:101"
                         },
                         "variableNames": [
                           {
                             "name": "impl",
                             "nodeType": "YulIdentifier",
-                            "src": "737:4:100"
+                            "src": "737:4:101"
                           }
                         ]
                       }
@@ -145,58 +145,58 @@
                   "evmVersion": "london",
                   "externalReferences": [
                     {
-                      "declaration": 36382,
+                      "declaration": 36398,
                       "isOffset": false,
                       "isSlot": false,
-                      "src": "751:20:100",
+                      "src": "751:20:101",
                       "valueSize": 1
                     },
                     {
-                      "declaration": 36386,
+                      "declaration": 36402,
                       "isOffset": false,
                       "isSlot": false,
-                      "src": "737:4:100",
+                      "src": "737:4:101",
                       "valueSize": 1
                     }
                   ],
-                  "id": 36388,
+                  "id": 36404,
                   "nodeType": "InlineAssembly",
-                  "src": "691:91:100"
+                  "src": "691:91:101"
                 }
               ]
             },
             "documentation": {
-              "id": 36383,
+              "id": 36399,
               "nodeType": "StructuredDocumentation",
-              "src": "577:36:100",
+              "src": "577:36:101",
               "text": "@dev Get implementation address."
             },
-            "id": 36390,
+            "id": 36406,
             "implemented": true,
             "kind": "function",
             "modifiers": [],
             "name": "implementation",
-            "nameLocation": "627:14:100",
+            "nameLocation": "627:14:101",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 36384,
+              "id": 36400,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "641:2:100"
+              "src": "641:2:101"
             },
             "returnParameters": {
-              "id": 36387,
+              "id": 36403,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 36386,
+                  "id": 36402,
                   "mutability": "mutable",
                   "name": "impl",
-                  "nameLocation": "675:4:100",
+                  "nameLocation": "675:4:101",
                   "nodeType": "VariableDeclaration",
-                  "scope": 36390,
-                  "src": "667:12:100",
+                  "scope": 36406,
+                  "src": "667:12:101",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -204,10 +204,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 36385,
+                    "id": 36401,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "667:7:100",
+                    "src": "667:7:101",
                     "stateMutability": "nonpayable",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
@@ -217,24 +217,24 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "666:14:100"
+              "src": "666:14:101"
             },
-            "scope": 36399,
-            "src": "618:170:100",
+            "scope": 36415,
+            "src": "618:170:101",
             "stateMutability": "view",
             "virtual": false,
             "visibility": "internal"
           },
           {
             "body": {
-              "id": 36397,
+              "id": 36413,
               "nodeType": "Block",
-              "src": "896:171:100",
+              "src": "896:171:101",
               "statements": [
                 {
                   "AST": {
                     "nodeType": "YulBlock",
-                    "src": "915:146:100",
+                    "src": "915:146:101",
                     "statements": [
                       {
                         "expression": {
@@ -242,76 +242,76 @@
                             {
                               "name": "_IMPLEMENTATION_SLOT",
                               "nodeType": "YulIdentifier",
-                              "src": "988:20:100"
+                              "src": "988:20:101"
                             },
                             {
                               "name": "codeAddress",
                               "nodeType": "YulIdentifier",
-                              "src": "1026:11:100"
+                              "src": "1026:11:101"
                             }
                           ],
                           "functionName": {
                             "name": "sstore",
                             "nodeType": "YulIdentifier",
-                            "src": "964:6:100"
+                            "src": "964:6:101"
                           },
                           "nodeType": "YulFunctionCall",
-                          "src": "964:87:100"
+                          "src": "964:87:101"
                         },
                         "nodeType": "YulExpressionStatement",
-                        "src": "964:87:100"
+                        "src": "964:87:101"
                       }
                     ]
                   },
                   "evmVersion": "london",
                   "externalReferences": [
                     {
-                      "declaration": 36382,
+                      "declaration": 36398,
                       "isOffset": false,
                       "isSlot": false,
-                      "src": "988:20:100",
+                      "src": "988:20:101",
                       "valueSize": 1
                     },
                     {
-                      "declaration": 36393,
+                      "declaration": 36409,
                       "isOffset": false,
                       "isSlot": false,
-                      "src": "1026:11:100",
+                      "src": "1026:11:101",
                       "valueSize": 1
                     }
                   ],
-                  "id": 36396,
+                  "id": 36412,
                   "nodeType": "InlineAssembly",
-                  "src": "906:155:100"
+                  "src": "906:155:101"
                 }
               ]
             },
             "documentation": {
-              "id": 36391,
+              "id": 36407,
               "nodeType": "StructuredDocumentation",
-              "src": "794:40:100",
+              "src": "794:40:101",
               "text": "@dev Set new implementation address."
             },
-            "id": 36398,
+            "id": 36414,
             "implemented": true,
             "kind": "function",
             "modifiers": [],
             "name": "setImplementation",
-            "nameLocation": "848:17:100",
+            "nameLocation": "848:17:101",
             "nodeType": "FunctionDefinition",
             "parameters": {
-              "id": 36394,
+              "id": 36410,
               "nodeType": "ParameterList",
               "parameters": [
                 {
                   "constant": false,
-                  "id": 36393,
+                  "id": 36409,
                   "mutability": "mutable",
                   "name": "codeAddress",
-                  "nameLocation": "874:11:100",
+                  "nameLocation": "874:11:101",
                   "nodeType": "VariableDeclaration",
-                  "scope": 36398,
-                  "src": "866:19:100",
+                  "scope": 36414,
+                  "src": "866:19:101",
                   "stateVariable": false,
                   "storageLocation": "default",
                   "typeDescriptions": {
@@ -319,10 +319,10 @@
                     "typeString": "address"
                   },
                   "typeName": {
-                    "id": 36392,
+                    "id": 36408,
                     "name": "address",
                     "nodeType": "ElementaryTypeName",
-                    "src": "866:7:100",
+                    "src": "866:7:101",
                     "stateMutability": "nonpayable",
                     "typeDescriptions": {
                       "typeIdentifier": "t_address",
@@ -332,27 +332,27 @@
                   "visibility": "internal"
                 }
               ],
-              "src": "865:21:100"
+              "src": "865:21:101"
             },
             "returnParameters": {
-              "id": 36395,
+              "id": 36411,
               "nodeType": "ParameterList",
               "parameters": [],
-              "src": "896:0:100"
+              "src": "896:0:101"
             },
-            "scope": 36399,
-            "src": "839:228:100",
+            "scope": 36415,
+            "src": "839:228:101",
             "stateMutability": "nonpayable",
             "virtual": false,
             "visibility": "internal"
           }
         ],
-        "scope": 36400,
-        "src": "137:933:100",
+        "scope": 36416,
+        "src": "137:933:101",
         "usedErrors": []
       }
     ],
-    "src": "35:1036:100"
+    "src": "35:1036:101"
   },
   "compiler": {
     "name": "solc",
@@ -360,7 +360,7 @@
   },
   "networks": {},
   "schemaVersion": "3.4.7",
-  "updatedAt": "2022-05-06T12:43:05.834Z",
+  "updatedAt": "2022-05-09T18:30:12.032Z",
   "devdoc": {
     "kind": "dev",
     "methods": {},

package/contracts/libs/ERC1820RegistryCompiled.sol

@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: AGPLv3
+// solhint-disable const-name-snakecase
+// solhint-disable max-line-length
+pragma solidity 0.8.13;
+
+/// @dev This is meant to be used by test framework to get the raw bytecode without compiling the origin contract
+library ERC1820RegistryCompiled {
+    address internal constant at = address(0x1820a4B7618BdE71Dce8cdc73aAB6C95905faD24);
+    bytes internal constant bin = bytes(hex"608060405234801561001057600080fd5b50600436106100a5576000357c010000000000000000000000000000000000000000000000000000000090048063a41e7d5111610078578063a41e7d51146101d4578063aabbb8ca1461020a578063b705676514610236578063f712f3e814610280576100a5565b806329965a1d146100aa5780633d584063146100e25780635df8122f1461012457806365ba36c114610152575b600080fd5b6100e0600480360360608110156100c057600080fd5b50600160a060020a038135811691602081013591604090910135166102b6565b005b610108600480360360208110156100f857600080fd5b5035600160a060020a0316610570565b60408051600160a060020a039092168252519081900360200190f35b6100e06004803603604081101561013a57600080fd5b50600160a060020a03813581169160200135166105bc565b6101c26004803603602081101561016857600080fd5b81019060208101813564010000000081111561018357600080fd5b82018360208201111561019557600080fd5b803590602001918460018302840111640100000000831117156101b757600080fd5b5090925090506106b3565b60408051918252519081900360200190f35b6100e0600480360360408110156101ea57600080fd5b508035600160a060020a03169060200135600160e060020a0319166106ee565b6101086004803603604081101561022057600080fd5b50600160a060020a038135169060200135610778565b61026c6004803603604081101561024c57600080fd5b508035600160a060020a03169060200135600160e060020a0319166107ef565b604080519115158252519081900360200190f35b61026c6004803603604081101561029657600080fd5b508035600160a060020a03169060200135600160e060020a0319166108aa565b6000600160a060020a038416156102cd57836102cf565b335b9050336102db82610570565b600160a060020a031614610339576040805160e560020a62461bcd02815260206004820152600f60248201527f4e6f7420746865206d616e616765720000000000000000000000000000000000604482015290519081900360640190fd5b6103428361092a565b15610397576040805160e560020a62461bcd02815260206004820152601a60248201527f4d757374206e6f7420626520616e204552433136352068617368000000000000604482015290519081900360640190fd5b600160a060020a038216158015906103b85750600160a060020a0382163314155b156104ff5760405160200180807f455243313832305f4143434550545f4d4147494300000000000000000000000081525060140190506040516020818303038152906040528051906020012082600160a060020a031663249cb3fa85846040518363ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018083815260200182600160a060020a0316600160a060020a031681526020019250505060206040518083038186803b15801561047e57600080fd5b505afa158015610492573d6000803e3d6000fd5b505050506040513d60208110156104a857600080fd5b5051146104ff576040805160e560020a62461bcd02815260206004820181905260248201527f446f6573206e6f7420696d706c656d656e742074686520696e74657266616365604482015290519081900360640190fd5b600160a060020a03818116600081815260208181526040808320888452909152808220805473ffffffffffffffffffffffffffffffffffffffff19169487169485179055518692917f93baa6efbd2244243bfee6ce4cfdd1d04fc4c0e9a786abd3a41313bd352db15391a450505050565b600160a060020a03818116600090815260016020526040812054909116151561059a5750806105b7565b50600160a060020a03808216600090815260016020526040902054165b919050565b336105c683610570565b600160a060020a031614610624576040805160e560020a62461bcd02815260206004820152600f60248201527f4e6f7420746865206d616e616765720000000000000000000000000000000000604482015290519081900360640190fd5b81600160a060020a031681600160a060020a0316146106435780610646565b60005b600160a060020a03838116600081815260016020526040808220805473ffffffffffffffffffffffffffffffffffffffff19169585169590951790945592519184169290917f605c2dbf762e5f7d60a546d42e7205dcb1b011ebc62a61736a57c9089d3a43509190a35050565b600082826040516020018083838082843780830192505050925050506040516020818303038152906040528051906020012090505b92915050565b6106f882826107ef565b610703576000610705565b815b600160a060020a03928316600081815260208181526040808320600160e060020a031996909616808452958252808320805473ffffffffffffffffffffffffffffffffffffffff19169590971694909417909555908152600284528181209281529190925220805460ff19166001179055565b600080600160a060020a038416156107905783610792565b335b905061079d8361092a565b156107c357826107ad82826108aa565b6107b85760006107ba565b815b925050506106e8565b600160a060020a0390811660009081526020818152604080832086845290915290205416905092915050565b6000808061081d857f01ffc9a70000000000000000000000000000000000000000000000000000000061094c565b909250905081158061082d575080155b1561083d576000925050506106e8565b61084f85600160e060020a031961094c565b909250905081158061086057508015155b15610870576000925050506106e8565b61087a858561094c565b909250905060018214801561088f5750806001145b1561089f576001925050506106e8565b506000949350505050565b600160a060020a0382166000908152600260209081526040808320600160e060020a03198516845290915281205460ff1615156108f2576108eb83836107ef565b90506106e8565b50600160a060020a03808316600081815260208181526040808320600160e060020a0319871684529091529020549091161492915050565b7bffffffffffffffffffffffffffffffffffffffffffffffffffffffff161590565b6040517f01ffc9a7000000000000000000000000000000000000000000000000000000008082526004820183905260009182919060208160248189617530fa90519096909550935050505056fea165627a7a72305820377f4a2d4301ede9949f163f319021a6e9c687c292a5e2b2c4734c126b524e6c0029");
+}

package/contracts/utils/SuperfluidFrameworkDeployer.sol

@@ -16,17 +16,28 @@ import {
     ERC20WithTokenInfo
 } from "../superfluid/SuperTokenFactory.sol";
 import {SuperToken} from "../superfluid/SuperToken.sol";
+import "../apps/CFAv1Library.sol";
+import "../apps/IDAv1Library.sol";
 
 
 /// @title Superfluid Framework Deployer
 /// @notice This is NOT for deploying public nets, but rather only for tesing envs
 contract SuperfluidFrameworkDeployer {
 
+    struct Framework {
+        TestGovernance governance;
+        Superfluid host;
+        ConstantFlowAgreementV1 cfa;
+        CFAv1Library.InitData cfaLib;
+        InstantDistributionAgreementV1 ida;
+        IDAv1Library.InitData idaLib;
+        SuperTokenFactory superTokenFactory;
+    }
+
     TestGovernance internal governance;
     Superfluid internal host;
     ConstantFlowAgreementV1 internal cfa;
     InstantDistributionAgreementV1 internal ida;
-    SuperTokenFactoryHelper internal superTokenFactoryHelper;
     SuperTokenFactory internal superTokenFactory;
 
     /// @notice Deploys everything... probably
@@ -73,7 +84,7 @@ contract SuperfluidFrameworkDeployer {
         governance.registerAgreementClass(host, address(ida));
 
         // Deploy SuperTokenFactoryHelper
-        superTokenFactoryHelper = new SuperTokenFactoryHelper();
+        SuperTokenFactoryHelper superTokenFactoryHelper = new SuperTokenFactoryHelper();
 
         // Deploy SuperTokenFactory
         superTokenFactory = new SuperTokenFactory(
@@ -93,14 +104,18 @@ contract SuperfluidFrameworkDeployer {
     /// @notice Fetches the framework contracts
     function getFramework()
         external view
-        returns (
-            Superfluid,
-            ConstantFlowAgreementV1,
-            InstantDistributionAgreementV1,
-            SuperTokenFactory
-        )
+        returns (Framework memory sf)
     {
-        return (host, cfa, ida, superTokenFactory);
+        sf = Framework({
+            governance: governance,
+            host: host,
+            cfa: cfa,
+            cfaLib: CFAv1Library.InitData(host, cfa),
+            ida: ida,
+            idaLib: IDAv1Library.InitData(host, ida),
+            superTokenFactory: superTokenFactory
+        });
+        return sf;
     }
 
     /// @notice Deploy new wrapper super token

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@superfluid-finance/ethereum-contracts",
-    "version": "1.2.2-dev.ec379f7.0",
+    "version": "1.2.3-dev.c960cdd.0",
     "description": " Ethereum contracts implementation for the Superfluid Protocol",
     "homepage": "https://github.com/superfluid-finance/protocol-monorepo/tree/dev/packages/ethereum-contracts#readme",
     "repository": {
@@ -56,7 +56,7 @@
     "dependencies": {
         "@decentral.ee/web3-helpers": "0.5.3",
         "@openzeppelin/contracts": "4.5.0",
-        "@superfluid-finance/js-sdk": "0.5.12",
+        "@superfluid-finance/js-sdk": "^0.5.14-dev.c960cdd.0",
         "@truffle/contract": "4.5.5",
         "ethereumjs-tx": "2.1.2",
         "ethereumjs-util": "7.1.4",