@etherisc/gif-next 0.0.2-def25d4-556 → 0.0.2-e0ff180-766
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 +65 -2
- package/artifacts/contracts/components/Component.sol/Component.dbg.json +4 -0
- package/artifacts/contracts/components/Component.sol/Component.json +842 -0
- package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +1 -1
- package/artifacts/contracts/components/Distribution.sol/Distribution.json +897 -238
- package/artifacts/contracts/components/IComponent.sol/IComponent.dbg.json +4 -0
- package/artifacts/contracts/{shared/RegisterableUpgradable.sol/RegisterableUpgradable.json → components/IComponent.sol/IComponent.json} +295 -132
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +801 -36
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +864 -49
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +682 -9
- package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
- package/artifacts/contracts/components/Pool.sol/Pool.json +844 -258
- package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/components/Product.sol/Product.json +626 -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 +2107 -184
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +321 -168
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +979 -1206
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +593 -180
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +227 -221
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +574 -246
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +360 -91
- 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/instance/base/{ComponentServiceBase.sol/ComponentServiceBase.json → ComponentService.sol/ComponentService.json} +273 -152
- 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 +71 -45
- 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 +1039 -0
- package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.json +673 -0
- package/artifacts/contracts/instance/service/BundleService.sol/BundleService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +1231 -0
- package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +721 -0
- package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.json +817 -0
- package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.json +641 -0
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +1370 -229
- 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 +622 -0
- package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.json +659 -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} +217 -208
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +804 -160
- package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.json +606 -0
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +437 -154
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +90 -391
- package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +1092 -0
- package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +697 -0
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +1237 -0
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +661 -0
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +840 -0
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +653 -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 +232 -219
- 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 +233 -312
- 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 +559 -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 +86 -172
- 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 +191 -163
- 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 +210 -214
- 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/Amount.sol/AmountLib.dbg.json +4 -0
- package/artifacts/contracts/types/Amount.sol/AmountLib.json +161 -0
- 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 +40 -9
- package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +1 -1
- package/artifacts/contracts/types/Key32.sol/Key32Lib.json +2 -2
- package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/NftId.sol/NftIdLib.json +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 +253 -0
- package/contracts/components/Distribution.sol +197 -83
- package/contracts/components/IComponent.sol +76 -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 +225 -180
- 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 +77 -11
- package/contracts/instance/IInstanceService.sol +47 -5
- package/contracts/instance/Instance.sol +152 -268
- package/contracts/instance/InstanceAccessManager.sol +414 -175
- package/contracts/instance/InstanceReader.sol +36 -35
- 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 +121 -0
- package/contracts/instance/base/KeyValueStore.sol +13 -5
- package/contracts/instance/base/Lifecycle.sol +11 -2
- package/contracts/instance/module/IAccess.sol +36 -20
- package/contracts/instance/module/IBundle.sol +8 -4
- package/contracts/instance/module/IComponents.sol +41 -0
- package/contracts/instance/module/IDistribution.sol +2 -0
- package/contracts/instance/module/IPolicy.sol +30 -3
- package/contracts/instance/module/ISetup.sol +9 -19
- package/contracts/instance/service/ApplicationService.sol +350 -0
- package/contracts/instance/service/ApplicationServiceManager.sol +35 -0
- package/contracts/instance/service/BundleService.sol +431 -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 +378 -48
- package/contracts/instance/service/DistributionServiceManager.sol +11 -13
- package/contracts/instance/service/IApplicationService.sol +82 -0
- package/contracts/instance/service/IBundleService.sol +93 -0
- package/contracts/instance/service/IClaimService.sol +61 -0
- package/contracts/instance/service/IDistributionService.sol +87 -0
- package/contracts/instance/service/IPolicyService.sol +72 -0
- package/contracts/instance/service/IPoolService.sol +79 -17
- package/contracts/instance/service/IProductService.sol +6 -73
- package/contracts/instance/service/PolicyService.sol +362 -0
- package/contracts/instance/service/PolicyServiceManager.sol +54 -0
- package/contracts/instance/service/PoolService.sol +303 -0
- package/contracts/instance/service/PoolServiceManager.sol +51 -0
- package/contracts/instance/service/ProductService.sol +210 -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 +48 -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 +114 -231
- package/contracts/registry/RegistryServiceManager.sol +21 -39
- package/contracts/registry/ReleaseManager.sol +324 -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 +5 -4
- 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 +42 -24
- 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/Amount.sol +60 -0
- 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 +13 -5
- 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,41 +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
|
-
import {
|
38
|
+
import {IPoolService} from "./service/IPoolService.sol";
|
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";
|
30
44
|
|
31
45
|
contract Instance is
|
32
|
-
AccessManagedSimple,
|
33
|
-
KeyValueStore,
|
34
46
|
IInstance,
|
35
|
-
|
36
|
-
Registerable
|
47
|
+
AccessManagedUpgradeable,
|
48
|
+
Registerable,
|
49
|
+
KeyValueStore
|
37
50
|
{
|
38
51
|
|
52
|
+
uint256 public constant GIF_MAJOR_VERSION = 3;
|
53
|
+
|
39
54
|
uint64 public constant ADMIN_ROLE = type(uint64).min;
|
40
55
|
uint64 public constant PUBLIC_ROLE = type(uint64).max;
|
41
56
|
uint64 public constant CUSTOM_ROLE_ID_MIN = 10000;
|
@@ -44,153 +59,28 @@ contract Instance is
|
|
44
59
|
|
45
60
|
bool private _initialized;
|
46
61
|
|
47
|
-
|
48
|
-
mapping(RoleId roleId => EnumerableSet.AddressSet roleMembers) internal _roleMembers;
|
49
|
-
RoleId [] internal _roles;
|
50
|
-
|
51
|
-
mapping(ShortString name => address target) internal _target;
|
52
|
-
|
53
|
-
AccessManagerSimple internal _accessManager;
|
62
|
+
InstanceAccessManager internal _accessManager;
|
54
63
|
InstanceReader internal _instanceReader;
|
64
|
+
BundleManager internal _bundleManager;
|
55
65
|
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
}
|
60
|
-
|
61
|
-
function initialize(address accessManagerAddress, address registryAddress, NftId registryNftId, address initialOwner) public {
|
62
|
-
require(!_initialized, "Contract instance has already been initialized");
|
63
|
-
|
64
|
-
initializeAccessManagedSimple(accessManagerAddress);
|
65
|
-
|
66
|
-
_accessManager = AccessManagerSimple(accessManagerAddress);
|
67
|
-
_createRole(RoleIdLib.toRoleId(ADMIN_ROLE), "AdminRole", false, false);
|
68
|
-
_createRole(RoleIdLib.toRoleId(PUBLIC_ROLE), "PublicRole", false, false);
|
69
|
-
|
70
|
-
_initializeRegisterable(registryAddress, registryNftId, INSTANCE(), false, initialOwner, "");
|
71
|
-
|
72
|
-
_registerInterface(type(IInstance).interfaceId);
|
73
|
-
_initialized = true;
|
74
|
-
}
|
75
|
-
|
76
|
-
//--- Role ------------------------------------------------------//
|
77
|
-
function createStandardRole(RoleId roleId, string memory name) external restricted() {
|
78
|
-
_createRole(roleId, name, false, true);
|
79
|
-
}
|
80
|
-
|
81
|
-
function createCustomRole(RoleId roleId, string memory name) external restricted() {
|
82
|
-
_createRole(roleId, name, true, true);
|
83
|
-
}
|
84
|
-
|
85
|
-
function updateRole(RoleId roleId, string memory name, StateId newState) external restricted() {
|
86
|
-
(bool isCustom,) = _validateRoleParameters(roleId, name, false);
|
87
|
-
IAccess.RoleInfo memory role = _toRole(roleId, name, isCustom);
|
88
|
-
update(toRoleKey32(roleId), abi.encode(role), newState);
|
89
|
-
}
|
90
|
-
|
91
|
-
function updateRoleState(RoleId roleId, StateId newState) external restricted() {
|
92
|
-
updateState(toRoleKey32(roleId), newState);
|
93
|
-
}
|
94
|
-
|
95
|
-
function grantRole(RoleId roleId, address member) external restricted() returns (bool granted) {
|
96
|
-
Key32 roleKey = toRoleKey32(roleId);
|
97
|
-
|
98
|
-
if (!exists(roleKey)) {
|
99
|
-
revert IAccess.ErrorGrantNonexstentRole(roleId);
|
66
|
+
modifier onlyChainNft() {
|
67
|
+
if(msg.sender != getRegistry().getChainNftAddress()) {
|
68
|
+
revert();
|
100
69
|
}
|
101
|
-
|
102
|
-
if (getState(roleKey) != ACTIVE()) {
|
103
|
-
revert IAccess.ErrorRoleIdNotActive(roleId);
|
104
|
-
}
|
105
|
-
|
106
|
-
if (!EnumerableSet.contains(_roleMembers[roleId], member)) {
|
107
|
-
_accessManager.grantRole(roleId.toInt(), member, EXECUTION_DELAY);
|
108
|
-
EnumerableSet.add(_roleMembers[roleId], member);
|
109
|
-
return true;
|
110
|
-
}
|
111
|
-
|
112
|
-
return false;
|
70
|
+
_;
|
113
71
|
}
|
114
72
|
|
115
|
-
function
|
116
|
-
|
117
|
-
|
118
|
-
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
|
124
|
-
EnumerableSet.remove(_roleMembers[roleId], member);
|
125
|
-
return true;
|
126
|
-
}
|
127
|
-
|
128
|
-
return false;
|
129
|
-
}
|
130
|
-
|
131
|
-
/// @dev not restricted function by intention
|
132
|
-
/// the restriction to role members is already enforced by the call to the access manger
|
133
|
-
function renounceRole(RoleId roleId) external returns (bool revoked) {
|
134
|
-
address member = msg.sender;
|
135
|
-
Key32 roleKey = toRoleKey32(roleId);
|
136
|
-
|
137
|
-
if (!exists(roleKey)) {
|
138
|
-
revert IAccess.ErrorRenounceNonexstentRole(roleId);
|
139
|
-
}
|
140
|
-
|
141
|
-
if (EnumerableSet.contains(_roleMembers[roleId], member)) {
|
142
|
-
_accessManager.renounceRole(roleId.toInt(), member);
|
143
|
-
EnumerableSet.remove(_roleMembers[roleId], member);
|
144
|
-
return true;
|
145
|
-
}
|
146
|
-
|
147
|
-
return false;
|
148
|
-
}
|
149
|
-
|
150
|
-
function roles() external view returns (uint256 numberOfRoles) {
|
151
|
-
return _roles.length;
|
152
|
-
}
|
153
|
-
|
154
|
-
function getRoleId(uint256 idx) external view returns (RoleId roleId) {
|
155
|
-
return _roles[idx];
|
156
|
-
}
|
157
|
-
|
158
|
-
function getRole(RoleId roleId) external view returns (IAccess.RoleInfo memory role) {
|
159
|
-
return abi.decode(getData(roleId.toKey32()), (IAccess.RoleInfo));
|
160
|
-
}
|
161
|
-
|
162
|
-
function roleMembers(RoleId roleId) external view returns (uint256 numberOfMembers) {
|
163
|
-
return EnumerableSet.length(_roleMembers[roleId]);
|
164
|
-
}
|
165
|
-
|
166
|
-
function getRoleMember(RoleId roleId, uint256 idx) external view returns (address roleMember) {
|
167
|
-
return EnumerableSet.at(_roleMembers[roleId], idx);
|
168
|
-
}
|
169
|
-
|
170
|
-
function _createRole(RoleId roleId, string memory name, bool isCustom, bool validateParameters) internal {
|
171
|
-
if (validateParameters) {
|
172
|
-
_validateRoleParameters(roleId, name, isCustom);
|
173
|
-
}
|
174
|
-
|
175
|
-
IAccess.RoleInfo memory role = _toRole(roleId, name, isCustom);
|
176
|
-
_role[role.name] = roleId;
|
177
|
-
_roles.push(roleId);
|
178
|
-
|
179
|
-
create(toRoleKey32(roleId), abi.encode(role));
|
180
|
-
}
|
181
|
-
|
182
|
-
//--- Target ------------------------------------------------------//
|
183
|
-
function createTarget(address target, IAccess.TargetInfo memory targetInfo) external restricted() {
|
184
|
-
_validateTargetParameters(target, targetInfo);
|
185
|
-
create(toTargetKey32(target), abi.encode(targetInfo));
|
186
|
-
}
|
187
|
-
|
188
|
-
function setTargetClosed(address target, bool closed) external restricted() {
|
189
|
-
if (!exists(toTargetKey32(target))) {
|
190
|
-
revert IAccess.ErrorTargetDoesNotExist(target);
|
191
|
-
}
|
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();
|
192
82
|
|
193
|
-
|
83
|
+
registerInterface(type(IInstance).interfaceId);
|
194
84
|
}
|
195
85
|
|
196
86
|
//--- ProductSetup ------------------------------------------------------//
|
@@ -220,55 +110,55 @@ contract Instance is
|
|
220
110
|
}
|
221
111
|
|
222
112
|
//--- PoolSetup ------------------------------------------------------//
|
223
|
-
function createPoolSetup(NftId
|
224
|
-
create(_toNftKey32(
|
113
|
+
function createPoolSetup(NftId poolNftId, IComponents.ComponentInfo memory info) external restricted() {
|
114
|
+
create(_toNftKey32(poolNftId, POOL()), abi.encode(info));
|
225
115
|
}
|
226
116
|
|
227
|
-
function updatePoolSetup(NftId
|
228
|
-
update(_toNftKey32(
|
117
|
+
function updatePoolSetup(NftId poolNftId, IComponents.ComponentInfo memory info, StateId newState) external restricted() {
|
118
|
+
update(_toNftKey32(poolNftId, POOL()), abi.encode(info), newState);
|
229
119
|
}
|
230
120
|
|
231
|
-
function updatePoolSetupState(NftId
|
232
|
-
updateState(_toNftKey32(
|
121
|
+
function updatePoolSetupState(NftId poolNftId, StateId newState) external restricted() {
|
122
|
+
updateState(_toNftKey32(poolNftId, POOL()), newState);
|
233
123
|
}
|
234
124
|
|
235
|
-
//--- DistributorType
|
236
|
-
function createDistributorType(
|
237
|
-
create(
|
125
|
+
//--- DistributorType -------------------------------------------------------//
|
126
|
+
function createDistributorType(Key32 distributorKey, IDistribution.DistributorTypeInfo memory info) external restricted() {
|
127
|
+
create(distributorKey, abi.encode(info));
|
238
128
|
}
|
239
129
|
|
240
|
-
function updateDistributorType(
|
241
|
-
update(
|
130
|
+
function updateDistributorType(Key32 distributorKey, IDistribution.DistributorTypeInfo memory info, StateId newState) external restricted() {
|
131
|
+
update(distributorKey, abi.encode(info), newState);
|
242
132
|
}
|
243
133
|
|
244
|
-
function updateDistributorTypeState(
|
245
|
-
updateState(
|
134
|
+
function updateDistributorTypeState(Key32 distributorKey, StateId newState) external restricted() {
|
135
|
+
updateState(distributorKey, newState);
|
246
136
|
}
|
247
137
|
|
248
138
|
//--- Distributor -------------------------------------------------------//
|
249
|
-
function createDistributor(NftId
|
250
|
-
create(
|
139
|
+
function createDistributor(NftId nftId, IDistribution.DistributorInfo memory info) external restricted() {
|
140
|
+
create(toDistributorKey32(nftId), abi.encode(info));
|
251
141
|
}
|
252
142
|
|
253
|
-
function updateDistributor(NftId
|
254
|
-
update(
|
143
|
+
function updateDistributor(NftId nftId, IDistribution.DistributorInfo memory info, StateId newState) external restricted() {
|
144
|
+
update(toDistributorKey32(nftId), abi.encode(info), newState);
|
255
145
|
}
|
256
146
|
|
257
|
-
function updateDistributorState(NftId
|
258
|
-
updateState(
|
147
|
+
function updateDistributorState(NftId nftId, StateId newState) external restricted() {
|
148
|
+
updateState(toDistributorKey32(nftId), newState);
|
259
149
|
}
|
260
150
|
|
261
151
|
//--- Referral ----------------------------------------------------------//
|
262
|
-
function createReferral(
|
263
|
-
create(
|
152
|
+
function createReferral(Key32 referralKey, IDistribution.ReferralInfo memory referralInfo) external restricted() {
|
153
|
+
create(referralKey, abi.encode(referralInfo));
|
264
154
|
}
|
265
155
|
|
266
|
-
function updateReferral(
|
267
|
-
update(
|
156
|
+
function updateReferral(Key32 referralKey, IDistribution.ReferralInfo memory referralInfo, StateId newState) external restricted() {
|
157
|
+
update(referralKey, abi.encode(referralInfo), newState);
|
268
158
|
}
|
269
159
|
|
270
|
-
function updateReferralState(
|
271
|
-
updateState(
|
160
|
+
function updateReferralState(Key32 referralKey, StateId newState) external restricted() {
|
161
|
+
updateState(referralKey, newState);
|
272
162
|
}
|
273
163
|
|
274
164
|
//--- Bundle ------------------------------------------------------------//
|
@@ -297,11 +187,20 @@ contract Instance is
|
|
297
187
|
updateState(riskId.toKey32(), newState);
|
298
188
|
}
|
299
189
|
|
300
|
-
//--- Policy
|
301
|
-
function
|
302
|
-
create(toPolicyKey32(
|
190
|
+
//--- Application (Policy) ----------------------------------------------//
|
191
|
+
function createApplication(NftId applicationNftId, IPolicy.PolicyInfo memory policy) external restricted() {
|
192
|
+
create(toPolicyKey32(applicationNftId), abi.encode(policy));
|
193
|
+
}
|
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);
|
303
201
|
}
|
304
202
|
|
203
|
+
//--- Policy ------------------------------------------------------------//
|
305
204
|
function updatePolicy(NftId policyNftId, IPolicy.PolicyInfo memory policy, StateId newState) external restricted() {
|
306
205
|
update(toPolicyKey32(policyNftId), abi.encode(policy), newState);
|
307
206
|
}
|
@@ -311,15 +210,15 @@ contract Instance is
|
|
311
210
|
}
|
312
211
|
|
313
212
|
//--- Claim -------------------------------------------------------------//
|
314
|
-
function createClaim(NftId policyNftId,
|
213
|
+
function createClaim(NftId policyNftId, ClaimId claimId, IPolicy.ClaimInfo memory claim) external restricted() {
|
315
214
|
create(toPolicyKey32(policyNftId), abi.encode(claim));
|
316
215
|
}
|
317
216
|
|
318
|
-
function updateClaim(NftId policyNftId,
|
217
|
+
function updateClaim(NftId policyNftId, ClaimId claimId, IPolicy.ClaimInfo memory claim, StateId newState) external restricted() {
|
319
218
|
update(toPolicyKey32(policyNftId), abi.encode(claim), newState);
|
320
219
|
}
|
321
220
|
|
322
|
-
function updateClaimState(NftId policyNftId, StateId newState) external restricted() {
|
221
|
+
function updateClaimState(NftId policyNftId, ClaimId claimId, StateId newState) external restricted() {
|
323
222
|
updateState(toPolicyKey32(policyNftId), newState);
|
324
223
|
}
|
325
224
|
|
@@ -328,7 +227,7 @@ contract Instance is
|
|
328
227
|
create(toPolicyKey32(policyNftId), abi.encode(payout));
|
329
228
|
}
|
330
229
|
|
331
|
-
function
|
230
|
+
function updatePayout(NftId policyNftId, NumberId payoutId, IPolicy.PayoutInfo memory payout, StateId newState) external restricted() {
|
332
231
|
update(toPolicyKey32(policyNftId), abi.encode(payout), newState);
|
333
232
|
}
|
334
233
|
|
@@ -336,72 +235,18 @@ contract Instance is
|
|
336
235
|
updateState(toPolicyKey32(policyNftId), newState);
|
337
236
|
}
|
338
237
|
|
339
|
-
//---
|
340
|
-
function
|
341
|
-
|
342
|
-
|
343
|
-
returns (IAccess.RoleInfo memory role)
|
344
|
-
{
|
345
|
-
return IAccess.RoleInfo(
|
346
|
-
ShortStrings.toShortString(name),
|
347
|
-
isCustom);
|
348
|
-
}
|
349
|
-
|
350
|
-
function _validateRoleParameters(
|
351
|
-
RoleId roleId,
|
352
|
-
string memory name,
|
353
|
-
bool isCustom
|
354
|
-
)
|
355
|
-
internal
|
356
|
-
view
|
357
|
-
returns (
|
358
|
-
bool roleExists,
|
359
|
-
bool roleIsCustom
|
360
|
-
)
|
361
|
-
{
|
362
|
-
Key32 roleKey = toRoleKey32(roleId);
|
363
|
-
roleExists = exists(roleKey);
|
364
|
-
if (roleExists) {
|
365
|
-
roleIsCustom = abi.decode(getData(roleKey), (IAccess.RoleInfo)).isCustom;
|
366
|
-
} else {
|
367
|
-
roleIsCustom = isCustom;
|
368
|
-
}
|
369
|
-
|
370
|
-
// check role id
|
371
|
-
uint64 roleIdInt = RoleId.unwrap(roleId);
|
372
|
-
if(roleIdInt == ADMIN_ROLE || roleIdInt == PUBLIC_ROLE) {
|
373
|
-
revert IAccess.ErrorRoleIdInvalid(roleId);
|
374
|
-
}
|
375
|
-
|
376
|
-
if (roleIsCustom && roleIdInt < CUSTOM_ROLE_ID_MIN) {
|
377
|
-
revert IAccess.ErrorRoleIdTooSmall(roleId);
|
378
|
-
} else if (roleIsCustom && roleIdInt >= CUSTOM_ROLE_ID_MIN) {
|
379
|
-
revert IAccess.ErrorRoleIdTooBig(roleId);
|
380
|
-
}
|
381
|
-
|
382
|
-
// role name checks
|
383
|
-
ShortString nameShort = ShortStrings.toShortString(name);
|
384
|
-
if (ShortStrings.byteLength(nameShort) == 0) {
|
385
|
-
revert IAccess.ErrorRoleNameEmpty(roleId);
|
386
|
-
}
|
387
|
-
|
388
|
-
if (_role[nameShort] != RoleIdLib.zero() && _role[nameShort] != roleId) {
|
389
|
-
revert IAccess.ErrorRoleNameNotUnique(_role[nameShort], nameShort);
|
390
|
-
}
|
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);
|
391
242
|
}
|
392
243
|
|
393
|
-
function
|
394
|
-
|
395
|
-
|
396
|
-
|
397
|
-
function toRoleKey32(RoleId roleId) public pure returns (Key32) {
|
398
|
-
return roleId.toKey32();
|
399
|
-
}
|
400
|
-
|
401
|
-
function toTargetKey32(address target) public pure returns (Key32) {
|
402
|
-
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);
|
403
247
|
}
|
404
248
|
|
249
|
+
//--- internal view/pure functions --------------------------------------//
|
405
250
|
function _toNftKey32(NftId nftId, ObjectType objectType) internal pure returns (Key32) {
|
406
251
|
return nftId.toKey32(objectType);
|
407
252
|
}
|
@@ -414,30 +259,69 @@ contract Instance is
|
|
414
259
|
return policyNftId.toKey32(POLICY());
|
415
260
|
}
|
416
261
|
|
417
|
-
function
|
418
|
-
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());
|
419
268
|
}
|
420
269
|
|
270
|
+
function toDistributorKey32(NftId distNftId) public pure returns (Key32) {
|
271
|
+
return distNftId.toKey32(DISTRIBUTOR());
|
272
|
+
}
|
273
|
+
|
421
274
|
function getDistributionService() external view returns (IDistributionService) {
|
422
|
-
return IDistributionService(
|
275
|
+
return IDistributionService(getRegistry().getServiceAddress(DISTRIBUTION(), VersionPart.wrap(3)));
|
276
|
+
}
|
277
|
+
|
278
|
+
function getProductService() external view returns (IProductService) {
|
279
|
+
return IProductService(getRegistry().getServiceAddress(PRODUCT(), VersionPart.wrap(3)));
|
280
|
+
}
|
281
|
+
|
282
|
+
function getPoolService() external view returns (IPoolService) {
|
283
|
+
return IPoolService(getRegistry().getServiceAddress(POOL(), VersionPart.wrap(3)));
|
423
284
|
}
|
424
285
|
|
425
|
-
|
426
|
-
|
427
|
-
|
428
|
-
// }
|
286
|
+
function getPolicyService() external view returns (IPolicyService) {
|
287
|
+
return IPolicyService(getRegistry().getServiceAddress(POLICY(), VersionPart.wrap(3)));
|
288
|
+
}
|
429
289
|
|
430
|
-
|
431
|
-
|
432
|
-
|
433
|
-
// }
|
290
|
+
function getBundleService() external view returns (IBundleService) {
|
291
|
+
return IBundleService(getRegistry().getServiceAddress(BUNDLE(), VersionPart.wrap(3)));
|
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
|
}
|