@etherisc/gif-next 0.0.2-a196164-289 → 0.0.2-a38075a-779

package/artifacts/contracts/instance/IInstance.sol/IInstance.json

@@ -4,349 +4,178 @@
   "sourceName": "contracts/instance/IInstance.sol",
   "abi": [
     {
-      "anonymous": false,
       "inputs": [
         {
-          "indexed": false,
-          "internalType": "RoleId",
-          "name": "role",
-          "type": "bytes8"
+          "internalType": "ObjectType",
+          "name": "objectType",
+          "type": "uint8"
         },
         {
-          "indexed": false,
-          "internalType": "string",
-          "name": "roleName",
-          "type": "string"
+          "internalType": "StateId",
+          "name": "fromStateId",
+          "type": "uint8"
+        },
+        {
+          "internalType": "StateId",
+          "name": "toStateId",
+          "type": "uint8"
         }
       ],
-      "name": "LogAccessRoleCreated",
-      "type": "event"
+      "name": "ErrorInvalidStateTransition",
+      "type": "error"
     },
     {
-      "anonymous": false,
       "inputs": [
         {
-          "indexed": false,
-          "internalType": "RoleId",
-          "name": "role",
-          "type": "bytes8"
-        },
-        {
-          "indexed": false,
-          "internalType": "address",
-          "name": "member",
-          "type": "address"
+          "internalType": "NftId",
+          "name": "nftId",
+          "type": "uint96"
         },
         {
-          "indexed": false,
-          "internalType": "bool",
-          "name": "isMember",
-          "type": "bool"
+          "internalType": "ObjectType",
+          "name": "objectType",
+          "type": "uint8"
         }
       ],
-      "name": "LogAccessRoleGranted",
-      "type": "event"
+      "name": "ErrorNoLifecycle",
+      "type": "error"
     },
     {
       "anonymous": false,
       "inputs": [
         {
           "indexed": false,
-          "internalType": "RoleId",
-          "name": "role",
-          "type": "bytes8"
+          "internalType": "ObjectType",
+          "name": "objectType",
+          "type": "uint8"
         },
         {
           "indexed": false,
-          "internalType": "bool",
-          "name": "active",
-          "type": "bool"
-        }
-      ],
-      "name": "LogAccessRoleStateSet",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
+          "internalType": "KeyId",
+          "name": "keyId",
+          "type": "bytes31"
+        },
         {
           "indexed": false,
-          "internalType": "Version",
-          "name": "version",
-          "type": "uint24"
+          "internalType": "StateId",
+          "name": "state",
+          "type": "uint8"
         },
         {
           "indexed": false,
           "internalType": "address",
-          "name": "implementation",
+          "name": "createdBy",
           "type": "address"
         },
         {
           "indexed": false,
           "internalType": "address",
-          "name": "activatedBy",
+          "name": "txOrigin",
           "type": "address"
         }
       ],
-      "name": "LogVersionableInitialized",
+      "name": "LogInfoCreated",
       "type": "event"
     },
     {
+      "anonymous": false,
       "inputs": [
         {
-          "internalType": "NftId",
-          "name": "bundleNftId",
-          "type": "uint96"
-        },
-        {
-          "internalType": "NftId",
-          "name": "poolNftId",
-          "type": "uint96"
-        },
-        {
-          "internalType": "uint256",
-          "name": "amount",
-          "type": "uint256"
-        }
-      ],
-      "name": "addBundleToPool",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "uint256",
-          "name": "amount",
-          "type": "uint256"
-        },
-        {
-          "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"
-        },
-        {
-          "internalType": "uint256",
-          "name": "netAmount",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "pure",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "NftId",
-          "name": "bundleNftId",
-          "type": "uint96"
-        },
-        {
-          "internalType": "NftId",
-          "name": "policyNftId",
-          "type": "uint96"
-        },
-        {
-          "internalType": "uint256",
-          "name": "amount",
-          "type": "uint256"
-        }
-      ],
-      "name": "collateralizePolicy",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "NftId",
-          "name": "bundleNftId",
-          "type": "uint96"
+          "indexed": false,
+          "internalType": "ObjectType",
+          "name": "objectType",
+          "type": "uint8"
         },
         {
-          "internalType": "NftId",
-          "name": "poolNftId",
-          "type": "uint96"
+          "indexed": false,
+          "internalType": "KeyId",
+          "name": "keyId",
+          "type": "bytes31"
         },
         {
-          "components": [
-            {
-              "internalType": "UFixed",
-              "name": "fractionalFee",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "fixedFee",
-              "type": "uint256"
-            }
-          ],
-          "internalType": "struct Fee",
-          "name": "fee",
-          "type": "tuple"
+          "indexed": false,
+          "internalType": "StateId",
+          "name": "state",
+          "type": "uint8"
         },
         {
-          "internalType": "uint256",
-          "name": "amount",
-          "type": "uint256"
+          "indexed": false,
+          "internalType": "address",
+          "name": "updatedBy",
+          "type": "address"
         },
         {
-          "internalType": "uint256",
-          "name": "lifetime",
-          "type": "uint256"
+          "indexed": false,
+          "internalType": "address",
+          "name": "txOrigin",
+          "type": "address"
         },
         {
-          "internalType": "bytes",
-          "name": "filter",
-          "type": "bytes"
+          "indexed": false,
+          "internalType": "Blocknumber",
+          "name": "lastUpdatedIn",
+          "type": "uint32"
         }
       ],
