@etherisc/gif-next 0.0.2-efdb520-159 → 0.0.2-efef0ea-320

package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.json

@@ -84,11 +84,49 @@
       "inputs": [
         {
           "internalType": "NftId",
-          "name": "poolNftId",
+          "name": "componentNftId",
           "type": "uint96"
         }
       ],
-      "name": "getPoolSetup",
+      "name": "getProductNftId",
+      "outputs": [
+        {
+          "internalType": "NftId",
+          "name": "productNftId",
+          "type": "uint96"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "NftId",
+          "name": "componentNftId",
+          "type": "uint96"
+        }
+      ],
+      "name": "getTokenHandler",
+      "outputs": [
+        {
+          "internalType": "contract TokenHandler",
+          "name": "tokenHandler",
+          "type": "address"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "NftId",
+          "name": "productNftId",
+          "type": "uint96"
+        }
+      ],
+      "name": "getTreasuryInfo",
       "outputs": [
         {
           "components": [
@@ -98,8 +136,13 @@
               "type": "uint96"
             },
             {
-              "internalType": "address",
-              "name": "wallet",
+              "internalType": "NftId",
+              "name": "distributionNftId",
+              "type": "uint96"
+            },
+            {
+              "internalType": "contract IERC20Metadata",
+              "name": "token",
               "type": "address"
             },
             {
@@ -116,7 +159,7 @@
                 }
               ],
               "internalType": "struct Fee",
-              "name": "stakingFee",
+              "name": "productFee",
               "type": "tuple"
             },
             {
@@ -133,59 +176,42 @@
                 }
               ],
               "internalType": "struct Fee",
-              "name": "performanceFee",
+              "name": "processingFee",
               "type": "tuple"
-            }
-          ],
-          "internalType": "struct ITreasury.PoolSetup",
-          "name": "setup",
-          "type": "tuple"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "NftId",
-          "name": "productNftId",
-          "type": "uint96"
-        }
-      ],
-      "name": "getProductSetup",
-      "outputs": [
-        {
-          "components": [
-            {
-              "internalType": "NftId",
-              "name": "productNftId",
-              "type": "uint96"
-            },
-            {
-              "internalType": "NftId",
-              "name": "distributorNftId",
-              "type": "uint96"
             },
             {
-              "internalType": "NftId",
-              "name": "poolNftId",
-              "type": "uint96"
-            },
-            {
-              "internalType": "contract IERC20Metadata",
-              "name": "token",
-              "type": "address"
-            },
-            {
-              "internalType": "contract TokenHandler",
-              "name": "tokenHandler",
-              "type": "address"
+              "components": [
+                {
+                  "internalType": "UFixed",
+                  "name": "fractionalFee",
+                  "type": "uint256"
+                },
+                {
+                  "internalType": "uint256",
+                  "name": "fixedFee",
+                  "type": "uint256"
+                }
+              ],
+              "internalType": "struct Fee",
+              "name": "poolFee",
+              "type": "tuple"
             },
             {
-              "internalType": "address",
-              "name": "wallet",
-              "type": "address"
+              "components": [
+                {
+                  "internalType": "UFixed",
+                  "name": "fractionalFee",
+                  "type": "uint256"
+                },
+                {
+                  "internalType": "uint256",
+                  "name": "fixedFee",
+                  "type": "uint256"
+                }
+              ],
+              "internalType": "struct Fee",
+              "name": "stakingFee",
+              "type": "tuple"
             },
             {
               "components": [
@@ -201,7 +227,7 @@
                 }
               ],
               "internalType": "struct Fee",
-              "name": "policyFee",
+              "name": "performanceFee",
               "type": "tuple"
             },
             {
@@ -218,37 +244,18 @@
                 }
               ],
               "internalType": "struct Fee",
-              "name": "processingFee",
+              "name": "distributionFee",
               "type": "tuple"
             }
           ],
-          "internalType": "struct ITreasury.ProductSetup",
-          "name": "setup",
+          "internalType": "struct ITreasury.TreasuryInfo",
+          "name": "info",
           "type": "tuple"
         }
       ],
       "stateMutability": "view",
       "type": "function"
     },
