@etherisc/gif-next 0.0.2-e42b0ca-323 → 0.0.2-e4b632c-016
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 +175 -1
- package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +1 -1
- package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.json +168 -28
- package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +4 -0
- package/artifacts/contracts/components/Distribution.sol/Distribution.json +610 -0
- package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.json +121 -28
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +4 -0
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +152 -0
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +74 -181
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +55 -177
- package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
- package/artifacts/contracts/components/Pool.sol/Pool.json +447 -60
- package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/components/Product.sol/Product.json +519 -70
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.dbg.json +4 -0
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.json +66 -0
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.dbg.json +4 -0
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.json +24 -0
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.dbg.json +4 -0
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.json +42 -0
- package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +1 -1
- package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +1 -1
- package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +1 -1
- package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.json +2 -2
- package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +1 -1
- package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +1 -1
- package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +1 -1
- package/artifacts/contracts/experiment/statemachine/SM.sol/SM.json +2 -2
- package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +1 -1
- package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.json +2 -2
- package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +1 -1
- package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +1 -1
- package/artifacts/contracts/instance/AccessManagedSimple.sol/AccessManagedSimple.dbg.json +4 -0
- package/artifacts/contracts/instance/AccessManagedSimple.sol/AccessManagedSimple.json +114 -0
- package/artifacts/contracts/instance/AccessManagerSimple.sol/AccessManagerSimple.dbg.json +4 -0
- package/artifacts/contracts/instance/AccessManagerSimple.sol/AccessManagerSimple.json +1132 -0
- package/artifacts/contracts/instance/IAccessManagerSimple.sol/IAccessManagerSimple.dbg.json +4 -0
- package/artifacts/contracts/instance/IAccessManagerSimple.sol/IAccessManagerSimple.json +1082 -0
- package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.json +278 -1700
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +4 -0
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +480 -0
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +2509 -1176
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +4 -0
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +930 -0
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +4 -0
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +1283 -0
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +4 -0
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +755 -0
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +432 -0
- package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.json +224 -43
- package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +1 -1
- package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.json +51 -1
- package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.json +45 -127
- 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 +55 -245
- package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
- package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +4 -4
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +4 -0
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +211 -0
- package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +4 -0
- package/artifacts/contracts/instance/module/{bundle/IBundle.sol → IBundle.sol}/IBundle.json +1 -1
- package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +4 -0
- package/artifacts/contracts/instance/module/{access/IAccess.sol/IAccess.json → IDistribution.sol/IDistribution.json} +2 -2
- package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +4 -0
- package/artifacts/contracts/instance/module/{policy/IPolicy.sol → IPolicy.sol}/IPolicy.json +1 -1
- package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +4 -0
- package/artifacts/contracts/instance/module/{risk/IRisk.sol → IRisk.sol}/IRisk.json +1 -1
- package/artifacts/contracts/instance/module/ISetup.sol/ISetup.dbg.json +4 -0
- package/artifacts/contracts/instance/{base/ModuleBase.sol/ModuleBase.json → module/ISetup.sol/ISetup.json} +2 -2
- package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.dbg.json +4 -0
- package/artifacts/contracts/instance/module/{treasury/ITreasury.sol → ITreasury.sol}/ITreasury.json +1 -1
- package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +381 -77
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +604 -0
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +428 -0
- package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.json +177 -75
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +4 -0
- package/artifacts/contracts/instance/{base/ServiceBase.sol/ServiceBase.json → service/IDistributionService.sol/IDistributionService.json} +204 -58
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +235 -50
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +325 -51
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +186 -12
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +190 -51
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +4 -0
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +872 -0
- package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +4 -0
- package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.json +34 -0
- package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registry.json +380 -139
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +4 -0
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +1261 -0
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +4 -0
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +504 -0
- package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +4 -0
- package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.json +107 -0
- package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
- package/artifacts/contracts/shared/ERC165.sol/ERC165.json +2 -2
- package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +4 -0
- package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +127 -0
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +117 -37
- package/artifacts/contracts/shared/IService.sol/IService.dbg.json +4 -0
- package/artifacts/contracts/{instance/base → shared}/IService.sol/IService.json +175 -54
- package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
- package/artifacts/contracts/shared/IVersionable.sol/IVersionable.json +55 -14
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +4 -0
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +158 -0
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +4 -0
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +349 -0
- package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
- package/artifacts/contracts/shared/Registerable.sol/Registerable.json +190 -37
- package/artifacts/contracts/shared/RegisterableUpgradable.sol/RegisterableUpgradable.dbg.json +4 -0
- package/artifacts/contracts/{instance/base/InstanceBase.sol/InstanceBase.json → shared/RegisterableUpgradable.sol/RegisterableUpgradable.json} +199 -83
- package/artifacts/contracts/shared/Service.sol/Service.dbg.json +4 -0
- package/artifacts/contracts/shared/Service.sol/Service.json +468 -0
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +4 -0
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +96 -0
- package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +4 -0
- package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +129 -0
- package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
- package/artifacts/contracts/shared/Versionable.sol/Versionable.json +78 -14
- package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +1 -1
- package/artifacts/contracts/test/TestFee.sol/TestFee.json +4 -4
- package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
- package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +204 -36
- package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
- package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +14 -14
- package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
- package/artifacts/contracts/test/TestService.sol/TestService.json +283 -62
- package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +1 -1
- package/artifacts/contracts/test/TestToken.sol/TestUsdc.json +91 -53
- package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +1 -1
- package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +2 -2
- package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +1 -1
- package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +103 -23
- package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +1 -1
- package/artifacts/contracts/test/Usdc.sol/USDC.json +91 -53
- package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +1 -1
- 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/DistributorType.sol/DistributorTypeLib.dbg.json +4 -0
- package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.json +104 -0
- package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +1 -1
- package/artifacts/contracts/types/Fee.sol/FeeLib.json +52 -13
- package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +1 -1
- package/artifacts/contracts/types/Key32.sol/Key32Lib.json +31 -17
- 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 +4 -0
- package/artifacts/contracts/types/NumberId.sol/NumberIdLib.json +100 -0
- 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/Referral.sol/ReferralLib.dbg.json +4 -0
- package/artifacts/contracts/types/Referral.sol/ReferralLib.json +123 -0
- package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +4 -0
- package/artifacts/contracts/types/RiskId.sol/RiskIdLib.json +86 -0
- package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +134 -8
- 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 +15 -2
- package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +4 -0
- package/artifacts/contracts/types/UFixed.sol/MathLib.json +10 -0
- package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +4 -0
- package/artifacts/contracts/types/UFixed.sol/{UFixedMathLib.json → UFixedLib.json} +3 -3
- package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
- package/artifacts/contracts/types/Version.sol/VersionLib.json +40 -2
- package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
- package/artifacts/contracts/types/Version.sol/VersionPartLib.json +2 -2
- package/contracts/components/BaseComponent.sol +20 -22
- package/contracts/components/Distribution.sol +166 -0
- package/contracts/components/IBaseComponent.sol +8 -3
- package/contracts/components/IDistributionComponent.sol +43 -0
- package/contracts/components/IPoolComponent.sol +14 -9
- package/contracts/components/IProductComponent.sol +25 -9
- package/contracts/components/Pool.sol +115 -30
- package/contracts/components/Product.sol +212 -32
- package/contracts/experiment/cloning/Cloner.sol +47 -0
- package/contracts/instance/AccessManagedSimple.sol +122 -0
- package/contracts/instance/AccessManagerSimple.sol +692 -0
- package/contracts/instance/IAccessManagerSimple.sol +391 -0
- package/contracts/instance/IInstance.sol +26 -45
- package/contracts/instance/IInstanceService.sol +30 -0
- package/contracts/instance/Instance.sol +426 -52
- package/contracts/instance/InstanceAccessManager.sol +288 -0
- package/contracts/instance/InstanceReader.sol +290 -0
- package/contracts/instance/InstanceService.sol +138 -0
- package/contracts/instance/InstanceServiceManager.sol +56 -0
- package/contracts/instance/base/ComponentServiceBase.sol +11 -14
- package/contracts/instance/base/IInstanceBase.sol +11 -2
- package/contracts/instance/base/IKeyValueStore.sol +13 -13
- package/contracts/instance/base/ILifecycle.sol +3 -3
- package/contracts/instance/base/KeyValueStore.sol +53 -37
- package/contracts/instance/base/Lifecycle.sol +16 -11
- package/contracts/instance/module/IAccess.sol +38 -0
- package/contracts/instance/module/IBundle.sol +19 -0
- package/contracts/instance/module/IDistribution.sol +39 -0
- package/contracts/instance/module/IPolicy.sol +45 -0
- package/contracts/instance/module/IRisk.sol +11 -0
- package/contracts/instance/module/ISetup.sol +43 -0
- package/contracts/instance/module/ITreasury.sol +23 -0
- package/contracts/instance/service/ComponentOwnerService.sol +244 -97
- package/contracts/instance/service/DistributionService.sol +70 -0
- package/contracts/instance/service/DistributionServiceManager.sol +53 -0
- package/contracts/instance/service/IComponentOwnerService.sol +1 -3
- package/contracts/instance/service/IDistributionService.sol +12 -0
- package/contracts/instance/service/IPoolService.sol +8 -1
- package/contracts/instance/service/IProductService.sol +56 -7
- package/contracts/registry/ChainNft.sol +80 -37
- package/contracts/registry/IRegistry.sol +29 -28
- package/contracts/registry/IRegistryService.sol +35 -0
- package/contracts/registry/ITransferInterceptor.sol +6 -0
- package/contracts/registry/Registry.sol +315 -273
- package/contracts/registry/RegistryService.sol +444 -0
- package/contracts/registry/RegistryServiceManager.sol +64 -0
- package/contracts/shared/ContractDeployerLib.sol +72 -0
- package/contracts/shared/INftOwnable.sol +22 -0
- package/contracts/shared/IRegisterable.sol +8 -15
- package/contracts/{instance/base → shared}/IService.sol +3 -3
- package/contracts/shared/IVersionable.sol +55 -11
- package/contracts/shared/NftOwnable.sol +136 -0
- package/contracts/shared/ProxyManager.sol +94 -0
- package/contracts/shared/Registerable.sol +62 -59
- package/contracts/shared/RegisterableUpgradable.sol +16 -0
- package/contracts/shared/Service.sol +54 -0
- package/contracts/shared/TokenHandler.sol +27 -0
- package/contracts/shared/UpgradableProxyWithAdmin.sol +16 -0
- package/contracts/shared/Versionable.sol +113 -55
- package/contracts/test/TestFee.sol +2 -2
- package/contracts/test/TestRegisterable.sol +5 -6
- package/contracts/test/TestRoleId.sol +1 -1
- package/contracts/test/TestService.sol +5 -13
- package/contracts/types/DistributorType.sol +55 -0
- package/contracts/types/Fee.sol +10 -5
- package/contracts/types/Key32.sol +8 -3
- package/contracts/types/NumberId.sol +52 -0
- package/contracts/types/ObjectType.sol +51 -14
- package/contracts/types/Referral.sol +85 -0
- package/contracts/types/RiskId.sol +43 -0
- package/contracts/types/RoleId.sol +54 -10
- package/contracts/types/StateId.sol +5 -1
- package/contracts/types/Timestamp.sol +7 -3
- package/contracts/types/UFixed.sol +128 -12
- package/contracts/types/Version.sol +9 -0
- package/package.json +4 -3
- package/artifacts/contracts/instance/IInstanceLinked.sol/IInstanceLinked.dbg.json +0 -4
- package/artifacts/contracts/instance/IInstanceLinked.sol/IInstanceLinked.json +0 -24
- package/artifacts/contracts/instance/base/IService.sol/IService.dbg.json +0 -4
- package/artifacts/contracts/instance/base/InstanceBase.sol/InstanceBase.dbg.json +0 -4
- package/artifacts/contracts/instance/base/ModuleBase.sol/ModuleBase.dbg.json +0 -4
- package/artifacts/contracts/instance/base/ServiceBase.sol/ServiceBase.dbg.json +0 -4
- package/artifacts/contracts/instance/module/access/Access.sol/AccessModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/access/Access.sol/AccessModule.json +0 -333
- package/artifacts/contracts/instance/module/access/IAccess.sol/IAccess.dbg.json +0 -4
- package/artifacts/contracts/instance/module/access/IAccess.sol/IAccessModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/access/IAccess.sol/IAccessModule.json +0 -333
- package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.json +0 -296
- package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundle.dbg.json +0 -4
- package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.json +0 -296
- package/artifacts/contracts/instance/module/compensation/CompensationModule.sol/CompensationModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/compensation/CompensationModule.sol/CompensationModule.json +0 -10
- package/artifacts/contracts/instance/module/compensation/ICompensation.sol/ICompensation.dbg.json +0 -4
- package/artifacts/contracts/instance/module/compensation/ICompensation.sol/ICompensation.json +0 -10
- package/artifacts/contracts/instance/module/compensation/ICompensation.sol/ICompensationModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/compensation/ICompensation.sol/ICompensationModule.json +0 -10
- package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.json +0 -188
- package/artifacts/contracts/instance/module/component/IComponent.sol/IComponent.dbg.json +0 -4
- package/artifacts/contracts/instance/module/component/IComponent.sol/IComponent.json +0 -10
- package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.json +0 -188
- package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicy.dbg.json +0 -4
- package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.json +0 -261
- package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.json +0 -261
- package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPool.dbg.json +0 -4
- package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPool.json +0 -10
- package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.json +0 -149
- package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.json +0 -149
- package/artifacts/contracts/instance/module/risk/IRisk.sol/IRisk.dbg.json +0 -4
- package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.json +0 -10
- package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.json +0 -10
- package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasury.dbg.json +0 -4
- package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.json +0 -533
- package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.dbg.json +0 -4
- package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.json +0 -76
- package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.json +0 -533
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +0 -471
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +0 -673
- package/artifacts/contracts/registry/IChainNft.sol/IChainNft.dbg.json +0 -4
- package/artifacts/contracts/registry/IChainNft.sol/IChainNft.json +0 -452
- package/artifacts/contracts/registry/IRegistryLinked.sol/IRegistryLinked.dbg.json +0 -4
- package/artifacts/contracts/registry/IRegistryLinked.sol/IRegistryLinked.json +0 -24
- package/artifacts/contracts/shared/IOwnable.sol/IOwnable.dbg.json +0 -4
- package/artifacts/contracts/shared/IOwnable.sol/IOwnable.json +0 -24
- package/artifacts/contracts/test/TestPool.sol/TestPool.dbg.json +0 -4
- package/artifacts/contracts/test/TestPool.sol/TestPool.json +0 -387
- package/artifacts/contracts/test/TestProduct.sol/TestProduct.dbg.json +0 -4
- package/artifacts/contracts/test/TestProduct.sol/TestProduct.json +0 -393
- package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.dbg.json +0 -4
- package/contracts/experiment/statemachine/README.md +0 -112
- package/contracts/instance/IInstanceLinked.sol +0 -8
- package/contracts/instance/base/InstanceBase.sol +0 -80
- package/contracts/instance/base/ModuleBase.sol +0 -52
- package/contracts/instance/base/ServiceBase.sol +0 -37
- package/contracts/instance/module/access/Access.sol +0 -149
- package/contracts/instance/module/access/IAccess.sol +0 -53
- package/contracts/instance/module/bundle/BundleModule.sol +0 -136
- package/contracts/instance/module/bundle/IBundle.sol +0 -58
- package/contracts/instance/module/compensation/CompensationModule.sol +0 -8
- package/contracts/instance/module/compensation/ICompensation.sol +0 -10
- package/contracts/instance/module/component/ComponentModule.sol +0 -95
- package/contracts/instance/module/component/IComponent.sol +0 -53
- package/contracts/instance/module/policy/IPolicy.sol +0 -60
- package/contracts/instance/module/policy/PolicyModule.sol +0 -76
- package/contracts/instance/module/pool/IPoolModule.sol +0 -41
- package/contracts/instance/module/pool/PoolModule.sol +0 -87
- package/contracts/instance/module/risk/IRisk.sol +0 -10
- package/contracts/instance/module/risk/RiskModule.sol +0 -8
- package/contracts/instance/module/treasury/ITreasury.sol +0 -103
- package/contracts/instance/module/treasury/TokenHandler.sol +0 -48
- package/contracts/instance/module/treasury/TreasuryModule.sol +0 -152
- package/contracts/instance/service/PoolService.sol +0 -123
- package/contracts/instance/service/ProductService.sol +0 -354
- package/contracts/registry/IChainNft.sol +0 -21
- package/contracts/registry/IRegistryLinked.sol +0 -8
- package/contracts/shared/IOwnable.sol +0 -6
- package/contracts/test/TestPool.sol +0 -22
- package/contracts/test/TestProduct.sol +0 -44
@@ -0,0 +1,138 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.20;
|
3
|
+
|
4
|
+
import {Clones} from "@openzeppelin/contracts/proxy/Clones.sol";
|
5
|
+
|
6
|
+
import {AccessManagerSimple} from "./AccessManagerSimple.sol";
|
7
|
+
import {InstanceAccessManager} from "./InstanceAccessManager.sol";
|
8
|
+
import {Instance} from "./Instance.sol";
|
9
|
+
import {IInstanceService} from "./IInstanceService.sol";
|
10
|
+
import {InstanceReader} from "./InstanceReader.sol";
|
11
|
+
import {IRegistry} from "../registry/IRegistry.sol";
|
12
|
+
import {Registry} from "../registry/Registry.sol";
|
13
|
+
import {RegistryService} from "../registry/RegistryService.sol";
|
14
|
+
import {Service} from "../../contracts/shared/Service.sol";
|
15
|
+
import {IService} from "../shared/IService.sol";
|
16
|
+
import {ContractDeployerLib} from "../shared/ContractDeployerLib.sol";
|
17
|
+
import {NftId, NftIdLib, zeroNftId} from "../../contracts/types/NftId.sol";
|
18
|
+
import {VersionLib} from "../types/Version.sol";
|
19
|
+
|
20
|
+
contract InstanceService is Service, IInstanceService {
|
21
|
+
|
22
|
+
address internal _registryAddress;
|
23
|
+
address internal _accessManagerMaster;
|
24
|
+
address internal _instanceMaster;
|
25
|
+
address internal _instanceReaderMaster;
|
26
|
+
|
27
|
+
// TODO update to real hash when instance is stable
|
28
|
+
bytes32 public constant INSTANCE_CREATION_CODE_HASH = bytes32(0);
|
29
|
+
string public constant NAME = "InstanceService";
|
30
|
+
|
31
|
+
function createInstanceClone()
|
32
|
+
external
|
33
|
+
returns (
|
34
|
+
AccessManagerSimple clonedAccessManager,
|
35
|
+
Instance clonedInstance,
|
36
|
+
NftId instanceNftId,
|
37
|
+
InstanceReader clonedInstanceReader
|
38
|
+
)
|
39
|
+
{
|
40
|
+
Registry registry = Registry(_registryAddress);
|
41
|
+
NftId registryNftId = registry.getNftId(_registryAddress);
|
42
|
+
address registryServiceAddress = registry.getServiceAddress("RegistryService", VersionLib.toVersion(3, 0, 0).toMajorPart());
|
43
|
+
RegistryService registryService = RegistryService(registryServiceAddress);
|
44
|
+
|
45
|
+
clonedAccessManager = AccessManagerSimple(Clones.clone(_accessManagerMaster));
|
46
|
+
clonedAccessManager.initialize(msg.sender);
|
47
|
+
|
48
|
+
clonedInstance = Instance(Clones.clone(_instanceMaster));
|
49
|
+
clonedInstance.initialize(address(clonedAccessManager), _registryAddress, registryNftId, msg.sender);
|
50
|
+
( IRegistry.ObjectInfo memory info, ) = registryService.registerInstance(clonedInstance);
|
51
|
+
instanceNftId = info.nftId;
|
52
|
+
|
53
|
+
clonedInstanceReader = InstanceReader(Clones.clone(address(_instanceReaderMaster)));
|
54
|
+
clonedInstanceReader.initialize(_registryAddress, instanceNftId);
|
55
|
+
|
56
|
+
emit LogInstanceCloned(address(clonedAccessManager), address(clonedInstance), address(clonedInstanceReader), instanceNftId);
|
57
|
+
}
|
58
|
+
|
59
|
+
function setAccessManagerMaster(address accessManagerMaster) external {
|
60
|
+
require(
|
61
|
+
_accessManagerMaster == address(0),
|
62
|
+
"ERROR:CRD-001:ACCESS_MANAGER_MASTER_ALREADY_SET");
|
63
|
+
_accessManagerMaster = accessManagerMaster;
|
64
|
+
}
|
65
|
+
|
66
|
+
function setInstanceMaster(address instanceMaster) external {
|
67
|
+
require(
|
68
|
+
_instanceMaster == address(0),
|
69
|
+
"ERROR:CRD-002:INSTANCE_MASTER_ALREADY_SET");
|
70
|
+
_instanceMaster = instanceMaster;
|
71
|
+
}
|
72
|
+
|
73
|
+
function setInstanceReaderMaster(address instanceReaderMaster) external {
|
74
|
+
require(
|
75
|
+
_instanceReaderMaster == address(0),
|
76
|
+
"ERROR:CRD-003:INSTANCE_READER_MASTER_ALREADY_SET");
|
77
|
+
_instanceReaderMaster = instanceReaderMaster;
|
78
|
+
}
|
79
|
+
|
80
|
+
function getInstanceReaderMaster() external view returns (address) {
|
81
|
+
return _instanceReaderMaster;
|
82
|
+
}
|
83
|
+
|
84
|
+
function getInstanceMaster() external view returns (address) {
|
85
|
+
return _instanceMaster;
|
86
|
+
}
|
87
|
+
|
88
|
+
function getAccessManagerMaster() external view returns (address) {
|
89
|
+
return _accessManagerMaster;
|
90
|
+
}
|
91
|
+
|
92
|
+
// From IService
|
93
|
+
function getName() public pure override(IService, Service) returns(string memory) {
|
94
|
+
return NAME;
|
95
|
+
}
|
96
|
+
|
97
|
+
/// @dev top level initializer
|
98
|
+
// 1) registry is non upgradeable -> don't need a proxy and uses constructor !
|
99
|
+
// 2) deploy registry service first -> from its initialization func it is easier to deploy registry then vice versa
|
100
|
+
// 3) deploy registry -> pass registry service address as constructor argument
|
101
|
+
// registry is getting instantiated and locked to registry service address forever
|
102
|
+
function _initialize(
|
103
|
+
address owner,
|
104
|
+
bytes memory data
|
105
|
+
)
|
106
|
+
internal
|
107
|
+
initializer
|
108
|
+
virtual override
|
109
|
+
{
|
110
|
+
// bytes memory encodedConstructorArguments = abi.encode(
|
111
|
+
// _registryAddress);
|
112
|
+
|
113
|
+
// bytes memory instanceCreationCode = ContractDeployerLib.getCreationCode(
|
114
|
+
// instanceByteCodeWithInitCode,
|
115
|
+
// encodedConstructorArguments);
|
116
|
+
|
117
|
+
// address instanceAddress = ContractDeployerLib.deploy(
|
118
|
+
// instanceCreationCode,
|
119
|
+
// INSTANCE_CREATION_CODE_HASH);
|
120
|
+
|
121
|
+
address initialOwner = address(0);
|
122
|
+
(_registryAddress, initialOwner) = abi.decode(data, (address, address));
|
123
|
+
|
124
|
+
// // TODO register instance in registry
|
125
|
+
IRegistry registry = IRegistry(_registryAddress);
|
126
|
+
NftId registryNftId = registry.getNftId(_registryAddress);
|
127
|
+
|
128
|
+
_initializeService(_registryAddress, initialOwner);
|
129
|
+
|
130
|
+
_registerInterface(type(IService).interfaceId);
|
131
|
+
_registerInterface(type(IInstanceService).interfaceId);
|
132
|
+
}
|
133
|
+
|
134
|
+
function getInstance() external view returns (Instance) {
|
135
|
+
return Instance(address(this));
|
136
|
+
}
|
137
|
+
}
|
138
|
+
|
@@ -0,0 +1,56 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.20;
|
3
|
+
|
4
|
+
import {Instance} from "./Instance.sol";
|
5
|
+
import {IVersionable} from "../shared/IVersionable.sol";
|
6
|
+
import {ProxyManager} from "../shared/ProxyManager.sol";
|
7
|
+
import {InstanceService} from "./InstanceService.sol";
|
8
|
+
import {Registry} from "../registry/Registry.sol";
|
9
|
+
import {RegistryService} from "../registry/RegistryService.sol";
|
10
|
+
import {VersionLib} from "../types/Version.sol";
|
11
|
+
|
12
|
+
contract InstanceServiceManager is ProxyManager {
|
13
|
+
|
14
|
+
InstanceService private _instanceService;
|
15
|
+
|
16
|
+
/// @dev initializes proxy manager with instance service implementation and deploys instance
|
17
|
+
constructor(
|
18
|
+
address registryAddress
|
19
|
+
)
|
20
|
+
ProxyManager()
|
21
|
+
{
|
22
|
+
InstanceService instSrv = new InstanceService();
|
23
|
+
// bytes memory initCode = type(InstanceService).creationCode;
|
24
|
+
bytes memory data = abi.encode(registryAddress, address(this));
|
25
|
+
IVersionable versionable = deploy(
|
26
|
+
address(instSrv),
|
27
|
+
data);
|
28
|
+
|
29
|
+
_instanceService = InstanceService(address(versionable));
|
30
|
+
|
31
|
+
Registry registry = Registry(registryAddress);
|
32
|
+
address registryServiceAddress = registry.getServiceAddress("RegistryService", VersionLib.toVersion(3, 0, 0).toMajorPart());
|
33
|
+
RegistryService registryService = RegistryService(registryServiceAddress);
|
34
|
+
|
35
|
+
registryService.registerService(_instanceService);
|
36
|
+
// RegistryService registryService = _instanceService.getRegistryService();
|
37
|
+
|
38
|
+
// link ownership of instance service manager ot nft owner of instance service
|
39
|
+
_linkToNftOwnable(
|
40
|
+
address(registryAddress),
|
41
|
+
address(_instanceService));
|
42
|
+
|
43
|
+
// implies that after this constructor call only upgrade functionality is available
|
44
|
+
_isDeployed = true;
|
45
|
+
}
|
46
|
+
|
47
|
+
//--- view functions ----------------------------------------------------//
|
48
|
+
function getInstanceService()
|
49
|
+
external
|
50
|
+
view
|
51
|
+
returns (InstanceService instanceService)
|
52
|
+
{
|
53
|
+
return _instanceService;
|
54
|
+
}
|
55
|
+
|
56
|
+
}
|
@@ -2,23 +2,15 @@
|
|
2
2
|
pragma solidity ^0.8.19;
|
3
3
|
|
4
4
|
import {IRegistry} from "../../registry/IRegistry.sol";
|
5
|
+
import {IRegistryService} from "../../registry/IRegistryService.sol";
|
5
6
|
import {IInstance} from "../../instance/IInstance.sol";
|
6
7
|
import {ObjectType, INSTANCE, PRODUCT, POOL} from "../../types/ObjectType.sol";
|
7
8
|
import {NftId, NftIdLib} from "../../types/NftId.sol";
|
8
9
|
|
9
|
-
import {
|
10
|
-
|
11
|
-
abstract contract ComponentServiceBase is ServiceBase {
|
12
|
-
|
13
|
-
constructor(
|
14
|
-
address registry,
|
15
|
-
NftId registryNftId
|
16
|
-
)
|
17
|
-
ServiceBase(registry, registryNftId)
|
18
|
-
// solhint-disable-next-line no-empty-blocks
|
19
|
-
{
|
20
|
-
}
|
10
|
+
import {Service} from "../../shared/Service.sol";
|
11
|
+
import {Version, VersionPart, VersionLib} from "../../types/Version.sol";
|
21
12
|
|
13
|
+
abstract contract ComponentServiceBase is Service {
|
22
14
|
|
23
15
|
function _getAndVerifyComponentInfoAndInstance(
|
24
16
|
ObjectType objectType
|
@@ -33,10 +25,15 @@ abstract contract ComponentServiceBase is ServiceBase {
|
|
33
25
|
NftId componentNftId = _registry.getNftId(msg.sender);
|
34
26
|
require(componentNftId.gtz(), "ERROR_COMPONENT_UNKNOWN");
|
35
27
|
|
36
|
-
info =
|
28
|
+
info = getRegistry().getObjectInfo(componentNftId);
|
37
29
|
require(info.objectType == objectType, "OBJECT_TYPE_INVALID");
|
38
30
|
|
39
|
-
address instanceAddress =
|
31
|
+
address instanceAddress = getRegistry().getObjectInfo(info.parentNftId).objectAddress;
|
40
32
|
instance = IInstance(instanceAddress);
|
41
33
|
}
|
34
|
+
|
35
|
+
function getRegistryService() public view virtual returns (IRegistryService) {
|
36
|
+
address service = getRegistry().getServiceAddress("RegistryService", getMajorVersion());
|
37
|
+
return IRegistryService(service);
|
38
|
+
}
|
42
39
|
}
|
@@ -1,14 +1,23 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
|
-
pragma solidity ^0.8.
|
2
|
+
pragma solidity ^0.8.20;
|
3
|
+
|
4
|
+
import {Key32} from "../../types/Key32.sol";
|
5
|
+
import {StateId} from "../../types/StateId.sol";
|
3
6
|
|
4
7
|
import {IKeyValueStore} from "./IKeyValueStore.sol";
|
8
|
+
|
5
9
|
import {IComponentOwnerService} from "../service/IComponentOwnerService.sol";
|
10
|
+
import {IDistributionService} from "../service/IDistributionService.sol";
|
6
11
|
import {IProductService} from "../service/IProductService.sol";
|
7
12
|
import {IPoolService} from "../service/IPoolService.sol";
|
8
13
|
|
9
14
|
interface IInstanceBase {
|
10
15
|
function getKeyValueStore() external view returns (IKeyValueStore keyValueStore);
|
11
|
-
function
|
16
|
+
function updateState(Key32 key, StateId state) external;
|
17
|
+
function getState(Key32 key) external view returns (StateId state);
|
18
|
+
|
19
|
+
function getComponentOwnerService() external view returns(IComponentOwnerService);
|
20
|
+
function getDistributionService() external view returns(IDistributionService);
|
12
21
|
function getProductService() external view returns(IProductService service);
|
13
22
|
function getPoolService() external view returns(IPoolService service);
|
14
23
|
}
|
@@ -1,5 +1,5 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
|
-
pragma solidity ^0.8.
|
2
|
+
pragma solidity ^0.8.20;
|
3
3
|
|
4
4
|
import {Blocknumber, blockBlocknumber, zeroBlocknumber} from "../../types/Blocknumber.sol";
|
5
5
|
import {Key32, KeyId} from "../../types/Key32.sol";
|
@@ -9,13 +9,9 @@ import {StateId} from "../../types/StateId.sol";
|
|
9
9
|
|
10
10
|
import {ILifecycle} from "./ILifecycle.sol";
|
11
11
|
|
12
|
+
// TODO remove - internal only?
|
12
13
|
interface IKeyValueStore is ILifecycle {
|
13
14
|
|
14
|
-
struct Key {
|
15
|
-
ObjectType objectType;
|
16
|
-
KeyId id;
|
17
|
-
}
|
18
|
-
|
19
15
|
struct Value {
|
20
16
|
Metadata metadata;
|
21
17
|
bytes data;
|
@@ -24,20 +20,24 @@ interface IKeyValueStore is ILifecycle {
|
|
24
20
|
struct Metadata {
|
25
21
|
ObjectType objectType;
|
26
22
|
StateId state;
|
23
|
+
// TODO updatedBy needs concept that says what value should go here
|
24
|
+
// eg account outside gif objects that initiated the tx
|
25
|
+
// implies the caller needs to be propagated through all calls up to key values store itself
|
26
|
+
// to always have the instance address there doesn't seem to make sense
|
27
27
|
address updatedBy;
|
28
28
|
Blocknumber updatedIn;
|
29
29
|
Blocknumber createdIn;
|
30
30
|
}
|
31
31
|
|
32
|
-
event LogInfoCreated(
|
33
|
-
event LogInfoUpdated(
|
34
|
-
event LogStateUpdated(
|
32
|
+
event LogInfoCreated(ObjectType objectType, KeyId keyId, StateId state, address createdBy, address txOrigin);
|
33
|
+
event LogInfoUpdated(ObjectType objectType, KeyId keyId, StateId state, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
|
34
|
+
event LogStateUpdated(ObjectType objectType, KeyId keyId, StateId stateOld, StateId stateNew, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
|
35
35
|
|
36
36
|
// generic state changing functions
|
37
|
-
function create(Key32 key,
|
38
|
-
function update(Key32 key,
|
39
|
-
function updateData(Key32 key, bytes memory data) external;
|
40
|
-
function updateState(Key32 key, StateId state) external;
|
37
|
+
// function create(Key32 key, bytes memory data) external;
|
38
|
+
// function update(Key32 key, bytes memory data, StateId state) external;
|
39
|
+
// function updateData(Key32 key, bytes memory data) external;
|
40
|
+
// function updateState(Key32 key, StateId state) external;
|
41
41
|
|
42
42
|
function exists(Key32 key) external view returns (bool);
|
43
43
|
function get(Key32 key) external view returns (Value memory value);
|
@@ -1,9 +1,9 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
|
-
pragma solidity ^0.8.
|
2
|
+
pragma solidity ^0.8.20;
|
3
3
|
|
4
|
-
import {ObjectType} from "../../types/ObjectType.sol";
|
5
|
-
import {StateId, toStateId, zeroStateId} from "../../types/StateId.sol";
|
6
4
|
import {NftId} from "../../types/NftId.sol";
|
5
|
+
import {ObjectType} from "../../types/ObjectType.sol";
|
6
|
+
import {StateId} from "../../types/StateId.sol";
|
7
7
|
|
8
8
|
interface ILifecycle {
|
9
9
|
|
@@ -1,12 +1,12 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
|
-
pragma solidity ^0.8.
|
2
|
+
pragma solidity ^0.8.20;
|
3
3
|
|
4
4
|
import {Blocknumber, blockBlocknumber, zeroBlocknumber} from "../../types/Blocknumber.sol";
|
5
5
|
import {Key32, KeyId, Key32Lib} from "../../types/Key32.sol";
|
6
6
|
import {NftId} from "../../types/NftId.sol";
|
7
7
|
import {ObjectType} from "../../types/ObjectType.sol";
|
8
8
|
import {StateId, ACTIVE} from "../../types/StateId.sol";
|
9
|
-
import {Timestamp,
|
9
|
+
import {Timestamp, TimestampLib} from "../../types/Timestamp.sol";
|
10
10
|
|
11
11
|
import {Lifecycle} from "./Lifecycle.sol";
|
12
12
|
import {IKeyValueStore} from "./IKeyValueStore.sol";
|
@@ -14,27 +14,23 @@ import {IKeyValueStore} from "./IKeyValueStore.sol";
|
|
14
14
|
contract KeyValueStore is Lifecycle, IKeyValueStore {
|
15
15
|
|
16
16
|
mapping(Key32 key32 => Value value) private _value;
|
17
|
-
address private _owner;
|
18
17
|
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
constructor() {
|
27
|
-
_owner = msg.sender;
|
18
|
+
function create(
|
19
|
+
Key32 key32,
|
20
|
+
bytes memory data
|
21
|
+
)
|
22
|
+
internal
|
23
|
+
{
|
24
|
+
_create(key32, data);
|
28
25
|
}
|
29
26
|
|
30
|
-
function
|
27
|
+
function _create(
|
31
28
|
Key32 key32,
|
32
|
-
ObjectType objectType,
|
33
29
|
bytes memory data
|
34
30
|
)
|
35
|
-
|
36
|
-
onlyOwner
|
31
|
+
internal
|
37
32
|
{
|
33
|
+
ObjectType objectType = key32.toObjectType();
|
38
34
|
require(objectType.gtz(), "ERROR:KVS-010:TYPE_UNDEFINED");
|
39
35
|
|
40
36
|
Metadata storage metadata = _value[key32].metadata;
|
@@ -54,12 +50,26 @@ contract KeyValueStore is Lifecycle, IKeyValueStore {
|
|
54
50
|
// set data
|
55
51
|
_value[key32].data = data;
|
56
52
|
|
57
|
-
|
53
|
+
// solhint-disable-next-line avoid-tx-origin
|
54
|
+
emit LogInfoCreated(key32.toObjectType(), key32.toKeyId(), initialState, createdBy, tx.origin);
|
58
55
|
}
|
59
56
|
|
60
|
-
function update(
|
61
|
-
|
62
|
-
|
57
|
+
function update(
|
58
|
+
Key32 key32,
|
59
|
+
bytes memory data,
|
60
|
+
StateId state
|
61
|
+
)
|
62
|
+
internal
|
63
|
+
{
|
64
|
+
_update(key32, data, state);
|
65
|
+
}
|
66
|
+
|
67
|
+
function _update(
|
68
|
+
Key32 key32,
|
69
|
+
bytes memory data,
|
70
|
+
StateId state
|
71
|
+
)
|
72
|
+
internal
|
63
73
|
{
|
64
74
|
require(state.gtz(), "ERROR:KVS-020:STATE_UNDEFINED");
|
65
75
|
Metadata storage metadata = _value[key32].metadata;
|
@@ -77,14 +87,20 @@ contract KeyValueStore is Lifecycle, IKeyValueStore {
|
|
77
87
|
metadata.updatedIn = blockBlocknumber();
|
78
88
|
|
79
89
|
// create log entries
|
80
|
-
|
81
|
-
emit LogStateUpdated(
|
82
|
-
emit LogInfoUpdated(
|
90
|
+
// solhint-disable avoid-tx-origin
|
91
|
+
emit LogStateUpdated(key32.toObjectType(), key32.toKeyId(), state, stateOld, updatedBy, tx.origin, lastUpdatedIn);
|
92
|
+
emit LogInfoUpdated(key32.toObjectType(), key32.toKeyId(), state, updatedBy, tx.origin, lastUpdatedIn);
|
93
|
+
// solhing-enable
|
83
94
|
}
|
84
95
|
|
85
96
|
function updateData(Key32 key32, bytes memory data)
|
86
|
-
|
87
|
-
|
97
|
+
internal
|
98
|
+
{
|
99
|
+
_updateData(key32, data);
|
100
|
+
}
|
101
|
+
|
102
|
+
function _updateData(Key32 key32, bytes memory data)
|
103
|
+
internal
|
88
104
|
{
|
89
105
|
Metadata storage metadata = _value[key32].metadata;
|
90
106
|
StateId state = metadata.state;
|
@@ -100,13 +116,18 @@ contract KeyValueStore is Lifecycle, IKeyValueStore {
|
|
100
116
|
metadata.updatedIn = blockBlocknumber();
|
101
117
|
|
102
118
|
// create log entry
|
103
|
-
|
104
|
-
emit LogInfoUpdated(
|
119
|
+
// solhint-disable-next-line avoid-tx-origin
|
120
|
+
emit LogInfoUpdated(key32.toObjectType(), key32.toKeyId(), state, updatedBy, tx.origin, lastUpdatedIn);
|
105
121
|
}
|
106
122
|
|
107
123
|
function updateState(Key32 key32, StateId state)
|
108
|
-
|
109
|
-
|
124
|
+
internal
|
125
|
+
{
|
126
|
+
_updateState(key32, state);
|
127
|
+
}
|
128
|
+
|
129
|
+
function _updateState(Key32 key32, StateId state)
|
130
|
+
internal
|
110
131
|
{
|
111
132
|
require(state.gtz(), "ERROR:KVS-040:STATE_UNDEFINED");
|
112
133
|
Metadata storage metadata = _value[key32].metadata;
|
@@ -121,8 +142,8 @@ contract KeyValueStore is Lifecycle, IKeyValueStore {
|
|
121
142
|
metadata.updatedIn = blockBlocknumber();
|
122
143
|
|
123
144
|
// create log entry
|
124
|
-
|
125
|
-
emit LogStateUpdated(
|
145
|
+
// solhint-disable-next-line avoid-tx-origin
|
146
|
+
emit LogStateUpdated(key32.toObjectType(), key32.toKeyId(), state, stateOld, updatedBy, tx.origin, lastUpdatedIn);
|
126
147
|
}
|
127
148
|
|
128
149
|
function exists(Key32 key32) public view returns (bool) {
|
@@ -145,12 +166,7 @@ contract KeyValueStore is Lifecycle, IKeyValueStore {
|
|
145
166
|
return _value[key32].metadata.state;
|
146
167
|
}
|
147
168
|
|
148
|
-
function toKey32(ObjectType objectType, KeyId id) external pure returns(Key32) {
|
169
|
+
function toKey32(ObjectType objectType, KeyId id) external pure override returns(Key32) {
|
149
170
|
return Key32Lib.toKey32(objectType, id);
|
150
171
|
}
|
151
|
-
|
152
|
-
function toKey(Key32 key32) public pure returns (Key memory key) {
|
153
|
-
(ObjectType objectType, KeyId id) = key32.toKey();
|
154
|
-
return Key(objectType, id);
|
155
|
-
}
|
156
172
|
}
|
@@ -1,8 +1,8 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
|
-
pragma solidity ^0.8.
|
2
|
+
pragma solidity ^0.8.20;
|
3
3
|
|
4
4
|
import {NftId} from "../../types/NftId.sol";
|
5
|
-
import {ObjectType,
|
5
|
+
import {ObjectType, COMPONENT, BUNDLE, POLICY, RISK} from "../../types/ObjectType.sol";
|
6
6
|
import {StateId, ACTIVE, PAUSED, ARCHIVED, CLOSED, APPLIED, UNDERWRITTEN, REVOKED, DECLINED} from "../../types/StateId.sol";
|
7
7
|
import {ILifecycle} from "./ILifecycle.sol";
|
8
8
|
|
@@ -14,12 +14,10 @@ contract Lifecycle is ILifecycle {
|
|
14
14
|
private _isValidTransition;
|
15
15
|
|
16
16
|
constructor() {
|
17
|
-
_setupComponentLifecycle(PRODUCT());
|
18
|
-
_setupComponentLifecycle(ORACLE());
|
19
|
-
_setupComponentLifecycle(POOL());
|
20
|
-
|
21
17
|
_setupBundleLifecycle();
|
18
|
+
_setupComponentLifecycle();
|
22
19
|
_setupPolicyLifecycle();
|
20
|
+
_setupRiskLifecycle();
|
23
21
|
}
|
24
22
|
|
25
23
|
function hasLifecycle(
|
@@ -70,11 +68,11 @@ contract Lifecycle is ILifecycle {
|
|
70
68
|
return _isValidTransition[objectType][fromId][toId];
|
71
69
|
}
|
72
70
|
|
73
|
-
function _setupComponentLifecycle(
|
74
|
-
_initialState[
|
75
|
-
_isValidTransition[
|
76
|
-
_isValidTransition[
|
77
|
-
_isValidTransition[
|
71
|
+
function _setupComponentLifecycle() internal {
|
72
|
+
_initialState[COMPONENT()] = ACTIVE();
|
73
|
+
_isValidTransition[COMPONENT()][ACTIVE()][PAUSED()] = true;
|
74
|
+
_isValidTransition[COMPONENT()][PAUSED()][ACTIVE()] = true;
|
75
|
+
_isValidTransition[COMPONENT()][PAUSED()][ARCHIVED()] = true;
|
78
76
|
}
|
79
77
|
|
80
78
|
function _setupBundleLifecycle() internal {
|
@@ -92,4 +90,11 @@ contract Lifecycle is ILifecycle {
|
|
92
90
|
_isValidTransition[POLICY()][UNDERWRITTEN()][ACTIVE()] = true;
|
93
91
|
_isValidTransition[POLICY()][ACTIVE()][CLOSED()] = true;
|
94
92
|
}
|
93
|
+
|
94
|
+
function _setupRiskLifecycle() internal {
|
95
|
+
_initialState[RISK()] = ACTIVE();
|
96
|
+
_isValidTransition[RISK()][ACTIVE()][PAUSED()] = true;
|
97
|
+
_isValidTransition[RISK()][PAUSED()][ACTIVE()] = true;
|
98
|
+
_isValidTransition[RISK()][PAUSED()][ARCHIVED()] = true;
|
99
|
+
}
|
95
100
|
}
|
@@ -0,0 +1,38 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.20;
|
3
|
+
|
4
|
+
import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
|
5
|
+
import {ShortString, ShortStrings} from "@openzeppelin/contracts/utils/ShortStrings.sol";
|
6
|
+
|
7
|
+
import {RoleId} from "../../types/RoleId.sol";
|
8
|
+
|
9
|
+
interface IAccess {
|
10
|
+
struct RoleInfo {
|
11
|
+
ShortString name;
|
12
|
+
bool isCustom;
|
13
|
+
}
|
14
|
+
|
15
|
+
struct TargetInfo {
|
16
|
+
ShortString name;
|
17
|
+
bool isCustom;
|
18
|
+
}
|
19
|
+
|
20
|
+
error ErrorTargetAddressZero();
|
21
|
+
error ErrorTargetAlreadyExists(address target, ShortString name);
|
22
|
+
error ErrorTargetDoesNotExist(address target);
|
23
|
+
error ErrorTargetNameEmpty(address target);
|
24
|
+
error ErrorTargetNameExists(address target, address existingTarget, ShortString name);
|
25
|
+
|
26
|
+
error ErrorRoleIdInvalid(RoleId roleId);
|
27
|
+
error ErrorRoleIdTooBig(RoleId roleId);
|
28
|
+
error ErrorRoleIdTooSmall(RoleId roleId);
|
29
|
+
error ErrorRoleIdAlreadyExists(RoleId roleId, ShortString name);
|
30
|
+
error ErrorRoleIdNotActive(RoleId roleId);
|
31
|
+
error ErrorRoleNameEmpty(RoleId roleId);
|
32
|
+
error ErrorRoleNameNotUnique(RoleId roleId, ShortString name);
|
33
|
+
error ErrorRoleInvalidUpdate(RoleId roleId, bool isCustom);
|
34
|
+
error ErrorGrantNonexstentRole(RoleId roleId);
|
35
|
+
error ErrorRevokeNonexstentRole(RoleId roleId);
|
36
|
+
error ErrorRenounceNonexstentRole(RoleId roleId);
|
37
|
+
|
38
|
+
}
|
@@ -0,0 +1,19 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.20;
|
3
|
+
|
4
|
+
import {NftId} from "../../types/NftId.sol";
|
5
|
+
import {Fee} from "../../types/Fee.sol";
|
6
|
+
import {Timestamp} from "../../types/Timestamp.sol";
|
7
|
+
|
8
|
+
interface IBundle {
|
9
|
+
struct BundleInfo {
|
10
|
+
NftId poolNftId;
|
11
|
+
Fee fee; // bundle fee on net premium amounts
|
12
|
+
bytes filter; // required conditions for applications to be considered for collateralization by this bundle
|
13
|
+
uint256 capitalAmount; // net investment capital + net premiums - payouts
|
14
|
+
uint256 lockedAmount; // capital amount linked to collateralizaion of non-closed policies (<= balance)
|
15
|
+
uint256 balanceAmount; // total amount of funds: capitalAmount + fees (balance >= captial)
|
16
|
+
Timestamp expiredAt; // no new policies
|
17
|
+
Timestamp closedAt; // no open policies, locked amount = 0
|
18
|
+
}
|
19
|
+
}
|
@@ -0,0 +1,39 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.20;
|
3
|
+
|
4
|
+
import {DistributorType} from "../../types/DistributorType.sol";
|
5
|
+
import {NftId} from "../../types/NftId.sol";
|
6
|
+
import {Timestamp} from "../../types/Timestamp.sol";
|
7
|
+
import {UFixed} from "../../types/UFixed.sol";
|
8
|
+
|
9
|
+
interface IDistribution {
|
10
|
+
|
11
|
+
struct DistributorTypeInfo {
|
12
|
+
string name;
|
13
|
+
UFixed minDiscountPercentage;
|
14
|
+
UFixed maxDiscountPercentage;
|
15
|
+
UFixed commissionPercentage;
|
16
|
+
uint32 maxReferralCount;
|
17
|
+
uint32 maxReferralLifetime;
|
18
|
+
bool allowSelfReferrals;
|
19
|
+
bool allowRenewals;
|
20
|
+
bytes data;
|
21
|
+
}
|
22
|
+
|
23
|
+
struct DistributorInfo {
|
24
|
+
DistributorType distributorType;
|
25
|
+
bool active;
|
26
|
+
bytes data;
|
27
|
+
}
|
28
|
+
|
29
|
+
struct ReferralInfo {
|
30
|
+
NftId distributorNftId;
|
31
|
+
string referralCode;
|
32
|
+
UFixed discountPercentage;
|
33
|
+
uint32 maxReferrals;
|
34
|
+
uint32 usedReferrals;
|
35
|
+
Timestamp expiryAt;
|
36
|
+
bytes data;
|
37
|
+
}
|
38
|
+
|
39
|
+
}
|