@etherisc/gif-next 0.0.2-f4f92b3-338 → 0.0.2-f509abc-684
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 +270 -94
- package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +1 -1
- package/artifacts/contracts/components/Distribution.sol/Distribution.json +627 -157
- package/artifacts/contracts/components/IComponent.sol/IComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IComponent.sol/IComponent.json +122 -72
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +323 -102
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +325 -186
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +126 -144
- package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
- package/artifacts/contracts/components/Pool.sol/Pool.json +552 -212
- package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/components/Product.sol/Product.json +374 -166
- package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.dbg.json +4 -0
- package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.json +1206 -0
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +1 -1
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +64 -50
- 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 +801 -434
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +194 -192
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +992 -782
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +441 -164
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +119 -221
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +371 -302
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +330 -102
- package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +1 -1
- package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json +8 -13
- 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 +61 -78
- 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 +1212 -252
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +453 -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 +222 -204
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +310 -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/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 +34 -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/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 +47 -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 +6 -6
- 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 +112 -83
- package/contracts/components/Distribution.sol +189 -53
- package/contracts/components/IComponent.sol +48 -17
- package/contracts/components/IDistributionComponent.sol +39 -15
- package/contracts/components/IPoolComponent.sol +84 -41
- package/contracts/components/IProductComponent.sol +3 -2
- package/contracts/components/Pool.sol +211 -153
- package/contracts/components/Product.sol +96 -61
- package/contracts/instance/AccessManagerUpgradeableInitializeable.sol +13 -0
- package/contracts/instance/BundleManager.sol +7 -5
- package/contracts/instance/Cloneable.sol +7 -2
- package/contracts/instance/IInstance.sol +36 -10
- package/contracts/instance/IInstanceService.sol +36 -4
- package/contracts/instance/Instance.sol +101 -43
- package/contracts/instance/InstanceAccessManager.sol +383 -159
- package/contracts/instance/InstanceReader.sol +7 -10
- package/contracts/instance/InstanceService.sol +262 -129
- package/contracts/instance/InstanceServiceManager.sol +1 -1
- package/contracts/instance/ObjectManager.sol +6 -8
- package/contracts/instance/base/ComponentService.sol +6 -6
- package/contracts/instance/base/KeyValueStore.sol +5 -2
- package/contracts/instance/base/Lifecycle.sol +11 -2
- package/contracts/instance/module/IAccess.sol +22 -16
- 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 +376 -15
- 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 +130 -19
- package/contracts/instance/service/PoolServiceManager.sol +1 -1
- package/contracts/instance/service/ProductService.sol +20 -11
- package/contracts/instance/service/ProductServiceManager.sol +2 -2
- package/contracts/registry/ChainNft.sol +8 -0
- package/contracts/registry/IRegistry.sol +5 -2
- package/contracts/registry/IRegistryService.sol +10 -8
- package/contracts/registry/ITransferInterceptor.sol +1 -0
- package/contracts/registry/Registry.sol +43 -28
- 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 +16 -9
- 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
@@ -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
|
}
|
@@ -0,0 +1,81 @@
|
|
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 {ERC165} from "./ERC165.sol";
|
9
|
+
import {IPolicyHolder} from "./IPolicyHolder.sol";
|
10
|
+
import {IRegistry} from "../registry/IRegistry.sol";
|
11
|
+
import {NftId} from "../types/NftId.sol";
|
12
|
+
import {NumberId} from "../types/NumberId.sol";
|
13
|
+
import {RegistryLinked} from "./RegistryLinked.sol";
|
14
|
+
|
15
|
+
/// @dev template implementation for IPolicyHolder
|
16
|
+
contract PolicyHolder is
|
17
|
+
ERC165,
|
18
|
+
RegistryLinked,
|
19
|
+
IPolicyHolder
|
20
|
+
{
|
21
|
+
// keccak256(abi.encode(uint256(keccak256("etherisc.storage.PolicyHolder")) - 1)) & ~bytes32(uint256(0xff));
|
22
|
+
// TODO fix address
|
23
|
+
bytes32 public constant POLICY_HOLDER_STORAGE_LOCATION_V1 = 0x07ebcf49758b6ed3af50fa146bec0abe157c0218fe65dc0874c286e9d5da4f00;
|
24
|
+
|
25
|
+
// TODO uncomment/fix/refactor
|
26
|
+
struct PolicyHolderStorage {
|
27
|
+
// mapping(NftId policyId => mapping(NumberId claimId => address beneficiary)) private _claimBeneficiary;
|
28
|
+
// mapping(NftId policyId => address beneficiary) private _beneficiary;
|
29
|
+
bool dummy;
|
30
|
+
}
|
31
|
+
|
32
|
+
function initializePolicyHolder(
|
33
|
+
address registryAddress
|
34
|
+
)
|
35
|
+
public
|
36
|
+
virtual
|
37
|
+
onlyInitializing()
|
38
|
+
{
|
39
|
+
initializeRegistryLinked(registryAddress);
|
40
|
+
}
|
41
|
+
|
42
|
+
/// @dev empty default implementation
|
43
|
+
function policyCreatedCallback(NftId policyNftId) external virtual { }
|
44
|
+
|
45
|
+
/// @dev empty default implementation
|
46
|
+
function payoutExecutedCallback(NftId policyNftId, NumberId payoutId, address beneficiary, uint256 amount) external virtual { }
|
47
|
+
|
48
|
+
/// @dev determines beneficiary address that will be used in payouts targeting this contract
|
49
|
+
/// returned address will override GIF default where the policy nft holder is treated as beneficiary
|
50
|
+
function getBeneficiary(NftId policyId, NumberId claimId) external virtual view returns (address beneficiary) {
|
51
|
+
// TODO add implementation
|
52
|
+
}
|
53
|
+
|
54
|
+
//--- IERC165 functions ---------------//
|
55
|
+
function onERC721Received(
|
56
|
+
address, // operator
|
57
|
+
address, // from
|
58
|
+
uint256, // tokenId
|
59
|
+
bytes calldata // data
|
60
|
+
)
|
61
|
+
external
|
62
|
+
virtual
|
63
|
+
returns (bytes4)
|
64
|
+
{
|
65
|
+
return IERC721Receiver.onERC721Received.selector;
|
66
|
+
}
|
67
|
+
|
68
|
+
function _setBeneficiary(address beneficiary) internal {
|
69
|
+
|
70
|
+
}
|
71
|
+
|
72
|
+
function _setBeneficiary(NftId policyId, address beneficiary) internal {
|
73
|
+
|
74
|
+
}
|
75
|
+
|
76
|
+
function _getPolicyHolderStorage() private pure returns (PolicyHolderStorage storage $) {
|
77
|
+
assembly {
|
78
|
+
$.slot := POLICY_HOLDER_STORAGE_LOCATION_V1
|
79
|
+
}
|
80
|
+
}
|
81
|
+
}
|
@@ -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
|
}
|
@@ -11,19 +11,13 @@ import {IRegistry} from "../registry/IRegistry.sol";
|
|
11
11
|
import {IRegisterable} from "./IRegisterable.sol";
|
12
12
|
import {Versionable} from "./Versionable.sol";
|
13
13
|
|
14
|
-
import {ERC165} from "./ERC165.sol";
|
15
|
-
|
16
14
|
contract Registerable is
|
17
|
-
ERC165,
|
18
|
-
Initializable,
|
19
15
|
NftOwnable,
|
20
16
|
IRegisterable
|
21
17
|
{
|
22
18
|
// keccak256(abi.encode(uint256(keccak256("gif-next.contracts.shared.Registerable.sol")) - 1)) & ~bytes32(uint256(0xff));
|
23
19
|
bytes32 public constant REGISTERABLE_LOCATION_V1 = 0x6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa300;
|
24
20
|
|
25
|
-
error ErrorRegisterableNotRegistry(address registryAddress);
|
26
|
-
|
27
21
|
struct RegisterableStorage {
|
28
22
|
NftId _parentNftId;
|
29
23
|
ObjectType _objectType;
|
@@ -37,33 +31,27 @@ contract Registerable is
|
|
37
31
|
}
|
38
32
|
}
|
39
33
|
|
40
|
-
function
|
34
|
+
function initializeRegisterable(
|
41
35
|
address registryAddress,
|
42
36
|
NftId parentNftId,
|
43
37
|
ObjectType objectType,
|
44
38
|
bool isInterceptor,
|
45
39
|
address initialOwner,
|
46
|
-
bytes memory data
|
40
|
+
bytes memory registryData // writeonly data that will saved in the object info record of the registry
|
47
41
|
)
|
48
|
-
|
49
|
-
//onlyInitializing//TODO uncomment when "fully" upgradeable
|
42
|
+
public
|
50
43
|
virtual
|
44
|
+
onlyInitializing
|
51
45
|
{
|
52
|
-
|
53
|
-
_initializeNftOwnable(
|
46
|
+
initializeNftOwnable(
|
54
47
|
initialOwner,
|
55
48
|
registryAddress);
|
56
49
|
|
57
|
-
// TODO check parentNftId -> registry.isRegistered(parentNftId)
|
58
|
-
// TODO check object-parent type pair -> registry.isValidTypeCombo() or something...verify with registry that setup will be able to register...
|
59
|
-
|
60
50
|
RegisterableStorage storage $ = _getRegisterableStorage();
|
61
51
|
$._parentNftId = parentNftId;
|
62
52
|
$._objectType = objectType;
|
63
53
|
$._isInterceptor = isInterceptor;
|
64
|
-
$._data =
|
65
|
-
|
66
|
-
_registerInterface(type(IRegisterable).interfaceId);
|
54
|
+
$._data = registryData;
|
67
55
|
}
|
68
56
|
|
69
57
|
|
@@ -80,7 +68,7 @@ contract Registerable is
|
|
80
68
|
$._objectType,
|
81
69
|
$._isInterceptor,
|
82
70
|
address(this),
|
83
|
-
|
71
|
+
getOwner(),
|
84
72
|
$._data);
|
85
73
|
}
|
86
74
|
}
|
@@ -0,0 +1,48 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.20;
|
3
|
+
|
4
|
+
import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
|
5
|
+
import {IRegistry} from "../registry/IRegistry.sol";
|
6
|
+
import {IRegistryLinked} from "./IRegistryLinked.sol";
|
7
|
+
|
8
|
+
contract RegistryLinked is
|
9
|
+
Initializable,
|
10
|
+
IRegistryLinked
|
11
|
+
{
|
12
|
+
|
13
|
+
IRegistry private _registry;
|
14
|
+
|
15
|
+
/// @dev initialization for upgradable contracts
|
16
|
+
// used in _initializeRegisterable
|
17
|
+
function initializeRegistryLinked(
|
18
|
+
address registryAddress
|
19
|
+
)
|
20
|
+
public
|
21
|
+
virtual
|
22
|
+
onlyInitializing()
|
23
|
+
{
|
24
|
+
if (registryAddress.code.length == 0) {
|
25
|
+
revert ErrorNotRegistry(registryAddress);
|
26
|
+
}
|
27
|
+
|
28
|
+
_registry = IRegistry(registryAddress);
|
29
|
+
|
30
|
+
try _registry.supportsInterface(type(IRegistry).interfaceId) returns (bool isRegistry) {
|
31
|
+
if (!isRegistry) {
|
32
|
+
revert ErrorNotRegistry(registryAddress);
|
33
|
+
}
|
34
|
+
} catch {
|
35
|
+
revert ErrorNotRegistry(registryAddress);
|
36
|
+
}
|
37
|
+
}
|
38
|
+
|
39
|
+
|
40
|
+
function getRegistry() public view returns (IRegistry) {
|
41
|
+
return _registry;
|
42
|
+
}
|
43
|
+
|
44
|
+
|
45
|
+
function getRegistryAddress() public view returns (address) {
|
46
|
+
return address(_registry);
|
47
|
+
}
|
48
|
+
}
|
@@ -3,7 +3,7 @@ pragma solidity ^0.8.19;
|
|
3
3
|
|
4
4
|
import {ObjectType, SERVICE} from "../types/ObjectType.sol";
|
5
5
|
import {NftId, zeroNftId} from "../types/NftId.sol";
|
6
|
-
import {Version, VersionPart, VersionLib} from "../types/Version.sol";
|
6
|
+
import {Version, VersionPart, VersionLib, VersionPartLib} from "../types/Version.sol";
|
7
7
|
|
8
8
|
import {Versionable} from "./Versionable.sol";
|
9
9
|
import {IService} from "./IService.sol";
|
@@ -22,8 +22,9 @@ abstract contract Service is
|
|
22
22
|
{
|
23
23
|
function getDomain() public pure virtual override returns(ObjectType);
|
24
24
|
|
25
|
+
// version major version MUST be consistent with major version of getVersion()
|
25
26
|
function getMajorVersion() public view virtual override returns(VersionPart majorVersion) {
|
26
|
-
return
|
27
|
+
return VersionPartLib.toVersionPart(3);
|
27
28
|
}
|
28
29
|
|
29
30
|
// from Versionable
|
@@ -36,25 +37,22 @@ abstract contract Service is
|
|
36
37
|
return VersionLib.toVersion(3,0,0);
|
37
38
|
}
|
38
39
|
|
39
|
-
function
|
40
|
+
function initializeService(
|
40
41
|
address registry,
|
41
42
|
address initialOwner
|
42
43
|
)
|
43
|
-
|
44
|
+
public
|
44
45
|
virtual
|
45
|
-
|
46
|
+
onlyInitializing()
|
46
47
|
{
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
// this is just a conveniene function, actual validation will be done upon registration
|
57
|
-
function _getRegistryNftId(address registryAddress) internal view returns (NftId) {
|
58
|
-
return IRegistry(registryAddress).getNftId(registryAddress);
|
48
|
+
initializeRegisterable(
|
49
|
+
registry,
|
50
|
+
IRegistry(registry).getNftId(),
|
51
|
+
SERVICE(),
|
52
|
+
false, // is interceptor
|
53
|
+
initialOwner,
|
54
|
+
""); // data
|
55
|
+
|
56
|
+
registerInterface(type(IService).interfaceId);
|
59
57
|
}
|
60
58
|
}
|