-      "name": "createBundleInfo",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
+      "name": "LogInfoUpdated",
+      "type": "event"
     },
     {
+      "anonymous": false,
       "inputs": [
         {
-          "internalType": "NftId",
-          "name": "policyNftId",
-          "type": "uint96"
-        },
-        {
-          "internalType": "NftId",
-          "name": "productNftId",
-          "type": "uint96"
+          "indexed": false,
+          "internalType": "ObjectType",
+          "name": "objectType",
+          "type": "uint8"
         },
         {
-          "internalType": "ReferralId",
-          "name": "referralId",
-          "type": "bytes8"
+          "indexed": false,
+          "internalType": "KeyId",
+          "name": "keyId",
+          "type": "bytes31"
         },
         {
-          "internalType": "RiskId",
-          "name": "riskId",
-          "type": "bytes8"
+          "indexed": false,
+          "internalType": "StateId",
+          "name": "stateOld",
+          "type": "uint8"
         },
         {
-          "internalType": "uint256",
-          "name": "sumInsuredAmount",
-          "type": "uint256"
+          "indexed": false,
+          "internalType": "StateId",
+          "name": "stateNew",
+          "type": "uint8"
         },
         {
-          "internalType": "uint256",
-          "name": "premiumAmount",
-          "type": "uint256"
+          "indexed": false,
+          "internalType": "address",
+          "name": "updatedBy",
+          "type": "address"
         },
         {
-          "internalType": "uint256",
-          "name": "lifetime",
-          "type": "uint256"
+          "indexed": false,
+          "internalType": "address",
+          "name": "txOrigin",
+          "type": "address"
         },
         {
-          "internalType": "NftId",
-          "name": "bundleNftId",
-          "type": "uint96"
+          "indexed": false,
+          "internalType": "Blocknumber",
+          "name": "lastUpdatedIn",
+          "type": "uint32"
         }
       ],
-      "name": "createPolicyInfo",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
+      "name": "LogStateUpdated",
+      "type": "event"
     },
     {
       "inputs": [
-        {
-          "internalType": "RiskId",
-          "name": "riskId",
-          "type": "bytes8"
-        },
         {
           "internalType": "NftId",
-          "name": "productNftId",
+          "name": "bundleNftId",
           "type": "uint96"
         },
-        {
-          "internalType": "bytes",
-          "name": "data",
-          "type": "bytes"
-        }
-      ],
-      "name": "createRisk",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "string",
-          "name": "roleName",
-          "type": "string"
-        }
-      ],
-      "name": "createRole",
-      "outputs": [
-        {
-          "internalType": "RoleId",
-          "name": "role",
-          "type": "bytes8"
-        }
-      ],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "NftId",
-          "name": "poolNftId",
-          "type": "uint96"
-        }
-      ],
-      "name": "getBundleCount",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "bundleCount",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "NftId",
-          "name": "nftId",
-          "type": "uint96"
-        }
-      ],
-      "name": "getBundleInfo",
-      "outputs": [
         {
           "components": [
             {
@@ -391,6 +220,11 @@
               "name": "balanceAmount",
               "type": "uint256"
             },
+            {
+              "internalType": "uint256",
+              "name": "lifetime",
+              "type": "uint256"
+            },
             {
               "internalType": "Timestamp",
               "name": "expiredAt",
@@ -403,257 +237,79 @@
             }
           ],
           "internalType": "struct IBundle.BundleInfo",
-          "name": "bundleInfo",
+          "name": "bundle",
           "type": "tuple"
         }
       ],
