@etherisc/gif-next 0.0.2-f9bc4c7-556 → 0.0.2-faaba97-954
Sign up to get free protection for your applications and to get access to all the features.
- package/README.md +249 -14
- package/artifacts/contracts/components/Component.sol/Component.dbg.json +4 -0
- package/artifacts/contracts/components/Component.sol/Component.json +842 -0
- package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +4 -0
- package/artifacts/contracts/components/Distribution.sol/Distribution.json +1329 -0
- package/artifacts/contracts/components/IComponent.sol/IComponent.dbg.json +4 -0
- package/artifacts/contracts/components/IComponent.sol/IComponent.json +605 -0
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +4 -0
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +969 -0
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +823 -115
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +608 -57
- package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
- package/artifacts/contracts/components/Pool.sol/Pool.json +1132 -143
- package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/components/Product.sol/Product.json +967 -105
- package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.dbg.json +4 -0
- package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.json +1206 -0
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +4 -0
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +778 -0
- package/artifacts/contracts/instance/Cloneable.sol/Cloneable.dbg.json +4 -0
- package/artifacts/contracts/instance/Cloneable.sol/Cloneable.json +190 -0
- package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.json +1549 -1048
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +4 -0
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +633 -0
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +2291 -1198
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +4 -0
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +1330 -0
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +4 -0
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +1289 -0
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +4 -0
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +1179 -0
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +741 -0
- package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +4 -0
- package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json +256 -0
- package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.dbg.json +4 -0
- package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.json +607 -0
- package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.json +45 -127
- 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 +85 -245
- 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 +4 -0
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +237 -0
- package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +4 -0
- package/artifacts/contracts/instance/module/{bundle/IBundle.sol → IBundle.sol}/IBundle.json +1 -1
- package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +4 -0
- package/artifacts/contracts/instance/module/{access/IAccess.sol/IAccess.json → IComponents.sol/IComponents.json} +2 -2
- package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +4 -0
- package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.json +10 -0
- package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +4 -0
- package/artifacts/contracts/instance/module/{policy/IPolicy.sol → IPolicy.sol}/IPolicy.json +1 -1
- package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +4 -0
- package/artifacts/contracts/instance/module/{risk/IRisk.sol → IRisk.sol}/IRisk.json +1 -1
- package/artifacts/contracts/instance/module/ISetup.sol/ISetup.dbg.json +4 -0
- package/artifacts/contracts/instance/{base/ModuleBase.sol/ModuleBase.json → module/ISetup.sol/ISetup.json} +2 -2
- package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.dbg.json +4 -0
- package/artifacts/contracts/instance/module/{treasury/ITreasury.sol → ITreasury.sol}/ITreasury.json +1 -1
- package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.json +1039 -0
- package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.json +673 -0
- package/artifacts/contracts/instance/service/BundleService.sol/BundleService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +1231 -0
- package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +721 -0
- package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.json +817 -0
- package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.json +641 -0
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +1798 -0
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +805 -0
- package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.json +622 -0
- package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.json +659 -0
- package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.json +475 -0
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +1090 -0
- package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.json +606 -0
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +577 -109
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +186 -213
- package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +1092 -0
- package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +697 -0
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +965 -199
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +661 -0
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +460 -293
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +653 -0
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +199 -12
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +485 -34
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +4 -0
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +866 -0
- package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +4 -0
- package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.json +52 -0
- package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registry.json +487 -101
- package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +4 -0
- package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +285 -0
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +4 -0
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +1158 -0
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +4 -0
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +670 -0
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +4 -0
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +559 -0
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +4 -0
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +498 -0
- package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +4 -0
- package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.json +107 -0
- 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 +4 -0
- package/artifacts/contracts/{components/IBaseComponent.sol/IBaseComponent.json → shared/INftOwnable.sol/INftOwnable.json} +38 -74
- 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 +100 -33
- 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 +4 -0
- package/artifacts/contracts/{instance/base/InstanceBase.sol/InstanceBase.json → shared/IService.sol/IService.json} +159 -150
- package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
- package/artifacts/contracts/shared/IVersionable.sol/IVersionable.json +16 -125
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +4 -0
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +251 -0
- 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 +4 -0
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +582 -0
- package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
- package/artifacts/contracts/shared/Registerable.sol/Registerable.json +256 -25
- 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 +4 -0
- package/artifacts/contracts/{registry/IChainNft.sol/IChainNft.json → shared/Service.sol/Service.json} +261 -217
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +4 -0
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +96 -0
- package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +4 -0
- package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +129 -0
- package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
- package/artifacts/contracts/shared/Versionable.sol/Versionable.json +29 -115
- package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +1 -1
- package/artifacts/contracts/test/TestFee.sol/TestFee.json +4 -4
- package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
- package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +272 -26
- package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
- package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +14 -14
- package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
- package/artifacts/contracts/test/TestService.sol/TestService.json +347 -130
- package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +1 -1
- package/artifacts/contracts/test/TestToken.sol/TestUsdc.json +91 -53
- 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 +38 -140
- package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +1 -1
- package/artifacts/contracts/test/Usdc.sol/USDC.json +91 -53
- package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +1 -1
- package/artifacts/contracts/types/Amount.sol/AmountLib.dbg.json +4 -0
- package/artifacts/contracts/types/Amount.sol/AmountLib.json +161 -0
- package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
- package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.json +2 -2
- package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.dbg.json +4 -0
- package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.json +100 -0
- package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.dbg.json +4 -0
- package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.json +104 -0
- package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +1 -1
- package/artifacts/contracts/types/Fee.sol/FeeLib.json +84 -14
- package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +1 -1
- package/artifacts/contracts/types/Key32.sol/Key32Lib.json +31 -17
- package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/NftId.sol/NftIdLib.json +17 -4
- package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
- package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.json +26 -3
- package/artifacts/contracts/types/NumberId.sol/NumberIdLib.dbg.json +4 -0
- package/artifacts/contracts/types/NumberId.sol/NumberIdLib.json +100 -0
- 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 +4 -0
- package/artifacts/contracts/types/Referral.sol/ReferralLib.json +142 -0
- package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +4 -0
- package/artifacts/contracts/types/RiskId.sol/RiskIdLib.json +86 -0
- package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +134 -8
- 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 +4 -0
- package/artifacts/contracts/{experiment/types/TypeB.sol/TypeBLib.json → types/UFixed.sol/MathLib.json} +4 -4
- package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +4 -0
- package/artifacts/contracts/types/UFixed.sol/{UFixedMathLib.json → UFixedLib.json} +3 -3
- package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
- package/artifacts/contracts/types/Version.sol/VersionLib.json +40 -2
- package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
- package/artifacts/contracts/types/Version.sol/VersionPartLib.json +22 -3
- package/contracts/components/Component.sol +253 -0
- package/contracts/components/Distribution.sol +280 -0
- package/contracts/components/IComponent.sol +76 -0
- package/contracts/components/IDistributionComponent.sol +71 -0
- package/contracts/components/IPoolComponent.sol +98 -42
- package/contracts/components/IProductComponent.sol +30 -9
- package/contracts/components/Pool.sol +238 -109
- package/contracts/components/Product.sol +218 -42
- package/contracts/instance/AccessManagerUpgradeableInitializeable.sol +13 -0
- package/contracts/instance/BundleManager.sol +127 -0
- package/contracts/instance/Cloneable.sol +51 -0
- package/contracts/instance/IInstance.sol +87 -41
- package/contracts/instance/IInstanceService.sol +72 -0
- package/contracts/instance/Instance.sol +311 -52
- package/contracts/instance/InstanceAccessManager.sol +527 -0
- package/contracts/instance/InstanceReader.sol +291 -0
- package/contracts/instance/InstanceService.sol +495 -0
- package/contracts/instance/InstanceServiceManager.sol +54 -0
- package/contracts/instance/ObjectManager.sol +82 -0
- package/contracts/instance/base/ComponentService.sol +121 -0
- package/contracts/instance/base/IKeyValueStore.sol +13 -13
- package/contracts/instance/base/ILifecycle.sol +3 -3
- package/contracts/instance/base/KeyValueStore.sol +64 -40
- package/contracts/instance/base/Lifecycle.sol +27 -13
- package/contracts/instance/module/IAccess.sol +54 -0
- package/contracts/instance/module/IBundle.sol +23 -0
- package/contracts/instance/module/IComponents.sol +41 -0
- package/contracts/instance/module/IDistribution.sol +41 -0
- package/contracts/instance/module/IPolicy.sol +72 -0
- package/contracts/instance/module/IRisk.sol +11 -0
- package/contracts/instance/module/ISetup.sol +33 -0
- package/contracts/instance/module/ITreasury.sol +23 -0
- package/contracts/instance/service/ApplicationService.sol +350 -0
- package/contracts/instance/service/ApplicationServiceManager.sol +35 -0
- package/contracts/instance/service/BundleService.sol +431 -0
- package/contracts/instance/service/BundleServiceManager.sol +51 -0
- package/contracts/instance/service/ClaimService.sol +151 -0
- package/contracts/instance/service/ClaimServiceManager.sol +35 -0
- package/contracts/instance/service/DistributionService.sol +435 -0
- package/contracts/instance/service/DistributionServiceManager.sol +51 -0
- package/contracts/instance/service/IApplicationService.sol +82 -0
- package/contracts/instance/service/IBundleService.sol +93 -0
- package/contracts/instance/service/IClaimService.sol +61 -0
- package/contracts/instance/service/IDistributionService.sol +99 -0
- package/contracts/instance/service/IPolicyService.sol +72 -0
- package/contracts/instance/service/IPoolService.sol +81 -12
- package/contracts/instance/service/IProductService.sol +21 -39
- package/contracts/instance/service/PolicyService.sol +362 -0
- package/contracts/instance/service/PolicyServiceManager.sol +54 -0
- package/contracts/instance/service/PoolService.sol +249 -69
- package/contracts/instance/service/PoolServiceManager.sol +51 -0
- package/contracts/instance/service/ProductService.sol +147 -291
- package/contracts/instance/service/ProductServiceManager.sol +54 -0
- package/contracts/registry/ChainNft.sol +87 -36
- package/contracts/registry/IRegistry.sol +68 -24
- package/contracts/registry/IRegistryService.sol +68 -0
- package/contracts/registry/ITransferInterceptor.sol +7 -0
- package/contracts/registry/Registry.sol +372 -286
- package/contracts/registry/RegistryAccessManager.sol +216 -0
- package/contracts/registry/RegistryService.sol +282 -0
- package/contracts/registry/RegistryServiceManager.sol +62 -0
- package/contracts/registry/ReleaseManager.sol +324 -0
- package/contracts/registry/TokenRegistry.sol +116 -0
- package/contracts/shared/ContractDeployerLib.sol +72 -0
- package/contracts/shared/ERC165.sol +14 -8
- package/contracts/shared/INftOwnable.sol +23 -0
- package/contracts/shared/IPolicyHolder.sol +26 -0
- package/contracts/shared/IRegisterable.sol +10 -19
- package/contracts/shared/IRegistryLinked.sol +12 -0
- package/contracts/shared/IService.sol +16 -0
- package/contracts/shared/IVersionable.sol +38 -37
- package/contracts/shared/NftOwnable.sol +120 -0
- package/contracts/shared/PolicyHolder.sol +81 -0
- package/contracts/shared/ProxyManager.sol +169 -0
- package/contracts/shared/Registerable.sol +54 -66
- package/contracts/shared/RegistryLinked.sol +48 -0
- package/contracts/shared/Service.sol +72 -0
- package/contracts/shared/TokenHandler.sol +33 -0
- package/contracts/shared/UpgradableProxyWithAdmin.sol +16 -0
- package/contracts/shared/Versionable.sol +38 -68
- package/contracts/test/TestFee.sol +2 -2
- package/contracts/test/TestRegisterable.sol +5 -6
- package/contracts/test/TestRoleId.sol +1 -1
- package/contracts/test/TestService.sol +7 -14
- package/contracts/types/Amount.sol +60 -0
- package/contracts/types/Blocknumber.sol +1 -0
- package/contracts/types/ClaimId.sol +52 -0
- package/contracts/types/DistributorType.sol +55 -0
- package/contracts/types/Fee.sol +22 -9
- package/contracts/types/Key32.sol +8 -3
- package/contracts/types/NftId.sol +8 -0
- package/contracts/types/NftIdSet.sol +26 -24
- package/contracts/types/NumberId.sol +52 -0
- package/contracts/types/ObjectType.sol +56 -14
- package/contracts/types/PayoutId.sol +54 -0
- package/contracts/types/Referral.sol +89 -0
- package/contracts/types/RiskId.sol +43 -0
- package/contracts/types/RoleId.sol +69 -10
- package/contracts/types/Seconds.sol +54 -0
- package/contracts/types/StateId.sol +6 -1
- package/contracts/types/Timestamp.sol +17 -13
- package/contracts/types/UFixed.sol +129 -12
- package/contracts/types/Version.sol +14 -1
- package/package.json +6 -5
- package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +0 -4
- package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.json +0 -174
- package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +0 -4
- 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/instance/IInstanceLinked.sol/IInstanceLinked.dbg.json +0 -4
- package/artifacts/contracts/instance/IInstanceLinked.sol/IInstanceLinked.json +0 -24
- package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +0 -4
- package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.json +0 -300
- package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +0 -4
- package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.json +0 -63
- package/artifacts/contracts/instance/base/IService.sol/IService.dbg.json +0 -4
- package/artifacts/contracts/instance/base/IService.sol/IService.json +0 -300
- package/artifacts/contracts/instance/base/InstanceBase.sol/InstanceBase.dbg.json +0 -4
- package/artifacts/contracts/instance/base/ModuleBase.sol/ModuleBase.dbg.json +0 -4
- package/artifacts/contracts/instance/base/ServiceBase.sol/ServiceBase.dbg.json +0 -4
- package/artifacts/contracts/instance/base/ServiceBase.sol/ServiceBase.json +0 -300
- package/artifacts/contracts/instance/module/access/Access.sol/AccessModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/access/Access.sol/AccessModule.json +0 -333
- package/artifacts/contracts/instance/module/access/IAccess.sol/IAccess.dbg.json +0 -4
- package/artifacts/contracts/instance/module/access/IAccess.sol/IAccessModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/access/IAccess.sol/IAccessModule.json +0 -333
- package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.json +0 -296
- package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundle.dbg.json +0 -4
- package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.json +0 -296
- package/artifacts/contracts/instance/module/compensation/CompensationModule.sol/CompensationModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/compensation/CompensationModule.sol/CompensationModule.json +0 -10
- package/artifacts/contracts/instance/module/compensation/ICompensation.sol/ICompensation.dbg.json +0 -4
- package/artifacts/contracts/instance/module/compensation/ICompensation.sol/ICompensation.json +0 -10
- package/artifacts/contracts/instance/module/compensation/ICompensation.sol/ICompensationModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/compensation/ICompensation.sol/ICompensationModule.json +0 -10
- package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.json +0 -188
- package/artifacts/contracts/instance/module/component/IComponent.sol/IComponent.dbg.json +0 -4
- package/artifacts/contracts/instance/module/component/IComponent.sol/IComponent.json +0 -10
- package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.json +0 -188
- package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicy.dbg.json +0 -4
- package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.json +0 -261
- package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.json +0 -261
- package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPool.dbg.json +0 -4
- package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPool.json +0 -10
- package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.json +0 -149
- package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.json +0 -149
- package/artifacts/contracts/instance/module/risk/IRisk.sol/IRisk.dbg.json +0 -4
- package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.json +0 -10
- package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.json +0 -10
- package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasury.dbg.json +0 -4
- package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.json +0 -533
- package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.dbg.json +0 -4
- package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.json +0 -76
- package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.dbg.json +0 -4
- package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.json +0 -533
- package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +0 -523
- package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.json +0 -364
- package/artifacts/contracts/registry/IChainNft.sol/IChainNft.dbg.json +0 -4
- package/artifacts/contracts/registry/IRegistryLinked.sol/IRegistryLinked.dbg.json +0 -4
- package/artifacts/contracts/registry/IRegistryLinked.sol/IRegistryLinked.json +0 -24
- package/artifacts/contracts/shared/IOwnable.sol/IOwnable.dbg.json +0 -4
- package/artifacts/contracts/shared/IOwnable.sol/IOwnable.json +0 -24
- package/artifacts/contracts/test/TestPool.sol/TestPool.dbg.json +0 -4
- package/artifacts/contracts/test/TestPool.sol/TestPool.json +0 -387
- package/artifacts/contracts/test/TestProduct.sol/TestProduct.dbg.json +0 -4
- package/artifacts/contracts/test/TestProduct.sol/TestProduct.json +0 -393
- package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.dbg.json +0 -4
- package/contracts/components/BaseComponent.sol +0 -88
- package/contracts/components/IBaseComponent.sol +0 -19
- 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/README.md +0 -112
- 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/IInstanceLinked.sol +0 -8
- package/contracts/instance/base/ComponentServiceBase.sol +0 -42
- package/contracts/instance/base/IInstanceBase.sol +0 -14
- package/contracts/instance/base/IService.sol +0 -15
- package/contracts/instance/base/InstanceBase.sol +0 -80
- package/contracts/instance/base/ModuleBase.sol +0 -52
- package/contracts/instance/base/ServiceBase.sol +0 -37
- package/contracts/instance/module/access/Access.sol +0 -149
- package/contracts/instance/module/access/IAccess.sol +0 -53
- package/contracts/instance/module/bundle/BundleModule.sol +0 -136
- package/contracts/instance/module/bundle/IBundle.sol +0 -58
- package/contracts/instance/module/compensation/CompensationModule.sol +0 -8
- package/contracts/instance/module/compensation/ICompensation.sol +0 -10
- package/contracts/instance/module/component/ComponentModule.sol +0 -95
- package/contracts/instance/module/component/IComponent.sol +0 -53
- package/contracts/instance/module/policy/IPolicy.sol +0 -60
- package/contracts/instance/module/policy/PolicyModule.sol +0 -76
- package/contracts/instance/module/pool/IPoolModule.sol +0 -41
- package/contracts/instance/module/pool/PoolModule.sol +0 -87
- package/contracts/instance/module/risk/IRisk.sol +0 -10
- package/contracts/instance/module/risk/RiskModule.sol +0 -8
- package/contracts/instance/module/treasury/ITreasury.sol +0 -103
- package/contracts/instance/module/treasury/TokenHandler.sol +0 -48
- package/contracts/instance/module/treasury/TreasuryModule.sol +0 -152
- package/contracts/instance/service/ComponentOwnerService.sol +0 -170
- package/contracts/instance/service/IComponentOwnerService.sol +0 -22
- package/contracts/registry/IChainNft.sol +0 -21
- package/contracts/registry/IRegistryLinked.sol +0 -8
- package/contracts/shared/IOwnable.sol +0 -6
- package/contracts/test/TestPool.sol +0 -22
- package/contracts/test/TestProduct.sol +0 -44
@@ -1,7 +1,5 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
|
-
pragma solidity ^0.8.
|
3
|
-
|
4
|
-
import {Math} from "@openzeppelin/contracts/utils/math/Math.sol";
|
2
|
+
pragma solidity ^0.8.20;
|
5
3
|
|
6
4
|
/// @dev UFixed is a fixed point number with 18 decimals precision.
|
7
5
|
type UFixed is uint256;
|
@@ -16,9 +14,16 @@ using {
|
|
16
14
|
ltUFixed as <,
|
17
15
|
lteUFixed as <=,
|
18
16
|
eqUFixed as ==,
|
19
|
-
|
17
|
+
neUFixed as !=,
|
18
|
+
UFixedLib.toInt,
|
19
|
+
UFixedLib.gtz
|
20
20
|
} for UFixed global;
|
21
21
|
|
22
|
+
// TODO move to UFixedLib and rename to zero()
|
23
|
+
function zeroUFixed() pure returns (UFixed zero) {
|
24
|
+
return UFixed.wrap(0);
|
25
|
+
}
|
26
|
+
|
22
27
|
function addUFixed(UFixed a, UFixed b) pure returns (UFixed) {
|
23
28
|
return UFixed.wrap(UFixed.unwrap(a) + UFixed.unwrap(b));
|
24
29
|
}
|
@@ -30,14 +35,14 @@ function subUFixed(UFixed a, UFixed b) pure returns (UFixed) {
|
|
30
35
|
|
31
36
|
function mulUFixed(UFixed a, UFixed b) pure returns (UFixed) {
|
32
37
|
return
|
33
|
-
UFixed.wrap(
|
38
|
+
UFixed.wrap(MathLib.mulDiv(UFixed.unwrap(a), UFixed.unwrap(b), 10 ** 18));
|
34
39
|
}
|
35
40
|
|
36
41
|
function divUFixed(UFixed a, UFixed b) pure returns (UFixed) {
|
37
42
|
require(UFixed.unwrap(b) > 0, "ERROR:UFM-020:DIVISOR_ZERO");
|
38
43
|
|
39
44
|
return
|
40
|
-
UFixed.wrap(
|
45
|
+
UFixed.wrap(MathLib.mulDiv(UFixed.unwrap(a), 10 ** 18, UFixed.unwrap(b)));
|
41
46
|
}
|
42
47
|
|
43
48
|
function gtUFixed(UFixed a, UFixed b) pure returns (bool isGreaterThan) {
|
@@ -60,6 +65,10 @@ function eqUFixed(UFixed a, UFixed b) pure returns (bool isEqual) {
|
|
60
65
|
return UFixed.unwrap(a) == UFixed.unwrap(b);
|
61
66
|
}
|
62
67
|
|
68
|
+
function neUFixed(UFixed a, UFixed b) pure returns (bool isEqual) {
|
69
|
+
return UFixed.unwrap(a) != UFixed.unwrap(b);
|
70
|
+
}
|
71
|
+
|
63
72
|
function gtzUFixed(UFixed a) pure returns (bool isZero) {
|
64
73
|
return UFixed.unwrap(a) > 0;
|
65
74
|
}
|
@@ -76,7 +85,115 @@ function deltaUFixed(UFixed a, UFixed b) pure returns (UFixed) {
|
|
76
85
|
return b - a;
|
77
86
|
}
|
78
87
|
|
79
|
-
|
88
|
+
/// @dev copied from https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v4.9.3/contracts/utils/math/Math.sol
|
89
|
+
library MathLib {
|
90
|
+
|
91
|
+
enum Rounding {
|
92
|
+
Down, // Toward negative infinity
|
93
|
+
Up, // Toward infinity
|
94
|
+
Zero // Toward zero
|
95
|
+
}
|
96
|
+
|
97
|
+
/**
|
98
|
+
* @notice Calculates floor(x * y / denominator) with full precision. Throws if result overflows a uint256 or denominator == 0
|
99
|
+
* @dev Original credit to Remco Bloemen under MIT license (https://xn--2-umb.com/21/muldiv)
|
100
|
+
* with further edits by Uniswap Labs also under MIT license.
|
101
|
+
*/
|
102
|
+
function mulDiv(uint256 x, uint256 y, uint256 denominator) internal pure returns (uint256 result) {
|
103
|
+
unchecked {
|
104
|
+
// 512-bit multiply [prod1 prod0] = x * y. Compute the product mod 2^256 and mod 2^256 - 1, then use
|
105
|
+
// use the Chinese Remainder Theorem to reconstruct the 512 bit result. The result is stored in two 256
|
106
|
+
// variables such that product = prod1 * 2^256 + prod0.
|
107
|
+
uint256 prod0; // Least significant 256 bits of the product
|
108
|
+
uint256 prod1; // Most significant 256 bits of the product
|
109
|
+
assembly {
|
110
|
+
let mm := mulmod(x, y, not(0))
|
111
|
+
prod0 := mul(x, y)
|
112
|
+
prod1 := sub(sub(mm, prod0), lt(mm, prod0))
|
113
|
+
}
|
114
|
+
|
115
|
+
// Handle non-overflow cases, 256 by 256 division.
|
116
|
+
if (prod1 == 0) {
|
117
|
+
// Solidity will revert if denominator == 0, unlike the div opcode on its own.
|
118
|
+
// The surrounding unchecked block does not change this fact.
|
119
|
+
// See https://docs.soliditylang.org/en/latest/control-structures.html#checked-or-unchecked-arithmetic.
|
120
|
+
return prod0 / denominator;
|
121
|
+
}
|
122
|
+
|
123
|
+
// Make sure the result is less than 2^256. Also prevents denominator == 0.
|
124
|
+
require(denominator > prod1, "Math: mulDiv overflow");
|
125
|
+
|
126
|
+
///////////////////////////////////////////////
|
127
|
+
// 512 by 256 division.
|
128
|
+
///////////////////////////////////////////////
|
129
|
+
|
130
|
+
// Make division exact by subtracting the remainder from [prod1 prod0].
|
131
|
+
uint256 remainder;
|
132
|
+
assembly {
|
133
|
+
// Compute remainder using mulmod.
|
134
|
+
remainder := mulmod(x, y, denominator)
|
135
|
+
|
136
|
+
// Subtract 256 bit number from 512 bit number.
|
137
|
+
prod1 := sub(prod1, gt(remainder, prod0))
|
138
|
+
prod0 := sub(prod0, remainder)
|
139
|
+
}
|
140
|
+
|
141
|
+
// Factor powers of two out of denominator and compute largest power of two divisor of denominator. Always >= 1.
|
142
|
+
// See https://cs.stackexchange.com/q/138556/92363.
|
143
|
+
|
144
|
+
// Does not overflow because the denominator cannot be zero at this stage in the function.
|
145
|
+
uint256 twos = denominator & (~denominator + 1);
|
146
|
+
assembly {
|
147
|
+
// Divide denominator by twos.
|
148
|
+
denominator := div(denominator, twos)
|
149
|
+
|
150
|
+
// Divide [prod1 prod0] by twos.
|
151
|
+
prod0 := div(prod0, twos)
|
152
|
+
|
153
|
+
// Flip twos such that it is 2^256 / twos. If twos is zero, then it becomes one.
|
154
|
+
twos := add(div(sub(0, twos), twos), 1)
|
155
|
+
}
|
156
|
+
|
157
|
+
// Shift in bits from prod1 into prod0.
|
158
|
+
prod0 |= prod1 * twos;
|
159
|
+
|
160
|
+
// Invert denominator mod 2^256. Now that denominator is an odd number, it has an inverse modulo 2^256 such
|
161
|
+
// that denominator * inv = 1 mod 2^256. Compute the inverse by starting with a seed that is correct for
|
162
|
+
// four bits. That is, denominator * inv = 1 mod 2^4.
|
163
|
+
uint256 inverse = (3 * denominator) ^ 2;
|
164
|
+
|
165
|
+
// Use the Newton-Raphson iteration to improve the precision. Thanks to Hensel's lifting lemma, this also works
|
166
|
+
// in modular arithmetic, doubling the correct bits in each step.
|
167
|
+
inverse *= 2 - denominator * inverse; // inverse mod 2^8
|
168
|
+
inverse *= 2 - denominator * inverse; // inverse mod 2^16
|
169
|
+
inverse *= 2 - denominator * inverse; // inverse mod 2^32
|
170
|
+
inverse *= 2 - denominator * inverse; // inverse mod 2^64
|
171
|
+
inverse *= 2 - denominator * inverse; // inverse mod 2^128
|
172
|
+
inverse *= 2 - denominator * inverse; // inverse mod 2^256
|
173
|
+
|
174
|
+
// Because the division is now exact we can divide by multiplying with the modular inverse of denominator.
|
175
|
+
// This will give us the correct result modulo 2^256. Since the preconditions guarantee that the outcome is
|
176
|
+
// less than 2^256, this is the final result. We don't need to compute the high bits of the result and prod1
|
177
|
+
// is no longer required.
|
178
|
+
result = prod0 * inverse;
|
179
|
+
return result;
|
180
|
+
}
|
181
|
+
}
|
182
|
+
|
183
|
+
/**
|
184
|
+
* @notice Calculates x * y / denominator with full precision, following the selected rounding direction.
|
185
|
+
*/
|
186
|
+
function mulDiv(uint256 x, uint256 y, uint256 denominator, Rounding rounding) internal pure returns (uint256) {
|
187
|
+
uint256 result = mulDiv(x, y, denominator);
|
188
|
+
if (rounding == Rounding.Up && mulmod(x, y, denominator) > 0) {
|
189
|
+
result += 1;
|
190
|
+
}
|
191
|
+
return result;
|
192
|
+
}
|
193
|
+
|
194
|
+
}
|
195
|
+
|
196
|
+
library UFixedLib {
|
80
197
|
int8 public constant EXP = 18;
|
81
198
|
uint256 public constant MULTIPLIER = 10 ** uint256(int256(EXP));
|
82
199
|
uint256 public constant MULTIPLIER_HALF = MULTIPLIER / 2;
|
@@ -123,23 +240,23 @@ library UFixedMathLib {
|
|
123
240
|
function toIntWithRounding(UFixed a, uint8 rounding) public pure returns (uint256) {
|
124
241
|
if (rounding == ROUNDING_HALF_UP()) {
|
125
242
|
return
|
126
|
-
|
243
|
+
MathLib.mulDiv(
|
127
244
|
UFixed.unwrap(a) + MULTIPLIER_HALF,
|
128
245
|
1,
|
129
246
|
MULTIPLIER,
|
130
|
-
|
247
|
+
MathLib.Rounding.Down
|
131
248
|
);
|
132
249
|
} else if (rounding == ROUNDING_DOWN()) {
|
133
250
|
return
|
134
|
-
|
251
|
+
MathLib.mulDiv(
|
135
252
|
UFixed.unwrap(a),
|
136
253
|
1,
|
137
254
|
MULTIPLIER,
|
138
|
-
|
255
|
+
MathLib.Rounding.Down
|
139
256
|
);
|
140
257
|
} else {
|
141
258
|
return
|
142
|
-
|
259
|
+
MathLib.mulDiv(UFixed.unwrap(a), 1, MULTIPLIER, MathLib.Rounding.Up);
|
143
260
|
}
|
144
261
|
}
|
145
262
|
|
@@ -6,15 +6,18 @@ type VersionPart is uint8;
|
|
6
6
|
using {
|
7
7
|
versionPartGt as >,
|
8
8
|
versionPartEq as ==,
|
9
|
+
versionPartNe as !=,
|
9
10
|
VersionPartLib.toInt
|
10
11
|
}
|
11
12
|
for VersionPart global;
|
12
13
|
|
13
14
|
function versionPartGt(VersionPart a, VersionPart b) pure returns(bool isGreaterThan) { return VersionPart.unwrap(a) > VersionPart.unwrap(b); }
|
14
15
|
function versionPartEq(VersionPart a, VersionPart b) pure returns(bool isSame) { return VersionPart.unwrap(a) == VersionPart.unwrap(b); }
|
16
|
+
function versionPartNe(VersionPart a, VersionPart b) pure returns(bool isSame) { return VersionPart.unwrap(a) != VersionPart.unwrap(b); }
|
15
17
|
|
16
18
|
library VersionPartLib {
|
17
|
-
function toInt(VersionPart
|
19
|
+
function toInt(VersionPart a) external pure returns(uint) { return VersionPart.unwrap(a); }
|
20
|
+
function toVersionPart(uint256 a) external pure returns(VersionPart) { return VersionPart.wrap(uint8(a)); }
|
18
21
|
}
|
19
22
|
|
20
23
|
type Version is uint24; // contains major,minor,patch version parts
|
@@ -23,6 +26,7 @@ using {
|
|
23
26
|
versionGt as >,
|
24
27
|
versionEq as ==,
|
25
28
|
VersionLib.toInt,
|
29
|
+
VersionLib.toUint64,
|
26
30
|
VersionLib.toMajorPart,
|
27
31
|
VersionLib.toVersionParts
|
28
32
|
}
|
@@ -34,6 +38,8 @@ function versionEq(Version a, Version b) pure returns(bool isSame) { return Vers
|
|
34
38
|
library VersionLib {
|
35
39
|
function toInt(Version version) external pure returns(uint) { return Version.unwrap(version); }
|
36
40
|
|
41
|
+
function toUint64(Version version) external pure returns(uint64) { return Version.unwrap(version); }
|
42
|
+
|
37
43
|
function toMajorPart(Version version)
|
38
44
|
external
|
39
45
|
pure
|
@@ -89,6 +95,13 @@ library VersionLib {
|
|
89
95
|
(major << 16) + (minor << 8) + patch));
|
90
96
|
}
|
91
97
|
|
98
|
+
// TODO check for overflow?
|
99
|
+
function toVersion(uint64 versionNumber) external pure returns(Version) {
|
100
|
+
//assert(versionNumber <= type(Version).max);
|
101
|
+
return Version.wrap(uint24(versionNumber));
|
102
|
+
}
|
103
|
+
|
104
|
+
// TODO rename to zero()
|
92
105
|
function zeroVersion() external pure returns(Version) {
|
93
106
|
return Version.wrap(0);
|
94
107
|
}
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@etherisc/gif-next",
|
3
|
-
"version": "0.0.2-
|
3
|
+
"version": "0.0.2-faaba97-954",
|
4
4
|
"description": "This is the repository for the next version of the Generic Insurance Framework (GIF) smart contracts. ",
|
5
5
|
"main": "index.js",
|
6
6
|
"scripts": {
|
@@ -32,8 +32,8 @@
|
|
32
32
|
"@nomicfoundation/hardhat-foundry": "^1.1.1",
|
33
33
|
"@nomicfoundation/hardhat-toolbox": "^3.0.0",
|
34
34
|
"@nomicfoundation/hardhat-verify": "^1.1.1",
|
35
|
-
"@typescript-eslint/eslint-plugin": "^
|
36
|
-
"@typescript-eslint/parser": "^
|
35
|
+
"@typescript-eslint/eslint-plugin": "^7.1.0",
|
36
|
+
"@typescript-eslint/parser": "^7.1.0",
|
37
37
|
"dotenv": "^16.3.1",
|
38
38
|
"eslint": "^8.50.0",
|
39
39
|
"hardhat": "^2.17.2",
|
@@ -42,10 +42,11 @@
|
|
42
42
|
"typescript": "^5"
|
43
43
|
},
|
44
44
|
"dependencies": {
|
45
|
-
"@openzeppelin/contracts": "
|
46
|
-
"@openzeppelin/contracts-upgradeable": "
|
45
|
+
"@openzeppelin/contracts": "5.0.0",
|
46
|
+
"@openzeppelin/contracts-upgradeable": "5.0.0",
|
47
47
|
"abi-coder": "^5.0.0",
|
48
48
|
"ethers": "^6.7.1",
|
49
|
+
"solidity-docgen": "^0.6.0-beta.36",
|
49
50
|
"winston": "^3.10.0"
|
50
51
|
}
|
51
52
|
}
|
@@ -1,174 +0,0 @@
|
|
1
|
-
{
|
2
|
-
"_format": "hh-sol-artifact-1",
|
3
|
-
"contractName": "BaseComponent",
|
4
|
-
"sourceName": "contracts/components/BaseComponent.sol",
|
5
|
-
"abi": [
|
6
|
-
{
|
7
|
-
"inputs": [],
|
8
|
-
"name": "getData",
|
9
|
-
"outputs": [
|
10
|
-
{
|
11
|
-
"internalType": "bytes",
|
12
|
-
"name": "data",
|
13
|
-
"type": "bytes"
|
14
|
-
}
|
15
|
-
],
|
16
|
-
"stateMutability": "view",
|
17
|
-
"type": "function"
|
18
|
-
},
|
19
|
-
{
|
20
|
-
"inputs": [],
|
21
|
-
"name": "getInstance",
|
22
|
-
"outputs": [
|
23
|
-
{
|
24
|
-
"internalType": "contract IInstance",
|
25
|
-
"name": "instance",
|
26
|
-
"type": "address"
|
27
|
-
}
|
28
|
-
],
|
29
|
-
"stateMutability": "view",
|
30
|
-
"type": "function"
|
31
|
-
},
|
32
|
-
{
|
33
|
-
"inputs": [],
|
34
|
-
"name": "getNftId",
|
35
|
-
"outputs": [
|
36
|
-
{
|
37
|
-
"internalType": "NftId",
|
38
|
-
"name": "nftId",
|
39
|
-
"type": "uint96"
|
40
|
-
}
|
41
|
-
],
|
42
|
-
"stateMutability": "view",
|
43
|
-
"type": "function"
|
44
|
-
},
|
45
|
-
{
|
46
|
-
"inputs": [],
|
47
|
-
"name": "getOwner",
|
48
|
-
"outputs": [
|
49
|
-
{
|
50
|
-
"internalType": "address",
|
51
|
-
"name": "owner",
|
52
|
-
"type": "address"
|
53
|
-
}
|
54
|
-
],
|
55
|
-
"stateMutability": "view",
|
56
|
-
"type": "function"
|
57
|
-
},
|
58
|
-
{
|
59
|
-
"inputs": [],
|
60
|
-
"name": "getParentNftId",
|
61
|
-
"outputs": [
|
62
|
-
{
|
63
|
-
"internalType": "NftId",
|
64
|
-
"name": "nftId",
|
65
|
-
"type": "uint96"
|
66
|
-
}
|
67
|
-
],
|
68
|
-
"stateMutability": "view",
|
69
|
-
"type": "function"
|
70
|
-
},
|
71
|
-
{
|
72
|
-
"inputs": [],
|
73
|
-
"name": "getRegistry",
|
74
|
-
"outputs": [
|
75
|
-
{
|
76
|
-
"internalType": "contract IRegistry",
|
77
|
-
"name": "registry",
|
78
|
-
"type": "address"
|
79
|
-
}
|
80
|
-
],
|
81
|
-
"stateMutability": "view",
|
82
|
-
"type": "function"
|
83
|
-
},
|
84
|
-
{
|
85
|
-
"inputs": [],
|
86
|
-
"name": "getToken",
|
87
|
-
"outputs": [
|
88
|
-
{
|
89
|
-
"internalType": "contract IERC20Metadata",
|
90
|
-
"name": "token",
|
91
|
-
"type": "address"
|
92
|
-
}
|
93
|
-
],
|
94
|
-
"stateMutability": "view",
|
95
|
-
"type": "function"
|
96
|
-
},
|
97
|
-
{
|
98
|
-
"inputs": [],
|
99
|
-
"name": "getType",
|
100
|
-
"outputs": [
|
101
|
-
{
|
102
|
-
"internalType": "ObjectType",
|
103
|
-
"name": "objectType",
|
104
|
-
"type": "uint8"
|
105
|
-
}
|
106
|
-
],
|
107
|
-
"stateMutability": "pure",
|
108
|
-
"type": "function"
|
109
|
-
},
|
110
|
-
{
|
111
|
-
"inputs": [],
|
112
|
-
"name": "getWallet",
|
113
|
-
"outputs": [
|
114
|
-
{
|
115
|
-
"internalType": "address",
|
116
|
-
"name": "walletAddress",
|
117
|
-
"type": "address"
|
118
|
-
}
|
119
|
-
],
|
120
|
-
"stateMutability": "view",
|
121
|
-
"type": "function"
|
122
|
-
},
|
123
|
-
{
|
124
|
-
"inputs": [],
|
125
|
-
"name": "lock",
|
126
|
-
"outputs": [],
|
127
|
-
"stateMutability": "nonpayable",
|
128
|
-
"type": "function"
|
129
|
-
},
|
130
|
-
{
|
131
|
-
"inputs": [],
|
132
|
-
"name": "register",
|
133
|
-
"outputs": [
|
134
|
-
{
|
135
|
-
"internalType": "NftId",
|
136
|
-
"name": "componentId",
|
137
|
-
"type": "uint96"
|
138
|
-
}
|
139
|
-
],
|
140
|
-
"stateMutability": "nonpayable",
|
141
|
-
"type": "function"
|
142
|
-
},
|
143
|
-
{
|
144
|
-
"inputs": [
|
145
|
-
{
|
146
|
-
"internalType": "bytes4",
|
147
|
-
"name": "interfaceId",
|
148
|
-
"type": "bytes4"
|
149
|
-
}
|
150
|
-
],
|
151
|
-
"name": "supportsInterface",
|
152
|
-
"outputs": [
|
153
|
-
{
|
154
|
-
"internalType": "bool",
|
155
|
-
"name": "",
|
156
|
-
"type": "bool"
|
157
|
-
}
|
158
|
-
],
|
159
|
-
"stateMutability": "view",
|
160
|
-
"type": "function"
|
161
|
-
},
|
162
|
-
{
|
163
|
-
"inputs": [],
|
164
|
-
"name": "unlock",
|
165
|
-
"outputs": [],
|
166
|
-
"stateMutability": "nonpayable",
|
167
|
-
"type": "function"
|
168
|
-
}
|
169
|
-
],
|
170
|
-
"bytecode": "0x",
|
171
|
-
"deployedBytecode": "0x",
|
172
|
-
"linkReferences": {},
|
173
|
-
"deployedLinkReferences": {}
|
174
|
-
}
|
@@ -1,105 +0,0 @@
|
|
1
|
-
{
|
2
|
-
"_format": "hh-sol-artifact-1",
|
3
|
-
"contractName": "Require",
|
4
|
-
"sourceName": "contracts/experiment/errors/Require.sol",
|
5
|
-
"abi": [
|
6
|
-
{
|
7
|
-
"inputs": [],
|
8
|
-
"stateMutability": "nonpayable",
|
9
|
-
"type": "constructor"
|
10
|
-
},
|
11
|
-
{
|
12
|
-
"inputs": [
|
13
|
-
{
|
14
|
-
"internalType": "uint256",
|
15
|
-
"name": "a",
|
16
|
-
"type": "uint256"
|
17
|
-
},
|
18
|
-
{
|
19
|
-
"internalType": "uint256",
|
20
|
-
"name": "b",
|
21
|
-
"type": "uint256"
|
22
|
-
}
|
23
|
-
],
|
24
|
-
"name": "AsmallerThanB_L",
|
25
|
-
"type": "error"
|
26
|
-
},
|
27
|
-
{
|
28
|
-
"inputs": [
|
29
|
-
{
|
30
|
-
"internalType": "uint256",
|
31
|
-
"name": "a",
|
32
|
-
"type": "uint256"
|
33
|
-
}
|
34
|
-
],
|
35
|
-
"name": "AsmallerThanB_M",
|
36
|
-
"type": "error"
|
37
|
-
},
|
38
|
-
{
|
39
|
-
"inputs": [],
|
40
|
-
"name": "AsmallerThanB_S",
|
41
|
-
"type": "error"
|
42
|
-
},
|
43
|
-
{
|
44
|
-
"inputs": [
|
45
|
-
{
|
46
|
-
"internalType": "uint256",
|
47
|
-
"name": "a",
|
48
|
-
"type": "uint256"
|
49
|
-
}
|
50
|
-
],
|
51
|
-
"name": "isAlargerThanBRequire_L",
|
52
|
-
"outputs": [
|
53
|
-
{
|
54
|
-
"internalType": "bool",
|
55
|
-
"name": "isLarger",
|
56
|
-
"type": "bool"
|
57
|
-
}
|
58
|
-
],
|
59
|
-
"stateMutability": "view",
|
60
|
-
"type": "function"
|
61
|
-
},
|
62
|
-
{
|
63
|
-
"inputs": [
|
64
|
-
{
|
65
|
-
"internalType": "uint256",
|
66
|
-
"name": "a",
|
67
|
-
"type": "uint256"
|
68
|
-
}
|
69
|
-
],
|
70
|
-
"name": "isAlargerThanBRequire_M",
|
71
|
-
"outputs": [
|
72
|
-
{
|
73
|
-
"internalType": "bool",
|
74
|
-
"name": "isLarger",
|
75
|
-
"type": "bool"
|
76
|
-
}
|
77
|
-
],
|
78
|
-
"stateMutability": "view",
|
79
|
-
"type": "function"
|
80
|
-
},
|
81
|
-
{
|
82
|
-
"inputs": [
|
83
|
-
{
|
84
|
-
"internalType": "uint256",
|
85
|
-
"name": "a",
|
86
|
-
"type": "uint256"
|
87
|
-
}
|
88
|
-
],
|
89
|
-
"name": "isAlargerThanBRequire_S",
|
90
|
-
"outputs": [
|
91
|
-
{
|
92
|
-
"internalType": "bool",
|
93
|
-
"name": "isLarger",
|
94
|
-
"type": "bool"
|
95
|
-
}
|
96
|
-
],
|
97
|
-
"stateMutability": "view",
|
98
|
-
"type": "function"
|
99
|
-
}
|
100
|
-
],
|
101
|
-
"bytecode": "0x608060405234801561001057600080fd5b50602a6000556101df806100256000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c806342bf62e0146100465780638db581aa1461006d57806394977ddd14610080575b600080fd5b610059610054366004610190565b610093565b604051901515815260200160405180910390f35b61005961007b366004610190565b6100f2565b61005961008e366004610190565b610134565b6000805482116100ea5760405162461bcd60e51b815260206004820152601a60248201527f4552524f523a4142432d3030323a415f49535f534d414c4c455200000000000060448201526064015b60405180910390fd5b506001919050565b6000805482116100ea5760405162461bcd60e51b815260206004820152600d60248201526c4552524f523a4142432d30303160981b60448201526064016100e1565b6000805482116100ea5760405162461bcd60e51b815260206004820152602160248201527f4552524f523a4142432d3030333a415f49535f534d414c4c45525f5448414e5f6044820152602160f91b60648201526084016100e1565b6000602082840312156101a257600080fd5b503591905056fea2646970667358221220572bbc4b1e30046ddb065771b03fa96e34255214cd346e350172d87d56991ba064736f6c63430008140033",
|
102
|
-
"deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100415760003560e01c806342bf62e0146100465780638db581aa1461006d57806394977ddd14610080575b600080fd5b610059610054366004610190565b610093565b604051901515815260200160405180910390f35b61005961007b366004610190565b6100f2565b61005961008e366004610190565b610134565b6000805482116100ea5760405162461bcd60e51b815260206004820152601a60248201527f4552524f523a4142432d3030323a415f49535f534d414c4c455200000000000060448201526064015b60405180910390fd5b506001919050565b6000805482116100ea5760405162461bcd60e51b815260206004820152600d60248201526c4552524f523a4142432d30303160981b60448201526064016100e1565b6000805482116100ea5760405162461bcd60e51b815260206004820152602160248201527f4552524f523a4142432d3030333a415f49535f534d414c4c45525f5448414e5f6044820152602160f91b60648201526084016100e1565b6000602082840312156101a257600080fd5b503591905056fea2646970667358221220572bbc4b1e30046ddb065771b03fa96e34255214cd346e350172d87d56991ba064736f6c63430008140033",
|
103
|
-
"linkReferences": {},
|
104
|
-
"deployedLinkReferences": {}
|
105
|
-
}
|