-    {
-      "inputs": [
-        {
-          "internalType": "NftId",
-          "name": "productNftId",
-          "type": "uint96"
-        }
-      ],
-      "name": "getTokenHandler",
-      "outputs": [
-        {
-          "internalType": "contract TokenHandler",
-          "name": "tokenHandler",
-          "type": "address"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
     {
       "inputs": [
         {
@@ -314,124 +321,47 @@
           "type": "tuple"
         }
       ],
-      "stateMutability": "pure",
+      "stateMutability": "view",
       "type": "function"
     },
     {
       "inputs": [
         {
           "internalType": "NftId",
-          "name": "poolNftId",
+          "name": "productNftId",
           "type": "uint96"
-        },
-        {
-          "internalType": "address",
-          "name": "wallet",
-          "type": "address"
-        },
-        {
-          "components": [
-            {
-              "internalType": "UFixed",
-              "name": "fractionalFee",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "fixedFee",
-              "type": "uint256"
-            }
-          ],
-          "internalType": "struct Fee",
-          "name": "stakingFee",
-          "type": "tuple"
-        },
+        }
+      ],
+      "name": "hasTreasuryInfo",
+      "outputs": [
         {
-          "components": [
-            {
-              "internalType": "UFixed",
-              "name": "fractionalFee",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "fixedFee",
-              "type": "uint256"
-            }
-          ],
-          "internalType": "struct Fee",
-          "name": "performanceFee",
-          "type": "tuple"
+          "internalType": "bool",
+          "name": "hasInfo",
+          "type": "bool"
         }
       ],
-      "name": "registerPool",
-      "outputs": [],
-      "stateMutability": "nonpayable",
+      "stateMutability": "view",
       "type": "function"
     },
     {
       "inputs": [
         {
-          "internalType": "NftId",
-          "name": "productNftId",
-          "type": "uint96"
-        },
-        {
-          "internalType": "NftId",
-          "name": "distributorNftId",
-          "type": "uint96"
-        },
-        {
-          "internalType": "NftId",
-          "name": "poolNftId",
-          "type": "uint96"
-        },
-        {
-          "internalType": "contract IERC20Metadata",
-          "name": "token",
+          "internalType": "contract IProductComponent",
+          "name": "product",
           "type": "address"
         },
         {
-          "internalType": "address",
-          "name": "wallet",
+          "internalType": "contract IPoolComponent",
+          "name": "pool",
           "type": "address"
         },
         {
-          "components": [
-            {
-              "internalType": "UFixed",
-              "name": "fractionalFee",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "fixedFee",
-              "type": "uint256"
-            }
-          ],
-          "internalType": "struct Fee",
-          "name": "policyFee",
-          "type": "tuple"
-        },
-        {
-          "components": [
-            {
-              "internalType": "UFixed",
-              "name": "fractionalFee",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "fixedFee",
-              "type": "uint256"
-            }
-          ],
-          "internalType": "struct Fee",
-          "name": "processingFee",
-          "type": "tuple"
+          "internalType": "contract IDistributionComponent",
+          "name": "distribution",
+          "type": "address"
         }
       ],
-      "name": "registerProduct",
+      "name": "registerProductSetup",
       "outputs": [],
       "stateMutability": "nonpayable",
       "type": "function"
@@ -440,92 +370,135 @@
       "inputs": [
         {
           "internalType": "NftId",
-          "name": "poolNftId",
+          "name": "productNftId",
           "type": "uint96"
         },
         {
           "components": [
             {
-              "internalType": "UFixed",
-              "name": "fractionalFee",
-              "type": "uint256"
+              "internalType": "NftId",
+              "name": "poolNftId",
+              "type": "uint96"
             },
             {
-              "internalType": "uint256",
-              "name": "fixedFee",
-              "type": "uint256"
-            }
-          ],
-          "internalType": "struct Fee",
-          "name": "stakingFee",
-          "type": "tuple"
-        },
-        {
-          "components": [
+              "internalType": "NftId",
+              "name": "distributionNftId",
+              "type": "uint96"
+            },
             {
-              "internalType": "UFixed",
-              "name": "fractionalFee",
-              "type": "uint256"
+              "internalType": "contract IERC20Metadata",
+              "name": "token",
+              "type": "address"
             },
             {
-              "internalType": "uint256",
-              "name": "fixedFee",
-              "type": "uint256"
-            }
-          ],
-          "internalType": "struct Fee",
-          "name": "performanceFee",
-          "type": "tuple"
-        }
-      ],
-      "name": "setPoolFees",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "NftId",
-          "name": "productNftId",
-          "type": "uint96"
-        },
-        {
-          "components": [
+              "components": [
+                {
+                  "internalType": "UFixed",
+                  "name": "fractionalFee",
+                  "type": "uint256"
+                },
+                {
+                  "internalType": "uint256",
+                  "name": "fixedFee",
+                  "type": "uint256"
+                }
+              ],
+              "internalType": "struct Fee",
+              "name": "productFee",
+              "type": "tuple"
+            },
             {
-              "internalType": "UFixed",
-              "name": "fractionalFee",
-              "type": "uint256"
+              "components": [
+                {
+                  "internalType": "UFixed",
+                  "name": "fractionalFee",
+                  "type": "uint256"
+                },
+                {
+                  "internalType": "uint256",
+                  "name": "fixedFee",
+                  "type": "uint256"
+                }
+              ],
+              "internalType": "struct Fee",
+              "name": "processingFee",
+              "type": "tuple"
             },
             {
-              "internalType": "uint256",
-              "name": "fixedFee",
-              "type": "uint256"
-            }
-          ],
-          "internalType": "struct Fee",
-          "name": "policyFee",
-          "type": "tuple"
-        },
-        {
-          "components": [
+              "components": [
+                {
+                  "internalType": "UFixed",
+                  "name": "fractionalFee",
+                  "type": "uint256"
+                },
+                {
+                  "internalType": "uint256",
+                  "name": "fixedFee",
+                  "type": "uint256"
+                }
+              ],
+              "internalType": "struct Fee",
+              "name": "poolFee",
+              "type": "tuple"
+            },
             {
-              "internalType": "UFixed",
-              "name": "fractionalFee",
-              "type": "uint256"
+              "components": [
+                {
+                  "internalType": "UFixed",
+                  "name": "fractionalFee",
+                  "type": "uint256"
+                },
+                {
+                  "internalType": "uint256",
+                  "name": "fixedFee",
+                  "type": "uint256"
+                }
+              ],
+              "internalType": "struct Fee",
+              "name": "stakingFee",
+              "type": "tuple"
             },
             {
-              "internalType": "uint256",
-              "name": "fixedFee",
-              "type": "uint256"
+              "components": [
+                {
+                  "internalType": "UFixed",
+                  "name": "fractionalFee",
+                  "type": "uint256"
+                },
+                {
+                  "internalType": "uint256",
+                  "name": "fixedFee",
+                  "type": "uint256"
+                }
+              ],
+              "internalType": "struct Fee",
+              "name": "performanceFee",
+              "type": "tuple"
+            },
+            {
+              "components": [
+                {
+                  "internalType": "UFixed",
+                  "name": "fractionalFee",
+                  "type": "uint256"
+                },
+                {
+                  "internalType": "uint256",
+                  "name": "fixedFee",
+                  "type": "uint256"
+                }
+              ],
+              "internalType": "struct Fee",
+              "name": "distributionFee",
+              "type": "tuple"
             }
           ],