-      "stateMutability": "view",
+      "name": "createBundle",
+      "outputs": [],
+      "stateMutability": "nonpayable",
       "type": "function"
     },
     {
       "inputs": [
         {
           "internalType": "NftId",
-          "name": "poolNftId",
+          "name": "distributionNftId",
           "type": "uint96"
         },
-        {
-          "internalType": "uint256",
-          "name": "index",
-          "type": "uint256"
-        }
-      ],
-      "name": "getBundleNftId",
-      "outputs": [
-        {
-          "internalType": "NftId",
-          "name": "bundleNftId",
-          "type": "uint96"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "getComponentCount",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "numberOfCompnents",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "uint256",
-          "name": "idx",
-          "type": "uint256"
-        }
-      ],
-      "name": "getComponentId",
-      "outputs": [
-        {
-          "internalType": "NftId",
-          "name": "nftId",
-          "type": "uint96"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "getComponentOwnerService",
-      "outputs": [
-        {
-          "internalType": "contract IComponentOwnerService",
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "NftId",
-          "name": "nftId",
-          "type": "uint96"
-        }
-      ],
-      "name": "getComponentToken",
-      "outputs": [
-        {
-          "internalType": "contract IERC20Metadata",
-          "name": "token",
-          "type": "address"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "NftId",
-          "name": "nftId",
-          "type": "uint96"
-        }
-      ],
-      "name": "getComponentWallet",
-      "outputs": [
-        {
-          "internalType": "address",
-          "name": "wallet",
-          "type": "address"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "getData",
-      "outputs": [
-        {
-          "internalType": "bytes",
-          "name": "data",
-          "type": "bytes"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "getDistributionService",
-      "outputs": [
-        {
-          "internalType": "contract IDistributionService",
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "UFixed",
-          "name": "fractionalFee",
-          "type": "uint256"
-        },
-        {
-          "internalType": "uint256",
-          "name": "fixedFee",
-          "type": "uint256"
-        }
-      ],
-      "name": "getFee",
-      "outputs": [
         {
           "components": [
             {
-              "internalType": "UFixed",
-              "name": "fractionalFee",
-              "type": "uint256"
+              "internalType": "NftId",
+              "name": "productNftId",
+              "type": "uint96"
             },
             {
-              "internalType": "uint256",
-              "name": "fixedFee",
-              "type": "uint256"
+              "internalType": "contract TokenHandler",
+              "name": "tokenHandler",
+              "type": "address"
+            },
+            {
+              "components": [
+                {
+                  "internalType": "UFixed",
+                  "name": "fractionalFee",
+                  "type": "uint256"
+                },
+                {
+                  "internalType": "uint256",
+                  "name": "fixedFee",
+                  "type": "uint256"
+                }
+              ],
+              "internalType": "struct Fee",
+              "name": "distributionFee",
+              "type": "tuple"
+            },
+            {
+              "internalType": "bool",
+              "name": "isIntercepting",
+              "type": "bool"
+            },
+            {
+              "internalType": "address",
+              "name": "wallet",
+              "type": "address"
             }
           ],
-          "internalType": "struct Fee",
-          "name": "fee",
+          "internalType": "struct ISetup.DistributionSetupInfo",
+          "name": "setup",
           "type": "tuple"
         }
       ],
-      "stateMutability": "pure",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "getInitializedVersion",
-      "outputs": [
-        {
-          "internalType": "uint64",
-          "name": "",
-          "type": "uint64"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "getKeyValueStore",
-      "outputs": [
-        {
-          "internalType": "contract IKeyValueStore",
-          "name": "keyValueStore",
-          "type": "address"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "getNftId",
-      "outputs": [
-        {
-          "internalType": "NftId",
-          "name": "nftId",
-          "type": "uint96"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "getOwner",
-      "outputs": [
-        {
-          "internalType": "address",
-          "name": "owner",
-          "type": "address"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "getParentNftId",
-      "outputs": [
-        {
-          "internalType": "NftId",
-          "name": "nftId",
-          "type": "uint96"
-        }
-      ],
-      "stateMutability": "view",
+      "name": "createDistributionSetup",
+      "outputs": [],
+      "stateMutability": "nonpayable",
       "type": "function"
     },
     {
       "inputs": [
         {
           "internalType": "NftId",
-          "name": "nftId",
+          "name": "policyNftId",
           "type": "uint96"
-        }
-      ],
-      "name": "getPolicyInfo",
-      "outputs": [
+        },
         {
           "components": [
             {
@@ -671,11 +327,6 @@
               "name": "referralId",
               "type": "bytes8"
             },
-            {
-              "internalType": "address",
-              "name": "beneficiary",
-              "type": "address"
-            },
             {
               "internalType": "RiskId",
               "name": "riskId",
@@ -711,6 +362,21 @@
               "name": "policyData",
               "type": "bytes"
             },
+            {
+              "internalType": "uint16",
+              "name": "claimsCount",
+              "type": "uint16"
+            },
+            {
+              "internalType": "uint16",
+              "name": "openClaimsCount",
+              "type": "uint16"
+            },
+            {
+              "internalType": "uint256",
+              "name": "payoutAmount",
+              "type": "uint256"
+            },
             {
               "internalType": "Timestamp",
               "name": "activatedAt",
@@ -728,112 +394,22 @@
             }
           ],
           "internalType": "struct IPolicy.PolicyInfo",
-          "name": "info",
-          "type": "tuple"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "NftId",
-          "name": "nftId",
-          "type": "uint96"
-        }
-      ],
-      "name": "getPoolInfo",
-      "outputs": [
-        {
-          "components": [
-            {
-              "internalType": "bool",
-              "name": "isVerifying",
-              "type": "bool"
-            },
-            {
-              "internalType": "UFixed",
-              "name": "collateralizationLevel",
-              "type": "uint256"
-            }
-          ],
-          "internalType": "struct IPool.PoolInfo",
-          "name": "info",
+          "name": "policy",
           "type": "tuple"
         }
       ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "getPoolService",
-      "outputs": [
-        {
-          "internalType": "contract IPoolService",
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "stateMutability": "view",
+      "name": "createPolicy",
+      "outputs": [],
+      "stateMutability": "nonpayable",
       "type": "function"
     },
     {
       "inputs": [
         {
           "internalType": "NftId",
-          "name": "componentNftId",
-          "type": "uint96"
-        }
-      ],
-      "name": "getProductNftId",
-      "outputs": [
-        {
-          "internalType": "NftId",
-          "name": "productNftId",
+          "name": "poolNftId",
           "type": "uint96"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "getProductService",
-      "outputs": [
-        {
-          "internalType": "contract IProductService",
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "getRegistry",
-      "outputs": [
-        {
-          "internalType": "contract IRegistry",
-          "name": "registry",
-          "type": "address"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "RiskId",
-          "name": "riskId",
-          "type": "bytes8"
-        }
-      ],
-      "name": "getRiskInfo",
-      "outputs": [
+        },
         {
           "components": [
             {
@@ -842,185 +418,90 @@
               "type": "uint96"
             },
             {
-              "internalType": "bytes",
-              "name": "data",
-              "type": "bytes"
-            }
-          ],
-          "internalType": "struct IRisk.RiskInfo",
-          "name": "info",
-          "type": "tuple"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "uint256",
-          "name": "idx",
-          "type": "uint256"
-        }
-      ],
-      "name": "getRole",
-      "outputs": [
-        {
-          "internalType": "RoleId",
-          "name": "role",
-          "type": "bytes8"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "getRoleCount",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "roles",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "string",
-          "name": "roleName",
-          "type": "string"
-        }
-      ],
-      "name": "getRoleId",
-      "outputs": [
-        {
-          "internalType": "RoleId",
-          "name": "role",
-          "type": "bytes8"
-        }
-      ],
-      "stateMutability": "pure",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "RoleId",
-          "name": "role",
-          "type": "bytes8"
-        }
-      ],
-      "name": "getRoleInfo",
-      "outputs": [
-        {
-          "components": [
-            {
-              "internalType": "RoleId",
-              "name": "id",
-              "type": "bytes8"
+              "internalType": "contract TokenHandler",
+              "name": "tokenHandler",
+              "type": "address"
             },
             {
-              "internalType": "string",
-              "name": "name",
-              "type": "string"
+              "internalType": "UFixed",
+              "name": "collateralizationLevel",
+              "type": "uint256"
             },
             {
-              "internalType": "bool",
-              "name": "isActive",
-              "type": "bool"
-            }
-          ],
-          "internalType": "struct IAccess.RoleInfo",
-          "name": "info",
-          "type": "tuple"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "RoleId",
-          "name": "role",
-          "type": "bytes8"
-        },
-        {
-          "internalType": "uint256",
-          "name": "idx",
-          "type": "uint256"
-        }
-      ],
-      "name": "getRoleMember",
-      "outputs": [
-        {
-          "internalType": "address",
-          "name": "roleMember",
-          "type": "address"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "RoleId",
-          "name": "role",
-          "type": "bytes8"
-        }
-      ],
-      "name": "getRoleMemberCount",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "roleMembers",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "Key32",
-          "name": "key",
-          "type": "bytes32"
-        }
-      ],
-      "name": "getState",
-      "outputs": [
-        {
-          "internalType": "StateId",
-          "name": "state",
-          "type": "uint8"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "NftId",
-          "name": "componentNftId",
-          "type": "uint96"
-        }
-      ],
-      "name": "getTokenHandler",
-      "outputs": [
-        {
-          "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"
+            },
+            {
+              "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": "bool",
+              "name": "isIntercepting",
+              "type": "bool"
+            },
+            {
+              "internalType": "bool",
+              "name": "isConfirmingApplication",
+              "type": "bool"
+            },
+            {
+              "internalType": "address",
+              "name": "wallet",
+              "type": "address"
+            }
+          ],
+          "internalType": "struct ISetup.PoolSetupInfo",
+          "name": "setup",
+          "type": "tuple"
         }
       ],
-      "stateMutability": "view",
+      "name": "createPoolSetup",
+      "outputs": [],
+      "stateMutability": "nonpayable",
       "type": "function"
     },
     {
@@ -1029,16 +510,18 @@
           "internalType": "NftId",
           "name": "productNftId",
           "type": "uint96"
-        }
-      ],
-      "name": "getTreasuryInfo",
-      "outputs": [
+        },
         {
           "components": [
             {
-              "internalType": "NftId",
-              "name": "poolNftId",
-              "type": "uint96"
+              "internalType": "contract IERC20Metadata",
+              "name": "token",
+              "type": "address"
+            },
+            {
+              "internalType": "contract TokenHandler",
+              "name": "tokenHandler",
+              "type": "address"
             },
             {
               "internalType": "NftId",
@@ -1046,9 +529,9 @@
               "type": "uint96"
             },
             {
-              "internalType": "contract IERC20Metadata",
-              "name": "token",
-              "type": "address"
+              "internalType": "NftId",
+              "name": "poolNftId",
+              "type": "uint96"
             },
             {
               "components": [
@@ -1064,7 +547,7 @@
                 }
               ],
               "internalType": "struct Fee",
-              "name": "productFee",
+              "name": "distributionFee",
               "type": "tuple"
             },
             {
@@ -1081,7 +564,7 @@
                 }
               ],
               "internalType": "struct Fee",
-              "name": "processingFee",
+              "name": "productFee",
               "type": "tuple"
             },
             {
@@ -1098,7 +581,7 @@
                 }
               ],
               "internalType": "struct Fee",
-              "name": "poolFee",
+              "name": "processingFee",
               "type": "tuple"
             },
             {
@@ -1115,7 +598,7 @@
                 }
               ],
               "internalType": "struct Fee",
-              "name": "stakingFee",
+              "name": "poolFee",
               "type": "tuple"
             },
             {
@@ -1132,7 +615,7 @@
                 }
               ],
               "internalType": "struct Fee",
-              "name": "performanceFee",
+              "name": "stakingFee",
               "type": "tuple"
             },
             {
@@ -1149,114 +632,74 @@
                 }
               ],
               "internalType": "struct Fee",
-              "name": "distributionFee",
+              "name": "performanceFee",
               "type": "tuple"
+            },
+            {
+              "internalType": "bool",
+              "name": "isIntercepting",
+              "type": "bool"
+            },
+            {
+              "internalType": "address",
+              "name": "wallet",
+              "type": "address"
             }
           ],
-          "internalType": "struct ITreasury.TreasuryInfo",
-          "name": "info",
+          "internalType": "struct ISetup.ProductSetupInfo",
+          "name": "setup",
           "type": "tuple"
         }
       ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "getType",
-      "outputs": [
-        {
-          "internalType": "ObjectType",
-          "name": "objectType",
-          "type": "uint8"
-        }
-      ],
-      "stateMutability": "pure",
+      "name": "createProductSetup",
+      "outputs": [],
+      "stateMutability": "nonpayable",
       "type": "function"
     },
     {
       "inputs": [
         {
-          "internalType": "uint256",
-          "name": "a",
-          "type": "uint256"
+          "internalType": "RiskId",
+          "name": "riskId",
+          "type": "bytes8"
         },
         {
-          "internalType": "int8",
-          "name": "exp",
-          "type": "int8"
-        }
-      ],
-      "name": "getUFixed",
-      "outputs": [
-        {
-          "internalType": "UFixed",
-          "name": "",
-          "type": "uint256"
+          "components": [
+            {
+              "internalType": "NftId",
+              "name": "productNftId",
+              "type": "uint96"
+            },
+            {
+              "internalType": "bytes",
+              "name": "data",
+              "type": "bytes"
+            }
+          ],
+          "internalType": "struct IRisk.RiskInfo",
+          "name": "risk",
+          "type": "tuple"
         }
       ],
-      "stateMutability": "pure",
+      "name": "createRisk",
+      "outputs": [],
+      "stateMutability": "nonpayable",
       "type": "function"
     },
     {
       "inputs": [
         {
-          "internalType": "uint256",
-          "name": "a",
-          "type": "uint256"
-        }
-      ],
-      "name": "getUFixed",
-      "outputs": [
-        {
-          "internalType": "UFixed",
-          "name": "",
-          "type": "uint256"
+          "internalType": "Key32",
+          "name": "key",
+          "type": "bytes32"
         }
       ],
-      "stateMutability": "pure",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "getVersion",
+      "name": "exists",
       "outputs": [
         {
-          "internalType": "Version",
+          "internalType": "bool",
           "name": "",
-          "type": "uint24"
-        }
-      ],
-      "stateMutability": "pure",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "uint256",
-          "name": "index",
-          "type": "uint256"
-        }
-      ],
-      "name": "getVersion",
-      "outputs": [
-        {
-          "internalType": "Version",
-          "name": "version",
-          "type": "uint24"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "getVersionCount",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "numberOfVersions",
-          "type": "uint256"
+          "type": "bool"
         }
       ],
       "stateMutability": "view",
