@etherisc/gif-next 0.0.2-b63c0fc-410 → 0.0.2-b72409c-493
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 +136 -2
- package/artifacts/contracts/components/Component.sol/Component.dbg.json +4 -0
- package/artifacts/contracts/components/Component.sol/Component.json +832 -0
- package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +1 -1
- package/artifacts/contracts/components/Distribution.sol/Distribution.json +887 -238
- package/artifacts/contracts/components/IComponent.sol/IComponent.dbg.json +4 -0
- package/artifacts/contracts/{instance/base/ComponentServiceBase.sol/ComponentServiceBase.json → components/IComponent.sol/IComponent.json} +192 -173
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +696 -31
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +755 -50
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +582 -9
- package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
- package/artifacts/contracts/components/Pool.sol/Pool.json +790 -307
- package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/components/Product.sol/Product.json +616 -234
- package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.dbg.json +4 -0
- package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.json +1206 -0
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +4 -0
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +778 -0
- package/artifacts/contracts/instance/Cloneable.sol/Cloneable.dbg.json +4 -0
- package/artifacts/contracts/instance/{AccessManagedSimple.sol/AccessManagedSimple.json → Cloneable.sol/Cloneable.json} +91 -2
- package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.json +1836 -242
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +252 -165
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +949 -1219
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +571 -177
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +131 -240
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +431 -249
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +321 -92
- package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +4 -0
- package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json +256 -0
- package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.dbg.json +4 -0
- package/artifacts/contracts/{shared/RegisterableUpgradable.sol/RegisterableUpgradable.json → instance/base/ComponentService.sol/ComponentService.json} +236 -126
- 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 +40 -10
- package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
- package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +36 -11
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +69 -43
- package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +4 -0
- package/artifacts/contracts/instance/module/IComponents.sol/IComponents.json +10 -0
- 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 +4 -0
- package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.json +968 -0
- package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.json +665 -0
- package/artifacts/contracts/instance/service/BundleService.sol/BundleService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +1093 -0
- package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +661 -0
- package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.json +754 -0
- package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.json +637 -0
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +1256 -181
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +444 -75
- package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.json +556 -0
- package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.json +630 -0
- package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/{IComponentOwnerService.sol/IComponentOwnerService.json → IClaimService.sol/IClaimService.json} +150 -207
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +727 -160
- package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.json +540 -0
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +84 -217
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +47 -414
- package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +1021 -0
- package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +689 -0
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +302 -274
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +304 -95
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +777 -0
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +649 -0
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +15 -2
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +227 -224
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +243 -206
- package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
- package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.json +18 -0
- package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registry.json +241 -330
- package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +4 -0
- package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +285 -0
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +235 -295
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +295 -150
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +4 -0
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +547 -0
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +141 -53
- 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/ERC165.sol/ERC165.json +41 -3
- package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
- package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +40 -29
- package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +4 -0
- package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +129 -0
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +21 -34
- package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +4 -0
- package/artifacts/contracts/{experiment/inheritance/IB.sol/IB.json → shared/IRegistryLinked.sol/IRegistryLinked.json} +18 -20
- package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
- package/artifacts/contracts/shared/IService.sol/IService.json +31 -183
- package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
- package/artifacts/contracts/shared/IVersionable.sol/IVersionable.json +2 -152
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +120 -27
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +4 -0
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +248 -0
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +294 -61
- package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
- package/artifacts/contracts/shared/Registerable.sol/Registerable.json +129 -51
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +4 -0
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +84 -0
- package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
- package/artifacts/contracts/shared/Service.sol/Service.json +127 -170
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +2 -2
- package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
- package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +2 -2
- package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
- package/artifacts/contracts/shared/Versionable.sol/Versionable.json +2 -152
- 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 +129 -51
- package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
- package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +6 -6
- package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
- package/artifacts/contracts/test/TestService.sol/TestService.json +148 -227
- 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/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 +8 -190
- 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/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
- package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.json +2 -2
- package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.dbg.json +4 -0
- package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.json +100 -0
- 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 +2 -2
- 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 +17 -4
- package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
- package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.json +26 -3
- 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 +4 -0
- package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.json +100 -0
- package/artifacts/contracts/types/Referral.sol/ReferralLib.dbg.json +1 -1
- package/artifacts/contracts/types/Referral.sol/ReferralLib.json +23 -4
- 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 +4 -0
- package/artifacts/contracts/types/Seconds.sol/SecondsLib.json +124 -0
- 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 +25 -7
- package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +1 -1
- package/artifacts/contracts/types/UFixed.sol/MathLib.json +2 -2
- package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +1 -1
- package/artifacts/contracts/types/UFixed.sol/UFixedLib.json +2 -2
- package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
- package/artifacts/contracts/types/Version.sol/VersionLib.json +2 -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/Component.sol +251 -0
- package/contracts/components/Distribution.sol +197 -83
- package/contracts/components/IComponent.sol +74 -0
- package/contracts/components/IDistributionComponent.sol +43 -18
- package/contracts/components/IPoolComponent.sol +88 -37
- package/contracts/components/IProductComponent.sol +10 -5
- package/contracts/components/Pool.sol +214 -162
- package/contracts/components/Product.sol +130 -134
- package/contracts/instance/AccessManagerUpgradeableInitializeable.sol +13 -0
- package/contracts/instance/BundleManager.sol +127 -0
- package/contracts/instance/Cloneable.sol +51 -0
- package/contracts/instance/IInstance.sol +71 -12
- package/contracts/instance/IInstanceService.sol +47 -5
- package/contracts/instance/Instance.sol +147 -263
- package/contracts/instance/InstanceAccessManager.sol +410 -176
- package/contracts/instance/InstanceReader.sol +18 -34
- package/contracts/instance/InstanceService.sol +429 -104
- package/contracts/instance/InstanceServiceManager.sol +11 -13
- package/contracts/instance/ObjectManager.sol +82 -0
- package/contracts/instance/base/ComponentService.sol +134 -0
- package/contracts/instance/base/KeyValueStore.sol +5 -2
- package/contracts/instance/base/Lifecycle.sol +11 -2
- package/contracts/instance/module/IAccess.sol +36 -20
- package/contracts/instance/module/IBundle.sol +2 -1
- package/contracts/instance/module/IComponents.sol +35 -0
- package/contracts/instance/module/IDistribution.sol +2 -0
- package/contracts/instance/module/IPolicy.sol +30 -3
- package/contracts/instance/module/ISetup.sol +9 -20
- package/contracts/instance/service/ApplicationService.sol +350 -0
- package/contracts/instance/service/ApplicationServiceManager.sol +35 -0
- package/contracts/instance/service/BundleService.sol +336 -0
- package/contracts/instance/service/BundleServiceManager.sol +51 -0
- package/contracts/instance/service/ClaimService.sol +151 -0
- package/contracts/instance/service/ClaimServiceManager.sol +35 -0
- package/contracts/instance/service/DistributionService.sol +408 -46
- package/contracts/instance/service/DistributionServiceManager.sol +11 -13
- package/contracts/instance/service/IApplicationService.sol +82 -0
- package/contracts/instance/service/IBundleService.sol +62 -0
- package/contracts/instance/service/IClaimService.sol +61 -0
- package/contracts/instance/service/IDistributionService.sol +86 -0
- package/contracts/instance/service/IPolicyService.sol +72 -0
- package/contracts/instance/service/IPoolService.sol +21 -23
- package/contracts/instance/service/IProductService.sol +6 -73
- package/contracts/instance/service/PolicyService.sol +403 -0
- package/contracts/instance/service/PolicyServiceManager.sol +54 -0
- package/contracts/instance/service/PoolService.sol +151 -142
- package/contracts/instance/service/PoolServiceManager.sol +11 -13
- package/contracts/instance/service/ProductService.sol +241 -0
- package/contracts/instance/service/ProductServiceManager.sol +54 -0
- package/contracts/registry/ChainNft.sol +9 -1
- package/contracts/registry/IRegistry.sol +40 -33
- package/contracts/registry/IRegistryService.sol +47 -13
- package/contracts/registry/ITransferInterceptor.sol +1 -0
- package/contracts/registry/Registry.sol +234 -256
- package/contracts/registry/RegistryAccessManager.sol +216 -0
- package/contracts/registry/RegistryService.sol +113 -229
- package/contracts/registry/RegistryServiceManager.sol +21 -39
- package/contracts/registry/ReleaseManager.sol +322 -0
- package/contracts/registry/TokenRegistry.sol +22 -17
- package/contracts/shared/ERC165.sol +14 -12
- package/contracts/shared/INftOwnable.sol +11 -10
- package/contracts/shared/IPolicyHolder.sol +26 -0
- package/contracts/shared/IRegisterable.sol +4 -6
- package/contracts/shared/IRegistryLinked.sol +12 -0
- package/contracts/shared/IService.sol +4 -1
- package/contracts/shared/IVersionable.sol +4 -47
- package/contracts/shared/NftOwnable.sol +67 -83
- package/contracts/shared/PolicyHolder.sol +81 -0
- package/contracts/shared/ProxyManager.sol +100 -25
- package/contracts/shared/Registerable.sol +16 -32
- package/contracts/shared/RegistryLinked.sol +48 -0
- package/contracts/shared/Service.sol +26 -22
- package/contracts/shared/TokenHandler.sol +11 -5
- package/contracts/shared/Versionable.sol +4 -92
- package/contracts/test/TestRegisterable.sol +1 -1
- package/contracts/test/TestService.sol +4 -3
- package/contracts/types/Blocknumber.sol +1 -0
- package/contracts/types/ClaimId.sol +52 -0
- package/contracts/types/DistributorType.sol +2 -2
- package/contracts/types/Fee.sol +1 -0
- package/contracts/types/NftId.sol +8 -0
- package/contracts/types/NftIdSet.sol +26 -24
- package/contracts/types/ObjectType.sol +10 -5
- package/contracts/types/PayoutId.sol +54 -0
- package/contracts/types/Referral.sol +4 -0
- package/contracts/types/RoleId.sol +26 -17
- package/contracts/types/Seconds.sol +54 -0
- package/contracts/types/StateId.sol +1 -0
- package/contracts/types/Timestamp.sol +13 -13
- package/contracts/types/UFixed.sol +1 -0
- package/contracts/types/Version.sol +1 -0
- package/package.json +3 -3
- package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +0 -4
- package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.json +0 -327
- package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +0 -4
- package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.json +0 -280
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.dbg.json +0 -4
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.json +0 -66
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.dbg.json +0 -4
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.json +0 -24
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.dbg.json +0 -4
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.json +0 -42
- package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +0 -4
- package/artifacts/contracts/experiment/errors/Require.sol/Require.json +0 -105
- package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +0 -4
- package/artifacts/contracts/experiment/errors/Revert.sol/Revert.json +0 -105
- package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/A.sol/A.json +0 -128
- package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/A.sol/AShared.json +0 -42
- package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/B.sol/B.json +0 -76
- package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/C.sol/C.json +0 -89
- package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/IA.sol/IA.json +0 -128
- package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.json +0 -37
- package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/IC.sol/IC.json +0 -63
- package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +0 -4
- package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.json +0 -59
- package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +0 -4
- package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.json +0 -124
- package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +0 -4
- package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.json +0 -74
- package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +0 -4
- package/artifacts/contracts/experiment/statemachine/SM.sol/SM.json +0 -124
- package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +0 -4
- package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.json +0 -207
- package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +0 -4
- package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.json +0 -10
- package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +0 -4
- package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.json +0 -10
- package/artifacts/contracts/instance/AccessManagedSimple.sol/AccessManagedSimple.dbg.json +0 -4
- package/artifacts/contracts/instance/AccessManagerSimple.sol/AccessManagerSimple.dbg.json +0 -4
- package/artifacts/contracts/instance/AccessManagerSimple.sol/AccessManagerSimple.json +0 -1132
- package/artifacts/contracts/instance/IAccessManagerSimple.sol/IAccessManagerSimple.dbg.json +0 -4
- package/artifacts/contracts/instance/IAccessManagerSimple.sol/IAccessManagerSimple.json +0 -1082
- package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +0 -4
- package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +0 -4
- package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.json +0 -113
- package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +0 -827
- package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +0 -4
- package/artifacts/contracts/shared/RegisterableUpgradable.sol/RegisterableUpgradable.dbg.json +0 -4
- package/contracts/components/BaseComponent.sol +0 -91
- package/contracts/components/IBaseComponent.sol +0 -25
- package/contracts/experiment/cloning/Cloner.sol +0 -47
- package/contracts/experiment/errors/Require.sol +0 -38
- package/contracts/experiment/errors/Revert.sol +0 -44
- package/contracts/experiment/inheritance/A.sol +0 -53
- package/contracts/experiment/inheritance/B.sol +0 -28
- package/contracts/experiment/inheritance/C.sol +0 -34
- package/contracts/experiment/inheritance/IA.sol +0 -13
- package/contracts/experiment/inheritance/IB.sol +0 -10
- package/contracts/experiment/inheritance/IC.sol +0 -12
- package/contracts/experiment/statemachine/Dummy.sol +0 -27
- package/contracts/experiment/statemachine/ISM.sol +0 -25
- package/contracts/experiment/statemachine/SM.sol +0 -57
- package/contracts/experiment/statemachine/SimpleStateMachine.sol +0 -31
- package/contracts/experiment/types/TypeA.sol +0 -47
- package/contracts/experiment/types/TypeB.sol +0 -29
- package/contracts/instance/AccessManagedSimple.sol +0 -115
- package/contracts/instance/AccessManagerSimple.sol +0 -692
- package/contracts/instance/IAccessManagerSimple.sol +0 -391
- package/contracts/instance/base/ComponentServiceBase.sol +0 -41
- package/contracts/instance/base/IInstanceBase.sol +0 -23
- package/contracts/instance/service/ComponentOwnerService.sol +0 -317
- package/contracts/instance/service/IComponentOwnerService.sol +0 -20
- package/contracts/shared/RegisterableUpgradable.sol +0 -16
@@ -1,42 +1,56 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.20;
|
3
3
|
|
4
|
-
import {
|
5
|
-
import {ShortString, ShortStrings} from "@openzeppelin/contracts/utils/ShortStrings.sol";
|
4
|
+
import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";
|
6
5
|
|
7
|
-
import {AccessManagedSimple} from "./AccessManagedSimple.sol";
|
8
|
-
import {AccessManagerSimple} from "./AccessManagerSimple.sol";
|
9
|
-
import {IAccess} from "./module/IAccess.sol";
|
10
|
-
import {IBundle} from "./module/IBundle.sol";
|
11
|
-
import {IPolicy} from "./module/IPolicy.sol";
|
12
|
-
import {IRisk} from "./module/IRisk.sol";
|
13
|
-
import {ISetup} from "./module/ISetup.sol";
|
14
6
|
import {Key32, KeyId, Key32Lib} from "../types/Key32.sol";
|
15
|
-
import {KeyValueStore} from "./base/KeyValueStore.sol";
|
16
|
-
import {IInstance} from "./IInstance.sol";
|
17
|
-
import {InstanceReader} from "./InstanceReader.sol";
|
18
7
|
import {NftId} from "../types/NftId.sol";
|
8
|
+
import {ClaimId} from "../types/ClaimId.sol";
|
19
9
|
import {NumberId} from "../types/NumberId.sol";
|
20
|
-
import {ObjectType, BUNDLE, DISTRIBUTION, INSTANCE, POLICY, POOL, ROLE, PRODUCT, TARGET} from "../types/ObjectType.sol";
|
10
|
+
import {ObjectType, BUNDLE, DISTRIBUTION, INSTANCE, POLICY, POOL, ROLE, PRODUCT, TARGET, COMPONENT, DISTRIBUTOR, DISTRIBUTOR_TYPE} from "../types/ObjectType.sol";
|
21
11
|
import {RiskId, RiskIdLib} from "../types/RiskId.sol";
|
22
|
-
import {RoleId, RoleIdLib} from "../types/RoleId.sol";
|
12
|
+
import {RoleId, RoleIdLib, INSTANCE_ROLE, INSTANCE_OWNER_ROLE} from "../types/RoleId.sol";
|
23
13
|
import {StateId, ACTIVE} from "../types/StateId.sol";
|
14
|
+
import {TimestampLib} from "../types/Timestamp.sol";
|
15
|
+
import {VersionPart, VersionPartLib} from "../types/Version.sol";
|
16
|
+
|
24
17
|
import {ERC165} from "../shared/ERC165.sol";
|
25
18
|
import {Registerable} from "../shared/Registerable.sol";
|
26
|
-
|
27
|
-
import {
|
19
|
+
|
20
|
+
import {IRegistry} from "../registry/IRegistry.sol";
|
21
|
+
|
22
|
+
import {IInstance} from "./IInstance.sol";
|
23
|
+
import {InstanceReader} from "./InstanceReader.sol";
|
24
|
+
import {InstanceAccessManager} from "./InstanceAccessManager.sol";
|
25
|
+
import {BundleManager} from "./BundleManager.sol";
|
26
|
+
|
27
|
+
import {KeyValueStore} from "./base/KeyValueStore.sol";
|
28
|
+
|
29
|
+
import {IAccess} from "./module/IAccess.sol";
|
30
|
+
import {IBundle} from "./module/IBundle.sol";
|
31
|
+
import {IComponents} from "./module/IComponents.sol";
|
32
|
+
import {IDistribution} from "./module/IDistribution.sol";
|
33
|
+
import {IPolicy} from "./module/IPolicy.sol";
|
34
|
+
import {IRisk} from "./module/IRisk.sol";
|
35
|
+
import {ISetup} from "./module/ISetup.sol";
|
36
|
+
|
28
37
|
import {IDistributionService} from "./service/IDistributionService.sol";
|
29
38
|
import {IPoolService} from "./service/IPoolService.sol";
|
30
|
-
import {
|
39
|
+
import {IProductService} from "./service/IProductService.sol";
|
40
|
+
import {IPolicyService} from "./service/IPolicyService.sol";
|
41
|
+
import {IBundleService} from "./service/IBundleService.sol";
|
42
|
+
import {TokenHandler} from "../shared/TokenHandler.sol";
|
43
|
+
import {VersionPart, VersionPartLib} from "../types/Version.sol";
|
31
44
|
|
32
45
|
contract Instance is
|
33
|
-
AccessManagedSimple,
|
34
|
-
KeyValueStore,
|
35
46
|
IInstance,
|
36
|
-
|
37
|
-
Registerable
|
47
|
+
AccessManagedUpgradeable,
|
48
|
+
Registerable,
|
49
|
+
KeyValueStore
|
38
50
|
{
|
39
51
|
|
52
|
+
uint256 public constant GIF_MAJOR_VERSION = 3;
|
53
|
+
|
40
54
|
uint64 public constant ADMIN_ROLE = type(uint64).min;
|
41
55
|
uint64 public constant PUBLIC_ROLE = type(uint64).max;
|
42
56
|
uint64 public constant CUSTOM_ROLE_ID_MIN = 10000;
|
@@ -45,153 +59,28 @@ contract Instance is
|
|
45
59
|
|
46
60
|
bool private _initialized;
|
47
61
|
|
48
|
-
|
49
|
-
mapping(RoleId roleId => EnumerableSet.AddressSet roleMembers) internal _roleMembers;
|
50
|
-
RoleId [] internal _roles;
|
51
|
-
|
52
|
-
mapping(ShortString name => address target) internal _target;
|
53
|
-
|
54
|
-
AccessManagerSimple internal _accessManager;
|
62
|
+
InstanceAccessManager internal _accessManager;
|
55
63
|
InstanceReader internal _instanceReader;
|
64
|
+
BundleManager internal _bundleManager;
|
56
65
|
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
}
|
61
|
-
|
62
|
-
function initialize(address accessManagerAddress, address registryAddress, NftId registryNftId, address initialOwner) public {
|
63
|
-
require(!_initialized, "Contract instance has already been initialized");
|
64
|
-
|
65
|
-
initializeAccessManagedSimple(accessManagerAddress);
|
66
|
-
|
67
|
-
_accessManager = AccessManagerSimple(accessManagerAddress);
|
68
|
-
_createRole(RoleIdLib.toRoleId(ADMIN_ROLE), "AdminRole", false, false);
|
69
|
-
_createRole(RoleIdLib.toRoleId(PUBLIC_ROLE), "PublicRole", false, false);
|
70
|
-
|
71
|
-
_initializeRegisterable(registryAddress, registryNftId, INSTANCE(), false, initialOwner, "");
|
72
|
-
|
73
|
-
_registerInterface(type(IInstance).interfaceId);
|
74
|
-
_initialized = true;
|
75
|
-
}
|
76
|
-
|
77
|
-
//--- Role ------------------------------------------------------//
|
78
|
-
function createStandardRole(RoleId roleId, string memory name) external restricted() {
|
79
|
-
_createRole(roleId, name, false, true);
|
80
|
-
}
|
81
|
-
|
82
|
-
function createCustomRole(RoleId roleId, string memory name) external restricted() {
|
83
|
-
_createRole(roleId, name, true, true);
|
84
|
-
}
|
85
|
-
|
86
|
-
function updateRole(RoleId roleId, string memory name, StateId newState) external restricted() {
|
87
|
-
(bool isCustom,) = _validateRoleParameters(roleId, name, false);
|
88
|
-
IAccess.RoleInfo memory role = _toRole(roleId, name, isCustom);
|
89
|
-
update(toRoleKey32(roleId), abi.encode(role), newState);
|
90
|
-
}
|
91
|
-
|
92
|
-
function updateRoleState(RoleId roleId, StateId newState) external restricted() {
|
93
|
-
updateState(toRoleKey32(roleId), newState);
|
94
|
-
}
|
95
|
-
|
96
|
-
function grantRole(RoleId roleId, address member) external restricted() returns (bool granted) {
|
97
|
-
Key32 roleKey = toRoleKey32(roleId);
|
98
|
-
|
99
|
-
if (!exists(roleKey)) {
|
100
|
-
revert IAccess.ErrorGrantNonexstentRole(roleId);
|
101
|
-
}
|
102
|
-
|
103
|
-
if (getState(roleKey) != ACTIVE()) {
|
104
|
-
revert IAccess.ErrorRoleIdNotActive(roleId);
|
105
|
-
}
|
106
|
-
|
107
|
-
if (!EnumerableSet.contains(_roleMembers[roleId], member)) {
|
108
|
-
_accessManager.grantRole(roleId.toInt(), member, EXECUTION_DELAY);
|
109
|
-
EnumerableSet.add(_roleMembers[roleId], member);
|
110
|
-
return true;
|
111
|
-
}
|
112
|
-
|
113
|
-
return false;
|
114
|
-
}
|
115
|
-
|
116
|
-
function revokeRole(RoleId roleId, address member) external restricted() returns (bool revoked) {
|
117
|
-
Key32 roleKey = toRoleKey32(roleId);
|
118
|
-
|
119
|
-
if (!exists(roleKey)) {
|
120
|
-
revert IAccess.ErrorRevokeNonexstentRole(roleId);
|
121
|
-
}
|
122
|
-
|
123
|
-
if (EnumerableSet.contains(_roleMembers[roleId], member)) {
|
124
|
-
_accessManager.revokeRole(roleId.toInt(), member);
|
125
|
-
EnumerableSet.remove(_roleMembers[roleId], member);
|
126
|
-
return true;
|
127
|
-
}
|
128
|
-
|
129
|
-
return false;
|
130
|
-
}
|
131
|
-
|
132
|
-
/// @dev not restricted function by intention
|
133
|
-
/// the restriction to role members is already enforced by the call to the access manger
|
134
|
-
function renounceRole(RoleId roleId) external returns (bool revoked) {
|
135
|
-
address member = msg.sender;
|
136
|
-
Key32 roleKey = toRoleKey32(roleId);
|
137
|
-
|
138
|
-
if (!exists(roleKey)) {
|
139
|
-
revert IAccess.ErrorRenounceNonexstentRole(roleId);
|
140
|
-
}
|
141
|
-
|
142
|
-
if (EnumerableSet.contains(_roleMembers[roleId], member)) {
|
143
|
-
_accessManager.renounceRole(roleId.toInt(), member);
|
144
|
-
EnumerableSet.remove(_roleMembers[roleId], member);
|
145
|
-
return true;
|
146
|
-
}
|
147
|
-
|
148
|
-
return false;
|
149
|
-
}
|
150
|
-
|
151
|
-
function roles() external view returns (uint256 numberOfRoles) {
|
152
|
-
return _roles.length;
|
153
|
-
}
|
154
|
-
|
155
|
-
function getRoleId(uint256 idx) external view returns (RoleId roleId) {
|
156
|
-
return _roles[idx];
|
157
|
-
}
|
158
|
-
|
159
|
-
function getRole(RoleId roleId) external view returns (IAccess.RoleInfo memory role) {
|
160
|
-
return abi.decode(getData(roleId.toKey32()), (IAccess.RoleInfo));
|
161
|
-
}
|
162
|
-
|
163
|
-
function roleMembers(RoleId roleId) external view returns (uint256 numberOfMembers) {
|
164
|
-
return EnumerableSet.length(_roleMembers[roleId]);
|
165
|
-
}
|
166
|
-
|
167
|
-
function getRoleMember(RoleId roleId, uint256 idx) external view returns (address roleMember) {
|
168
|
-
return EnumerableSet.at(_roleMembers[roleId], idx);
|
169
|
-
}
|
170
|
-
|
171
|
-
function _createRole(RoleId roleId, string memory name, bool isCustom, bool validateParameters) internal {
|
172
|
-
if (validateParameters) {
|
173
|
-
_validateRoleParameters(roleId, name, isCustom);
|
66
|
+
modifier onlyChainNft() {
|
67
|
+
if(msg.sender != getRegistry().getChainNftAddress()) {
|
68
|
+
revert();
|
174
69
|
}
|
175
|
-
|
176
|
-
IAccess.RoleInfo memory role = _toRole(roleId, name, isCustom);
|
177
|
-
_role[role.name] = roleId;
|
178
|
-
_roles.push(roleId);
|
179
|
-
|
180
|
-
create(toRoleKey32(roleId), abi.encode(role));
|
181
|
-
}
|
182
|
-
|
183
|
-
//--- Target ------------------------------------------------------//
|
184
|
-
function createTarget(address target, IAccess.TargetInfo memory targetInfo) external restricted() {
|
185
|
-
_validateTargetParameters(target, targetInfo);
|
186
|
-
create(toTargetKey32(target), abi.encode(targetInfo));
|
70
|
+
_;
|
187
71
|
}
|
188
72
|
|
189
|
-
function
|
190
|
-
|
191
|
-
|
192
|
-
|
73
|
+
function initialize(address authority, address registryAddress, address initialOwner)
|
74
|
+
public
|
75
|
+
initializer()
|
76
|
+
{
|
77
|
+
__AccessManaged_init(authority);
|
78
|
+
|
79
|
+
IRegistry registry = IRegistry(registryAddress);
|
80
|
+
initializeRegisterable(registryAddress, registry.getNftId(), INSTANCE(), true, initialOwner, "");
|
81
|
+
initializeLifecycle();
|
193
82
|
|
194
|
-
|
83
|
+
registerInterface(type(IInstance).interfaceId);
|
195
84
|
}
|
196
85
|
|
197
86
|
//--- ProductSetup ------------------------------------------------------//
|
@@ -221,55 +110,55 @@ contract Instance is
|
|
221
110
|
}
|
222
111
|
|
223
112
|
//--- PoolSetup ------------------------------------------------------//
|
224
|
-
function createPoolSetup(NftId poolNftId,
|
225
|
-
create(_toNftKey32(poolNftId, POOL()), abi.encode(
|
113
|
+
function createPoolSetup(NftId poolNftId, IComponents.ComponentInfo memory info) external restricted() {
|
114
|
+
create(_toNftKey32(poolNftId, POOL()), abi.encode(info));
|
226
115
|
}
|
227
116
|
|
228
|
-
function updatePoolSetup(NftId poolNftId,
|
229
|
-
update(_toNftKey32(poolNftId, POOL()), abi.encode(
|
117
|
+
function updatePoolSetup(NftId poolNftId, IComponents.ComponentInfo memory info, StateId newState) external restricted() {
|
118
|
+
update(_toNftKey32(poolNftId, POOL()), abi.encode(info), newState);
|
230
119
|
}
|
231
120
|
|
232
121
|
function updatePoolSetupState(NftId poolNftId, StateId newState) external restricted() {
|
233
122
|
updateState(_toNftKey32(poolNftId, POOL()), newState);
|
234
123
|
}
|
235
124
|
|
236
|
-
//--- DistributorType
|
237
|
-
function createDistributorType(
|
238
|
-
create(
|
125
|
+
//--- DistributorType -------------------------------------------------------//
|
126
|
+
function createDistributorType(Key32 distributorKey, IDistribution.DistributorTypeInfo memory info) external restricted() {
|
127
|
+
create(distributorKey, abi.encode(info));
|
239
128
|
}
|
240
129
|
|
241
|
-
function updateDistributorType(
|
242
|
-
update(
|
130
|
+
function updateDistributorType(Key32 distributorKey, IDistribution.DistributorTypeInfo memory info, StateId newState) external restricted() {
|
131
|
+
update(distributorKey, abi.encode(info), newState);
|
243
132
|
}
|
244
133
|
|
245
|
-
function updateDistributorTypeState(
|
246
|
-
updateState(
|
134
|
+
function updateDistributorTypeState(Key32 distributorKey, StateId newState) external restricted() {
|
135
|
+
updateState(distributorKey, newState);
|
247
136
|
}
|
248
137
|
|
249
138
|
//--- Distributor -------------------------------------------------------//
|
250
|
-
function createDistributor(NftId
|
251
|
-
create(
|
139
|
+
function createDistributor(NftId nftId, IDistribution.DistributorInfo memory info) external restricted() {
|
140
|
+
create(toDistributorKey32(nftId), abi.encode(info));
|
252
141
|
}
|
253
142
|
|
254
|
-
function updateDistributor(NftId
|
255
|
-
update(
|
143
|
+
function updateDistributor(NftId nftId, IDistribution.DistributorInfo memory info, StateId newState) external restricted() {
|
144
|
+
update(toDistributorKey32(nftId), abi.encode(info), newState);
|
256
145
|
}
|
257
146
|
|
258
|
-
function updateDistributorState(NftId
|
259
|
-
updateState(
|
147
|
+
function updateDistributorState(NftId nftId, StateId newState) external restricted() {
|
148
|
+
updateState(toDistributorKey32(nftId), newState);
|
260
149
|
}
|
261
150
|
|
262
151
|
//--- Referral ----------------------------------------------------------//
|
263
|
-
function createReferral(
|
264
|
-
create(
|
152
|
+
function createReferral(Key32 referralKey, IDistribution.ReferralInfo memory referralInfo) external restricted() {
|
153
|
+
create(referralKey, abi.encode(referralInfo));
|
265
154
|
}
|
266
155
|
|
267
|
-
function updateReferral(
|
268
|
-
update(
|
156
|
+
function updateReferral(Key32 referralKey, IDistribution.ReferralInfo memory referralInfo, StateId newState) external restricted() {
|
157
|
+
update(referralKey, abi.encode(referralInfo), newState);
|
269
158
|
}
|
270
159
|
|
271
|
-
function updateReferralState(
|
272
|
-
updateState(
|
160
|
+
function updateReferralState(Key32 referralKey, StateId newState) external restricted() {
|
161
|
+
updateState(referralKey, newState);
|
273
162
|
}
|
274
163
|
|
275
164
|
//--- Bundle ------------------------------------------------------------//
|
@@ -298,11 +187,20 @@ contract Instance is
|
|
298
187
|
updateState(riskId.toKey32(), newState);
|
299
188
|
}
|
300
189
|
|
301
|
-
//--- Policy
|
302
|
-
function
|
303
|
-
create(toPolicyKey32(
|
190
|
+
//--- Application (Policy) ----------------------------------------------//
|
191
|
+
function createApplication(NftId applicationNftId, IPolicy.PolicyInfo memory policy) external restricted() {
|
192
|
+
create(toPolicyKey32(applicationNftId), abi.encode(policy));
|
304
193
|
}
|
305
194
|
|
195
|
+
function updateApplication(NftId applicationNftId, IPolicy.PolicyInfo memory policy, StateId newState) external restricted() {
|
196
|
+
update(toPolicyKey32(applicationNftId), abi.encode(policy), newState);
|
197
|
+
}
|
198
|
+
|
199
|
+
function updateApplicationState(NftId applicationNftId, StateId newState) external restricted() {
|
200
|
+
updateState(toPolicyKey32(applicationNftId), newState);
|
201
|
+
}
|
202
|
+
|
203
|
+
//--- Policy ------------------------------------------------------------//
|
306
204
|
function updatePolicy(NftId policyNftId, IPolicy.PolicyInfo memory policy, StateId newState) external restricted() {
|
307
205
|
update(toPolicyKey32(policyNftId), abi.encode(policy), newState);
|
308
206
|
}
|
@@ -312,15 +210,15 @@ contract Instance is
|
|
312
210
|
}
|
313
211
|
|
314
212
|
//--- Claim -------------------------------------------------------------//
|
315
|
-
function createClaim(NftId policyNftId,
|
213
|
+
function createClaim(NftId policyNftId, ClaimId claimId, IPolicy.ClaimInfo memory claim) external restricted() {
|
316
214
|
create(toPolicyKey32(policyNftId), abi.encode(claim));
|
317
215
|
}
|
318
216
|
|
319
|
-
function updateClaim(NftId policyNftId,
|
217
|
+
function updateClaim(NftId policyNftId, ClaimId claimId, IPolicy.ClaimInfo memory claim, StateId newState) external restricted() {
|
320
218
|
update(toPolicyKey32(policyNftId), abi.encode(claim), newState);
|
321
219
|
}
|
322
220
|
|
323
|
-
function updateClaimState(NftId policyNftId, StateId newState) external restricted() {
|
221
|
+
function updateClaimState(NftId policyNftId, ClaimId claimId, StateId newState) external restricted() {
|
324
222
|
updateState(toPolicyKey32(policyNftId), newState);
|
325
223
|
}
|
326
224
|
|
@@ -329,7 +227,7 @@ contract Instance is
|
|
329
227
|
create(toPolicyKey32(policyNftId), abi.encode(payout));
|
330
228
|
}
|
331
229
|
|
332
|
-
function
|
230
|
+
function updatePayout(NftId policyNftId, NumberId payoutId, IPolicy.PayoutInfo memory payout, StateId newState) external restricted() {
|
333
231
|
update(toPolicyKey32(policyNftId), abi.encode(payout), newState);
|
334
232
|
}
|
335
233
|
|
@@ -337,72 +235,18 @@ contract Instance is
|
|
337
235
|
updateState(toPolicyKey32(policyNftId), newState);
|
338
236
|
}
|
339
237
|
|
340
|
-
//---
|
341
|
-
function
|
342
|
-
|
343
|
-
|
344
|
-
returns (IAccess.RoleInfo memory role)
|
345
|
-
{
|
346
|
-
return IAccess.RoleInfo(
|
347
|
-
ShortStrings.toShortString(name),
|
348
|
-
isCustom);
|
349
|
-
}
|
350
|
-
|
351
|
-
function _validateRoleParameters(
|
352
|
-
RoleId roleId,
|
353
|
-
string memory name,
|
354
|
-
bool isCustom
|
355
|
-
)
|
356
|
-
internal
|
357
|
-
view
|
358
|
-
returns (
|
359
|
-
bool roleExists,
|
360
|
-
bool roleIsCustom
|
361
|
-
)
|
362
|
-
{
|
363
|
-
Key32 roleKey = toRoleKey32(roleId);
|
364
|
-
roleExists = exists(roleKey);
|
365
|
-
if (roleExists) {
|
366
|
-
roleIsCustom = abi.decode(getData(roleKey), (IAccess.RoleInfo)).isCustom;
|
367
|
-
} else {
|
368
|
-
roleIsCustom = isCustom;
|
369
|
-
}
|
370
|
-
|
371
|
-
// check role id
|
372
|
-
uint64 roleIdInt = RoleId.unwrap(roleId);
|
373
|
-
if(roleIdInt == ADMIN_ROLE || roleIdInt == PUBLIC_ROLE) {
|
374
|
-
revert IAccess.ErrorRoleIdInvalid(roleId);
|
375
|
-
}
|
376
|
-
|
377
|
-
if (roleIsCustom && roleIdInt < CUSTOM_ROLE_ID_MIN) {
|
378
|
-
revert IAccess.ErrorRoleIdTooSmall(roleId);
|
379
|
-
} else if (roleIsCustom && roleIdInt >= CUSTOM_ROLE_ID_MIN) {
|
380
|
-
revert IAccess.ErrorRoleIdTooBig(roleId);
|
381
|
-
}
|
382
|
-
|
383
|
-
// role name checks
|
384
|
-
ShortString nameShort = ShortStrings.toShortString(name);
|
385
|
-
if (ShortStrings.byteLength(nameShort) == 0) {
|
386
|
-
revert IAccess.ErrorRoleNameEmpty(roleId);
|
387
|
-
}
|
388
|
-
|
389
|
-
if (_role[nameShort] != RoleIdLib.zero() && _role[nameShort] != roleId) {
|
390
|
-
revert IAccess.ErrorRoleNameNotUnique(_role[nameShort], nameShort);
|
391
|
-
}
|
392
|
-
}
|
393
|
-
|
394
|
-
function _validateTargetParameters(address target, IAccess.TargetInfo memory targetInfo) internal view {
|
395
|
-
|
238
|
+
//--- ITransferInterceptor ------------------------------------------------------------//
|
239
|
+
function nftMint(address to, uint256 tokenId) external onlyChainNft {
|
240
|
+
assert(_accessManager.roleMembers(INSTANCE_OWNER_ROLE()) == 0);// temp
|
241
|
+
assert(_accessManager.grantRole(INSTANCE_OWNER_ROLE(), to) == true);
|
396
242
|
}
|
397
243
|
|
398
|
-
function
|
399
|
-
|
400
|
-
|
401
|
-
|
402
|
-
function toTargetKey32(address target) public pure returns (Key32) {
|
403
|
-
return Key32Lib.toKey32(TARGET(), KeyId.wrap(bytes20(target)));
|
244
|
+
function nftTransferFrom(address from, address to, uint256 tokenId) external onlyChainNft {
|
245
|
+
assert(_accessManager.revokeRole(INSTANCE_OWNER_ROLE(), from) == true);
|
246
|
+
assert(_accessManager.grantRole(INSTANCE_OWNER_ROLE(), to) == true);
|
404
247
|
}
|
405
248
|
|
249
|
+
//--- internal view/pure functions --------------------------------------//
|
406
250
|
function _toNftKey32(NftId nftId, ObjectType objectType) internal pure returns (Key32) {
|
407
251
|
return nftId.toKey32(objectType);
|
408
252
|
}
|
@@ -415,29 +259,69 @@ contract Instance is
|
|
415
259
|
return policyNftId.toKey32(POLICY());
|
416
260
|
}
|
417
261
|
|
418
|
-
function
|
419
|
-
return
|
262
|
+
function toDistributionKey32(NftId distNftId) public pure returns (Key32) {
|
263
|
+
return distNftId.toKey32(DISTRIBUTION());
|
264
|
+
}
|
265
|
+
|
266
|
+
function toDistributorTypeKey32(NftId distNftId) public pure returns (Key32) {
|
267
|
+
return distNftId.toKey32(DISTRIBUTOR_TYPE());
|
420
268
|
}
|
421
269
|
|
270
|
+
function toDistributorKey32(NftId distNftId) public pure returns (Key32) {
|
271
|
+
return distNftId.toKey32(DISTRIBUTOR());
|
272
|
+
}
|
273
|
+
|
422
274
|
function getDistributionService() external view returns (IDistributionService) {
|
423
|
-
return IDistributionService(
|
275
|
+
return IDistributionService(getRegistry().getServiceAddress(DISTRIBUTION(), VersionPart.wrap(3)));
|
424
276
|
}
|
425
277
|
|
426
|
-
|
427
|
-
|
428
|
-
|
429
|
-
// }
|
278
|
+
function getProductService() external view returns (IProductService) {
|
279
|
+
return IProductService(getRegistry().getServiceAddress(PRODUCT(), VersionPart.wrap(3)));
|
280
|
+
}
|
430
281
|
|
431
282
|
function getPoolService() external view returns (IPoolService) {
|
432
|
-
return IPoolService(
|
283
|
+
return IPoolService(getRegistry().getServiceAddress(POOL(), VersionPart.wrap(3)));
|
284
|
+
}
|
285
|
+
|
286
|
+
function getPolicyService() external view returns (IPolicyService) {
|
287
|
+
return IPolicyService(getRegistry().getServiceAddress(POLICY(), VersionPart.wrap(3)));
|
288
|
+
}
|
289
|
+
|
290
|
+
function getBundleService() external view returns (IBundleService) {
|
291
|
+
return IBundleService(getRegistry().getServiceAddress(BUNDLE(), VersionPart.wrap(3)));
|
433
292
|
}
|
434
293
|
|
435
294
|
function setInstanceReader(InstanceReader instanceReader) external restricted() {
|
436
|
-
require(
|
295
|
+
require(instanceReader.getInstance() == Instance(this), "InstanceReader instance mismatch");
|
437
296
|
_instanceReader = instanceReader;
|
438
297
|
}
|
439
298
|
|
299
|
+
function getMajorVersion() external pure returns (VersionPart majorVersion) {
|
300
|
+
return VersionPartLib.toVersionPart(GIF_MAJOR_VERSION);
|
301
|
+
}
|
302
|
+
|
440
303
|
function getInstanceReader() external view returns (InstanceReader) {
|
441
304
|
return _instanceReader;
|
442
305
|
}
|
306
|
+
|
307
|
+
function setBundleManager(BundleManager bundleManager) external restricted() {
|
308
|
+
require(address(_bundleManager) == address(0), "BundleManager is set");
|
309
|
+
require(bundleManager.getInstance() == Instance(this), "BundleManager instance mismatch");
|
310
|
+
require(bundleManager.authority() == authority(), "BundleManager authority mismatch");
|
311
|
+
_bundleManager = bundleManager;
|
312
|
+
}
|
313
|
+
|
314
|
+
function getBundleManager() external view returns (BundleManager) {
|
315
|
+
return _bundleManager;
|
316
|
+
}
|
317
|
+
|
318
|
+
function setInstanceAccessManager(InstanceAccessManager accessManager) external restricted {
|
319
|
+
require(address(_accessManager) == address(0), "InstanceAccessManager is set");
|
320
|
+
require(accessManager.authority() == authority(), "InstanceAccessManager authority mismatch");
|
321
|
+
_accessManager = accessManager;
|
322
|
+
}
|
323
|
+
|
324
|
+
function getInstanceAccessManager() external view returns (InstanceAccessManager) {
|
325
|
+
return _accessManager;
|
326
|
+
}
|
443
327
|
}
|