@etherisc/gif-next 0.0.2-fe88ad7-208 → 0.0.2-ff8087d-237
Sign up to get free protection for your applications and to get access to all the features.
- package/README.md +8 -13
- package/artifacts/contracts/components/Component.sol/Component.dbg.json +4 -0
- package/artifacts/contracts/components/Component.sol/Component.json +873 -0
- package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +1 -1
- package/artifacts/contracts/components/Distribution.sol/Distribution.json +903 -202
- package/artifacts/contracts/components/IComponent.sol/IComponent.dbg.json +4 -0
- package/artifacts/contracts/components/{BaseComponent.sol/BaseComponent.json → IComponent.sol/IComponent.json} +237 -83
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +879 -31
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +879 -59
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +720 -16
- package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
- package/artifacts/contracts/components/Pool.sol/Pool.json +760 -195
- package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/components/Product.sol/Product.json +564 -141
- package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.dbg.json +1 -1
- package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.json +15 -15
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +1 -1
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +69 -79
- package/artifacts/contracts/instance/Cloneable.sol/Cloneable.dbg.json +1 -1
- package/artifacts/contracts/instance/Cloneable.sol/Cloneable.json +5 -0
- package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.json +1474 -483
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +248 -218
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +1152 -794
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +462 -179
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +414 -267
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +482 -346
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +355 -91
- package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +1 -1
- package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json +11 -40
- 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} +263 -164
- 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 +58 -75
- 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 +1124 -0
- package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.json +688 -0
- package/artifacts/contracts/instance/service/BundleService.sol/BundleService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +641 -303
- package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +343 -79
- package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.json +1384 -0
- package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.json +752 -0
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +1434 -280
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +469 -73
- package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/{IComponentOwnerService.sol/IComponentOwnerService.json → IApplicationService.sol/IApplicationService.json} +342 -189
- package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.json +310 -249
- package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.json +743 -0
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +757 -144
- package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.json +262 -275
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +703 -125
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +71 -165
- package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +632 -344
- package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +367 -91
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +1119 -224
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +361 -73
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +297 -210
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +298 -78
- 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 +117 -5
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +99 -217
- 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 +131 -27
- package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +18 -18
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +205 -250
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +287 -81
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +1 -1
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +81 -68
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +138 -50
- 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 +27 -29
- package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +4 -0
- package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +189 -0
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +8 -34
- package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +4 -0
- package/artifacts/contracts/{experiment/inheritance/IA.sol/ISharedA.json → shared/IRegistryLinked.sol/IRegistryLinked.json} +15 -17
- package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
- package/artifacts/contracts/shared/IService.sol/IService.json +71 -165
- 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 +107 -27
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +4 -0
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +302 -0
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +283 -63
- package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
- package/artifacts/contracts/shared/Registerable.sol/Registerable.json +116 -51
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +4 -0
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +71 -0
- package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
- package/artifacts/contracts/shared/Service.sol/Service.json +173 -153
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +24 -6
- 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 +116 -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 +191 -203
- 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 +281 -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 +179 -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 +74 -19
- 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 +209 -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 +38 -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 +272 -0
- package/contracts/components/Distribution.sol +204 -82
- package/contracts/components/IComponent.sol +90 -0
- package/contracts/components/IDistributionComponent.sol +44 -17
- package/contracts/components/IPoolComponent.sol +90 -42
- package/contracts/components/IProductComponent.sol +15 -9
- package/contracts/components/Pool.sol +217 -186
- package/contracts/components/Product.sol +246 -166
- package/contracts/instance/AccessManagerUpgradeableInitializeable.sol +2 -12
- package/contracts/instance/BundleManager.sol +17 -20
- package/contracts/instance/Cloneable.sol +7 -2
- package/contracts/instance/IInstance.sol +67 -25
- package/contracts/instance/IInstanceService.sol +34 -11
- package/contracts/instance/Instance.sol +158 -116
- package/contracts/instance/InstanceAccessManager.sol +389 -165
- package/contracts/instance/InstanceReader.sol +87 -36
- package/contracts/instance/InstanceService.sol +295 -161
- package/contracts/instance/InstanceServiceManager.sol +1 -1
- package/contracts/instance/ObjectManager.sol +10 -29
- package/contracts/instance/base/ComponentService.sol +130 -0
- package/contracts/instance/base/KeyValueStore.sol +13 -36
- package/contracts/instance/base/Lifecycle.sol +26 -6
- package/contracts/instance/module/IAccess.sol +22 -16
- package/contracts/instance/module/IBundle.sol +8 -5
- package/contracts/instance/module/IComponents.sol +41 -0
- package/contracts/instance/module/IDistribution.sol +3 -0
- package/contracts/instance/module/IPolicy.sol +43 -11
- package/contracts/instance/module/ISetup.sol +7 -20
- package/contracts/instance/service/ApplicationService.sol +356 -0
- package/contracts/instance/service/ApplicationServiceManager.sol +35 -0
- package/contracts/instance/service/BundleService.sol +244 -119
- package/contracts/instance/service/BundleServiceManager.sol +1 -1
- package/contracts/instance/service/ClaimService.sol +443 -0
- package/contracts/instance/service/ClaimServiceManager.sol +35 -0
- package/contracts/instance/service/DistributionService.sol +360 -41
- package/contracts/instance/service/DistributionServiceManager.sol +1 -1
- package/contracts/instance/service/IApplicationService.sol +79 -0
- package/contracts/instance/service/IBundleService.sol +93 -20
- package/contracts/instance/service/IClaimService.sol +90 -0
- package/contracts/instance/service/IDistributionService.sol +89 -0
- package/contracts/instance/service/IPolicyService.sol +44 -51
- package/contracts/instance/service/IPoolService.sol +97 -3
- package/contracts/instance/service/PolicyService.sol +233 -364
- package/contracts/instance/service/PolicyServiceManager.sol +2 -2
- package/contracts/instance/service/PoolService.sol +319 -40
- package/contracts/instance/service/PoolServiceManager.sol +1 -1
- package/contracts/instance/service/ProductService.sol +90 -50
- package/contracts/instance/service/ProductServiceManager.sol +2 -2
- package/contracts/registry/ChainNft.sol +8 -0
- package/contracts/registry/IRegistry.sol +18 -8
- package/contracts/registry/IRegistryService.sol +21 -13
- package/contracts/registry/ITransferInterceptor.sol +1 -0
- package/contracts/registry/Registry.sol +142 -71
- package/contracts/registry/RegistryAccessManager.sol +31 -25
- package/contracts/registry/RegistryService.sol +93 -134
- package/contracts/registry/RegistryServiceManager.sol +13 -13
- package/contracts/registry/ReleaseManager.sol +103 -127
- package/contracts/registry/TokenRegistry.sol +19 -13
- package/contracts/shared/ERC165.sol +14 -12
- package/contracts/shared/INftOwnable.sol +11 -10
- package/contracts/shared/IPolicyHolder.sol +40 -0
- package/contracts/shared/IRegisterable.sol +4 -6
- package/contracts/shared/IRegistryLinked.sol +11 -0
- package/contracts/shared/IService.sol +6 -4
- package/contracts/shared/IVersionable.sol +4 -47
- package/contracts/shared/NftOwnable.sol +64 -80
- package/contracts/shared/PolicyHolder.sol +94 -0
- package/contracts/shared/ProxyManager.sol +100 -25
- package/contracts/shared/Registerable.sol +24 -39
- package/contracts/shared/RegistryLinked.sol +43 -0
- package/contracts/shared/Service.sol +36 -22
- package/contracts/shared/TokenHandler.sol +14 -6
- package/contracts/shared/Versionable.sol +4 -92
- package/contracts/test/TestRegisterable.sol +1 -1
- package/contracts/test/TestService.sol +1 -1
- package/contracts/types/Amount.sol +109 -0
- package/contracts/types/Blocknumber.sol +1 -0
- package/contracts/types/ClaimId.sol +75 -0
- package/contracts/types/DistributorType.sol +2 -2
- package/contracts/types/Fee.sol +17 -8
- package/contracts/types/NftId.sol +8 -0
- package/contracts/types/ObjectType.sol +11 -6
- package/contracts/types/PayoutId.sol +82 -0
- package/contracts/types/Referral.sol +4 -0
- package/contracts/types/RoleId.sol +18 -11
- package/contracts/types/Seconds.sol +54 -0
- package/contracts/types/StateId.sol +7 -2
- package/contracts/types/Timestamp.sol +18 -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/IBaseComponent.sol/IBaseComponent.dbg.json +0 -4
- package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.json +0 -397
- 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/IB.sol/IB.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/IB.sol/IB.json +0 -50
- 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/IInstanceBase.sol/IInstanceBase.dbg.json +0 -4
- package/artifacts/contracts/instance/IInstanceBase.sol/IInstanceBase.json +0 -448
- package/artifacts/contracts/instance/InstanceBase.sol/InstanceBase.dbg.json +0 -4
- package/artifacts/contracts/instance/InstanceBase.sol/InstanceBase.json +0 -763
- 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 -814
- package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +0 -4
- package/artifacts/contracts/shared/RegisterableUpgradable.sol/RegisterableUpgradable.dbg.json +0 -4
- package/artifacts/contracts/shared/RegisterableUpgradable.sol/RegisterableUpgradable.json +0 -442
- package/contracts/components/BaseComponent.sol +0 -159
- package/contracts/components/IBaseComponent.sol +0 -34
- 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/IInstanceBase.sol +0 -26
- package/contracts/instance/InstanceBase.sol +0 -41
- package/contracts/instance/base/ComponentServiceBase.sol +0 -82
- package/contracts/instance/base/IInstanceBase.sol +0 -23
- package/contracts/instance/service/ComponentOwnerService.sol +0 -315
- package/contracts/instance/service/IComponentOwnerService.sol +0 -20
- package/contracts/shared/RegisterableUpgradable.sol +0 -16
@@ -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,134 +1,118 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.20;
|
3
3
|
|
4
|
+
import {ERC165} from "./ERC165.sol";
|
4
5
|
import {INftOwnable} from "./INftOwnable.sol";
|
5
|
-
import {
|
6
|
-
import {
|
7
|
-
|
8
|
-
contract NftOwnable is
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
6
|
+
import {NftId} from "../types/NftId.sol";
|
7
|
+
import {RegistryLinked} from "./RegistryLinked.sol";
|
8
|
+
|
9
|
+
contract NftOwnable is
|
10
|
+
ERC165,
|
11
|
+
RegistryLinked,
|
12
|
+
INftOwnable
|
13
|
+
{
|
14
|
+
// keccak256(abi.encode(uint256(keccak256("etherisc.storage.NftOwnable")) - 1)) & ~bytes32(uint256(0xff));
|
15
|
+
bytes32 public constant NFT_OWNABLE_STORAGE_LOCATION_V1 = 0x07ebcf49758b6ed3af50fa146bec0abe157c0218fe65dc0874c286e9d5da4f00;
|
16
|
+
|
17
|
+
struct NftOwnableStorage {
|
18
|
+
NftId _nftId;
|
19
|
+
address _initialOwner;
|
20
|
+
}
|
13
21
|
|
14
22
|
/// @dev enforces msg.sender is owner of nft (or initial owner of nft ownable)
|
15
23
|
modifier onlyOwner() {
|
16
24
|
if (msg.sender != getOwner()) {
|
17
|
-
revert
|
25
|
+
revert ErrorNftOwnableNotOwner(msg.sender);
|
18
26
|
}
|
19
27
|
_;
|
20
28
|
}
|
21
29
|
|
22
|
-
|
23
|
-
|
30
|
+
|
31
|
+
/// @dev initialization for upgradable contracts
|
32
|
+
// used in _initializeRegisterable
|
33
|
+
function initializeNftOwnable(
|
34
|
+
address initialOwner,
|
35
|
+
address registryAddress
|
36
|
+
)
|
37
|
+
public
|
38
|
+
virtual
|
39
|
+
onlyInitializing()
|
40
|
+
{
|
41
|
+
initializeRegistryLinked(registryAddress);
|
42
|
+
initializeERC165();
|
43
|
+
|
44
|
+
if(initialOwner == address(0)) {
|
45
|
+
revert ErrorNftOwnableInitialOwnerZero();
|
46
|
+
}
|
47
|
+
|
48
|
+
_getNftOwnableStorage()._initialOwner = initialOwner;
|
24
49
|
}
|
25
50
|
|
51
|
+
|
26
52
|
/// @dev links this contract to nft after registration
|
27
53
|
// needs to be done once per registered contract and
|
28
54
|
// reduces registry calls to check ownership
|
29
55
|
// does not need any protection as function can only do the "right thing"
|
30
|
-
function linkToRegisteredNftId()
|
31
|
-
|
32
|
-
|
33
|
-
|
56
|
+
function linkToRegisteredNftId()
|
57
|
+
public
|
58
|
+
virtual
|
59
|
+
{
|
60
|
+
NftOwnableStorage storage $ = _getNftOwnableStorage();
|
34
61
|
|
35
|
-
if (
|
36
|
-
revert
|
62
|
+
if ($._nftId.gtz()) {
|
63
|
+
revert ErrorNftOwnableAlreadyLinked($._nftId);
|
37
64
|
}
|
38
65
|
|
39
66
|
address contractAddress = address(this);
|
40
67
|
|
41
|
-
if (!
|
42
|
-
revert
|
68
|
+
if (!getRegistry().isRegistered(contractAddress)) {
|
69
|
+
revert ErrorNftOwnableContractNotRegistered(contractAddress);
|
43
70
|
}
|
44
71
|
|
45
|
-
_nftId =
|
72
|
+
$._nftId = getRegistry().getNftId(contractAddress);
|
46
73
|
}
|
47
74
|
|
48
|
-
|
49
|
-
function getRegistry() public view virtual override returns (IRegistry) {
|
50
|
-
return _registry;
|
51
|
-
}
|
52
|
-
|
53
|
-
|
54
75
|
function getNftId() public view virtual override returns (NftId) {
|
55
|
-
return _nftId;
|
76
|
+
return _getNftOwnableStorage()._nftId;
|
56
77
|
}
|
57
78
|
|
58
|
-
|
59
79
|
function getOwner() public view virtual override returns (address) {
|
60
|
-
|
61
|
-
return _registry.ownerOf(_nftId);
|
62
|
-
}
|
63
|
-
|
64
|
-
return _initialOwner;
|
65
|
-
}
|
80
|
+
NftOwnableStorage storage $ = _getNftOwnableStorage();
|
66
81
|
|
82
|
+
if ($._nftId.gtz()) {
|
83
|
+
return getRegistry().ownerOf($._nftId);
|
84
|
+
}
|
67
85
|
|
68
|
-
|
69
|
-
// used in _initializeRegisterable
|
70
|
-
function _initializeNftOwnable(
|
71
|
-
address initialOwner,
|
72
|
-
address registryAddress
|
73
|
-
)
|
74
|
-
internal
|
75
|
-
virtual
|
76
|
-
{
|
77
|
-
require(initialOwner > address(0), "NftOwnable: initial owner is 0");
|
78
|
-
_initialOwner = initialOwner;
|
79
|
-
_setRegistry(registryAddress);
|
86
|
+
return $._initialOwner;
|
80
87
|
}
|
81
88
|
|
82
|
-
|
83
89
|
/// @dev used in constructor of registry service manager
|
84
90
|
// links ownership of registry service manager ot nft owner of registry service
|
85
91
|
function _linkToNftOwnable(
|
86
|
-
address registryAddress,
|
87
92
|
address nftOwnableAddress
|
88
93
|
)
|
89
94
|
internal
|
90
|
-
onlyOwner()
|
91
95
|
returns (NftId)
|
92
96
|
{
|
93
|
-
|
94
|
-
revert ErrorAlreadyLinked(address(_registry), _nftId);
|
95
|
-
}
|
96
|
-
|
97
|
-
_setRegistry(registryAddress);
|
97
|
+
NftOwnableStorage storage $ = _getNftOwnableStorage();
|
98
98
|
|
99
|
-
if (
|
100
|
-
revert
|
99
|
+
if ($._nftId.gtz()) {
|
100
|
+
revert ErrorNftOwnableAlreadyLinked($._nftId);
|
101
101
|
}
|
102
102
|
|
103
|
-
|
104
|
-
|
105
|
-
return _nftId;
|
106
|
-
}
|
107
|
-
|
108
|
-
|
109
|
-
function _setRegistry(address registryAddress)
|
110
|
-
private
|
111
|
-
{
|
112
|
-
if (address(_registry) != address(0)) {
|
113
|
-
revert ErrorRegistryAlreadyInitialized(address(_registry));
|
103
|
+
if (!getRegistry().isRegistered(nftOwnableAddress)) {
|
104
|
+
revert ErrorNftOwnableContractNotRegistered(nftOwnableAddress);
|
114
105
|
}
|
115
106
|
|
116
|
-
|
117
|
-
revert ErrorRegistryAddressZero();
|
118
|
-
}
|
107
|
+
$._nftId = getRegistry().getNftId(nftOwnableAddress);
|
119
108
|
|
120
|
-
|
121
|
-
|
122
|
-
}
|
109
|
+
return $._nftId;
|
110
|
+
}
|
123
111
|
|
124
|
-
_registry = IRegistry(registryAddress);
|
125
112
|
|
126
|
-
|
127
|
-
|
128
|
-
|
129
|
-
}
|
130
|
-
} catch {
|
131
|
-
revert ErrorNotRegistry(registryAddress);
|
113
|
+
function _getNftOwnableStorage() private pure returns (NftOwnableStorage storage $) {
|
114
|
+
assembly {
|
115
|
+
$.slot := NFT_OWNABLE_STORAGE_LOCATION_V1
|
132
116
|
}
|
133
117
|
}
|
134
118
|
}
|
@@ -0,0 +1,94 @@
|
|
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
|
+
import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
|
7
|
+
|
8
|
+
import {Amount} from "../types/Amount.sol";
|
9
|
+
import {ClaimId, ClaimIdLib} from "../types/ClaimId.sol";
|
10
|
+
import {ERC165} from "./ERC165.sol";
|
11
|
+
import {IPolicyHolder} from "./IPolicyHolder.sol";
|
12
|
+
import {NftId} from "../types/NftId.sol";
|
13
|
+
import {PayoutId} from "../types/PayoutId.sol";
|
14
|
+
import {RegistryLinked} from "./RegistryLinked.sol";
|
15
|
+
|
16
|
+
/// @dev template implementation for IPolicyHolder
|
17
|
+
contract PolicyHolder is
|
18
|
+
ERC165,
|
19
|
+
RegistryLinked,
|
20
|
+
IPolicyHolder
|
21
|
+
{
|
22
|
+
// keccak256(abi.encode(uint256(keccak256("etherisc.storage.PolicyHolder")) - 1)) & ~bytes32(uint256(0xff));
|
23
|
+
// TODO fix address
|
24
|
+
bytes32 public constant POLICY_HOLDER_STORAGE_LOCATION_V1 = 0x07ebcf49758b6ed3af50fa146bec0abe157c0218fe65dc0874c286e9d5da4f00;
|
25
|
+
|
26
|
+
struct PolicyHolderStorage {
|
27
|
+
mapping(NftId policyId => mapping(ClaimId claimId => address beneficiary)) _beneficiary;
|
28
|
+
}
|
29
|
+
|
30
|
+
function initializePolicyHolder(
|
31
|
+
address registryAddress,
|
32
|
+
address beneficiaryDefault
|
33
|
+
)
|
34
|
+
public
|
35
|
+
virtual
|
36
|
+
onlyInitializing()
|
37
|
+
{
|
38
|
+
initializeRegistryLinked(registryAddress);
|
39
|
+
registerInterface(type(IPolicyHolder).interfaceId);
|
40
|
+
}
|
41
|
+
|
42
|
+
/// @dev empty default implementation
|
43
|
+
function policyActivated(NftId policyNftId) external {}
|
44
|
+
|
45
|
+
/// @dev empty default implementation
|
46
|
+
function policyExpired(NftId policyNftId) external {}
|
47
|
+
|
48
|
+
/// @dev empty default implementation
|
49
|
+
function claimConfirmed(NftId policyNftId, ClaimId claimId, Amount amount) external {}
|
50
|
+
|
51
|
+
/// @dev empty default implementation
|
52
|
+
function payoutExecuted(NftId policyNftId, PayoutId payoutId, address beneficiary, Amount amount) external {}
|
53
|
+
|
54
|
+
/// @dev returns claim specific beneficiary
|
55
|
+
/// when no such beneficiary is defined the policy specific beneficiary is returned
|
56
|
+
function getBeneficiary(NftId policyNftId, ClaimId claimId) external virtual view returns (address beneficiary) {
|
57
|
+
beneficiary = _getPolicyHolderStorage()._beneficiary[policyNftId][claimId];
|
58
|
+
|
59
|
+
// fallback to claim independent beneficiary
|
60
|
+
if(beneficiary == address(0) && claimId.gtz()) {
|
61
|
+
beneficiary = _getPolicyHolderStorage()._beneficiary[policyNftId][ClaimIdLib.zero()];
|
62
|
+
}
|
63
|
+
}
|
64
|
+
|
65
|
+
//--- IERC165 functions ---------------//
|
66
|
+
function onERC721Received(
|
67
|
+
address, // operator
|
68
|
+
address, // from
|
69
|
+
uint256, // tokenId
|
70
|
+
bytes calldata // data
|
71
|
+
)
|
72
|
+
external
|
73
|
+
virtual
|
74
|
+
returns (bytes4)
|
75
|
+
{
|
76
|
+
return IERC721Receiver.onERC721Received.selector;
|
77
|
+
}
|
78
|
+
|
79
|
+
/// @dev sets policy specific beneficiary (used when no claim specific beneficiary is defined)
|
80
|
+
function _setBeneficiary(NftId policyNftId, address beneficiary) internal {
|
81
|
+
_setBeneficiary(policyNftId, ClaimIdLib.zero(), beneficiary);
|
82
|
+
}
|
83
|
+
|
84
|
+
/// @dev sets policy and claim specific beneficiary
|
85
|
+
function _setBeneficiary(NftId policyNftId, ClaimId claimId, address beneficiary) internal {
|
86
|
+
_getPolicyHolderStorage()._beneficiary[policyNftId][claimId] = beneficiary;
|
87
|
+
}
|
88
|
+
|
89
|
+
function _getPolicyHolderStorage() private pure returns (PolicyHolderStorage storage $) {
|
90
|
+
assembly {
|
91
|
+
$.slot := POLICY_HOLDER_STORAGE_LOCATION_V1
|
92
|
+
}
|
93
|
+
}
|
94
|
+
}
|
@@ -1,34 +1,57 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.20;
|
3
3
|
|
4
|
-
import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
|
5
|
-
import {ProxyAdmin} from "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
|
6
4
|
import {ITransparentUpgradeableProxy} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
|
7
5
|
|
6
|
+
import {Blocknumber, blockNumber} from "../types/Blocknumber.sol";
|
8
7
|
import {IVersionable} from "./IVersionable.sol";
|
9
8
|
import {NftOwnable} from "./NftOwnable.sol";
|
9
|
+
import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
|
10
|
+
import {ProxyAdmin} from "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
|
11
|
+
import {Timestamp, TimestampLib} from "../types/Timestamp.sol";
|
10
12
|
import {UpgradableProxyWithAdmin} from "./UpgradableProxyWithAdmin.sol";
|
13
|
+
import {Version, VersionLib} from "../types/Version.sol";
|
11
14
|
|
12
15
|
/// @dev manages proxy deployments for upgradable contracs of type IVersionable
|
13
16
|
contract ProxyManager is
|
14
17
|
NftOwnable
|
15
18
|
{
|
16
19
|
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
+
struct VersionInfo {
|
21
|
+
Version version;
|
22
|
+
address implementation;
|
23
|
+
address activatedBy;
|
24
|
+
Timestamp activatedAt;
|
25
|
+
Blocknumber activatedIn;
|
26
|
+
}
|
27
|
+
|
28
|
+
event LogProxyManagerVersionableDeployed(address indexed proxy, address initialImplementation);
|
29
|
+
event LogProxyManagerVersionableUpgraded(address indexed proxy, address upgradedImplementation);
|
30
|
+
|
31
|
+
error ErrorProxyManagerAlreadyDeployed();
|
32
|
+
error ErrorProxyManagerNotYetDeployed();
|
20
33
|
|
21
|
-
error
|
22
|
-
error
|
23
|
-
error ErrorNotYetDeployed();
|
34
|
+
error ErrorProxyManagerZeroVersion();
|
35
|
+
error ErrorProxyManagerNextVersionNotIncreasing(Version nextVersion);
|
24
36
|
|
25
37
|
UpgradableProxyWithAdmin internal _proxy;
|
26
|
-
|
38
|
+
|
39
|
+
// state to keep version history
|
40
|
+
mapping(Version version => VersionInfo info) _versionHistory;
|
41
|
+
Version [] _versions;
|
27
42
|
|
28
43
|
/// @dev only used to capture proxy owner
|
29
|
-
constructor()
|
30
|
-
|
31
|
-
|
44
|
+
constructor(address registry)
|
45
|
+
{
|
46
|
+
initializeProxyManager(registry);
|
47
|
+
}
|
48
|
+
|
49
|
+
function initializeProxyManager(address registry)
|
50
|
+
public
|
51
|
+
initializer()
|
52
|
+
{
|
53
|
+
initializeNftOwnable(msg.sender, registry);
|
54
|
+
}
|
32
55
|
|
33
56
|
/// @dev deploy initial contract
|
34
57
|
function deploy(address initialImplementation, bytes memory initializationData)
|
@@ -37,22 +60,23 @@ contract ProxyManager is
|
|
37
60
|
onlyOwner()
|
38
61
|
returns (IVersionable versionable)
|
39
62
|
{
|
40
|
-
if (
|
41
|
-
|
63
|
+
if (_versions.length > 0) {
|
64
|
+
revert ErrorProxyManagerAlreadyDeployed();
|
65
|
+
}
|
42
66
|
|
43
67
|
address currentProxyOwner = getOwner(); // used by implementation
|
44
68
|
address initialProxyAdminOwner = address(this); // used by proxy
|
45
|
-
bytes memory data = getDeployData(initialImplementation, currentProxyOwner, initializationData);
|
46
69
|
|
47
70
|
_proxy = new UpgradableProxyWithAdmin(
|
48
71
|
initialImplementation,
|
49
72
|
initialProxyAdminOwner,
|
50
|
-
|
73
|
+
getDeployData(currentProxyOwner, initializationData)
|
51
74
|
);
|
52
75
|
|
53
76
|
versionable = IVersionable(address(_proxy));
|
77
|
+
_updateVersionHistory(versionable.getVersion(), initialImplementation, currentProxyOwner);
|
54
78
|
|
55
|
-
emit
|
79
|
+
emit LogProxyManagerVersionableDeployed(address(_proxy), initialImplementation);
|
56
80
|
}
|
57
81
|
|
58
82
|
/// @dev upgrade existing contract
|
@@ -62,33 +86,84 @@ contract ProxyManager is
|
|
62
86
|
onlyOwner()
|
63
87
|
returns (IVersionable versionable)
|
64
88
|
{
|
65
|
-
if (
|
89
|
+
if (_versions.length == 0) {
|
90
|
+
revert ErrorProxyManagerNotYetDeployed();
|
91
|
+
}
|
66
92
|
|
67
93
|
address currentProxyOwner = getOwner();
|
68
94
|
ProxyAdmin proxyAdmin = getProxy().getProxyAdmin();
|
69
95
|
ITransparentUpgradeableProxy proxy = ITransparentUpgradeableProxy(address(_proxy));
|
70
|
-
bytes memory data = getUpgradeData(newImplementation, currentProxyOwner, upgradeData);
|
71
96
|
|
72
97
|
proxyAdmin.upgradeAndCall(
|
73
98
|
proxy,
|
74
99
|
newImplementation,
|
75
|
-
|
100
|
+
getUpgradeData(upgradeData));
|
76
101
|
|
77
102
|
versionable = IVersionable(address(_proxy));
|
103
|
+
_updateVersionHistory(versionable.getVersion(), newImplementation, currentProxyOwner);
|
78
104
|
|
79
|
-
emit
|
105
|
+
emit LogProxyManagerVersionableUpgraded(address(_proxy), newImplementation);
|
80
106
|
|
81
107
|
}
|
82
108
|
|
83
|
-
function getDeployData(address
|
84
|
-
return abi.encodeWithSelector(
|
109
|
+
function getDeployData(address proxyOwner, bytes memory deployData) public pure returns (bytes memory data) {
|
110
|
+
return abi.encodeWithSelector(
|
111
|
+
IVersionable.initializeVersionable.selector,
|
112
|
+
proxyOwner,
|
113
|
+
deployData);
|
85
114
|
}
|
86
115
|
|
87
|
-
function getUpgradeData(
|
88
|
-
return abi.encodeWithSelector(
|
116
|
+
function getUpgradeData(bytes memory upgradeData) public pure returns (bytes memory data) {
|
117
|
+
return abi.encodeWithSelector(
|
118
|
+
IVersionable.upgradeVersionable.selector,
|
119
|
+
upgradeData);
|
89
120
|
}
|
90
121
|
|
91
122
|
function getProxy() public returns (UpgradableProxyWithAdmin) {
|
92
123
|
return _proxy;
|
93
124
|
}
|
125
|
+
|
126
|
+
function getVersion() external view virtual returns(Version) {
|
127
|
+
return IVersionable(address(_proxy)).getVersion();
|
128
|
+
}
|
129
|
+
|
130
|
+
function getVersionCount() external view returns(uint256) {
|
131
|
+
return _versions.length;
|
132
|
+
}
|
133
|
+
|
134
|
+
function getVersion(uint256 idx) external view returns(Version) {
|
135
|
+
return _versions[idx];
|
136
|
+
}
|
137
|
+
|
138
|
+
function getVersionInfo(Version _version) external view returns(VersionInfo memory) {
|
139
|
+
return _versionHistory[_version];
|
140
|
+
}
|
141
|
+
|
142
|
+
function _updateVersionHistory(
|
143
|
+
Version newVersion,
|
144
|
+
address implementation,
|
145
|
+
address activatedBy
|
146
|
+
)
|
147
|
+
private
|
148
|
+
{
|
149
|
+
if(newVersion == VersionLib.zeroVersion()) {
|
150
|
+
revert ErrorProxyManagerZeroVersion();
|
151
|
+
}
|
152
|
+
|
153
|
+
if(_versions.length > 0) {
|
154
|
+
if(newVersion.toInt() <= _versions[_versions.length-1].toInt()) {
|
155
|
+
revert ErrorProxyManagerNextVersionNotIncreasing(newVersion);
|
156
|
+
}
|
157
|
+
}
|
158
|
+
|
159
|
+
// update version history
|
160
|
+
_versions.push(newVersion);
|
161
|
+
_versionHistory[newVersion] = VersionInfo(
|
162
|
+
newVersion,
|
163
|
+
implementation,
|
164
|
+
activatedBy,
|
165
|
+
TimestampLib.blockTimestamp(),
|
166
|
+
blockNumber()
|
167
|
+
);
|
168
|
+
}
|
94
169
|
}
|