@@ -1265,43 +708,55 @@
     {
       "inputs": [
         {
-          "internalType": "Version",
-          "name": "version",
-          "type": "uint24"
+          "internalType": "Key32",
+          "name": "key",
+          "type": "bytes32"
         }
       ],
-      "name": "getVersionInfo",
+      "name": "get",
       "outputs": [
         {
           "components": [
             {
-              "internalType": "Version",
-              "name": "version",
-              "type": "uint24"
-            },
-            {
-              "internalType": "address",
-              "name": "implementation",
-              "type": "address"
-            },
-            {
-              "internalType": "address",
-              "name": "activatedBy",
-              "type": "address"
-            },
-            {
-              "internalType": "Timestamp",
-              "name": "activatedAt",
-              "type": "uint40"
+              "components": [
+                {
+                  "internalType": "ObjectType",
+                  "name": "objectType",
+                  "type": "uint8"
+                },
+                {
+                  "internalType": "StateId",
+                  "name": "state",
+                  "type": "uint8"
+                },
+                {
+                  "internalType": "address",
+                  "name": "updatedBy",
+                  "type": "address"
+                },
+                {
+                  "internalType": "Blocknumber",
+                  "name": "updatedIn",
+                  "type": "uint32"
+                },
+                {
+                  "internalType": "Blocknumber",
+                  "name": "createdIn",
+                  "type": "uint32"
+                }
+              ],
+              "internalType": "struct IKeyValueStore.Metadata",
+              "name": "metadata",
+              "type": "tuple"
             },
             {
-              "internalType": "Blocknumber",
-              "name": "activatedIn",
-              "type": "uint32"
+              "internalType": "bytes",
+              "name": "data",
+              "type": "bytes"
             }
           ],
-          "internalType": "struct IVersionable.VersionInfo",
-          "name": "versionInfo",
+          "internalType": "struct IKeyValueStore.Value",
+          "name": "value",
           "type": "tuple"
         }
       ],
@@ -1310,66 +765,57 @@
     },
     {
       "inputs": [],
-      "name": "getZeroFee",
+      "name": "getBundleManager",
       "outputs": [
         {
-          "components": [
-            {
-              "internalType": "UFixed",
-              "name": "fractionalFee",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "fixedFee",
-              "type": "uint256"
-            }
-          ],
-          "internalType": "struct Fee",
-          "name": "fee",
-          "type": "tuple"
+          "internalType": "contract BundleManager",
+          "name": "",
+          "type": "address"
         }
       ],
       "stateMutability": "view",
       "type": "function"
     },
     {
-      "inputs": [
-        {
-          "internalType": "RoleId",
-          "name": "role",
-          "type": "bytes8"
-        },
+      "inputs": [],
+      "name": "getComponentOwnerService",
+      "outputs": [
         {
-          "internalType": "address",
-          "name": "member",
+          "internalType": "contract IComponentOwnerService",
+          "name": "",
           "type": "address"
         }
       ],
-      "name": "grantRole",
-      "outputs": [],
-      "stateMutability": "nonpayable",
+      "stateMutability": "view",
       "type": "function"
     },
     {
       "inputs": [
         {
-          "internalType": "RoleId",
-          "name": "role",
-          "type": "bytes8"
-        },
+          "internalType": "Key32",
+          "name": "key",
+          "type": "bytes32"
+        }
+      ],
+      "name": "getData",
+      "outputs": [
         {
-          "internalType": "address",
-          "name": "member",
-          "type": "address"
+          "internalType": "bytes",
+          "name": "data",
+          "type": "bytes"
         }
       ],
-      "name": "hasRole",
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "getDistributionService",
       "outputs": [
         {
-          "internalType": "bool",
+          "internalType": "contract IDistributionService",
           "name": "",
-          "type": "bool"
+          "type": "address"
         }
       ],
       "stateMutability": "view",
@@ -1378,59 +824,76 @@
     {
       "inputs": [
         {
-          "internalType": "NftId",
-          "name": "productNftId",
-          "type": "uint96"
+          "internalType": "ObjectType",
+          "name": "objectType",
+          "type": "uint8"
         }
       ],
-      "name": "hasTreasuryInfo",
+      "name": "getInitialState",
       "outputs": [
         {
-          "internalType": "bool",
-          "name": "hasInfo",
-          "type": "bool"
+          "internalType": "StateId",
+          "name": "",
+          "type": "uint8"
         }
       ],
       "stateMutability": "view",
       "type": "function"
     },
     {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "implementation",
-          "type": "address"
-        },
+      "inputs": [],
+      "name": "getInstanceReader",
+      "outputs": [
         {
-          "internalType": "address",
-          "name": "activatedBy",
+          "internalType": "contract InstanceReader",
+          "name": "",
           "type": "address"
-        },
-        {
-          "internalType": "bytes",
-          "name": "activationData",
-          "type": "bytes"
         }
       ],
-      "name": "initialize",
-      "outputs": [],
-      "stateMutability": "nonpayable",
+      "stateMutability": "view",
       "type": "function"
     },
     {
       "inputs": [
         {
-          "internalType": "Version",
-          "name": "version",
-          "type": "uint24"
+          "internalType": "Key32",
+          "name": "key",
+          "type": "bytes32"
         }
       ],
-      "name": "isInitialized",
+      "name": "getMetadata",
       "outputs": [
         {
-          "internalType": "bool",
-          "name": "",
-          "type": "bool"
+          "components": [
+            {
+              "internalType": "ObjectType",
+              "name": "objectType",
+              "type": "uint8"
+            },
+            {
+              "internalType": "StateId",
+              "name": "state",
+              "type": "uint8"
+            },
+            {
+              "internalType": "address",
+              "name": "updatedBy",
+              "type": "address"
+            },
+            {
+              "internalType": "Blocknumber",
+              "name": "updatedIn",
+              "type": "uint32"
+            },
+            {
+              "internalType": "Blocknumber",
+              "name": "createdIn",
+              "type": "uint32"
+            }
+          ],
+          "internalType": "struct IKeyValueStore.Metadata",
+          "name": "metadata",
+          "type": "tuple"
         }
       ],
       "stateMutability": "view",
@@ -1438,152 +901,145 @@
     },
     {
       "inputs": [],
-      "name": "register",
+      "name": "getPoolService",
       "outputs": [
         {
-          "internalType": "NftId",
-          "name": "nftId",
-          "type": "uint96"
+          "internalType": "contract IPoolService",
+          "name": "",
+          "type": "address"
         }
       ],
-      "stateMutability": "nonpayable",
+      "stateMutability": "view",
       "type": "function"
     },
     {
-      "inputs": [
-        {
-          "internalType": "NftId",
-          "name": "nftId",
-          "type": "uint96"
-        },
-        {
-          "internalType": "contract IERC20Metadata",
-          "name": "token",
-          "type": "address"
-        },
+      "inputs": [],
+      "name": "getProductService",
+      "outputs": [
         {
-          "internalType": "address",
-          "name": "wallet",
+          "internalType": "contract IProductService",
+          "name": "",
           "type": "address"
         }
       ],
-      "name": "registerComponent",
-      "outputs": [],
-      "stateMutability": "nonpayable",
+      "stateMutability": "view",
       "type": "function"
     },
     {
       "inputs": [
         {
-          "internalType": "NftId",
-          "name": "poolNftId",
-          "type": "uint96"
-        },
-        {
-          "internalType": "bool",
-          "name": "isVerifying",
-          "type": "bool"
-        },
+          "internalType": "Key32",
+          "name": "key",
+          "type": "bytes32"
+        }
+      ],
+      "name": "getState",
+      "outputs": [
         {
-          "internalType": "UFixed",
-          "name": "collateralizationLevel",
-          "type": "uint256"
+          "internalType": "StateId",
+          "name": "state",
+          "type": "uint8"
         }
       ],
-      "name": "registerPool",
-      "outputs": [],
-      "stateMutability": "nonpayable",
+      "stateMutability": "view",
       "type": "function"
     },
     {
       "inputs": [
         {
-          "internalType": "contract IProductComponent",
-          "name": "product",
-          "type": "address"
-        },
-        {
-          "internalType": "contract IPoolComponent",
-          "name": "pool",
-          "type": "address"
-        },
+          "internalType": "ObjectType",
+          "name": "objectType",
+          "type": "uint8"
+        }
+      ],
+      "name": "hasLifecycle",
+      "outputs": [
         {
-          "internalType": "contract IDistributionComponent",
-          "name": "distribution",
-          "type": "address"
+          "internalType": "bool",
+          "name": "",
+          "type": "bool"
         }
       ],