-          "internalType": "struct Fee",
-          "name": "processingFee",
+          "internalType": "struct ITreasury.TreasuryInfo",
+          "name": "info",
           "type": "tuple"
         }
       ],
-      "name": "setProductFees",
+      "name": "setTreasuryInfo",
       "outputs": [],
       "stateMutability": "nonpayable",
       "type": "function"

package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../../build-info/73036ef8d3587a4d497b53a8e5f6bc33.json"
+  "buildInfo": "../../../../../build-info/5ac43d71ce34a4d504e0bec066491786.json"
 }

package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.json

@@ -69,8 +69,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x608060405234801561001057600080fd5b506040516102aa3803806102aa83398101604081905261002f9161005b565b6001600160a01b03166c01000000000000000000000000026001600160601b03909116176000556100ad565b6000806040838503121561006e57600080fd5b82516001600160601b038116811461008557600080fd5b60208401519092506001600160a01b03811681146100a257600080fd5b809150509250929050565b6101ee806100bc6000396000f3fe608060405234801561001057600080fd5b50600436106100405760003560e01c806251884a1461004557806321df0da71461006a578063beabacc814610095575b600080fd5b6000546040516bffffffffffffffffffffffff90911681526020015b60405180910390f35b600054600160601b90046001600160a01b03166040516001600160a01b039091168152602001610061565b6100a86100a3366004610153565b6100aa565b005b6000546040516323b872dd60e01b81526001600160a01b038581166004830152848116602483015260448201849052600160601b909204909116906323b872dd906064016020604051808303816000875af115801561010d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610131919061018f565b50505050565b80356001600160a01b038116811461014e57600080fd5b919050565b60008060006060848603121561016857600080fd5b61017184610137565b925061017f60208501610137565b9150604084013590509250925092565b6000602082840312156101a157600080fd5b815180151581146101b157600080fd5b939250505056fea2646970667358221220de87685d485f45728fb2b557cd6d2622e4a09f86c8a90bedde65101a59e1a77864736f6c63430008140033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100405760003560e01c806251884a1461004557806321df0da71461006a578063beabacc814610095575b600080fd5b6000546040516bffffffffffffffffffffffff90911681526020015b60405180910390f35b600054600160601b90046001600160a01b03166040516001600160a01b039091168152602001610061565b6100a86100a3366004610153565b6100aa565b005b6000546040516323b872dd60e01b81526001600160a01b038581166004830152848116602483015260448201849052600160601b909204909116906323b872dd906064016020604051808303816000875af115801561010d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610131919061018f565b50505050565b80356001600160a01b038116811461014e57600080fd5b919050565b60008060006060848603121561016857600080fd5b61017184610137565b925061017f60208501610137565b9150604084013590509250925092565b6000602082840312156101a157600080fd5b815180151581146101b157600080fd5b939250505056fea2646970667358221220de87685d485f45728fb2b557cd6d2622e4a09f86c8a90bedde65101a59e1a77864736f6c63430008140033",
+  "bytecode": "0x608060405234801561001057600080fd5b506040516102aa3803806102aa83398101604081905261002f9161005b565b6001600160a01b03166c01000000000000000000000000026001600160601b03909116176000556100ad565b6000806040838503121561006e57600080fd5b82516001600160601b038116811461008557600080fd5b60208401519092506001600160a01b03811681146100a257600080fd5b809150509250929050565b6101ee806100bc6000396000f3fe608060405234801561001057600080fd5b50600436106100405760003560e01c806251884a1461004557806321df0da71461006a578063beabacc814610095575b600080fd5b6000546040516bffffffffffffffffffffffff90911681526020015b60405180910390f35b600054600160601b90046001600160a01b03166040516001600160a01b039091168152602001610061565b6100a86100a3366004610153565b6100aa565b005b6000546040516323b872dd60e01b81526001600160a01b038581166004830152848116602483015260448201849052600160601b909204909116906323b872dd906064016020604051808303816000875af115801561010d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610131919061018f565b50505050565b80356001600160a01b038116811461014e57600080fd5b919050565b60008060006060848603121561016857600080fd5b61017184610137565b925061017f60208501610137565b9150604084013590509250925092565b6000602082840312156101a157600080fd5b815180151581146101b157600080fd5b939250505056fea264697066735822122098042a25f53a65deabe0e6f542a37f2241e6a3e8502eedd92fc64bb45d25bfc364736f6c63430008140033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100405760003560e01c806251884a1461004557806321df0da71461006a578063beabacc814610095575b600080fd5b6000546040516bffffffffffffffffffffffff90911681526020015b60405180910390f35b600054600160601b90046001600160a01b03166040516001600160a01b039091168152602001610061565b6100a86100a3366004610153565b6100aa565b005b6000546040516323b872dd60e01b81526001600160a01b038581166004830152848116602483015260448201849052600160601b909204909116906323b872dd906064016020604051808303816000875af115801561010d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610131919061018f565b50505050565b80356001600160a01b038116811461014e57600080fd5b919050565b60008060006060848603121561016857600080fd5b61017184610137565b925061017f60208501610137565b9150604084013590509250925092565b6000602082840312156101a157600080fd5b815180151581146101b157600080fd5b939250505056fea264697066735822122098042a25f53a65deabe0e6f542a37f2241e6a3e8502eedd92fc64bb45d25bfc364736f6c63430008140033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../../build-info/73036ef8d3587a4d497b53a8e5f6bc33.json"
+  "buildInfo": "../../../../../build-info/5ac43d71ce34a4d504e0bec066491786.json"
 }