@etherisc/gif-next 0.0.2-f619be3-760 → 0.0.2-f72939c-683

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

@@ -1,40 +1,64 @@
 {
   "_format": "hh-sol-artifact-1",
   "contractName": "ITreasuryModule",
-  "sourceName": "contracts/instance/treasury/ITreasury.sol",
+  "sourceName": "contracts/instance/module/treasury/ITreasury.sol",
   "abi": [
     {
-      "anonymous": false,
       "inputs": [
         {
-          "indexed": false,
           "internalType": "uint256",
-          "name": "idx",
+          "name": "amount",
           "type": "uint256"
         },
         {
-          "indexed": false,
-          "internalType": "address",
-          "name": "module",
-          "type": "address"
+          "components": [
+            {
+              "internalType": "UFixed",
+              "name": "fractionalFee",
+              "type": "uint256"
+            },
+            {
+              "internalType": "uint256",
+              "name": "fixedFee",
+              "type": "uint256"
+            }
+          ],
+          "internalType": "struct Fee",
+          "name": "fee",
+          "type": "tuple"
+        }
+      ],
+      "name": "calculateFeeAmount",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "feeAmount",
+          "type": "uint256"
         },
         {
-          "indexed": false,
-          "internalType": "string",
-          "name": "comment",
-          "type": "string"
+          "internalType": "uint256",
+          "name": "netAmount",
+          "type": "uint256"
         }
       ],
-      "name": "LogDebug",
-      "type": "event"
+      "stateMutability": "pure",
+      "type": "function"
     },
     {
       "inputs": [
         {
-          "internalType": "uint256",
-          "name": "amount",
+          "internalType": "UFixed",
+          "name": "fractionalFee",
           "type": "uint256"
         },
+        {
+          "internalType": "uint256",
+          "name": "fixedFee",
+          "type": "uint256"
+        }
+      ],
+      "name": "getFee",
+      "outputs": [
         {
           "components": [
             {
@@ -53,42 +77,72 @@
           "type": "tuple"
         }
       ],
-      "name": "calculateFeeAmount",
+      "stateMutability": "pure",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "NftId",
+          "name": "componentNftId",
+          "type": "uint96"
+        }
+      ],
+      "name": "getProductNftId",
       "outputs": [
         {
-          "internalType": "uint256",
-          "name": "feeAmount",
-          "type": "uint256"
-        },
+          "internalType": "NftId",
+          "name": "productNftId",
+          "type": "uint96"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
         {
-          "internalType": "uint256",
-          "name": "netAmount",
-          "type": "uint256"
+          "internalType": "NftId",
+          "name": "componentNftId",
+          "type": "uint96"
         }
       ],
-      "stateMutability": "pure",
+      "name": "getTokenHandler",
+      "outputs": [
+        {
+          "internalType": "contract TokenHandler",
+          "name": "tokenHandler",
+          "type": "address"
+        }
+      ],
+      "stateMutability": "view",
       "type": "function"
     },
     {
       "inputs": [
         {
           "internalType": "NftId",
-          "name": "poolNftId",
+          "name": "productNftId",
           "type": "uint96"
         }
       ],
-      "name": "getPoolSetup",
+      "name": "getTreasuryInfo",
       "outputs": [
         {
           "components": [
+            {
+              "internalType": "NftId",
+              "name": "compensationNftId",
+              "type": "uint96"
+            },
             {
               "internalType": "NftId",
               "name": "poolNftId",
               "type": "uint96"
             },
             {
-              "internalType": "address",
-              "name": "wallet",
+              "internalType": "contract IERC20Metadata",
+              "name": "token",
               "type": "address"
             },
             {
@@ -105,7 +159,7 @@
                 }
               ],
               "internalType": "struct Fee",
-              "name": "stakingFee",
+              "name": "commissionFee",
               "type": "tuple"
             },
             {
@@ -122,59 +176,25 @@
                 }
               ],
               "internalType": "struct Fee",
-              "name": "performanceFee",
+              "name": "policyFee",
               "type": "tuple"
-            }
-          ],
-          "internalType": "struct ITreasuryModule.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 IERC20",
-              "name": "token",
-              "type": "address"
-            },
-            {
-              "internalType": "contract TokenHandler",
-              "name": "tokenHandler",
-              "type": "address"
-            },
-            {
-              "internalType": "address",
-              "name": "wallet",
-              "type": "address"
+              "components": [
+                {
+                  "internalType": "UFixed",
+                  "name": "fractionalFee",
+                  "type": "uint256"
+                },
+                {
+                  "internalType": "uint256",
+                  "name": "fixedFee",
+                  "type": "uint256"
+                }
+              ],
+              "internalType": "struct Fee",
+              "name": "processingFee",
+              "type": "tuple"
             },
             {
               "components": [
@@ -190,7 +210,7 @@
                 }
               ],
               "internalType": "struct Fee",