-      "name": "registerProductSetup",
-      "outputs": [],
-      "stateMutability": "nonpayable",
+      "stateMutability": "view",
       "type": "function"
     },
     {
       "inputs": [
         {
-          "internalType": "NftId",
-          "name": "bundleNftId",
-          "type": "uint96"
+          "internalType": "ObjectType",
+          "name": "objectType",
+          "type": "uint8"
         },
         {
-          "internalType": "NftId",
-          "name": "policyNftId",
-          "type": "uint96"
+          "internalType": "StateId",
+          "name": "fromId",
+          "type": "uint8"
+        },
+        {
+          "internalType": "StateId",
+          "name": "toId",
+          "type": "uint8"
         }
       ],
-      "name": "releasePolicy",
+      "name": "isValidTransition",
       "outputs": [
         {
-          "internalType": "uint256",
-          "name": "collateralAmount",
-          "type": "uint256"
+          "internalType": "bool",
+          "name": "",
+          "type": "bool"
         }
       ],
-      "stateMutability": "nonpayable",
+      "stateMutability": "view",
       "type": "function"
     },
     {
       "inputs": [
         {
-          "internalType": "RoleId",
-          "name": "role",
-          "type": "bytes8"
-        },
+          "internalType": "bytes4",
+          "name": "interfaceId",
+          "type": "bytes4"
+        }
+      ],
+      "name": "supportsInterface",
+      "outputs": [
         {
-          "internalType": "address",
-          "name": "member",
-          "type": "address"
+          "internalType": "bool",
+          "name": "",
+          "type": "bool"
         }
       ],
