@etherisc/gif-next 0.0.2-f7eda15-119 → 0.0.2-f831797-539
Sign up to get free protection for your applications and to get access to all the features.
- package/README.md +73 -1
- package/artifacts/contracts/components/Component.sol/Component.dbg.json +1 -1
- package/artifacts/contracts/components/Component.sol/Component.json +252 -94
- package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +1 -1
- package/artifacts/contracts/components/Distribution.sol/Distribution.json +611 -159
- package/artifacts/contracts/components/IComponent.sol/IComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IComponent.sol/IComponent.json +104 -72
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +311 -108
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +331 -164
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +108 -144
- package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
- package/artifacts/contracts/components/Pool.sol/Pool.json +553 -185
- package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/components/Product.sol/Product.json +356 -166
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +1 -1
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +30 -11
- package/artifacts/contracts/instance/Cloneable.sol/Cloneable.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.json +722 -422
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +94 -171
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +911 -779
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +39 -89
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +119 -216
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +276 -254
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +319 -99
- package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +1 -1
- package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json +2 -2
- package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.json +118 -169
- 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 +13 -13
- 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 +1 -1
- package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +306 -315
- package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +305 -93
- 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 +1207 -255
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +449 -85
- 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 +1 -1
- package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.json +155 -240
- package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.json +409 -0
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +711 -139
- package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.json +60 -286
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +81 -147
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +22 -169
- package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +185 -391
- package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +311 -127
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +214 -204
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +306 -90
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +142 -221
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +302 -90
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +15 -2
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +83 -174
- package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registry.json +28 -15
- package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +2 -2
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +193 -216
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +300 -94
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +1 -1
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +11 -11
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +141 -37
- 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 -29
- 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 +22 -169
- 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 +113 -33
- 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 -74
- package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
- package/artifacts/contracts/shared/Registerable.sol/Registerable.json +125 -55
- 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 +113 -164
- 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 +125 -55
- package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
- package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +2 -2
- package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
- package/artifacts/contracts/test/TestService.sol/TestService.json +134 -221
- 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 +2 -2
- package/artifacts/contracts/types/NumberId.sol/NumberIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
- package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.json +2 -2
- package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.dbg.json +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 +103 -78
- package/contracts/components/Distribution.sol +187 -57
- package/contracts/components/IComponent.sol +48 -17
- package/contracts/components/IDistributionComponent.sol +39 -15
- package/contracts/components/IPoolComponent.sol +84 -31
- package/contracts/components/IProductComponent.sol +3 -2
- package/contracts/components/Pool.sol +217 -145
- package/contracts/components/Product.sol +97 -69
- package/contracts/instance/BundleManager.sol +7 -5
- package/contracts/instance/IInstance.sol +24 -3
- package/contracts/instance/IInstanceService.sol +20 -1
- package/contracts/instance/Instance.sol +65 -39
- package/contracts/instance/InstanceAccessManager.sol +12 -13
- package/contracts/instance/InstanceReader.sol +4 -3
- package/contracts/instance/InstanceService.sol +111 -57
- package/contracts/instance/InstanceServiceManager.sol +1 -1
- package/contracts/instance/base/ComponentService.sol +1 -1
- package/contracts/instance/base/KeyValueStore.sol +5 -2
- package/contracts/instance/base/Lifecycle.sol +11 -2
- package/contracts/instance/module/IAccess.sol +3 -4
- 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 +7 -20
- package/contracts/instance/service/ApplicationService.sol +350 -0
- package/contracts/instance/service/ApplicationServiceManager.sol +35 -0
- package/contracts/instance/service/BundleService.sol +82 -39
- package/contracts/instance/service/BundleServiceManager.sol +1 -1
- package/contracts/instance/service/ClaimService.sol +151 -0
- package/contracts/instance/service/ClaimServiceManager.sol +35 -0
- package/contracts/instance/service/DistributionService.sol +360 -16
- package/contracts/instance/service/DistributionServiceManager.sol +1 -1
- package/contracts/instance/service/IApplicationService.sol +82 -0
- package/contracts/instance/service/IBundleService.sol +30 -12
- package/contracts/instance/service/IClaimService.sol +61 -0
- package/contracts/instance/service/IDistributionService.sol +86 -0
- package/contracts/instance/service/IPolicyService.sol +27 -49
- package/contracts/instance/service/IPoolService.sol +17 -2
- package/contracts/instance/service/PolicyService.sol +148 -283
- package/contracts/instance/service/PolicyServiceManager.sol +2 -2
- package/contracts/instance/service/PoolService.sol +75 -22
- package/contracts/instance/service/PoolServiceManager.sol +1 -1
- package/contracts/instance/service/ProductService.sol +10 -11
- package/contracts/instance/service/ProductServiceManager.sol +2 -2
- package/contracts/registry/IRegistry.sol +3 -2
- package/contracts/registry/IRegistryService.sol +10 -8
- package/contracts/registry/Registry.sol +20 -8
- package/contracts/registry/RegistryService.sol +69 -48
- package/contracts/registry/RegistryServiceManager.sol +13 -13
- package/contracts/registry/ReleaseManager.sol +18 -28
- package/contracts/registry/TokenRegistry.sol +16 -12
- 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 +3 -3
- package/contracts/shared/IRegistryLinked.sol +12 -0
- package/contracts/shared/IService.sol +2 -0
- package/contracts/shared/IVersionable.sol +4 -47
- package/contracts/shared/NftOwnable.sol +66 -85
- package/contracts/shared/PolicyHolder.sol +81 -0
- package/contracts/shared/ProxyManager.sol +100 -25
- package/contracts/shared/Registerable.sol +7 -19
- package/contracts/shared/RegistryLinked.sol +48 -0
- package/contracts/shared/Service.sol +15 -17
- 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 +1 -1
- 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/ObjectType.sol +10 -5
- package/contracts/types/PayoutId.sol +54 -0
- package/contracts/types/Referral.sol +4 -0
- package/contracts/types/RoleId.sol +10 -5
- 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/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/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
@@ -41,7 +41,7 @@ contract ReleaseManager is AccessManaged
|
|
41
41
|
error SelfRegistration();
|
42
42
|
error RegisterableOwnerIsRegistered();
|
43
43
|
|
44
|
-
//
|
44
|
+
// _verifyService
|
45
45
|
error UnexpectedServiceVersion(VersionPart expected, VersionPart found);
|
46
46
|
error UnexpectedServiceDomain(ObjectType expected, ObjectType found);
|
47
47
|
|
@@ -61,7 +61,7 @@ contract ReleaseManager is AccessManaged
|
|
61
61
|
|
62
62
|
mapping(VersionPart version => IRegistry.ReleaseInfo info) _release;
|
63
63
|
|
64
|
-
mapping(VersionPart version => mapping(ObjectType serviceDomain => bytes4))
|
64
|
+
mapping(VersionPart version => mapping(ObjectType serviceDomain => bytes4[])) _selectors; // registry service function selector assigned to domain
|
65
65
|
|
66
66
|
uint _awaitingRegistration; // "services left to register" counter
|
67
67
|
|
@@ -148,12 +148,8 @@ contract ReleaseManager is AccessManaged
|
|
148
148
|
|
149
149
|
VersionPart version = _next;
|
150
150
|
ObjectType domain = REGISTRY();
|
151
|
-
|
152
|
-
|
153
|
-
// data: config bytes
|
151
|
+
_verifyService(service, version, domain);
|
154
152
|
_createRelease(service.getFunctionConfigs());
|
155
|
-
|
156
|
-
//setTargetClosed(service, true);
|
157
153
|
|
158
154
|
nftId = _registry.registerService(info, version, domain);
|
159
155
|
|
@@ -175,17 +171,16 @@ contract ReleaseManager is AccessManaged
|
|
175
171
|
IRegistry.ObjectInfo memory info = _getAndVerifyContractInfo(service, SERVICE(), msg.sender);
|
176
172
|
VersionPart version = getNextVersion();
|
177
173
|
ObjectType domain = _release[version].domains[_awaitingRegistration];// reversed registration order of services specified in RegistryService config
|
178
|
-
|
174
|
+
_verifyService(service, version, domain);
|
179
175
|
|
180
176
|
// setup and grant unique role if service does registrations
|
181
|
-
bytes4[] memory
|
182
|
-
selector[0] = _selector[version][domain];
|
177
|
+
bytes4[] memory selectors = _selectors[version][domain];
|
183
178
|
address registryService = _registry.getServiceAddress(REGISTRY(), version);
|
184
|
-
if(
|
179
|
+
if(selectors.length > 0) {
|
185
180
|
_accessManager.setAndGrantUniqueRole(
|
186
181
|
address(service),
|
187
182
|
registryService,
|
188
|
-
|
183
|
+
selectors);
|
189
184
|
}
|
190
185
|
|
191
186
|
_awaitingRegistration--;
|
@@ -267,8 +262,8 @@ contract ReleaseManager is AccessManaged
|
|
267
262
|
}
|
268
263
|
}
|
269
264
|
|
270
|
-
function
|
271
|
-
|
265
|
+
function _verifyService(
|
266
|
+
IService service,
|
272
267
|
VersionPart expectedVersion,
|
273
268
|
ObjectType expectedDomain
|
274
269
|
)
|
@@ -276,20 +271,15 @@ contract ReleaseManager is AccessManaged
|
|
276
271
|
view
|
277
272
|
returns(ObjectType)
|
278
273
|
{
|
279
|
-
(
|
280
|
-
|
281
|
-
VersionPart version
|
282
|
-
) = abi.decode(info.data, (ObjectType, VersionPart));
|
283
|
-
|
284
|
-
if(version != expectedVersion) {
|
285
|
-
revert UnexpectedServiceVersion(expectedVersion, version);
|
274
|
+
if(service.getMajorVersion() != expectedVersion) {
|
275
|
+
revert UnexpectedServiceVersion(expectedVersion, service.getMajorVersion());
|
286
276
|
}
|
287
277
|
|
288
|
-
if(
|
289
|
-
revert UnexpectedServiceDomain(expectedDomain,
|
278
|
+
if(service.getDomain() != expectedDomain) {
|
279
|
+
revert UnexpectedServiceDomain(expectedDomain, service.getDomain());
|
290
280
|
}
|
291
281
|
|
292
|
-
return
|
282
|
+
return expectedDomain;
|
293
283
|
}
|
294
284
|
|
295
285
|
// TODO check if registry supports types specified in the config array
|
@@ -306,21 +296,21 @@ contract ReleaseManager is AccessManaged
|
|
306
296
|
for(uint idx = 0; idx < config.length; idx++)
|
307
297
|
{
|
308
298
|
ObjectType domain = config[idx].serviceDomain;
|
309
|
-
bytes4 selector = config[idx].selector;
|
310
|
-
|
311
299
|
// not "registry service" / zero domain
|
312
300
|
if(
|
313
301
|
domain == REGISTRY() ||
|
314
302
|
domain.eqz()
|
315
303
|
) { revert ConfigServiceDomainInvalid(idx, domain); }
|
316
304
|
|
305
|
+
bytes4[] memory selectors = config[idx].selectors;
|
306
|
+
|
317
307
|
// TODO can be zero -> e.g. duplicate domain, first with zero selector, second with non zero selector -> need to check _release[version].domains.contains(domain) instead
|
318
308
|
// no overwrite
|
319
|
-
if(
|
309
|
+
if(_selectors[version][domain].length > 0) {
|
320
310
|
revert SelectorAlreadyExists(version, domain);
|
321
311
|
}
|
322
312
|
|
323
|
-
|
313
|
+
_selectors[version][domain] = selectors;
|
324
314
|
_release[version].domains.push(domain);
|
325
315
|
}
|
326
316
|
// TODO set when activated?
|
@@ -26,9 +26,19 @@ contract TokenRegistry is
|
|
26
26
|
mapping(address token => bool registered) internal _registered;
|
27
27
|
mapping(address token => mapping(VersionPart majorVersion => bool isActive)) internal _active;
|
28
28
|
|
29
|
-
constructor(
|
30
|
-
|
31
|
-
|
29
|
+
constructor(
|
30
|
+
address registry
|
31
|
+
)
|
32
|
+
{
|
33
|
+
initialize(registry);
|
34
|
+
}
|
35
|
+
|
36
|
+
function initialize(address registry)
|
37
|
+
public
|
38
|
+
initializer()
|
39
|
+
{
|
40
|
+
initializeNftOwnable(msg.sender, registry);
|
41
|
+
}
|
32
42
|
|
33
43
|
|
34
44
|
/// @dev link ownership of token registry to nft owner of registry service
|
@@ -40,9 +50,8 @@ contract TokenRegistry is
|
|
40
50
|
IRegistry registry = IRegistry(registryAddress);
|
41
51
|
// TODO use _latest instead of _initial -> but _latest is 0 before first release activation
|
42
52
|
address registryServiceAddress = registry.getServiceAddress(REGISTRY(), registry.getNextVersion());
|
43
|
-
//address registryServiceAddress = registry.getServiceAddress(REGISTRY(), registry.getInitialVersion());
|
44
53
|
|
45
|
-
_linkToNftOwnable(
|
54
|
+
_linkToNftOwnable(registryServiceAddress);
|
46
55
|
}
|
47
56
|
|
48
57
|
/// @dev token state is informative, registry have no clue about used tokens
|
@@ -60,7 +69,7 @@ contract TokenRegistry is
|
|
60
69
|
// verify valid major version
|
61
70
|
// ensure major version increments is one
|
62
71
|
uint256 version = majorVersion.toInt();
|
63
|
-
if (!
|
72
|
+
if (!getRegistry().isValidRelease(majorVersion)) {
|
64
73
|
revert TokenMajorVersionInvalid(majorVersion);
|
65
74
|
}
|
66
75
|
|
@@ -93,12 +102,7 @@ contract TokenRegistry is
|
|
93
102
|
revert NotContract(token);
|
94
103
|
}
|
95
104
|
|
96
|
-
// MUST
|
97
|
-
if(ERC165Checker.supportsInterface(token, type(IRegisterable).interfaceId)) {
|
98
|
-
revert NotToken(token);
|
99
|
-
}
|
100
|
-
|
101
|
-
// MUST have decimals > 0
|
105
|
+
// MUST have decimals > 0 (indicator that this is in fact an erc20 token)
|
102
106
|
IERC20Metadata erc20 = IERC20Metadata(token);
|
103
107
|
if(erc20.decimals() == 0) {
|
104
108
|
revert TokenDecimalsZero();
|
@@ -2,24 +2,26 @@
|
|
2
2
|
pragma solidity ^0.8.19;
|
3
3
|
|
4
4
|
import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
|
5
|
+
import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
|
5
6
|
|
6
|
-
contract ERC165 is
|
7
|
+
contract ERC165 is
|
8
|
+
Initializable,
|
9
|
+
IERC165
|
10
|
+
{
|
7
11
|
mapping(bytes4 => bool) private _isSupported;
|
8
12
|
|
9
|
-
|
10
|
-
|
11
|
-
}
|
12
|
-
|
13
|
-
function supportsInterface(bytes4 interfaceId) external view override returns (bool) {
|
14
|
-
return _isSupported[interfaceId];
|
15
|
-
}
|
16
|
-
|
17
|
-
// @dev register support for ERC165 itself
|
18
|
-
function _initializeERC165() internal {
|
13
|
+
// @dev initializes with support for ERC165
|
14
|
+
function initializeERC165() public onlyInitializing() {
|
19
15
|
_isSupported[type(IERC165).interfaceId] = true;
|
20
16
|
}
|
21
17
|
|
22
|
-
|
18
|
+
// @dev register support for provided interfaceId
|
19
|
+
// includes initialization for ERC165_ID if not yet done
|
20
|
+
function registerInterface(bytes4 interfaceId) public onlyInitializing() {
|
23
21
|
_isSupported[interfaceId] = true;
|
24
22
|
}
|
23
|
+
|
24
|
+
function supportsInterface(bytes4 interfaceId) external view override returns (bool) {
|
25
|
+
return _isSupported[interfaceId];
|
26
|
+
}
|
25
27
|
}
|
@@ -1,22 +1,23 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.20;
|
3
3
|
|
4
|
-
import {
|
4
|
+
import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
|
5
|
+
|
6
|
+
import {IRegistryLinked} from "./IRegistryLinked.sol";
|
5
7
|
import {NftId} from "../types/NftId.sol";
|
6
8
|
|
7
|
-
interface INftOwnable
|
8
|
-
|
9
|
+
interface INftOwnable is
|
10
|
+
IERC165,
|
11
|
+
IRegistryLinked
|
12
|
+
{
|
13
|
+
error ErrorNftOwnableInitialOwnerZero();
|
14
|
+
error ErrorNftOwnableNotOwner(address account);
|
9
15
|
|
10
|
-
error
|
11
|
-
error
|
12
|
-
error ErrorRegistryNotInitialized();
|
13
|
-
error ErrorRegistryAddressZero();
|
14
|
-
error ErrorNotRegistry(address registryAddress);
|
15
|
-
error ErrorContractNotRegistered(address contractAddress);
|
16
|
+
error ErrorNftOwnableAlreadyLinked(NftId nftId);
|
17
|
+
error ErrorNftOwnableContractNotRegistered(address contractAddress);
|
16
18
|
|
17
19
|
function linkToRegisteredNftId() external;
|
18
20
|
|
19
|
-
function getRegistry() external view returns (IRegistry);
|
20
21
|
function getNftId() external view returns (NftId);
|
21
22
|
function getOwner() external view returns (address);
|
22
23
|
}
|
@@ -0,0 +1,26 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.20;
|
3
|
+
|
4
|
+
import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
|
5
|
+
import {IERC721Receiver} from "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol";
|
6
|
+
|
7
|
+
import {IRegistry} from "../registry/IRegistry.sol";
|
8
|
+
import {NftId} from "../types/NftId.sol";
|
9
|
+
import {NumberId} from "../types/NumberId.sol";
|
10
|
+
|
11
|
+
/// @dev generic interface for contracts that need to hold policies and receive payouts
|
12
|
+
/// GIF will notify policy holder contracts for policy creation and payout execution
|
13
|
+
///
|
14
|
+
|
15
|
+
interface IPolicyHolder is IERC165, IERC721Receiver {
|
16
|
+
|
17
|
+
/// @dev callback function that will be called after successful policy creation
|
18
|
+
function policyCreatedCallback(NftId policyNftId) external;
|
19
|
+
|
20
|
+
/// @dev callback function that will be called after a successful payout
|
21
|
+
function payoutExecutedCallback(NftId policyNftId, NumberId payoutId, address beneficiary, uint256 amount) external;
|
22
|
+
|
23
|
+
/// @dev determines beneficiary address that will be used in payouts targeting this contract
|
24
|
+
/// returned address will override GIF default where the policy nft holder is treated as beneficiary
|
25
|
+
function getBeneficiary(NftId policyId, NumberId claimId) external view returns (address beneficiary);
|
26
|
+
}
|
@@ -1,12 +1,12 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.20;
|
3
3
|
|
4
|
-
import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
|
5
|
-
|
6
4
|
import {INftOwnable} from "./INftOwnable.sol";
|
7
5
|
import {IRegistry} from "../registry/IRegistry.sol";
|
8
6
|
|
9
|
-
interface IRegisterable is
|
7
|
+
interface IRegisterable is
|
8
|
+
INftOwnable
|
9
|
+
{
|
10
10
|
|
11
11
|
function getInitialInfo()
|
12
12
|
external
|
@@ -0,0 +1,12 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.20;
|
3
|
+
|
4
|
+
import {IRegistry} from "../registry/IRegistry.sol";
|
5
|
+
|
6
|
+
interface IRegistryLinked {
|
7
|
+
|
8
|
+
error ErrorNotRegistry(address registryAddress);
|
9
|
+
|
10
|
+
function getRegistry() external view returns (IRegistry);
|
11
|
+
function getRegistryAddress() external view returns (address);
|
12
|
+
}
|
@@ -11,6 +11,8 @@ interface IService is
|
|
11
11
|
IRegisterable,
|
12
12
|
IVersionable
|
13
13
|
{
|
14
|
+
error ErrorIServiceCallerUnknown(address caller);
|
15
|
+
|
14
16
|
function getDomain() external pure returns(ObjectType serviceDomain);
|
15
17
|
function getMajorVersion() external view returns(VersionPart majorVersion);
|
16
18
|
}
|
@@ -1,11 +1,8 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.20;
|
3
3
|
|
4
|
-
import {Blocknumber} from "../types/Blocknumber.sol";
|
5
|
-
import {Timestamp} from "../types/Timestamp.sol";
|
6
4
|
import {Version} from "../types/Version.sol";
|
7
5
|
|
8
|
-
|
9
6
|
/// IMPORTANT
|
10
7
|
// Upgradeable contract MUST:
|
11
8
|
// 1) inherit from Versionable
|
@@ -14,7 +11,7 @@ import {Version} from "../types/Version.sol";
|
|
14
11
|
// 4) implement internal _upgrade() function with onlyInitializing modifier (1st version MUST revert)
|
15
12
|
// 5) have onlyInitialising modifier for each function callable inside _initialize()/_upgrade() (MUST use different functions for initialization/upgrade and normal operations)
|
16
13
|
// 6) use default empty constructor -> _disableInitializer() is called from Versionable contructor
|
17
|
-
// 7) use namespace storage
|
14
|
+
// 7) use namespace storage (should this be needed)
|
18
15
|
// 8) since now inheritance is used for upgradability, contract MUST BE inherited ONLY by the next version
|
19
16
|
// Upgradeable contract SHOULD:
|
20
17
|
// 9) define all non private methods as virtual (in order to be able to upgrade them latter)
|
@@ -22,48 +19,29 @@ import {Version} from "../types/Version.sol";
|
|
22
19
|
// in some cases this ok but not in the others...
|
23
20
|
//
|
24
21
|
// IMPORTANT
|
25
|
-
//
|
22
|
+
// If introducting/amending storage related to Versionable version MUST:
|
26
23
|
// 1) define namespace storage struct if accessing storage
|
27
24
|
// - DO NOT use structs inside, except
|
28
25
|
// - CAN use structs ONLY inside mappings
|
29
26
|
// 2) ALWAYS define private getter if accessing storage
|
30
27
|
// - MUST use default implementation, CAN change ONLY return type
|
31
|
-
// - MUST use the same "LOCATION_V1"
|
32
28
|
|
33
29
|
interface IVersionable {
|
34
30
|
|
35
|
-
struct VersionInfo {
|
36
|
-
Version version;
|
37
|
-
address implementation;
|
38
|
-
address activatedBy;
|
39
|
-
Timestamp activatedAt;
|
40
|
-
Blocknumber activatedIn;
|
41
|
-
}
|
42
|
-
|
43
|
-
event LogVersionableInitialized(Version version, address implementation, address activatedBy);
|
44
|
-
|
45
|
-
// TODO uncomment when all implementations are ready
|
46
31
|
/**
|
47
32
|
* @dev IMPORTANT
|
48
33
|
* implementation MUST be guarded by initializer modifier
|
49
|
-
* implementation MUST call internal function Versionable._updateVersionHistory
|
50
34
|
* new version MUST inherit from previous version
|
51
35
|
*/
|
52
|
-
function
|
36
|
+
function initializeVersionable(address activatedBy, bytes memory activationData) external;
|
53
37
|
|
54
38
|
/**
|
55
39
|
* @dev
|
56
40
|
* implementation MUST be guarded by reinitializer(version().toUint64()) modifier
|
57
|
-
* implementation MUST call internal function Versionable._updateVersionHistory
|
58
41
|
* new version MUST inherit from previous version
|
59
42
|
* the first verion MUST revert
|
60
43
|
*/
|
61
|
-
function
|
62
|
-
|
63
|
-
/**
|
64
|
-
* @dev returns true if the specified version has been activated for the current contract
|
65
|
-
*/
|
66
|
-
function isInitialized(Version version) external view returns(bool);
|
44
|
+
function upgradeVersionable(bytes memory upgradeData) external;
|
67
45
|
|
68
46
|
/**
|
69
47
|
* @dev returns version of this contract
|
@@ -72,25 +50,4 @@ interface IVersionable {
|
|
72
50
|
*/
|
73
51
|
function getVersion() external pure returns(Version);
|
74
52
|
|
75
|
-
/**
|
76
|
-
* @dev returns the number of all deployed versions of this contract
|
77
|
-
*/
|
78
|
-
function getVersionCount() external view returns(uint256 numberOfVersions);
|
79
|
-
|
80
|
-
/**
|
81
|
-
* @dev returns the i-th (index) version of this contract
|
82
|
-
*/
|
83
|
-
function getVersion(uint256 index) external view returns(Version version);
|
84
|
-
|
85
|
-
/**
|
86
|
-
* @dev returns the i-th (index) version info of this contract
|
87
|
-
*/
|
88
|
-
function getVersionInfo(Version version) external view returns(VersionInfo memory versionInfo);
|
89
|
-
|
90
|
-
// TODO make sure it is needed here
|
91
|
-
/**
|
92
|
-
* @dev returns currently active version
|
93
|
-
*/
|
94
|
-
function getInitializedVersion() external view returns(uint64);
|
95
|
-
|
96
53
|
}
|
@@ -1,139 +1,120 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.20;
|
3
3
|
|
4
|
-
import {
|
5
|
-
import {IRegistry} from "../registry/IRegistry.sol";
|
6
|
-
import {NftId, zeroNftId} from "../types/NftId.sol";
|
7
|
-
|
8
|
-
// TODO make contract upgradeable
|
9
|
-
contract NftOwnable is INftOwnable {
|
4
|
+
// import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
|
10
5
|
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
6
|
+
import {ERC165} from "./ERC165.sol";
|
7
|
+
import {INftOwnable} from "./INftOwnable.sol";
|
8
|
+
import {NftId} from "../types/NftId.sol";
|
9
|
+
import {RegistryLinked} from "./RegistryLinked.sol";
|
10
|
+
|
11
|
+
contract NftOwnable is
|
12
|
+
ERC165,
|
13
|
+
RegistryLinked,
|
14
|
+
INftOwnable
|
15
|
+
{
|
16
|
+
// keccak256(abi.encode(uint256(keccak256("etherisc.storage.NftOwnable")) - 1)) & ~bytes32(uint256(0xff));
|
17
|
+
bytes32 public constant NFT_OWNABLE_STORAGE_LOCATION_V1 = 0x07ebcf49758b6ed3af50fa146bec0abe157c0218fe65dc0874c286e9d5da4f00;
|
18
|
+
|
19
|
+
struct NftOwnableStorage {
|
20
|
+
NftId _nftId;
|
21
|
+
address _initialOwner;
|
22
|
+
}
|
15
23
|
|
16
24
|
/// @dev enforces msg.sender is owner of nft (or initial owner of nft ownable)
|
17
25
|
modifier onlyOwner() {
|
18
26
|
if (msg.sender != getOwner()) {
|
19
|
-
revert
|
27
|
+
revert ErrorNftOwnableNotOwner(msg.sender);
|
20
28
|
}
|
21
29
|
_;
|
22
30
|
}
|
23
31
|
|
24
|
-
|
25
|
-
|
32
|
+
|
33
|
+
/// @dev initialization for upgradable contracts
|
34
|
+
// used in _initializeRegisterable
|
35
|
+
function initializeNftOwnable(
|
36
|
+
address initialOwner,
|
37
|
+
address registryAddress
|
38
|
+
)
|
39
|
+
public
|
40
|
+
virtual
|
41
|
+
onlyInitializing()
|
42
|
+
{
|
43
|
+
initializeRegistryLinked(registryAddress);
|
44
|
+
initializeERC165();
|
45
|
+
|
46
|
+
if(initialOwner == address(0)) {
|
47
|
+
revert ErrorNftOwnableInitialOwnerZero();
|
48
|
+
}
|
49
|
+
|
50
|
+
_getNftOwnableStorage()._initialOwner = initialOwner;
|
26
51
|
}
|
27
52
|
|
53
|
+
|
28
54
|
/// @dev links this contract to nft after registration
|
29
55
|
// needs to be done once per registered contract and
|
30
56
|
// reduces registry calls to check ownership
|
31
57
|
// does not need any protection as function can only do the "right thing"
|
32
|
-
function linkToRegisteredNftId()
|
33
|
-
|
34
|
-
|
35
|
-
|
58
|
+
function linkToRegisteredNftId()
|
59
|
+
public
|
60
|
+
virtual
|
61
|
+
{
|
62
|
+
NftOwnableStorage storage $ = _getNftOwnableStorage();
|
36
63
|
|
37
|
-
if (
|
38
|
-
revert
|
64
|
+
if ($._nftId.gtz()) {
|
65
|
+
revert ErrorNftOwnableAlreadyLinked($._nftId);
|
39
66
|
}
|
40
67
|
|
41
68
|
address contractAddress = address(this);
|
42
69
|
|
43
|
-
if (!
|
44
|
-
revert
|
70
|
+
if (!getRegistry().isRegistered(contractAddress)) {
|
71
|
+
revert ErrorNftOwnableContractNotRegistered(contractAddress);
|
45
72
|
}
|
46
73
|
|
47
|
-
_nftId =
|
48
|
-
}
|
49
|
-
|
50
|
-
|
51
|
-
function getRegistry() public view virtual override returns (IRegistry) {
|
52
|
-
return _registry;
|
74
|
+
$._nftId = getRegistry().getNftId(contractAddress);
|
53
75
|
}
|
54
76
|
|
55
|
-
|
56
77
|
function getNftId() public view virtual override returns (NftId) {
|
57
|
-
return _nftId;
|
58
|
-
}
|
59
|
-
|
60
|
-
function getInitialOwner() public view returns (address) {
|
61
|
-
return _initialOwner;
|
78
|
+
return _getNftOwnableStorage()._nftId;
|
62
79
|
}
|
63
80
|
|
64
81
|
function getOwner() public view virtual override returns (address) {
|
65
|
-
|
66
|
-
return _registry.ownerOf(_nftId);
|
67
|
-
}
|
68
|
-
|
69
|
-
return _initialOwner;
|
70
|
-
}
|
82
|
+
NftOwnableStorage storage $ = _getNftOwnableStorage();
|
71
83
|
|
84
|
+
if ($._nftId.gtz()) {
|
85
|
+
return getRegistry().ownerOf($._nftId);
|
86
|
+
}
|
72
87
|
|
73
|
-
|
74
|
-
// used in _initializeRegisterable
|
75
|
-
function _initializeNftOwnable(
|
76
|
-
address initialOwner,
|
77
|
-
address registryAddress
|
78
|
-
)
|
79
|
-
internal
|
80
|
-
virtual
|
81
|
-
{
|
82
|
-
require(initialOwner > address(0), "NftOwnable: initial owner is 0");
|
83
|
-
_initialOwner = initialOwner;
|
84
|
-
_setRegistry(registryAddress);
|
88
|
+
return $._initialOwner;
|
85
89
|
}
|
86
90
|
|
87
|
-
|
88
91
|
/// @dev used in constructor of registry service manager
|
89
92
|
// links ownership of registry service manager ot nft owner of registry service
|
90
93
|
function _linkToNftOwnable(
|
91
|
-
address registryAddress,
|
92
94
|
address nftOwnableAddress
|
93
95
|
)
|
94
96
|
internal
|
95
|
-
onlyOwner()
|
96
97
|
returns (NftId)
|
97
98
|
{
|
98
|
-
|
99
|
-
revert ErrorAlreadyLinked(address(_registry), _nftId);
|
100
|
-
}
|
99
|
+
NftOwnableStorage storage $ = _getNftOwnableStorage();
|
101
100
|
|
102
|
-
|
103
|
-
|
104
|
-
if (!_registry.isRegistered(nftOwnableAddress)) {
|
105
|
-
revert ErrorContractNotRegistered(nftOwnableAddress);
|
101
|
+
if ($._nftId.gtz()) {
|
102
|
+
revert ErrorNftOwnableAlreadyLinked($._nftId);
|
106
103
|
}
|
107
104
|
|
108
|
-
|
109
|
-
|
110
|
-
return _nftId;
|
111
|
-
}
|
112
|
-
|
113
|
-
|
114
|
-
function _setRegistry(address registryAddress)
|
115
|
-
private
|
116
|
-
{
|
117
|
-
if (address(_registry) != address(0)) {
|
118
|
-
revert ErrorRegistryAlreadyInitialized(address(_registry));
|
105
|
+
if (!getRegistry().isRegistered(nftOwnableAddress)) {
|
106
|
+
revert ErrorNftOwnableContractNotRegistered(nftOwnableAddress);
|
119
107
|
}
|
120
108
|
|
121
|
-
|
122
|
-
revert ErrorRegistryAddressZero();
|
123
|
-
}
|
109
|
+
$._nftId = getRegistry().getNftId(nftOwnableAddress);
|
124
110
|
|
125
|
-
|
126
|
-
|
127
|
-
}
|
111
|
+
return $._nftId;
|
112
|
+
}
|
128
113
|
|
129
|
-
_registry = IRegistry(registryAddress);
|
130
114
|
|
131
|
-
|
132
|
-
|
133
|
-
|
134
|
-
}
|
135
|
-
} catch {
|
136
|
-
revert ErrorNotRegistry(registryAddress);
|
115
|
+
function _getNftOwnableStorage() private pure returns (NftOwnableStorage storage $) {
|
116
|
+
assembly {
|
117
|
+
$.slot := NFT_OWNABLE_STORAGE_LOCATION_V1
|
137
118
|
}
|
138
119
|
}
|
139
120
|
}
|