-              "name": "policyFee",
+              "name": "stakingFee",
               "type": "tuple"
             },
             {
@@ -207,97 +227,65 @@
                 }
               ],
               "internalType": "struct Fee",
-              "name": "processingFee",
+              "name": "performanceFee",
               "type": "tuple"
             }
           ],
-          "internalType": "struct ITreasuryModule.ProductSetup",
-          "name": "setup",
+          "internalType": "struct ITreasury.TreasuryInfo",
+          "name": "info",
           "type": "tuple"
         }
       ],
       "stateMutability": "view",
       "type": "function"
     },
-    {
-      "inputs": [],
-      "name": "getRegistry",
-      "outputs": [
-        {
-          "internalType": "contract IRegistry",
-          "name": "registry",
-          "type": "address"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
     {
       "inputs": [
         {
-          "internalType": "NftId",
-          "name": "productNftId",
-          "type": "uint96"
+          "internalType": "uint256",
+          "name": "a",
+          "type": "uint256"
+        },
+        {
+          "internalType": "int8",
+          "name": "exp",
+          "type": "int8"
         }
       ],
-      "name": "getTokenHandler",
+      "name": "getUFixed",
       "outputs": [
         {
-          "internalType": "contract TokenHandler",
-          "name": "tokenHandler",
-          "type": "address"
+          "internalType": "UFixed",
+          "name": "",
+          "type": "uint256"
         }
       ],
-      "stateMutability": "view",
+      "stateMutability": "pure",
       "type": "function"
     },
     {
       "inputs": [
         {
-          "internalType": "NftId",
-          "name": "policyNftId",
-          "type": "uint96"
-        },
+          "internalType": "uint256",
+          "name": "a",
+          "type": "uint256"
+        }
+      ],
+      "name": "getUFixed",
+      "outputs": [
         {
-          "internalType": "NftId",
-          "name": "productNftId",
-          "type": "uint96"
+          "internalType": "UFixed",
+          "name": "",
+          "type": "uint256"
         }
       ],
-      "name": "processPremium",
-      "outputs": [],
-      "stateMutability": "nonpayable",
+      "stateMutability": "pure",
       "type": "function"
     },
     {
-      "inputs": [
-        {
-          "internalType": "NftId",
-          "name": "poolNftId",
-          "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"
-        },
+      "inputs": [],
+      "name": "getZeroFee",
+      "outputs": [
         {
           "components": [
             {
@@ -312,13 +300,11 @@
             }
           ],
           "internalType": "struct Fee",
-          "name": "performanceFee",
+          "name": "fee",
           "type": "tuple"
         }
       ],
-      "name": "registerPool",
-      "outputs": [],
-      "stateMutability": "nonpayable",
+      "stateMutability": "view",
       "type": "function"
     },
     {
@@ -339,15 +325,10 @@
           "type": "uint96"
         },
         {
-          "internalType": "contract IERC20",
+          "internalType": "contract IERC20Metadata",
           "name": "token",
           "type": "address"
         },
-        {
-          "internalType": "address",
-          "name": "wallet",
-          "type": "address"
-        },
         {
           "components": [
             {
@@ -381,19 +362,6 @@
           "internalType": "struct Fee",
           "name": "processingFee",
           "type": "tuple"
-        }
-      ],
-      "name": "registerProduct",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "NftId",
-          "name": "poolNftId",
-          "type": "uint96"
         },
         {
           "components": [
@@ -430,7 +398,7 @@
           "type": "tuple"
         }
       ],
-      "name": "setPoolFees",
+      "name": "registerProductSetup",
       "outputs": [],
       "stateMutability": "nonpayable",
       "type": "function"
@@ -445,39 +413,112 @@
         {
           "components": [
             {
-              "internalType": "UFixed",
-              "name": "fractionalFee",
-              "type": "uint256"
+              "internalType": "NftId",
+              "name": "compensationNftId",
+              "type": "uint96"
             },
             {
-              "internalType": "uint256",
-              "name": "fixedFee",
-              "type": "uint256"
-            }
-          ],
-          "internalType": "struct Fee",
-          "name": "policyFee",
-          "type": "tuple"
-        },
-        {
-          "components": [
+              "internalType": "NftId",
+              "name": "poolNftId",
+              "type": "uint96"
+            },
             {
-              "internalType": "UFixed",
-              "name": "fractionalFee",
-              "type": "uint256"
+              "internalType": "contract IERC20Metadata",
+              "name": "token",
+              "type": "address"
             },
             {
-              "internalType": "uint256",
-              "name": "fixedFee",
-              "type": "uint256"
+              "components": [
+                {
+                  "internalType": "UFixed",
+                  "name": "fractionalFee",
+                  "type": "uint256"
+                },
+                {
+                  "internalType": "uint256",
+                  "name": "fixedFee",
+                  "type": "uint256"
+                }
+              ],
+              "internalType": "struct Fee",
+              "name": "commissionFee",
+              "type": "tuple"
+            },
+            {
+              "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"
+            },
+            {
+              "components": [
+                {
+                  "internalType": "UFixed",
+                  "name": "fractionalFee",
+                  "type": "uint256"
+                },
+                {
+                  "internalType": "uint256",
+                  "name": "fixedFee",
+                  "type": "uint256"
+                }
+              ],
+              "internalType": "struct Fee",
+              "name": "stakingFee",
+              "type": "tuple"
+            },
+            {
+              "components": [
+                {
+                  "internalType": "UFixed",
+                  "name": "fractionalFee",
+                  "type": "uint256"
+                },
+                {
+                  "internalType": "uint256",
+                  "name": "fixedFee",
+                  "type": "uint256"
+                }
+              ],
+              "internalType": "struct Fee",
+              "name": "performanceFee",
+              "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

@@ -0,0 +1,4 @@
+{
+  "_format": "hh-sol-dbg-1",
+  "buildInfo": "../../../../../build-info/01797c1a22420f170e92428a4c013a0c.json"
+}

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

@@ -0,0 +1,76 @@
+{
+  "_format": "hh-sol-artifact-1",
+  "contractName": "TokenHandler",
+  "sourceName": "contracts/instance/module/treasury/TokenHandler.sol",
+  "abi": [
+    {
+      "inputs": [
+        {
+          "internalType": "NftId",
+          "name": "productNftId",
+          "type": "uint96"
+        },
+        {
+          "internalType": "address",
+          "name": "token",
+          "type": "address"
+        }
+      ],
+      "stateMutability": "nonpayable",
+      "type": "constructor"
+    },
+    {
+      "inputs": [],
+      "name": "getProductNftId",
+      "outputs": [
+        {
+          "internalType": "NftId",
+          "name": "",
+          "type": "uint96"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "getToken",
+      "outputs": [
+        {
+          "internalType": "contract IERC20Metadata",
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "from",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "to",
+          "type": "address"
+        },
+        {
+          "internalType": "uint256",
+          "name": "amount",
+          "type": "uint256"
+        }
+      ],
+      "name": "transfer",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    }
+  ],
+  "bytecode": "0x608060405234801561001057600080fd5b506040516102aa3803806102aa83398101604081905261002f9161005b565b6001600160a01b03166c01000000000000000000000000026001600160601b03909116176000556100ad565b6000806040838503121561006e57600080fd5b82516001600160601b038116811461008557600080fd5b60208401519092506001600160a01b03811681146100a257600080fd5b809150509250929050565b6101ee806100bc6000396000f3fe608060405234801561001057600080fd5b50600436106100405760003560e01c806251884a1461004557806321df0da71461006a578063beabacc814610095575b600080fd5b6000546040516bffffffffffffffffffffffff90911681526020015b60405180910390f35b600054600160601b90046001600160a01b03166040516001600160a01b039091168152602001610061565b6100a86100a3366004610153565b6100aa565b005b6000546040516323b872dd60e01b81526001600160a01b038581166004830152848116602483015260448201849052600160601b909204909116906323b872dd906064016020604051808303816000875af115801561010d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610131919061018f565b50505050565b80356001600160a01b038116811461014e57600080fd5b919050565b60008060006060848603121561016857600080fd5b61017184610137565b925061017f60208501610137565b9150604084013590509250925092565b6000602082840312156101a157600080fd5b815180151581146101b157600080fd5b939250505056fea26469706673582212201ec515f8f82ece5c4a44ff2e1931f73edc1b2505823f0d816b75fa10490bcc5b64736f6c63430008140033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100405760003560e01c806251884a1461004557806321df0da71461006a578063beabacc814610095575b600080fd5b6000546040516bffffffffffffffffffffffff90911681526020015b60405180910390f35b600054600160601b90046001600160a01b03166040516001600160a01b039091168152602001610061565b6100a86100a3366004610153565b6100aa565b005b6000546040516323b872dd60e01b81526001600160a01b038581166004830152848116602483015260448201849052600160601b909204909116906323b872dd906064016020604051808303816000875af115801561010d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610131919061018f565b50505050565b80356001600160a01b038116811461014e57600080fd5b919050565b60008060006060848603121561016857600080fd5b61017184610137565b925061017f60208501610137565b9150604084013590509250925092565b6000602082840312156101a157600080fd5b815180151581146101b157600080fd5b939250505056fea26469706673582212201ec515f8f82ece5c4a44ff2e1931f73edc1b2505823f0d816b75fa10490bcc5b64736f6c63430008140033",
+  "linkReferences": {},
+  "deployedLinkReferences": {}
+}

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

@@ -0,0 +1,4 @@
+{
+  "_format": "hh-sol-dbg-1",
+  "buildInfo": "../../../../../build-info/01797c1a22420f170e92428a4c013a0c.json"
+}