-      "name": "revokeRole",
-      "outputs": [],
-      "stateMutability": "nonpayable",
+      "stateMutability": "view",
       "type": "function"
     },
     {
       "inputs": [
         {
-          "internalType": "RoleId",
-          "name": "role",
-          "type": "bytes8"
+          "internalType": "ObjectType",
+          "name": "objectType",
+          "type": "uint8"
+        },
+        {
+          "internalType": "KeyId",
+          "name": "id",
+          "type": "bytes31"
         }
       ],
-      "name": "roleExists",
+      "name": "toKey32",
       "outputs": [
         {
-          "internalType": "bool",
+          "internalType": "Key32",
           "name": "",
-          "type": "bool"
+          "type": "bytes32"
         }
       ],
-      "stateMutability": "view",
+      "stateMutability": "pure",
       "type": "function"
     },
     {
       "inputs": [
         {
           "internalType": "NftId",
-          "name": "nftId",
+          "name": "bundleNftId",
           "type": "uint96"
         },
         {
@@ -1630,6 +1086,11 @@
               "name": "balanceAmount",
               "type": "uint256"
             },
+            {
+              "internalType": "uint256",
+              "name": "lifetime",
+              "type": "uint256"
+            },
             {
               "internalType": "Timestamp",
               "name": "expiredAt",
@@ -1642,11 +1103,114 @@
             }
           ],
           "internalType": "struct IBundle.BundleInfo",
-          "name": "bundleInfo",
+          "name": "bundle",
+          "type": "tuple"
+        },
+        {
+          "internalType": "StateId",
+          "name": "newState",
+          "type": "uint8"
+        }
+      ],
+      "name": "updateBundle",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "NftId",
+          "name": "bundleNftId",
+          "type": "uint96"
+        },
+        {
+          "internalType": "StateId",
+          "name": "newState",
+          "type": "uint8"
+        }
+      ],
+      "name": "updateBundleState",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "NftId",
+          "name": "distributionNftId",
+          "type": "uint96"
+        },
+        {
+          "components": [
+            {
+              "internalType": "NftId",
+              "name": "productNftId",
+              "type": "uint96"
+            },
+            {
+              "internalType": "contract TokenHandler",
+              "name": "tokenHandler",
+              "type": "address"
+            },
+            {
+              "components": [
+                {
+                  "internalType": "UFixed",
+                  "name": "fractionalFee",
+                  "type": "uint256"
+                },
+                {
+                  "internalType": "uint256",
+                  "name": "fixedFee",
+                  "type": "uint256"
+                }
+              ],
+              "internalType": "struct Fee",
+              "name": "distributionFee",
+              "type": "tuple"
+            },
+            {
+              "internalType": "bool",
+              "name": "isIntercepting",
+              "type": "bool"
+            },
+            {
+              "internalType": "address",
+              "name": "wallet",
+              "type": "address"
+            }
+          ],
+          "internalType": "struct ISetup.DistributionSetupInfo",
+          "name": "setup",
           "type": "tuple"
+        },
+        {
+          "internalType": "StateId",
+          "name": "newState",
+          "type": "uint8"
         }
       ],
