@etherisc/gif-next 0.0.2-83d1db6-607 → 0.0.2-83e248c-054
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +6 -83
- package/artifacts/contracts/components/Component.sol/Component.dbg.json +1 -1
- package/artifacts/contracts/components/Component.sol/Component.json +10 -0
- package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +1 -1
- package/artifacts/contracts/components/Distribution.sol/Distribution.json +26 -0
- package/artifacts/contracts/components/IComponent.sol/IComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IComponent.sol/IComponent.json +100 -0
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +100 -0
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +110 -0
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +100 -0
- package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
- package/artifacts/contracts/components/Pool.sol/Pool.json +20 -0
- package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/components/Product.sol/Product.json +10 -0
- package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.dbg.json +1 -1
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +1 -1
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +2 -2
- package/artifacts/contracts/instance/Cloneable.sol/Cloneable.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.json +380 -116
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +80 -14
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +310 -303
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +76 -57
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +171 -47
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +208 -101
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +62 -22
- package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +1 -1
- package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json +2 -2
- package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.json +85 -30
- package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +1 -1
- package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +8 -8
- package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
- package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +6 -6
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +6 -6
- package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
- package/artifacts/contracts/instance/module/ISetup.sol/ISetup.dbg.json +1 -1
- package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.json +175 -83
- package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.json +29 -13
- package/artifacts/contracts/instance/service/BundleService.sol/BundleService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +333 -160
- package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +78 -14
- package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.json +372 -86
- package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.json +55 -7
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +183 -141
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +45 -57
- package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.json +111 -40
- package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.json +169 -113
- package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.json +251 -58
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +101 -24
- package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.json +438 -41
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +430 -14
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +80 -14
- package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +575 -85
- package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +71 -19
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +468 -55
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +18 -14
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +114 -51
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +16 -12
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +0 -24
- package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registry.json +2 -2
- package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +2 -2
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +17 -36
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +7 -7
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +1 -1
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +23 -11
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +2 -2
- package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +1 -1
- package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
- package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
- package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
- package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
- package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
- package/artifacts/contracts/shared/IService.sol/IService.json +80 -14
- package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +2 -2
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +2 -2
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +2 -2
- package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
- package/artifacts/contracts/shared/Registerable.sol/Registerable.json +2 -2
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +2 -2
- package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
- package/artifacts/contracts/shared/Service.sol/Service.json +86 -15
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
- package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
- package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
- package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +1 -1
- package/artifacts/contracts/test/TestFee.sol/TestFee.json +2 -2
- package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
- package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +2 -2
- package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
- package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +2 -2
- package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
- package/artifacts/contracts/test/TestService.sol/TestService.json +101 -26
- package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +1 -1
- package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +1 -1
- package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +1 -1
- package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +1 -1
- package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +1 -1
- package/artifacts/contracts/types/Amount.sol/AmountLib.dbg.json +4 -0
- package/artifacts/contracts/types/Amount.sol/AmountLib.json +185 -0
- package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
- package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.json +83 -4
- package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
- package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.json +2 -2
- package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +1 -1
- package/artifacts/contracts/types/Fee.sol/FeeLib.json +40 -9
- package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +1 -1
- package/artifacts/contracts/types/Key32.sol/Key32Lib.json +2 -2
- package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/NftId.sol/NftIdLib.json +2 -2
- package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
- package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.json +2 -2
- package/artifacts/contracts/types/NumberId.sol/NumberIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
- package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.json +2 -2
- package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.json +116 -7
- package/artifacts/contracts/types/Referral.sol/ReferralLib.dbg.json +1 -1
- package/artifacts/contracts/types/Referral.sol/ReferralLib.json +2 -2
- package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/RiskId.sol/RiskIdLib.json +2 -2
- package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +2 -2
- package/artifacts/contracts/types/Seconds.sol/SecondsLib.dbg.json +1 -1
- package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/StateId.sol/StateIdLib.json +2 -2
- package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
- package/artifacts/contracts/types/Timestamp.sol/TimestampLib.json +17 -4
- package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +1 -1
- package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +1 -1
- package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
- package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
- package/contracts/components/Component.sol +4 -2
- package/contracts/components/Distribution.sol +6 -2
- package/contracts/components/IComponent.sol +3 -1
- package/contracts/components/IPoolComponent.sol +1 -1
- package/contracts/components/Pool.sol +11 -8
- package/contracts/components/Product.sol +137 -59
- package/contracts/instance/BundleManager.sol +3 -4
- package/contracts/instance/IInstance.sol +25 -21
- package/contracts/instance/IInstanceService.sol +0 -4
- package/contracts/instance/Instance.sol +85 -102
- package/contracts/instance/InstanceAccessManager.sol +16 -11
- package/contracts/instance/InstanceReader.sol +31 -4
- package/contracts/instance/InstanceService.sol +29 -46
- package/contracts/instance/base/ComponentService.sol +17 -30
- package/contracts/instance/base/KeyValueStore.sol +8 -3
- package/contracts/instance/base/Lifecycle.sol +12 -4
- package/contracts/instance/module/IAccess.sol +2 -2
- package/contracts/instance/module/IBundle.sol +6 -4
- package/contracts/instance/module/IComponents.sol +6 -0
- package/contracts/instance/module/IPolicy.sol +11 -6
- package/contracts/instance/service/ApplicationService.sol +19 -14
- package/contracts/instance/service/BundleService.sol +163 -63
- package/contracts/instance/service/ClaimService.sol +114 -26
- package/contracts/instance/service/DistributionService.sol +38 -74
- package/contracts/instance/service/IApplicationService.sol +3 -7
- package/contracts/instance/service/IBundleService.sol +56 -22
- package/contracts/instance/service/IClaimService.sol +46 -15
- package/contracts/instance/service/IDistributionService.sol +1 -0
- package/contracts/instance/service/IPolicyService.sol +70 -5
- package/contracts/instance/service/IPoolService.sol +65 -1
- package/contracts/instance/service/PolicyService.sol +254 -116
- package/contracts/instance/service/PoolService.sol +132 -49
- package/contracts/instance/service/ProductService.sol +21 -52
- package/contracts/registry/IRegistryService.sol +4 -3
- package/contracts/registry/RegistryService.sol +10 -11
- package/contracts/registry/ReleaseManager.sol +20 -18
- package/contracts/shared/IService.sol +4 -6
- package/contracts/shared/Service.sol +21 -7
- package/contracts/test/TestService.sol +1 -1
- package/contracts/types/Amount.sol +65 -0
- package/contracts/types/ClaimId.sol +25 -2
- package/contracts/types/Fee.sol +12 -5
- package/contracts/types/ObjectType.sol +5 -5
- package/contracts/types/PayoutId.sol +33 -5
- package/contracts/types/StateId.sol +6 -2
- package/contracts/types/Timestamp.sol +5 -0
- package/package.json +1 -1
@@ -61,8 +61,8 @@
|
|
61
61
|
"type": "function"
|
62
62
|
}
|
63
63
|
],
|
64
|
-
"bytecode": "0x61032f61003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061004b5760003560e01c80632cf96bf9146100505780634a7485ba1461008357806355ee6275146100af575b600080fd5b61006b61005e36600461019a565b6001600160c01b03191690565b60405160ff1990911681526020015b60405180910390f35b6100966100913660046101e1565b6100d0565b6040516001600160c01b0319909116815260200161007a565b6100c26100bd36600461019a565b610100565b60405190815260200161007a565b6000816040516020016100e39190610292565b604051602081830303815290604052805190602001209050919050565b600073__$c8f743efd2b4f0c9300f2558c784479d3e$
|
65
|
-
"deployedBytecode": "0x730000000000000000000000000000000000000000301460806040526004361061004b5760003560e01c80632cf96bf9146100505780634a7485ba1461008357806355ee6275146100af575b600080fd5b61006b61005e36600461019a565b6001600160c01b03191690565b60405160ff1990911681526020015b60405180910390f35b6100966100913660046101e1565b6100d0565b6040516001600160c01b0319909116815260200161007a565b6100c26100bd36600461019a565b610100565b60405190815260200161007a565b6000816040516020016100e39190610292565b604051602081830303815290604052805190602001209050919050565b600073__$c8f743efd2b4f0c9300f2558c784479d3e$
|
64
|
+
"bytecode": "0x61032f61003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061004b5760003560e01c80632cf96bf9146100505780634a7485ba1461008357806355ee6275146100af575b600080fd5b61006b61005e36600461019a565b6001600160c01b03191690565b60405160ff1990911681526020015b60405180910390f35b6100966100913660046101e1565b6100d0565b6040516001600160c01b0319909116815260200161007a565b6100c26100bd36600461019a565b610100565b60405190815260200161007a565b6000816040516020016100e39190610292565b604051602081830303815290604052805190602001209050919050565b600073__$c8f743efd2b4f0c9300f2558c784479d3e$__63f48016ce60c86001600160c01b031985166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af4158015610170573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061019491906102e0565b92915050565b6000602082840312156101ac57600080fd5b81356001600160c01b0319811681146101c457600080fd5b9392505050565b634e487b7160e01b600052604160045260246000fd5b6000602082840312156101f357600080fd5b813567ffffffffffffffff8082111561020b57600080fd5b818401915084601f83011261021f57600080fd5b813581811115610231576102316101cb565b604051601f8201601f19908116603f01168101908382118183101715610259576102596101cb565b8160405282815287602084870101111561027257600080fd5b826020860160208301376000928101602001929092525095945050505050565b600060208083528351808285015260005b818110156102bf578581018301518582016040015282016102a3565b506000604082860101526040601f19601f8301168501019250505092915050565b6000602082840312156102f257600080fd5b505191905056fea2646970667358221220ce764668732ecd571a869b4974d36c7666190539fbdb79d80bcdfff58188010864736f6c63430008140033",
|
65
|
+
"deployedBytecode": "0x730000000000000000000000000000000000000000301460806040526004361061004b5760003560e01c80632cf96bf9146100505780634a7485ba1461008357806355ee6275146100af575b600080fd5b61006b61005e36600461019a565b6001600160c01b03191690565b60405160ff1990911681526020015b60405180910390f35b6100966100913660046101e1565b6100d0565b6040516001600160c01b0319909116815260200161007a565b6100c26100bd36600461019a565b610100565b60405190815260200161007a565b6000816040516020016100e39190610292565b604051602081830303815290604052805190602001209050919050565b600073__$c8f743efd2b4f0c9300f2558c784479d3e$__63f48016ce60c86001600160c01b031985166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af4158015610170573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061019491906102e0565b92915050565b6000602082840312156101ac57600080fd5b81356001600160c01b0319811681146101c457600080fd5b9392505050565b634e487b7160e01b600052604160045260246000fd5b6000602082840312156101f357600080fd5b813567ffffffffffffffff8082111561020b57600080fd5b818401915084601f83011261021f57600080fd5b813581811115610231576102316101cb565b604051601f8201601f19908116603f01168101908382118183101715610259576102596101cb565b8160405282815287602084870101111561027257600080fd5b826020860160208301376000928101602001929092525095945050505050565b600060208083528351808285015260005b818110156102bf578581018301518582016040015282016102a3565b506000604082860101526040601f19601f8301168501019250505092915050565b6000602082840312156102f257600080fd5b505191905056fea2646970667358221220ce764668732ecd571a869b4974d36c7666190539fbdb79d80bcdfff58188010864736f6c63430008140033",
|
66
66
|
"linkReferences": {
|
67
67
|
"contracts/types/Key32.sol": {
|
68
68
|
"Key32Lib": [
|
@@ -131,8 +131,8 @@
|
|
131
131
|
"type": "function"
|
132
132
|
}
|
133
133
|
],
|
134
|
-
"bytecode": "0x6102a461003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100875760003560e01c806368aebf7b1161006557806368aebf7b14610119578063a42e52e914610127578063bc1b392d14610144578063f37f38f01461014b57600080fd5b8063057182b41461008c578063545ce21c146100bd57806367cb8ec1146100e7575b600080fd5b6100a861009a36600461020b565b67ffffffffffffffff161590565b60405190151581526020015b60405180910390f35b6100ce6100cb36600461020b565b90565b60405167ffffffffffffffff90911681526020016100b4565b6101066100f536600461020b565b60081b68ffffffffffffffff001690565b60405160ff1990911681526020016100b4565b6100ce6100cb36600461023c565b6100a861013536600461020b565b67ffffffffffffffff16151590565b60006100ce565b61015e61015936600461020b565b61016c565b6040519081526020016100b4565b600073__$c8f743efd2b4f0c9300f2558c784479d3e$
|
135
|
-
"deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100875760003560e01c806368aebf7b1161006557806368aebf7b14610119578063a42e52e914610127578063bc1b392d14610144578063f37f38f01461014b57600080fd5b8063057182b41461008c578063545ce21c146100bd57806367cb8ec1146100e7575b600080fd5b6100a861009a36600461020b565b67ffffffffffffffff161590565b60405190151581526020015b60405180910390f35b6100ce6100cb36600461020b565b90565b60405167ffffffffffffffff90911681526020016100b4565b6101066100f536600461020b565b60081b68ffffffffffffffff001690565b60405160ff1990911681526020016100b4565b6100ce6100cb36600461023c565b6100a861013536600461020b565b67ffffffffffffffff16151590565b60006100ce565b61015e61015936600461020b565b61016c565b6040519081526020016100b4565b600073__$c8f743efd2b4f0c9300f2558c784479d3e$
|
134
|
+
"bytecode": "0x6102a461003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100875760003560e01c806368aebf7b1161006557806368aebf7b14610119578063a42e52e914610127578063bc1b392d14610144578063f37f38f01461014b57600080fd5b8063057182b41461008c578063545ce21c146100bd57806367cb8ec1146100e7575b600080fd5b6100a861009a36600461020b565b67ffffffffffffffff161590565b60405190151581526020015b60405180910390f35b6100ce6100cb36600461020b565b90565b60405167ffffffffffffffff90911681526020016100b4565b6101066100f536600461020b565b60081b68ffffffffffffffff001690565b60405160ff1990911681526020016100b4565b6100ce6100cb36600461023c565b6100a861013536600461020b565b67ffffffffffffffff16151590565b60006100ce565b61015e61015936600461020b565b61016c565b6040519081526020016100b4565b600073__$c8f743efd2b4f0c9300f2558c784479d3e$__63f48016ce6014600885901b68ffffffffffffffff00166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af41580156101e1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102059190610255565b92915050565b60006020828403121561021d57600080fd5b813567ffffffffffffffff8116811461023557600080fd5b9392505050565b60006020828403121561024e57600080fd5b5035919050565b60006020828403121561026757600080fd5b505191905056fea26469706673582212201201bc1f3c969b4e463091cedcdc61a3a2fca0c6e9a8e4560bc1fe675082419e64736f6c63430008140033",
|
135
|
+
"deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100875760003560e01c806368aebf7b1161006557806368aebf7b14610119578063a42e52e914610127578063bc1b392d14610144578063f37f38f01461014b57600080fd5b8063057182b41461008c578063545ce21c146100bd57806367cb8ec1146100e7575b600080fd5b6100a861009a36600461020b565b67ffffffffffffffff161590565b60405190151581526020015b60405180910390f35b6100ce6100cb36600461020b565b90565b60405167ffffffffffffffff90911681526020016100b4565b6101066100f536600461020b565b60081b68ffffffffffffffff001690565b60405160ff1990911681526020016100b4565b6100ce6100cb36600461023c565b6100a861013536600461020b565b67ffffffffffffffff16151590565b60006100ce565b61015e61015936600461020b565b61016c565b6040519081526020016100b4565b600073__$c8f743efd2b4f0c9300f2558c784479d3e$__63f48016ce6014600885901b68ffffffffffffffff00166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af41580156101e1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102059190610255565b92915050565b60006020828403121561021d57600080fd5b813567ffffffffffffffff8116811461023557600080fd5b9392505050565b60006020828403121561024e57600080fd5b5035919050565b60006020828403121561026757600080fd5b505191905056fea26469706673582212201201bc1f3c969b4e463091cedcdc61a3a2fca0c6e9a8e4560bc1fe675082419e64736f6c63430008140033",
|
136
136
|
"linkReferences": {
|
137
137
|
"contracts/types/Key32.sol": {
|
138
138
|
"Key32Lib": [
|
@@ -85,8 +85,8 @@
|
|
85
85
|
"type": "function"
|
86
86
|
}
|
87
87
|
],
|
88
|
-
"bytecode": "
|
89
|
-
"deployedBytecode": "
|
88
|
+
"bytecode": "0x61018c61003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100565760003560e01c80632c2f8a671461005b5780636f91962014610083578063ac43d83414610098578063b2466acf146100c9575b600080fd5b61006e610069366004610108565b6100df565b60405190151581526020015b60405180910390f35b61006e61009136600461013b565b60ff161590565b6100ac6100a636600461013b565b60ff1690565b6040516bffffffffffffffffffffffff909116815260200161007a565b61006e6100d736600461013b565b60ff16151590565b600060ff808416908316145b9392505050565b803560ff8116811461010357600080fd5b919050565b6000806040838503121561011b57600080fd5b610124836100f2565b9150610132602084016100f2565b90509250929050565b60006020828403121561014d57600080fd5b6100eb826100f256fea264697066735822122049f6558c0cb157a85a73ed50ebe855848931d039aa28f12620ce338c3e8bec8364736f6c63430008140033",
|
89
|
+
"deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100565760003560e01c80632c2f8a671461005b5780636f91962014610083578063ac43d83414610098578063b2466acf146100c9575b600080fd5b61006e610069366004610108565b6100df565b60405190151581526020015b60405180910390f35b61006e61009136600461013b565b60ff161590565b6100ac6100a636600461013b565b60ff1690565b6040516bffffffffffffffffffffffff909116815260200161007a565b61006e6100d736600461013b565b60ff16151590565b600060ff808416908316145b9392505050565b803560ff8116811461010357600080fd5b919050565b6000806040838503121561011b57600080fd5b610124836100f2565b9150610132602084016100f2565b90509250929050565b60006020828403121561014d57600080fd5b6100eb826100f256fea264697066735822122049f6558c0cb157a85a73ed50ebe855848931d039aa28f12620ce338c3e8bec8364736f6c63430008140033",
|
90
90
|
"linkReferences": {},
|
91
91
|
"deployedLinkReferences": {}
|
92
92
|
}
|
@@ -240,16 +240,29 @@
|
|
240
240
|
],
|
241
241
|
"stateMutability": "pure",
|
242
242
|
"type": "function"
|
243
|
+
},
|
244
|
+
{
|
245
|
+
"inputs": [],
|
246
|
+
"name": "zero",
|
247
|
+
"outputs": [
|
248
|
+
{
|
249
|
+
"internalType": "Timestamp",
|
250
|
+
"name": "",
|
251
|
+
"type": "uint40"
|
252
|
+
}
|
253
|
+
],
|
254
|
+
"stateMutability": "pure",
|
255
|
+
"type": "function"
|
243
256
|
}
|
244
257
|
],
|
245
|
-
"bytecode": "
|
246
|
-
"deployedBytecode": "
|
258
|
+
"bytecode": "0x6103d161003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100be5760003560e01c8063adb618321161007b578063adb618321461016d578063add9ce9914610173578063bc1b392d14610186578063c24922ce1461018d578063da09d484146101a0578063ddf3d631146101c657600080fd5b8063790a38ad146100c357806383ffcdef146100f15780638d38cd4b1461010457806394335b1a1461011e5780639df8763914610131578063a5798b4e14610144575b600080fd5b6100dc6100d1366004610304565b64ffffffffff161590565b60405190151581526020015b60405180910390f35b6100dc6100ff366004610328565b6101d9565b6100dc610112366004610304565b64ffffffffff16151590565b6100dc61012c366004610328565b6101f2565b6100dc61013f366004610328565b610207565b610157610152366004610328565b61021b565b60405164ffffffffff90911681526020016100e8565b42610157565b6100dc610181366004610328565b6102b0565b6000610157565b6100dc61019b366004610328565b6102c4565b6101b86101ae366004610304565b64ffffffffff1690565b6040519081526020016100e8565b6100dc6101d4366004610328565b6102d9565b600064ffffffffff808316908416115b90505b92915050565b600064ffffffffff80831690841611156101e9565b600064ffffffffff808416908316146101e9565b604051633682752160e21b815264ffffffffff821660048201526000906101e99073__$a3c3b8d16d3b00e17e1b34e034b17e7fd4$__9063da09d48490602401602060405180830381865af4158015610278573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061029c9190610361565b6102ad9064ffffffffff861661037a565b90565b600064ffffffffff808316908416106101e9565b600064ffffffffff80831690841610156101e9565b600064ffffffffff80841690831614156101e9565b64ffffffffff8116811461030157600080fd5b50565b60006020828403121561031657600080fd5b8135610321816102ee565b9392505050565b6000806040838503121561033b57600080fd5b8235610346816102ee565b91506020830135610356816102ee565b809150509250929050565b60006020828403121561037357600080fd5b5051919050565b808201808211156101ec57634e487b7160e01b600052601160045260246000fdfea26469706673582212209a859a9d2e862bf8df4a8ca5002e1814474f9c343aa91fa3f113da71f0d1f3dc64736f6c63430008140033",
|
259
|
+
"deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100be5760003560e01c8063adb618321161007b578063adb618321461016d578063add9ce9914610173578063bc1b392d14610186578063c24922ce1461018d578063da09d484146101a0578063ddf3d631146101c657600080fd5b8063790a38ad146100c357806383ffcdef146100f15780638d38cd4b1461010457806394335b1a1461011e5780639df8763914610131578063a5798b4e14610144575b600080fd5b6100dc6100d1366004610304565b64ffffffffff161590565b60405190151581526020015b60405180910390f35b6100dc6100ff366004610328565b6101d9565b6100dc610112366004610304565b64ffffffffff16151590565b6100dc61012c366004610328565b6101f2565b6100dc61013f366004610328565b610207565b610157610152366004610328565b61021b565b60405164ffffffffff90911681526020016100e8565b42610157565b6100dc610181366004610328565b6102b0565b6000610157565b6100dc61019b366004610328565b6102c4565b6101b86101ae366004610304565b64ffffffffff1690565b6040519081526020016100e8565b6100dc6101d4366004610328565b6102d9565b600064ffffffffff808316908416115b90505b92915050565b600064ffffffffff80831690841611156101e9565b600064ffffffffff808416908316146101e9565b604051633682752160e21b815264ffffffffff821660048201526000906101e99073__$a3c3b8d16d3b00e17e1b34e034b17e7fd4$__9063da09d48490602401602060405180830381865af4158015610278573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061029c9190610361565b6102ad9064ffffffffff861661037a565b90565b600064ffffffffff808316908416106101e9565b600064ffffffffff80831690841610156101e9565b600064ffffffffff80841690831614156101e9565b64ffffffffff8116811461030157600080fd5b50565b60006020828403121561031657600080fd5b8135610321816102ee565b9392505050565b6000806040838503121561033b57600080fd5b8235610346816102ee565b91506020830135610356816102ee565b809150509250929050565b60006020828403121561037357600080fd5b5051919050565b808201808211156101ec57634e487b7160e01b600052601160045260246000fdfea26469706673582212209a859a9d2e862bf8df4a8ca5002e1814474f9c343aa91fa3f113da71f0d1f3dc64736f6c63430008140033",
|
247
260
|
"linkReferences": {
|
248
261
|
"contracts/types/Seconds.sol": {
|
249
262
|
"SecondsLib": [
|
250
263
|
{
|
251
264
|
"length": 20,
|
252
|
-
"start":
|
265
|
+
"start": 632
|
253
266
|
}
|
254
267
|
]
|
255
268
|
}
|
@@ -259,7 +272,7 @@
|
|
259
272
|
"SecondsLib": [
|
260
273
|
{
|
261
274
|
"length": 20,
|
262
|
-
"start":
|
275
|
+
"start": 574
|
263
276
|
}
|
264
277
|
]
|
265
278
|
}
|
@@ -1,9 +1,10 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.20;
|
3
3
|
|
4
|
-
import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
|
5
|
-
import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
|
6
4
|
import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";
|
5
|
+
import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessManaged.sol";
|
6
|
+
import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
|
7
|
+
import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
|
7
8
|
|
8
9
|
import {IComponent} from "./IComponent.sol";
|
9
10
|
import {IComponents} from "../instance/module/IComponents.sol";
|
@@ -90,6 +91,7 @@ abstract contract Component is
|
|
90
91
|
$._wallet = address(this);
|
91
92
|
$._token = IERC20Metadata(token);
|
92
93
|
|
94
|
+
registerInterface(type(IAccessManaged).interfaceId);
|
93
95
|
registerInterface(type(IComponent).interfaceId);
|
94
96
|
}
|
95
97
|
|
@@ -37,6 +37,8 @@ abstract contract Distribution is
|
|
37
37
|
mapping(address distributor => NftId distributorNftId) _distributorNftId;
|
38
38
|
}
|
39
39
|
|
40
|
+
error ErrorDistributionAlreadyDistributor(address distributor, NftId distributorNftId);
|
41
|
+
|
40
42
|
function initializeDistribution(
|
41
43
|
address registry,
|
42
44
|
NftId instanceNftId,
|
@@ -58,7 +60,7 @@ abstract contract Distribution is
|
|
58
60
|
$._minDistributionOwnerFee = minDistributionOwnerFee;
|
59
61
|
$._distributionFee = distributionFee;
|
60
62
|
$._tokenHandler = new TokenHandler(token);
|
61
|
-
$._distributionService =
|
63
|
+
$._distributionService = IDistributionService(_getServiceAddress(DISTRIBUTION()));
|
62
64
|
|
63
65
|
registerInterface(type(IDistributionComponent).interfaceId);
|
64
66
|
}
|
@@ -116,7 +118,9 @@ abstract contract Distribution is
|
|
116
118
|
returns(NftId distributorNftId)
|
117
119
|
{
|
118
120
|
DistributionStorage storage $ = _getDistributionStorage();
|
119
|
-
|
121
|
+
if($._distributorNftId[distributor].gtz()) {
|
122
|
+
revert ErrorDistributionAlreadyDistributor(distributor, $._distributorNftId[distributor]);
|
123
|
+
}
|
120
124
|
|
121
125
|
distributorNftId = $._distributionService.createDistributor(
|
122
126
|
distributor,
|
@@ -1,6 +1,7 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.20;
|
3
3
|
|
4
|
+
import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessManaged.sol";
|
4
5
|
import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
|
5
6
|
|
6
7
|
import {IComponents} from "../instance/module/IComponents.sol";
|
@@ -16,7 +17,8 @@ import {ObjectType} from "../types/ObjectType.sol";
|
|
16
17
|
/// component examples are product, distribution, pool and oracle
|
17
18
|
interface IComponent is
|
18
19
|
IRegisterable,
|
19
|
-
ITransferInterceptor
|
20
|
+
ITransferInterceptor,
|
21
|
+
IAccessManaged
|
20
22
|
{
|
21
23
|
error ErrorComponentNotChainNft(address caller);
|
22
24
|
error ErrorComponentNotProductService(address caller);
|
@@ -37,7 +37,7 @@ interface IPoolComponent is IComponent {
|
|
37
37
|
|
38
38
|
/// @dev locks the specified bundle
|
39
39
|
/// a bundle to be locked MUST be in active state
|
40
|
-
/// locked bundles may not be used to
|
40
|
+
/// locked bundles may not be used to collateralize any new policy
|
41
41
|
function lockBundle(NftId bundleNftId) external;
|
42
42
|
|
43
43
|
/// @dev unlocks the specified bundle
|
@@ -1,21 +1,20 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.20;
|
3
3
|
|
4
|
+
import {Amount, AmountLib} from "../types/Amount.sol";
|
4
5
|
import {Component} from "./Component.sol";
|
5
6
|
import {Fee, FeeLib} from "../types/Fee.sol";
|
6
7
|
import {IBundleService} from "../instance/service/IBundleService.sol";
|
7
|
-
import {InstanceReader} from "../instance/InstanceReader.sol";
|
8
8
|
import {IPoolComponent} from "./IPoolComponent.sol";
|
9
9
|
import {IPoolService} from "../instance/service/IPoolService.sol";
|
10
10
|
import {IComponents} from "../instance/module/IComponents.sol";
|
11
11
|
import {NftId, NftIdLib} from "../types/NftId.sol";
|
12
|
-
import {POOL} from "../types/ObjectType.sol";
|
12
|
+
import {BUNDLE, POOL} from "../types/ObjectType.sol";
|
13
13
|
import {RoleId, PUBLIC_ROLE} from "../types/RoleId.sol";
|
14
14
|
import {Seconds} from "../types/Seconds.sol";
|
15
15
|
import {TokenHandler} from "../shared/TokenHandler.sol";
|
16
16
|
import {UFixed, UFixedLib} from "../types/UFixed.sol";
|
17
17
|
|
18
|
-
|
19
18
|
abstract contract Pool is
|
20
19
|
Component,
|
21
20
|
IPoolComponent
|
@@ -61,8 +60,8 @@ abstract contract Pool is
|
|
61
60
|
initializeComponent(registry, instanceNftId, name, token, POOL(), isInterceptingNftTransfers, initialOwner, registryData);
|
62
61
|
|
63
62
|
PoolStorage storage $ = _getPoolStorage();
|
64
|
-
$._poolService =
|
65
|
-
$._bundleService =
|
63
|
+
$._poolService = IPoolService(_getServiceAddress(POOL()));
|
64
|
+
$._bundleService = IBundleService(_getServiceAddress(BUNDLE()));
|
66
65
|
|
67
66
|
registerInterface(type(IPoolComponent).interfaceId);
|
68
67
|
}
|
@@ -133,7 +132,7 @@ abstract contract Pool is
|
|
133
132
|
//restricted()
|
134
133
|
onlyBundleOwner(bundleNftId)
|
135
134
|
{
|
136
|
-
_getPoolStorage().
|
135
|
+
_getPoolStorage()._poolService.closeBundle(bundleNftId);
|
137
136
|
}
|
138
137
|
|
139
138
|
|
@@ -239,14 +238,14 @@ abstract contract Pool is
|
|
239
238
|
function _createBundle(
|
240
239
|
address bundleOwner,
|
241
240
|
Fee memory fee,
|
242
|
-
|
241
|
+
Amount amount,
|
243
242
|
Seconds lifetime,
|
244
243
|
bytes memory filter
|
245
244
|
)
|
246
245
|
internal
|
247
246
|
returns(NftId bundleNftId)
|
248
247
|
{
|
249
|
-
bundleNftId = _getPoolStorage().
|
248
|
+
bundleNftId = _getPoolStorage()._poolService.createBundle(
|
250
249
|
bundleOwner,
|
251
250
|
fee,
|
252
251
|
amount,
|
@@ -274,11 +273,15 @@ abstract contract Pool is
|
|
274
273
|
getToken(),
|
275
274
|
TokenHandler(address(0)), // will be created by GIF service during registration
|
276
275
|
address(this), // contract is its own wallet
|
276
|
+
AmountLib.zero(), // balance amount
|
277
|
+
AmountLib.zero(), // fee amount
|
277
278
|
abi.encode(
|
278
279
|
IComponents.PoolInfo(
|
279
280
|
NftIdLib.zero(), // will be set when GIF registers the related product
|
280
281
|
PUBLIC_ROLE(), // bundleOwnerRole
|
281
282
|
type(uint256).max, // maxCapitalAmount,
|
283
|
+
0, // initial balance amount
|
284
|
+
0, // initial fee amount
|
282
285
|
isNftInterceptor(), // isInterceptingBundleTransfers
|
283
286
|
false, // isExternallyManaged,
|
284
287
|
false, // isVerifyingApplications,
|
@@ -3,6 +3,10 @@ pragma solidity ^0.8.19;
|
|
3
3
|
|
4
4
|
import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
|
5
5
|
|
6
|
+
import {Amount} from "../types/Amount.sol";
|
7
|
+
import {ClaimId} from "../types/ClaimId.sol";
|
8
|
+
import {Component} from "./Component.sol";
|
9
|
+
import {Fee} from "../types/Fee.sol";
|
6
10
|
import {IRisk} from "../instance/module/IRisk.sol";
|
7
11
|
import {IApplicationService} from "../instance/service/IApplicationService.sol";
|
8
12
|
import {IPolicyService} from "../instance/service/IPolicyService.sol";
|
@@ -10,14 +14,13 @@ import {IProductService} from "../instance/service/IProductService.sol";
|
|
10
14
|
import {IClaimService} from "../instance/service/IClaimService.sol";
|
11
15
|
import {IProductComponent} from "./IProductComponent.sol";
|
12
16
|
import {NftId, NftIdLib} from "../types/NftId.sol";
|
17
|
+
import {PayoutId} from "../types/PayoutId.sol";
|
13
18
|
import {PRODUCT, APPLICATION, POLICY, CLAIM } from "../types/ObjectType.sol";
|
14
19
|
import {ReferralId} from "../types/Referral.sol";
|
15
20
|
import {RiskId, RiskIdLib} from "../types/RiskId.sol";
|
16
21
|
import {Seconds} from "../types/Seconds.sol";
|
17
22
|
import {StateId} from "../types/StateId.sol";
|
18
23
|
import {Timestamp} from "../types/Timestamp.sol";
|
19
|
-
import {Fee} from "../types/Fee.sol";
|
20
|
-
import {Component} from "./Component.sol";
|
21
24
|
|
22
25
|
import {TokenHandler} from "../shared/TokenHandler.sol";
|
23
26
|
|
@@ -70,7 +73,7 @@ abstract contract Product is
|
|
70
73
|
|
71
74
|
ProductStorage storage $ = _getProductStorage();
|
72
75
|
// TODO add validation
|
73
|
-
// TODO refactor to go via registry
|
76
|
+
// TODO refactor to go via registry ?
|
74
77
|
$._productService = IProductService(_getServiceAddress(PRODUCT()));
|
75
78
|
$._applicationService = IApplicationService(_getServiceAddress(APPLICATION()));
|
76
79
|
$._policyService = IPolicyService(_getServiceAddress(POLICY()));
|
@@ -86,50 +89,17 @@ abstract contract Product is
|
|
86
89
|
registerInterface(type(IProductComponent).interfaceId);
|
87
90
|
}
|
88
91
|
|
89
|
-
|
90
|
-
function
|
91
|
-
|
92
|
-
|
93
|
-
Seconds lifetime,
|
94
|
-
bytes memory applicationData,
|
95
|
-
NftId bundleNftId,
|
96
|
-
ReferralId referralId
|
97
|
-
)
|
98
|
-
external
|
99
|
-
view
|
100
|
-
override
|
101
|
-
returns (uint256 premiumAmount)
|
102
|
-
{
|
103
|
-
IPolicy.Premium memory premium = _getProductStorage()._applicationService.calculatePremium(
|
104
|
-
getNftId(),
|
105
|
-
riskId,
|
106
|
-
sumInsuredAmount,
|
107
|
-
lifetime,
|
108
|
-
applicationData,
|
109
|
-
bundleNftId,
|
110
|
-
referralId
|
111
|
-
);
|
112
|
-
premiumAmount = premium.premiumAmount;
|
113
|
-
}
|
114
|
-
|
115
|
-
|
116
|
-
function calculateNetPremium(
|
117
|
-
uint256 sumInsuredAmount,
|
118
|
-
RiskId riskId,
|
119
|
-
Seconds lifetime,
|
120
|
-
bytes memory applicationData
|
92
|
+
// from product component
|
93
|
+
function setFees(
|
94
|
+
Fee memory productFee,
|
95
|
+
Fee memory processingFee
|
121
96
|
)
|
122
97
|
external
|
123
|
-
|
124
|
-
|
125
|
-
|
98
|
+
onlyOwner
|
99
|
+
restricted()
|
100
|
+
override
|
126
101
|
{
|
127
|
-
|
128
|
-
return sumInsuredAmount / 10;
|
129
|
-
}
|
130
|
-
|
131
|
-
function _toRiskId(string memory riskName) internal pure returns (RiskId riskId) {
|
132
|
-
return RiskIdLib.toRiskId(riskName);
|
102
|
+
_getProductService().setFees(productFee, processingFee);
|
133
103
|
}
|
134
104
|
|
135
105
|
function _createRisk(
|
@@ -189,14 +159,14 @@ abstract contract Product is
|
|
189
159
|
);
|
190
160
|
}
|
191
161
|
|
192
|
-
function
|
162
|
+
function _collateralize(
|
193
163
|
NftId policyNftId,
|
194
164
|
bool requirePremiumPayment,
|
195
165
|
Timestamp activateAt
|
196
166
|
)
|
197
167
|
internal
|
198
168
|
{
|
199
|
-
_getProductStorage()._policyService.
|
169
|
+
_getProductStorage()._policyService.collateralize(
|
200
170
|
policyNftId,
|
201
171
|
requirePremiumPayment,
|
202
172
|
activateAt);
|
@@ -229,28 +199,136 @@ abstract contract Product is
|
|
229
199
|
)
|
230
200
|
internal
|
231
201
|
{
|
232
|
-
_getProductStorage()._policyService.close(
|
202
|
+
_getProductStorage()._policyService.close(
|
203
|
+
policyNftId);
|
233
204
|
}
|
234
205
|
|
235
|
-
function
|
236
|
-
|
206
|
+
function _submitClaim(
|
207
|
+
NftId policyNftId,
|
208
|
+
Amount claimAmount,
|
209
|
+
bytes memory claimData
|
210
|
+
)
|
211
|
+
internal
|
212
|
+
returns(ClaimId)
|
213
|
+
{
|
214
|
+
return _getProductStorage()._policyService.submitClaim(
|
215
|
+
policyNftId,
|
216
|
+
claimAmount,
|
217
|
+
claimData);
|
237
218
|
}
|
238
219
|
|
239
|
-
function
|
240
|
-
|
220
|
+
function _confirmClaim(
|
221
|
+
NftId policyNftId,
|
222
|
+
ClaimId claimId,
|
223
|
+
Amount confirmedAmount
|
224
|
+
)
|
225
|
+
internal
|
226
|
+
{
|
227
|
+
_getProductStorage()._policyService.confirmClaim(
|
228
|
+
policyNftId,
|
229
|
+
claimId,
|
230
|
+
confirmedAmount);
|
241
231
|
}
|
242
232
|
|
243
|
-
|
244
|
-
|
245
|
-
|
246
|
-
|
233
|
+
function _declineClaim(
|
234
|
+
NftId policyNftId,
|
235
|
+
ClaimId claimId
|
236
|
+
)
|
237
|
+
internal
|
238
|
+
{
|
239
|
+
_getProductStorage()._policyService.declineClaim(
|
240
|
+
policyNftId,
|
241
|
+
claimId);
|
242
|
+
}
|
243
|
+
|
244
|
+
function _closeClaim(
|
245
|
+
NftId policyNftId,
|
246
|
+
ClaimId claimId
|
247
|
+
)
|
248
|
+
internal
|
249
|
+
{
|
250
|
+
_getProductStorage()._policyService.closeClaim(
|
251
|
+
policyNftId,
|
252
|
+
claimId);
|
253
|
+
}
|
254
|
+
|
255
|
+
function _createPayout(
|
256
|
+
NftId policyNftId,
|
257
|
+
ClaimId claimId,
|
258
|
+
Amount amount,
|
259
|
+
bytes memory data
|
260
|
+
)
|
261
|
+
internal
|
262
|
+
returns (PayoutId)
|
263
|
+
{
|
264
|
+
return _getProductStorage()._policyService.createPayout(
|
265
|
+
policyNftId,
|
266
|
+
claimId,
|
267
|
+
amount,
|
268
|
+
data);
|
269
|
+
}
|
270
|
+
|
271
|
+
function _processPayout(
|
272
|
+
NftId policyNftId,
|
273
|
+
PayoutId payoutId
|
274
|
+
)
|
275
|
+
internal
|
276
|
+
{
|
277
|
+
_getProductStorage()._policyService.processPayout(
|
278
|
+
policyNftId,
|
279
|
+
payoutId);
|
280
|
+
}
|
281
|
+
|
282
|
+
function calculatePremium(
|
283
|
+
uint256 sumInsuredAmount,
|
284
|
+
RiskId riskId,
|
285
|
+
Seconds lifetime,
|
286
|
+
bytes memory applicationData,
|
287
|
+
NftId bundleNftId,
|
288
|
+
ReferralId referralId
|
289
|
+
)
|
290
|
+
external
|
291
|
+
view
|
292
|
+
override
|
293
|
+
returns (uint256 premiumAmount)
|
294
|
+
{
|
295
|
+
IPolicy.Premium memory premium = _getProductStorage()._applicationService.calculatePremium(
|
296
|
+
getNftId(),
|
297
|
+
riskId,
|
298
|
+
sumInsuredAmount,
|
299
|
+
lifetime,
|
300
|
+
applicationData,
|
301
|
+
bundleNftId,
|
302
|
+
referralId
|
303
|
+
);
|
304
|
+
premiumAmount = premium.premiumAmount;
|
305
|
+
}
|
306
|
+
|
307
|
+
function calculateNetPremium(
|
308
|
+
uint256 sumInsuredAmount,
|
309
|
+
RiskId riskId,
|
310
|
+
Seconds lifetime,
|
311
|
+
bytes memory applicationData
|
247
312
|
)
|
248
313
|
external
|
249
|
-
|
250
|
-
|
251
|
-
|
314
|
+
view
|
315
|
+
virtual override
|
316
|
+
returns (uint256 netPremiumAmount)
|
252
317
|
{
|
253
|
-
|
318
|
+
// default 10% of sum insured
|
319
|
+
return sumInsuredAmount / 10;
|
320
|
+
}
|
321
|
+
|
322
|
+
function _toRiskId(string memory riskName) internal pure returns (RiskId riskId) {
|
323
|
+
return RiskIdLib.toRiskId(riskName);
|
324
|
+
}
|
325
|
+
|
326
|
+
function getPoolNftId() external view override returns (NftId poolNftId) {
|
327
|
+
return getRegistry().getNftId(address(_getProductStorage()._pool));
|
328
|
+
}
|
329
|
+
|
330
|
+
function getDistributionNftId() external view override returns (NftId distributionNftId) {
|
331
|
+
return getRegistry().getNftId(address(_getProductStorage()._distribution));
|
254
332
|
}
|
255
333
|
|
256
334
|
function getSetupInfo() public view returns (ISetup.ProductSetupInfo memory setupInfo) {
|
@@ -34,8 +34,7 @@ contract BundleManager is
|
|
34
34
|
mapping(NftId bundleNftId => LibNftIdSet.Set policies) internal _activePolicies;
|
35
35
|
|
36
36
|
/// @dev links a policy to its bundle
|
37
|
-
// to link a policy it MUST NOT yet have been
|
38
|
-
// the bundle MUST be unlocked (active) for linking (underwriting) and registered with this instance
|
37
|
+
// to link a policy it MUST NOT yet have been linked
|
39
38
|
function linkPolicy(NftId policyNftId) external restricted() {
|
40
39
|
NftId bundleNftId = _instance.getInstanceReader().getPolicyInfo(policyNftId).bundleNftId;
|
41
40
|
// decision will likely depend on the decision what to check here and what in the service
|
@@ -87,14 +86,14 @@ contract BundleManager is
|
|
87
86
|
}
|
88
87
|
|
89
88
|
|
90
|
-
/// @dev unlocked (active) bundles are available to
|
89
|
+
/// @dev unlocked (active) bundles are available to collateralize new policies
|
91
90
|
function unlock(NftId bundleNftId) external restricted() {
|
92
91
|
NftId poolNftId = _instance.getInstanceReader().getBundleInfo(bundleNftId).poolNftId;
|
93
92
|
_activate(poolNftId, bundleNftId);
|
94
93
|
emit LogBundleManagerBundleUnlocked(poolNftId, bundleNftId);
|
95
94
|
}
|
96
95
|
|
97
|
-
/// @dev locked (deactivated) bundles may not
|
96
|
+
/// @dev locked (deactivated) bundles may not collateralize any new policies
|
98
97
|
function lock(NftId bundleNftId) external restricted() {
|
99
98
|
NftId poolNftId = _instance.getInstanceReader().getBundleInfo(bundleNftId).poolNftId;
|
100
99
|
_deactivate(poolNftId, bundleNftId);
|