-      "name": "setBundleInfo",
+      "name": "updateDistributionSetup",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "NftId",
+          "name": "distributionNftId",
+          "type": "uint96"
+        },
+        {
+          "internalType": "StateId",
+          "name": "newState",
+          "type": "uint8"
+        }
+      ],
+      "name": "updateDistributionSetupState",
       "outputs": [],
       "stateMutability": "nonpayable",
       "type": "function"
@@ -1675,11 +1239,6 @@
               "name": "referralId",
               "type": "bytes8"
             },
-            {
-              "internalType": "address",
-              "name": "beneficiary",
-              "type": "address"
-            },
             {
               "internalType": "RiskId",
               "name": "riskId",
@@ -1715,6 +1274,21 @@
               "name": "policyData",
               "type": "bytes"
             },
+            {
+              "internalType": "uint16",
+              "name": "claimsCount",
+              "type": "uint16"
+            },
+            {
+              "internalType": "uint16",
+              "name": "openClaimsCount",
+              "type": "uint16"
+            },
+            {
+              "internalType": "uint256",
+              "name": "payoutAmount",
+              "type": "uint256"
+            },
             {
               "internalType": "Timestamp",
               "name": "activatedAt",
@@ -1732,11 +1306,16 @@
             }
           ],
           "internalType": "struct IPolicy.PolicyInfo",
-          "name": "info",
+          "name": "policy",
           "type": "tuple"
+        },
+        {
+          "internalType": "StateId",
+          "name": "newState",
+          "type": "uint8"
         }
       ],
-      "name": "setPolicyInfo",
+      "name": "updatePolicy",
       "outputs": [],
       "stateMutability": "nonpayable",
       "type": "function"
@@ -1744,9 +1323,27 @@
     {
       "inputs": [
         {
-          "internalType": "RiskId",
-          "name": "riskId",
-          "type": "bytes8"
+          "internalType": "NftId",
+          "name": "policyNftId",
+          "type": "uint96"
+        },
+        {
+          "internalType": "StateId",
+          "name": "newState",
+          "type": "uint8"
+        }
+      ],
+      "name": "updatePolicyState",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "NftId",
+          "name": "poolNftId",
+          "type": "uint96"
         },
         {
           "components": [
@@ -1756,17 +1353,93 @@
               "type": "uint96"
             },
             {
-              "internalType": "bytes",
-              "name": "data",
-              "type": "bytes"
+              "internalType": "contract TokenHandler",
+              "name": "tokenHandler",
+              "type": "address"
+            },
+            {
+              "internalType": "UFixed",
+              "name": "collateralizationLevel",
+              "type": "uint256"
+            },
+            {
+              "components": [
+                {
+                  "internalType": "UFixed",
+                  "name": "fractionalFee",
+                  "type": "uint256"
+                },
+                {
+                  "internalType": "uint256",
+                  "name": "fixedFee",
+                  "type": "uint256"
+                }
+              ],
+              "internalType": "struct Fee",
+              "name": "poolFee",
+              "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": "bool",
+              "name": "isIntercepting",
+              "type": "bool"
+            },
+            {
+              "internalType": "bool",
+              "name": "isConfirmingApplication",
+              "type": "bool"
+            },
+            {
+              "internalType": "address",
+              "name": "wallet",
+              "type": "address"
             }
           ],
-          "internalType": "struct IRisk.RiskInfo",
-          "name": "info",
+          "internalType": "struct ISetup.PoolSetupInfo",
+          "name": "setup",
           "type": "tuple"
+        },
+        {
+          "internalType": "StateId",
+          "name": "newState",
+          "type": "uint8"
         }
       ],
-      "name": "setRiskInfo",
+      "name": "updatePoolSetup",
       "outputs": [],
       "stateMutability": "nonpayable",
       "type": "function"
@@ -1774,17 +1447,17 @@
     {
       "inputs": [
         {
-          "internalType": "RoleId",
-          "name": "role",
-          "type": "bytes8"
+          "internalType": "NftId",
+          "name": "poolNftId",
+          "type": "uint96"
         },
         {
-          "internalType": "bool",
-          "name": "active",
-          "type": "bool"
+          "internalType": "StateId",
+          "name": "newState",
+          "type": "uint8"
         }
       ],
-      "name": "setRoleState",
+      "name": "updatePoolSetupState",
       "outputs": [],
       "stateMutability": "nonpayable",
       "type": "function"
@@ -1799,9 +1472,14 @@
         {
           "components": [
             {
-              "internalType": "NftId",
-              "name": "poolNftId",
-              "type": "uint96"
+              "internalType": "contract IERC20Metadata",
+              "name": "token",
+              "type": "address"
+            },
+            {
+              "internalType": "contract TokenHandler",
+              "name": "tokenHandler",
+              "type": "address"
             },
             {
               "internalType": "NftId",
@@ -1809,9 +1487,9 @@
               "type": "uint96"
             },
             {
-              "internalType": "contract IERC20Metadata",
-              "name": "token",
-              "type": "address"
+              "internalType": "NftId",
+              "name": "poolNftId",
+              "type": "uint96"
             },
             {
               "components": [
@@ -1827,7 +1505,7 @@
                 }
               ],
               "internalType": "struct Fee",
-              "name": "productFee",
+              "name": "distributionFee",
               "type": "tuple"
             },
             {
@@ -1844,7 +1522,7 @@
                 }
               ],
               "internalType": "struct Fee",
-              "name": "processingFee",
+              "name": "productFee",
               "type": "tuple"
             },
             {
@@ -1861,7 +1539,7 @@
                 }
               ],
               "internalType": "struct Fee",
-              "name": "poolFee",
+              "name": "processingFee",
               "type": "tuple"
             },
             {
@@ -1878,7 +1556,7 @@
                 }
               ],
               "internalType": "struct Fee",
-              "name": "stakingFee",
+              "name": "poolFee",
               "type": "tuple"
             },
             {
@@ -1895,7 +1573,7 @@
                 }
               ],
               "internalType": "struct Fee",
-              "name": "performanceFee",
+              "name": "stakingFee",
               "type": "tuple"
             },
             {
@@ -1912,53 +1590,31 @@
                 }
               ],
               "internalType": "struct Fee",
-              "name": "distributionFee",
+              "name": "performanceFee",
               "type": "tuple"
+            },
+            {
+              "internalType": "bool",
+              "name": "isIntercepting",
+              "type": "bool"
+            },
+            {
+              "internalType": "address",
+              "name": "wallet",
+              "type": "address"
             }
           ],
-          "internalType": "struct ITreasury.TreasuryInfo",
-          "name": "info",
+          "internalType": "struct ISetup.ProductSetupInfo",
+          "name": "setup",
           "type": "tuple"
-        }
-      ],
-      "name": "setTreasuryInfo",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "bytes4",
-          "name": "interfaceId",
-          "type": "bytes4"
-        }
-      ],
-      "name": "supportsInterface",
-      "outputs": [
-        {
-          "internalType": "bool",
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "NftId",
-          "name": "nftId",
-          "type": "uint96"
         },
         {
           "internalType": "StateId",
-          "name": "state",
+          "name": "newState",
           "type": "uint8"
         }
       ],
-      "name": "updateBundleState",
+      "name": "updateProductSetup",
       "outputs": [],
       "stateMutability": "nonpayable",
       "type": "function"
@@ -1967,16 +1623,16 @@
       "inputs": [
         {
           "internalType": "NftId",
-          "name": "nftId",
+          "name": "productNftId",
           "type": "uint96"
         },
         {
           "internalType": "StateId",
-          "name": "state",
+          "name": "newState",
           "type": "uint8"
         }
       ],
-      "name": "updatePolicyState",
+      "name": "updateProductSetupState",
       "outputs": [],
       "stateMutability": "nonpayable",
       "type": "function"
@@ -1989,30 +1645,29 @@
           "type": "bytes8"
         },
         {
-          "internalType": "StateId",
-          "name": "state",
-          "type": "uint8"
-        }
-      ],
-      "name": "updateRiskState",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "Key32",
-          "name": "key",
-          "type": "bytes32"
+          "components": [
+            {
+              "internalType": "NftId",
+              "name": "productNftId",
+              "type": "uint96"
+            },
+            {
+              "internalType": "bytes",
+              "name": "data",
+              "type": "bytes"
+            }
+          ],
+          "internalType": "struct IRisk.RiskInfo",
+          "name": "risk",
+          "type": "tuple"
         },
         {
           "internalType": "StateId",
-          "name": "state",
+          "name": "newState",
           "type": "uint8"
         }
       ],
-      "name": "updateState",
+      "name": "updateRisk",
       "outputs": [],
       "stateMutability": "nonpayable",
       "type": "function"
@@ -2020,22 +1675,17 @@
     {
       "inputs": [
         {
-          "internalType": "address",
-          "name": "implementation",
-          "type": "address"
-        },
-        {
-          "internalType": "address",
-          "name": "activatedBy",
-          "type": "address"
+          "internalType": "RiskId",
+          "name": "riskId",
+          "type": "bytes8"
         },
         {
-          "internalType": "bytes",
-          "name": "upgradeData",
-          "type": "bytes"
+          "internalType": "StateId",
+          "name": "newState",
+          "type": "uint8"
         }
       ],
-      "name": "upgrade",
+      "name": "updateRiskState",
       "outputs": [],
       "stateMutability": "nonpayable",
       "type": "function"