@etherisc/gif-next 0.0.2-f18fb8b-243 → 0.0.2-f1f3b2c-994
Sign up to get free protection for your applications and to get access to all the features.
- package/README.md +19 -2
- package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.dbg.json +1 -1
- package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.json +81 -63
- package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.dbg.json +1 -1
- package/artifacts/contracts/authorization/Authorization.sol/Authorization.dbg.json +1 -1
- package/artifacts/contracts/authorization/Authorization.sol/Authorization.json +2 -2
- package/artifacts/contracts/authorization/IAccess.sol/IAccess.dbg.json +1 -1
- package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.dbg.json +1 -1
- package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.json +48 -30
- package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.dbg.json +1 -1
- package/artifacts/contracts/authorization/IModuleAuthorization.sol/IModuleAuthorization.dbg.json +1 -1
- package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.dbg.json +1 -1
- package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.json +21 -2
- package/artifacts/contracts/authorization/ModuleAuthorization.sol/ModuleAuthorization.dbg.json +1 -1
- package/artifacts/contracts/authorization/ModuleAuthorization.sol/ModuleAuthorization.json +2 -2
- package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.dbg.json +1 -1
- package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.json +72 -9
- package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.dbg.json +1 -1
- package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.json +106 -248
- package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.dbg.json +1 -1
- package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.json +16 -16
- package/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +1 -1
- package/artifacts/contracts/distribution/Distribution.sol/Distribution.json +64 -222
- package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json +1 -1
- package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.json +228 -217
- package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
- package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +93 -101
- package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
- package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.json +64 -37
- package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +1 -1
- package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.json +120 -31
- package/artifacts/contracts/examples/fire/DamageLevel.sol/DamageLevelLib.dbg.json +4 -0
- package/artifacts/contracts/examples/fire/DamageLevel.sol/DamageLevelLib.json +22 -0
- package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.dbg.json +4 -0
- package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.json +1512 -0
- package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.dbg.json +4 -0
- package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.json +410 -0
- package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.dbg.json +4 -0
- package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.json +1999 -0
- package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.dbg.json +4 -0
- package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.json +414 -0
- package/artifacts/contracts/examples/fire/FireUSD.sol/FireUSD.dbg.json +4 -0
- package/artifacts/contracts/examples/fire/FireUSD.sol/FireUSD.json +376 -0
- package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.dbg.json +4 -0
- package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.json +1432 -0
- package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.dbg.json +4 -0
- package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.json +1192 -0
- package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.dbg.json +4 -0
- package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.json +1566 -0
- package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.dbg.json +4 -0
- package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.json +2001 -0
- package/artifacts/contracts/instance/BundleSet.sol/BundleSet.dbg.json +4 -0
- package/artifacts/contracts/instance/BundleSet.sol/BundleSet.json +703 -0
- package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.json +6 -6
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +5 -5
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +17 -106
- package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.json +146 -112
- package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.json +31 -31
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +437 -129
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +44 -151
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +61 -81
- package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +285 -228
- package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.dbg.json +1 -1
- package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.json +2 -2
- package/artifacts/contracts/instance/base/Cloneable.sol/Cloneable.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.json +2 -2
- package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.json +45 -4
- package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.dbg.json +4 -0
- package/artifacts/contracts/instance/base/{ObjectManager.sol/ObjectManager.json → ObjectSet.sol/ObjectSet.json} +6 -6
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +1 -1
- 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/mock/Dip.sol/Dip.dbg.json +1 -1
- package/artifacts/contracts/mock/Dip.sol/Dip.json +2 -2
- package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.dbg.json +1 -1
- package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.json +74 -229
- package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.dbg.json +1 -1
- package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.json +18 -18
- package/artifacts/contracts/oracle/IOracle.sol/IOracle.dbg.json +1 -1
- package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.dbg.json +1 -1
- package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.json +45 -31
- package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.dbg.json +1 -1
- package/artifacts/contracts/oracle/Oracle.sol/Oracle.dbg.json +1 -1
- package/artifacts/contracts/oracle/Oracle.sol/Oracle.json +42 -213
- package/artifacts/contracts/oracle/OracleService.sol/OracleService.dbg.json +1 -1
- package/artifacts/contracts/oracle/OracleService.sol/OracleService.json +37 -144
- package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.dbg.json +1 -1
- package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.json +60 -80
- package/artifacts/contracts/pool/BasicPool.sol/BasicPool.dbg.json +1 -1
- package/artifacts/contracts/pool/BasicPool.sol/BasicPool.json +94 -274
- package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.dbg.json +1 -1
- package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.json +16 -16
- package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +1 -1
- package/artifacts/contracts/pool/BundleService.sol/BundleService.json +458 -161
- package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
- package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +154 -86
- package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +1 -1
- package/artifacts/contracts/pool/IBundleService.sol/IBundleService.json +229 -1
- package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
- package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.json +87 -88
- package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +1 -1
- package/artifacts/contracts/pool/IPoolService.sol/IPoolService.json +360 -171
- package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +1 -1
- package/artifacts/contracts/pool/Pool.sol/Pool.json +84 -270
- package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +1 -1
- package/artifacts/contracts/pool/PoolService.sol/PoolService.json +492 -333
- package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
- package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +98 -82
- package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +1 -1
- package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +36 -162
- package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +57 -89
- package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.dbg.json +1 -1
- package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.json +62 -242
- package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.dbg.json +1 -1
- package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.json +16 -16
- package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +1 -1
- package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +263 -181
- package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +104 -100
- package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +1 -1
- package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.json +5 -0
- package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +1 -1
- package/artifacts/contracts/product/IClaimService.sol/IClaimService.json +147 -6
- package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +1 -1
- package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.json +295 -119
- package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +1 -1
- package/artifacts/contracts/product/IPricingService.sol/IPricingService.json +43 -43
- package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +1 -1
- package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.json +62 -57
- package/artifacts/contracts/product/IRiskService.sol/IRiskService.dbg.json +4 -0
- package/artifacts/contracts/product/{IProductService.sol/IProductService.json → IRiskService.sol/IRiskService.json} +2 -2
- package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +1 -1
- package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +406 -321
- package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +104 -100
- package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +1 -1
- package/artifacts/contracts/product/PricingService.sol/PricingService.json +118 -265
- package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +80 -120
- package/artifacts/contracts/product/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/product/Product.sol/Product.json +62 -242
- package/artifacts/contracts/product/RiskService.sol/RiskService.dbg.json +4 -0
- package/artifacts/contracts/product/RiskService.sol/RiskService.json +588 -0
- package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.dbg.json +4 -0
- package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.json +682 -0
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +59 -16
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +274 -22
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +0 -183
- package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registry.json +493 -80
- package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.json +263 -145
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +23 -313
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +52 -72
- package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.dbg.json +1 -1
- package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.json +46 -5
- package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.dbg.json +4 -0
- package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.json +1061 -0
- package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.dbg.json +1 -1
- package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.json +70 -12
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +2 -2
- package/artifacts/contracts/shared/Component.sol/Component.dbg.json +1 -1
- package/artifacts/contracts/shared/Component.sol/Component.json +15 -205
- package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +1 -1
- package/artifacts/contracts/shared/ComponentService.sol/ComponentService.json +247 -161
- package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.dbg.json +1 -1
- package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.json +105 -95
- package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.dbg.json +1 -1
- package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.json +5 -112
- package/artifacts/contracts/shared/ContractLib.sol/ContractLib.dbg.json +4 -0
- package/artifacts/contracts/shared/ContractLib.sol/ContractLib.json +92 -0
- package/artifacts/contracts/shared/IComponent.sol/IComponent.dbg.json +1 -1
- package/artifacts/contracts/shared/IComponent.sol/IComponent.json +15 -20
- package/artifacts/contracts/shared/IComponentService.sol/IComponentService.dbg.json +1 -1
- package/artifacts/contracts/shared/IComponentService.sol/IComponentService.json +153 -0
- package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.dbg.json +1 -1
- package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.json +34 -31
- package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.json +36 -0
- package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.dbg.json +1 -1
- package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.json +36 -0
- package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
- package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
- package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +15 -47
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
- package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
- package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
- package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.dbg.json +4 -0
- package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.json +53 -0
- package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.dbg.json +1 -1
- package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.json +34 -216
- package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.json +41 -0
- package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.dbg.json +1 -1
- package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.json +41 -0
- package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.dbg.json +4 -0
- package/artifacts/contracts/shared/{NftIdSetManager.sol/NftIdSetManager.json → NftIdSet.sol/NftIdSet.json} +4 -4
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +6 -57
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +19 -141
- package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
- package/artifacts/contracts/shared/Registerable.sol/Registerable.json +8 -97
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +2 -15
- package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
- package/artifacts/contracts/shared/Service.sol/Service.json +5 -112
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +330 -11
- package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.dbg.json +4 -0
- package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.json +108 -0
- package/artifacts/contracts/staking/IStaking.sol/IStaking.dbg.json +1 -1
- package/artifacts/contracts/staking/IStaking.sol/IStaking.json +42 -21
- package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +1 -1
- package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.dbg.json +1 -1
- package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.json +73 -93
- package/artifacts/contracts/staking/Staking.sol/Staking.dbg.json +1 -1
- package/artifacts/contracts/staking/Staking.sol/Staking.json +100 -256
- package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.json +45 -4
- package/artifacts/contracts/staking/StakingManager.sol/StakingManager.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingManager.sol/StakingManager.json +77 -88
- package/artifacts/contracts/staking/StakingReader.sol/StakingReader.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingReader.sol/StakingReader.json +6 -11
- package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingService.sol/StakingService.json +31 -138
- package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +56 -76
- package/artifacts/contracts/staking/StakingStore.sol/StakingStore.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingStore.sol/StakingStore.json +176 -130
- package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.dbg.json +1 -1
- package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.json +59 -23
- package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.dbg.json +1 -1
- package/artifacts/contracts/type/Amount.sol/AmountLib.dbg.json +1 -1
- package/artifacts/contracts/type/Amount.sol/AmountLib.json +61 -8
- package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
- package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.json +2 -2
- package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.json +28 -4
- package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
- package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.json +2 -2
- package/artifacts/contracts/type/Fee.sol/FeeLib.dbg.json +1 -1
- package/artifacts/contracts/type/Fee.sol/FeeLib.json +7 -2
- package/artifacts/contracts/type/Key32.sol/Key32Lib.dbg.json +1 -1
- package/artifacts/contracts/type/Key32.sol/Key32Lib.json +2 -2
- package/artifacts/contracts/type/NftId.sol/NftIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/NftId.sol/NftIdLib.json +2 -2
- package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
- package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.json +2 -2
- package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
- package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.json +2 -2
- package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.json +19 -19
- package/artifacts/contracts/type/Referral.sol/ReferralLib.dbg.json +1 -1
- package/artifacts/contracts/type/Referral.sol/ReferralLib.json +2 -2
- package/artifacts/contracts/type/RequestId.sol/RequestIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/RequestId.sol/RequestIdLib.json +2 -2
- package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/RiskId.sol/RiskIdLib.json +60 -4
- package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/RoleId.sol/RoleIdLib.json +2 -2
- package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json +1 -1
- package/artifacts/contracts/type/Seconds.sol/SecondsLib.json +50 -2
- package/artifacts/contracts/type/Selector.sol/SelectorLib.dbg.json +1 -1
- package/artifacts/contracts/type/Selector.sol/SelectorSetLib.dbg.json +1 -1
- package/artifacts/contracts/type/StateId.sol/StateIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/StateId.sol/StateIdLib.json +15 -2
- package/artifacts/contracts/type/String.sol/StrLib.dbg.json +1 -1
- package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json +1 -1
- package/artifacts/contracts/type/Timestamp.sol/TimestampLib.json +23 -4
- package/artifacts/contracts/type/UFixed.sol/MathLib.dbg.json +1 -1
- package/artifacts/contracts/type/UFixed.sol/MathLib.json +9 -3
- package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json +1 -1
- package/artifacts/contracts/type/UFixed.sol/UFixedLib.json +52 -2
- package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json +1 -1
- package/artifacts/contracts/type/Version.sol/VersionLib.json +2 -2
- package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json +1 -1
- package/artifacts/contracts/type/Version.sol/VersionPartLib.json +21 -2
- package/artifacts/contracts/upgradeability/IVersionable.sol/IVersionable.dbg.json +4 -0
- package/artifacts/contracts/{shared → upgradeability}/IVersionable.sol/IVersionable.json +1 -1
- package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.dbg.json +4 -0
- package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.json +586 -0
- package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +4 -0
- package/artifacts/contracts/{shared → upgradeability}/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +3 -3
- package/artifacts/contracts/upgradeability/Versionable.sol/Versionable.dbg.json +4 -0
- package/artifacts/contracts/{shared → upgradeability}/Versionable.sol/Versionable.json +1 -1
- package/contracts/authorization/AccessAdmin.sol +31 -24
- package/contracts/authorization/Authorization.sol +5 -2
- package/contracts/authorization/IAccessAdmin.sol +3 -2
- package/contracts/authorization/IServiceAuthorization.sol +4 -2
- package/contracts/authorization/ServiceAuthorization.sol +27 -11
- package/contracts/distribution/BasicDistribution.sol +4 -15
- package/contracts/distribution/BasicDistributionAuthorization.sol +5 -1
- package/contracts/distribution/Distribution.sol +23 -11
- package/contracts/distribution/DistributionService.sol +76 -42
- package/contracts/distribution/DistributionServiceManager.sol +8 -11
- package/contracts/distribution/IDistributionComponent.sol +8 -4
- package/contracts/distribution/IDistributionService.sol +18 -2
- package/contracts/examples/fire/DamageLevel.sol +59 -0
- package/contracts/examples/fire/FirePool.sol +75 -0
- package/contracts/examples/fire/FirePoolAuthorization.sol +34 -0
- package/contracts/examples/fire/FireProduct.sol +411 -0
- package/contracts/examples/fire/FireProductAuthorization.sol +45 -0
- package/contracts/examples/fire/FireUSD.sol +26 -0
- package/contracts/examples/unpermissioned/SimpleDistribution.sol +50 -0
- package/contracts/examples/unpermissioned/SimpleOracle.sol +137 -0
- package/contracts/examples/unpermissioned/SimplePool.sol +76 -0
- package/contracts/examples/unpermissioned/SimpleProduct.sol +351 -0
- package/contracts/instance/{BundleManager.sol → BundleSet.sol} +23 -23
- package/contracts/instance/IInstance.sol +11 -34
- package/contracts/instance/IInstanceService.sol +5 -5
- package/contracts/instance/Instance.sol +13 -38
- package/contracts/instance/InstanceAdmin.sol +31 -9
- package/contracts/instance/InstanceAuthorizationV3.sol +16 -14
- package/contracts/instance/InstanceReader.sol +115 -25
- package/contracts/instance/InstanceService.sol +71 -49
- package/contracts/instance/InstanceServiceManager.sol +8 -13
- package/contracts/instance/InstanceStore.sol +12 -1
- package/contracts/instance/base/ObjectLifecycle.sol +9 -4
- package/contracts/instance/base/{ObjectManager.sol → ObjectSet.sol} +5 -5
- package/contracts/instance/module/IBundle.sol +1 -1
- package/contracts/instance/module/IComponents.sol +4 -8
- package/contracts/instance/module/IDistribution.sol +0 -1
- package/contracts/instance/module/IPolicy.sol +24 -24
- package/contracts/mock/Dip.sol +1 -1
- package/contracts/oracle/IOracleComponent.sol +2 -1
- package/contracts/oracle/Oracle.sol +17 -7
- package/contracts/oracle/OracleService.sol +11 -8
- package/contracts/oracle/OracleServiceManager.sol +8 -11
- package/contracts/pool/BasicPool.sol +7 -5
- package/contracts/pool/BasicPoolAuthorization.sol +11 -2
- package/contracts/pool/BundleService.sol +221 -56
- package/contracts/pool/BundleServiceManager.sol +8 -11
- package/contracts/pool/IBundleService.sol +42 -5
- package/contracts/pool/IPoolComponent.sol +24 -8
- package/contracts/pool/IPoolService.sol +57 -36
- package/contracts/pool/Pool.sol +72 -30
- package/contracts/pool/PoolService.sol +240 -129
- package/contracts/pool/PoolServiceManager.sol +6 -9
- package/contracts/product/ApplicationService.sol +62 -65
- package/contracts/product/ApplicationServiceManager.sol +6 -6
- package/contracts/product/BasicProduct.sol +3 -32
- package/contracts/product/BasicProductAuthorization.sol +3 -0
- package/contracts/product/ClaimService.sol +254 -115
- package/contracts/product/ClaimServiceManager.sol +6 -6
- package/contracts/product/IApplicationService.sol +1 -0
- package/contracts/product/IClaimService.sol +31 -7
- package/contracts/product/IPolicyService.sol +34 -32
- package/contracts/product/IPricingService.sol +7 -7
- package/contracts/product/IProductComponent.sol +18 -4
- package/contracts/product/{IProductService.sol → IRiskService.sol} +1 -1
- package/contracts/product/PolicyService.sol +404 -193
- package/contracts/product/PolicyServiceManager.sol +6 -9
- package/contracts/product/PricingService.sol +46 -46
- package/contracts/product/PricingServiceManager.sol +5 -8
- package/contracts/product/Product.sol +90 -50
- package/contracts/product/{ProductService.sol → RiskService.sol} +13 -41
- package/contracts/product/RiskServiceManager.sol +39 -0
- package/contracts/registry/ChainNft.sol +65 -32
- package/contracts/registry/IRegistry.sol +65 -19
- package/contracts/registry/IRegistryService.sol +0 -9
- package/contracts/registry/Registry.sol +340 -211
- package/contracts/registry/RegistryAdmin.sol +155 -72
- package/contracts/registry/RegistryService.sol +59 -66
- package/contracts/registry/RegistryServiceManager.sol +4 -4
- package/contracts/registry/ReleaseLifecycle.sol +6 -3
- package/contracts/registry/ReleaseRegistry.sol +496 -0
- package/contracts/registry/ServiceAuthorizationV3.sol +13 -15
- package/contracts/registry/TokenRegistry.sol +2 -2
- package/contracts/shared/Component.sol +38 -43
- package/contracts/shared/ComponentService.sol +88 -28
- package/contracts/shared/ComponentServiceManager.sol +10 -7
- package/contracts/shared/ComponentVerifyingService.sol +2 -3
- package/contracts/shared/ContractLib.sol +38 -0
- package/contracts/shared/IComponent.sol +7 -4
- package/contracts/shared/IComponentService.sol +15 -9
- package/contracts/shared/IInstanceLinkedComponent.sol +9 -10
- package/contracts/shared/ILifecycle.sol +3 -1
- package/contracts/shared/IPolicyHolder.sol +12 -22
- package/contracts/shared/IService.sol +1 -1
- package/contracts/shared/{ERC165.sol → InitializableERC165.sol} +3 -3
- package/contracts/shared/InstanceLinkedComponent.sol +26 -6
- package/contracts/shared/KeyValueStore.sol +1 -1
- package/contracts/shared/Lifecycle.sol +13 -2
- package/contracts/shared/{NftIdSetManager.sol → NftIdSet.sol} +1 -1
- package/contracts/shared/NftOwnable.sol +7 -7
- package/contracts/shared/PolicyHolder.sol +17 -57
- package/contracts/shared/Registerable.sol +4 -4
- package/contracts/shared/RegistryLinked.sol +3 -2
- package/contracts/shared/Service.sol +19 -15
- package/contracts/shared/TokenHandler.sol +100 -19
- package/contracts/shared/TokenHandlerDeployerLib.sol +12 -0
- package/contracts/staking/IStaking.sol +3 -3
- package/contracts/staking/IStakingService.sol +12 -5
- package/contracts/staking/StakeManagerLib.sol +18 -25
- package/contracts/staking/Staking.sol +27 -42
- package/contracts/staking/StakingManager.sol +10 -12
- package/contracts/staking/StakingReader.sol +23 -20
- package/contracts/staking/StakingService.sol +10 -14
- package/contracts/staking/StakingServiceManager.sol +4 -4
- package/contracts/staking/StakingStore.sol +12 -22
- package/contracts/staking/TargetManagerLib.sol +7 -3
- package/contracts/type/Amount.sol +27 -5
- package/contracts/type/Blocknumber.sol +7 -1
- package/contracts/type/ClaimId.sol +6 -1
- package/contracts/type/NftId.sol +1 -0
- package/contracts/type/ObjectType.sol +19 -18
- package/contracts/type/PayoutId.sol +10 -10
- package/contracts/type/Referral.sol +1 -0
- package/contracts/type/RiskId.sol +15 -1
- package/contracts/type/Seconds.sol +21 -1
- package/contracts/type/StateId.sol +15 -1
- package/contracts/type/Timestamp.sol +11 -1
- package/contracts/type/UFixed.sol +33 -10
- package/contracts/type/Version.sol +3 -1
- package/contracts/{shared → upgradeability}/ProxyManager.sol +70 -38
- package/contracts/{shared → upgradeability}/UpgradableProxyWithAdmin.sol +1 -3
- package/contracts/{shared → upgradeability}/Versionable.sol +2 -2
- package/package.json +2 -1
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +0 -4
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +0 -703
- package/artifacts/contracts/instance/base/ObjectManager.sol/ObjectManager.dbg.json +0 -4
- package/artifacts/contracts/product/IProductService.sol/IProductService.dbg.json +0 -4
- package/artifacts/contracts/product/ProductService.sol/ProductService.dbg.json +0 -4
- package/artifacts/contracts/product/ProductService.sol/ProductService.json +0 -708
- package/artifacts/contracts/product/ProductServiceManager.sol/ProductServiceManager.dbg.json +0 -4
- package/artifacts/contracts/product/ProductServiceManager.sol/ProductServiceManager.json +0 -702
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +0 -4
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +0 -1159
- package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +0 -4
- package/artifacts/contracts/shared/ERC165.sol/ERC165.json +0 -73
- package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +0 -4
- package/artifacts/contracts/shared/InitializableCustom.sol/InitializableCustom.dbg.json +0 -4
- package/artifacts/contracts/shared/InitializableCustom.sol/InitializableCustom.json +0 -39
- package/artifacts/contracts/shared/NftIdSetManager.sol/NftIdSetManager.dbg.json +0 -4
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +0 -4
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +0 -617
- package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +0 -4
- package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +0 -4
- package/contracts/product/ProductServiceManager.sol +0 -42
- package/contracts/registry/ReleaseManager.sol +0 -487
- package/contracts/shared/InitializableCustom.sol +0 -177
- /package/contracts/{shared → upgradeability}/IVersionable.sol +0 -0
@@ -9,37 +9,27 @@ import {ClaimId} from "../type/ClaimId.sol";
|
|
9
9
|
import {IRegistryLinked} from "../shared/IRegistryLinked.sol";
|
10
10
|
import {NftId} from "../type/NftId.sol";
|
11
11
|
import {PayoutId} from "../type/PayoutId.sol";
|
12
|
+
import {Timestamp} from "../type/Timestamp.sol";
|
12
13
|
|
13
|
-
/// @dev
|
14
|
-
///
|
14
|
+
/// @dev Generic interface for contracts that need to hold policies and receive payouts.
|
15
|
+
/// The framework notifies policy holder contracts for policy creation/expiry, claim confirmation and payout execution
|
15
16
|
interface IPolicyHolder is
|
16
17
|
IERC165,
|
17
18
|
IERC721Receiver,
|
18
19
|
IRegistryLinked
|
19
20
|
{
|
20
21
|
|
21
|
-
/// @dev
|
22
|
-
///
|
23
|
-
function policyActivated(NftId policyNftId) external;
|
22
|
+
/// @dev Callback function that will be called after successful policy activation.
|
23
|
+
/// Active policies may open claims under the activated policy.
|
24
|
+
function policyActivated(NftId policyNftId, Timestamp activatedAt) external;
|
24
25
|
|
25
|
-
/// @dev
|
26
|
-
/// expired policies
|
27
|
-
|
28
|
-
function policyExpired(NftId policyNftId) external;
|
26
|
+
/// @dev Callback function to indicate the specified policy has expired.
|
27
|
+
/// expired policies no longer accept new claims.
|
28
|
+
function policyExpired(NftId policyNftId, Timestamp expiredAt) external;
|
29
29
|
|
30
|
-
/// @dev
|
31
|
-
/// the contract implements its use case specific handling for such requests.
|
32
|
-
/// eg. creation of a pending payout, a corresponding claim against one of the policies held by the IPolicyHolder
|
33
|
-
function requestPayout(NftId requestingPolicyNftId, Amount requestedPayoutAmount) external;
|
34
|
-
|
35
|
-
/// @dev callback function to notify the confirmation of the specified claim
|
36
|
-
/// active policies may open claims under the activated policy
|
30
|
+
/// @dev Callback function to notify the confirmation of the specified claim.
|
37
31
|
function claimConfirmed(NftId policyNftId, ClaimId claimId, Amount amount) external;
|
38
32
|
|
39
|
-
/// @dev
|
40
|
-
function payoutExecuted(NftId policyNftId, PayoutId payoutId,
|
41
|
-
|
42
|
-
/// @dev determines policy and claim specific beneficiary address
|
43
|
-
/// returned address will override GIF default where the policy nft holder is treated as beneficiary
|
44
|
-
function getBeneficiary(NftId policyNftId, PayoutId payoutId) external view returns (address beneficiary);
|
33
|
+
/// @dev Callback function to notify the successful payout.
|
34
|
+
function payoutExecuted(NftId policyNftId, PayoutId payoutId, Amount amount, address beneficiary) external;
|
45
35
|
}
|
@@ -4,7 +4,7 @@ pragma solidity ^0.8.20;
|
|
4
4
|
import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessManaged.sol";
|
5
5
|
|
6
6
|
import {IRegisterable} from "./IRegisterable.sol";
|
7
|
-
import {IVersionable} from "
|
7
|
+
import {IVersionable} from "../upgradeability/IVersionable.sol";
|
8
8
|
import {ObjectType} from "../type/ObjectType.sol";
|
9
9
|
import {RoleId} from "../type/RoleId.sol";
|
10
10
|
|
@@ -4,20 +4,20 @@ pragma solidity ^0.8.20;
|
|
4
4
|
import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
|
5
5
|
import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
|
6
6
|
|
7
|
-
contract
|
7
|
+
contract InitializableERC165 is
|
8
8
|
Initializable,
|
9
9
|
IERC165
|
10
10
|
{
|
11
11
|
mapping(bytes4 => bool) private _isSupported;
|
12
12
|
|
13
13
|
// @dev initializes with support for ERC165
|
14
|
-
function
|
14
|
+
function _initializeERC165() internal onlyInitializing() {
|
15
15
|
_isSupported[type(IERC165).interfaceId] = true;
|
16
16
|
}
|
17
17
|
|
18
18
|
// @dev register support for provided interfaceId
|
19
19
|
// includes initialization for ERC165_ID if not yet done
|
20
|
-
function
|
20
|
+
function _registerInterface(bytes4 interfaceId) internal onlyInitializing() {
|
21
21
|
_isSupported[interfaceId] = true;
|
22
22
|
}
|
23
23
|
|
@@ -6,6 +6,7 @@ import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessMana
|
|
6
6
|
import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
|
7
7
|
import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
|
8
8
|
|
9
|
+
import {Amount} from "../type/Amount.sol";
|
9
10
|
import {Component} from "./Component.sol";
|
10
11
|
import {IComponentService} from "./IComponentService.sol";
|
11
12
|
import {IInstanceLinkedComponent} from "./IInstanceLinkedComponent.sol";
|
@@ -36,6 +37,7 @@ abstract contract InstanceLinkedComponent is
|
|
36
37
|
IInstance _instance; // instance for this component
|
37
38
|
InstanceReader _instanceReader; // instance reader for this component
|
38
39
|
IAuthorization _initialAuthorization;
|
40
|
+
IComponentService _componentService;
|
39
41
|
}
|
40
42
|
|
41
43
|
function lock() external onlyOwner {
|
@@ -58,6 +60,17 @@ abstract contract InstanceLinkedComponent is
|
|
58
60
|
return _getInstanceLinkedComponentStorage()._initialAuthorization;
|
59
61
|
}
|
60
62
|
|
63
|
+
/// @inheritdoc IInstanceLinkedComponent
|
64
|
+
function withdrawFees(Amount amount)
|
65
|
+
external
|
66
|
+
virtual
|
67
|
+
onlyOwner()
|
68
|
+
restricted()
|
69
|
+
returns (Amount withdrawnAmount)
|
70
|
+
{
|
71
|
+
return _withdrawFees(amount);
|
72
|
+
}
|
73
|
+
|
61
74
|
function _getInstanceLinkedComponentStorage() private pure returns (InstanceLinkedComponentStorage storage $) {
|
62
75
|
assembly {
|
63
76
|
$.slot := INSTANCE_LINKED_COMPONENT_LOCATION_V1
|
@@ -83,14 +96,13 @@ abstract contract InstanceLinkedComponent is
|
|
83
96
|
// set and check linked instance
|
84
97
|
InstanceLinkedComponentStorage storage $ = _getInstanceLinkedComponentStorage();
|
85
98
|
$._instance = IInstance(
|
86
|
-
IRegistry(registry).
|
87
|
-
instanceNftId).objectAddress);
|
99
|
+
IRegistry(registry).getObjectAddress(instanceNftId));
|
88
100
|
|
89
101
|
if(!$._instance.supportsInterface(type(IInstance).interfaceId)) {
|
90
102
|
revert ErrorComponentNotInstance(instanceNftId);
|
91
103
|
}
|
92
104
|
|
93
|
-
|
105
|
+
_initializeComponent(
|
94
106
|
$._instance.authority(),
|
95
107
|
registry,
|
96
108
|
instanceNftId,
|
@@ -105,9 +117,10 @@ abstract contract InstanceLinkedComponent is
|
|
105
117
|
// set component state
|
106
118
|
$._instanceReader = $._instance.getInstanceReader();
|
107
119
|
$._initialAuthorization = authorization;
|
120
|
+
$._componentService = IComponentService(_getServiceAddress(COMPONENT()));
|
108
121
|
|
109
|
-
|
110
|
-
|
122
|
+
_registerInterface(type(IAccessManaged).interfaceId);
|
123
|
+
_registerInterface(type(IInstanceLinkedComponent).interfaceId);
|
111
124
|
}
|
112
125
|
|
113
126
|
/// @dev for instance linked components the wallet address stored in the instance store.
|
@@ -118,7 +131,7 @@ abstract contract InstanceLinkedComponent is
|
|
118
131
|
|
119
132
|
|
120
133
|
function _getComponentInfo() internal virtual override view returns (IComponents.ComponentInfo memory info) {
|
121
|
-
NftId componentNftId = getRegistry().
|
134
|
+
NftId componentNftId = getRegistry().getNftIdForAddress(address(this));
|
122
135
|
|
123
136
|
// if registered, attempt to return component info via instance reader
|
124
137
|
if (componentNftId.gtz()) {
|
@@ -141,6 +154,13 @@ abstract contract InstanceLinkedComponent is
|
|
141
154
|
return _getInstanceLinkedComponentStorage()._instanceReader;
|
142
155
|
}
|
143
156
|
|
157
|
+
function _withdrawFees(Amount amount)
|
158
|
+
internal
|
159
|
+
returns (Amount withdrawnAmount)
|
160
|
+
{
|
161
|
+
return _getInstanceLinkedComponentStorage()._componentService.withdrawFees(amount);
|
162
|
+
}
|
163
|
+
|
144
164
|
|
145
165
|
/// @dev returns the service address for the specified domain
|
146
166
|
/// gets address via lookup from registry using the major version form the linked instance
|
@@ -94,7 +94,7 @@ abstract contract KeyValueStore is
|
|
94
94
|
|
95
95
|
// update state
|
96
96
|
if(state != KEEP_STATE()) {
|
97
|
-
checkTransition(metadata.objectType, stateOld, state);
|
97
|
+
checkTransition(stateOld, metadata.objectType, stateOld, state);
|
98
98
|
metadata.state = state;
|
99
99
|
|
100
100
|
// solhint-disable-next-line avoid-tx-origin
|
@@ -49,6 +49,7 @@ abstract contract Lifecycle is
|
|
49
49
|
}
|
50
50
|
|
51
51
|
function checkTransition(
|
52
|
+
StateId stateId,
|
52
53
|
ObjectType objectType,
|
53
54
|
StateId fromId,
|
54
55
|
StateId toId
|
@@ -58,12 +59,22 @@ abstract contract Lifecycle is
|
|
58
59
|
{
|
59
60
|
// revert if no life cycle support
|
60
61
|
if (_initialState[objectType].eqz()) {
|
61
|
-
revert ErrorNoLifecycle(objectType);
|
62
|
+
revert ErrorNoLifecycle(address(this), objectType);
|
62
63
|
}
|
63
64
|
|
65
|
+
// revert if current state is not `from` state
|
66
|
+
if(stateId != fromId) {
|
67
|
+
revert ErrorFromStateMissmatch(address(this), objectType, stateId, fromId);
|
68
|
+
}
|
69
|
+
// TODO consider assert instead of error -> each child must check only for valid transitions
|
64
70
|
// enforce valid state transition
|
65
71
|
if (!_isValidTransition[objectType][fromId][toId]) {
|
66
|
-
revert ErrorInvalidStateTransition(
|
72
|
+
revert ErrorInvalidStateTransition(
|
73
|
+
address(this),
|
74
|
+
objectType,
|
75
|
+
fromId,
|
76
|
+
toId
|
77
|
+
);
|
67
78
|
}
|
68
79
|
}
|
69
80
|
|
@@ -4,7 +4,7 @@ pragma solidity ^0.8.20;
|
|
4
4
|
import {LibNftIdSet} from "../type/NftIdSet.sol";
|
5
5
|
import {NftId} from "../type/NftId.sol";
|
6
6
|
|
7
|
-
contract
|
7
|
+
contract NftIdSet {
|
8
8
|
|
9
9
|
error ErrorNftIdSetManagerNotOwner(address owner, address sender);
|
10
10
|
error ErrorNftIdSetManagerOwnerAlreadySet(address owner);
|
@@ -1,13 +1,13 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.20;
|
3
3
|
|
4
|
-
import {
|
4
|
+
import {InitializableERC165} from "./InitializableERC165.sol";
|
5
5
|
import {INftOwnable} from "./INftOwnable.sol";
|
6
6
|
import {NftId} from "../type/NftId.sol";
|
7
7
|
import {RegistryLinked} from "./RegistryLinked.sol";
|
8
8
|
|
9
9
|
contract NftOwnable is
|
10
|
-
|
10
|
+
InitializableERC165,
|
11
11
|
RegistryLinked,
|
12
12
|
INftOwnable
|
13
13
|
{
|
@@ -30,16 +30,16 @@ contract NftOwnable is
|
|
30
30
|
|
31
31
|
/// @dev initialization for upgradable contracts
|
32
32
|
// used in _initializeRegisterable
|
33
|
-
function
|
33
|
+
function _initializeNftOwnable(
|
34
34
|
address initialOwner,
|
35
35
|
address registryAddress
|
36
36
|
)
|
37
|
-
|
37
|
+
internal
|
38
38
|
virtual
|
39
39
|
onlyInitializing()
|
40
40
|
{
|
41
|
-
|
42
|
-
|
41
|
+
_initializeRegistryLinked(registryAddress);
|
42
|
+
_initializeERC165();
|
43
43
|
|
44
44
|
if(initialOwner == address(0)) {
|
45
45
|
revert ErrorNftOwnableInitialOwnerZero();
|
@@ -93,7 +93,7 @@ contract NftOwnable is
|
|
93
93
|
revert ErrorNftOwnableContractNotRegistered(nftOwnableAddress);
|
94
94
|
}
|
95
95
|
|
96
|
-
$._nftId = getRegistry().
|
96
|
+
$._nftId = getRegistry().getNftIdForAddress(nftOwnableAddress);
|
97
97
|
|
98
98
|
return $._nftId;
|
99
99
|
}
|
@@ -1,74 +1,50 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.20;
|
3
3
|
|
4
|
-
import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
|
5
4
|
import {IERC721Receiver} from "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol";
|
6
|
-
import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
|
7
5
|
|
8
6
|
import {Amount} from "../type/Amount.sol";
|
9
7
|
import {ClaimId} from "../type/ClaimId.sol";
|
10
|
-
import {
|
8
|
+
import {InitializableERC165} from "./InitializableERC165.sol";
|
11
9
|
import {IPolicyHolder} from "./IPolicyHolder.sol";
|
12
10
|
import {NftId} from "../type/NftId.sol";
|
13
11
|
import {PayoutId, PayoutIdLib} from "../type/PayoutId.sol";
|
14
12
|
import {RegistryLinked} from "./RegistryLinked.sol";
|
15
|
-
import {
|
13
|
+
import {Timestamp} from "../type/Timestamp.sol";
|
16
14
|
|
17
15
|
/// @dev template implementation for IPolicyHolder
|
18
16
|
contract PolicyHolder is
|
19
|
-
|
20
|
-
RegistryLinked,
|
17
|
+
InitializableERC165,
|
18
|
+
RegistryLinked,
|
21
19
|
IPolicyHolder
|
22
20
|
{
|
23
|
-
//
|
24
|
-
//
|
25
|
-
|
21
|
+
// TODO add modifier to protect callback functions from unauthorized access
|
22
|
+
// callbacks must only be allowed from the policy and claim services
|
23
|
+
// will need a release parameter to fetch the right service addresses for the modifiers
|
26
24
|
|
27
|
-
|
28
|
-
|
29
|
-
address _beneficiaryDefault;
|
30
|
-
}
|
31
|
-
|
32
|
-
function initializePolicyHolder(
|
33
|
-
address registryAddress,
|
34
|
-
address beneficiaryDefault
|
25
|
+
function _initializePolicyHolder(
|
26
|
+
address registryAddress
|
35
27
|
)
|
36
|
-
|
28
|
+
internal
|
37
29
|
virtual
|
38
30
|
onlyInitializing()
|
39
31
|
{
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
registerInterface(type(IPolicyHolder).interfaceId);
|
32
|
+
_initializeRegistryLinked(registryAddress);
|
33
|
+
_initializeERC165();
|
34
|
+
_registerInterface(type(IPolicyHolder).interfaceId);
|
45
35
|
}
|
46
36
|
|
47
37
|
/// @dev empty default implementation
|
48
|
-
function
|
38
|
+
function policyActivated(NftId policyNftId, Timestamp activatedAt) external virtual {}
|
49
39
|
|
50
40
|
/// @dev empty default implementation
|
51
|
-
function
|
41
|
+
function policyExpired(NftId policyNftId, Timestamp expiredAt) external virtual {}
|
52
42
|
|
53
43
|
/// @dev empty default implementation
|
54
|
-
function
|
44
|
+
function claimConfirmed(NftId policyNftId, ClaimId claimId, Amount amount) external virtual {}
|
55
45
|
|
56
46
|
/// @dev empty default implementation
|
57
|
-
function
|
58
|
-
|
59
|
-
/// @dev empty default implementation
|
60
|
-
function payoutExecuted(NftId policyNftId, PayoutId payoutId, address beneficiary, Amount amount) external {}
|
61
|
-
|
62
|
-
/// @dev returns payout specific beneficiary
|
63
|
-
/// when no such beneficiary is defined the policy specific beneficiary is returned
|
64
|
-
function getBeneficiary(NftId policyNftId, PayoutId payoutId) external virtual view returns (address beneficiary) {
|
65
|
-
beneficiary = _getPolicyHolderStorage()._beneficiary[policyNftId][payoutId];
|
66
|
-
|
67
|
-
// fallback to claim independent beneficiary
|
68
|
-
if(beneficiary == address(0) && payoutId.gtz()) {
|
69
|
-
beneficiary = _getPolicyHolderStorage()._beneficiary[policyNftId][PayoutIdLib.zero()];
|
70
|
-
}
|
71
|
-
}
|
47
|
+
function payoutExecuted(NftId policyNftId, PayoutId payoutId, Amount amount, address beneficiary) external virtual {}
|
72
48
|
|
73
49
|
//--- IERC165 functions ---------------//
|
74
50
|
function onERC721Received(
|
@@ -83,20 +59,4 @@ contract PolicyHolder is
|
|
83
59
|
{
|
84
60
|
return IERC721Receiver.onERC721Received.selector;
|
85
61
|
}
|
86
|
-
|
87
|
-
/// @dev sets policy specific beneficiary (used when no payout specific beneficiary is defined)
|
88
|
-
function _setBeneficiary(NftId policyNftId, address beneficiary) internal {
|
89
|
-
_setBeneficiary(policyNftId, PayoutIdLib.zero(), beneficiary);
|
90
|
-
}
|
91
|
-
|
92
|
-
/// @dev sets policy and claim specific beneficiary
|
93
|
-
function _setBeneficiary(NftId policyNftId, PayoutId payoutId, address beneficiary) internal {
|
94
|
-
_getPolicyHolderStorage()._beneficiary[policyNftId][payoutId] = beneficiary;
|
95
|
-
}
|
96
|
-
|
97
|
-
function _getPolicyHolderStorage() private pure returns (PolicyHolderStorage storage $) {
|
98
|
-
assembly {
|
99
|
-
$.slot := POLICY_HOLDER_STORAGE_LOCATION_V1
|
100
|
-
}
|
101
|
-
}
|
102
62
|
}
|
@@ -24,7 +24,7 @@ contract Registerable is
|
|
24
24
|
bytes _data;
|
25
25
|
}
|
26
26
|
|
27
|
-
function
|
27
|
+
function _initializeRegisterable(
|
28
28
|
address registryAddress,
|
29
29
|
NftId parentNftId,
|
30
30
|
ObjectType objectType,
|
@@ -32,11 +32,11 @@ contract Registerable is
|
|
32
32
|
address initialOwner,
|
33
33
|
bytes memory registryData // writeonly data that will saved in the object info record of the registry
|
34
34
|
)
|
35
|
-
|
35
|
+
internal
|
36
36
|
virtual
|
37
|
-
onlyInitializing
|
37
|
+
onlyInitializing()
|
38
38
|
{
|
39
|
-
|
39
|
+
_initializeNftOwnable(
|
40
40
|
initialOwner,
|
41
41
|
registryAddress);
|
42
42
|
|
@@ -10,14 +10,15 @@ contract RegistryLinked is
|
|
10
10
|
IRegistryLinked
|
11
11
|
{
|
12
12
|
|
13
|
+
// priorize simplicity and size over using standard upgradeability structs
|
13
14
|
IRegistry private _registry;
|
14
15
|
|
15
16
|
/// @dev initialization for upgradable contracts
|
16
17
|
// used in _initializeRegisterable
|
17
|
-
function
|
18
|
+
function _initializeRegistryLinked(
|
18
19
|
address registryAddress
|
19
20
|
)
|
20
|
-
|
21
|
+
internal
|
21
22
|
virtual
|
22
23
|
onlyInitializing()
|
23
24
|
{
|
@@ -3,16 +3,16 @@ pragma solidity ^0.8.20;
|
|
3
3
|
|
4
4
|
import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";
|
5
5
|
import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessManaged.sol";
|
6
|
+
import {ReentrancyGuardUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/ReentrancyGuardUpgradeable.sol";
|
6
7
|
|
7
8
|
import {IRegistry} from "../registry/IRegistry.sol";
|
8
9
|
import {IService} from "./IService.sol";
|
9
|
-
import {IVersionable} from "
|
10
|
-
import {NftId} from "../type/NftId.sol";
|
10
|
+
import {IVersionable} from "../upgradeability/IVersionable.sol";
|
11
11
|
import {ObjectType, REGISTRY, SERVICE} from "../type/ObjectType.sol";
|
12
12
|
import {Registerable} from "./Registerable.sol";
|
13
13
|
import {RoleId, RoleIdLib} from "../type/RoleId.sol";
|
14
|
-
import {Version,
|
15
|
-
import {Versionable} from "
|
14
|
+
import {Version, VersionLib, VersionPartLib} from "../type/Version.sol";
|
15
|
+
import {Versionable} from "../upgradeability/Versionable.sol";
|
16
16
|
|
17
17
|
|
18
18
|
/// @dev service base contract
|
@@ -20,28 +20,23 @@ abstract contract Service is
|
|
20
20
|
Registerable,
|
21
21
|
Versionable,
|
22
22
|
AccessManagedUpgradeable,
|
23
|
+
ReentrancyGuardUpgradeable,
|
23
24
|
IService
|
24
25
|
{
|
25
26
|
|
26
27
|
uint8 private constant GIF_MAJOR_VERSION = 3;
|
27
28
|
|
28
29
|
|
29
|
-
function
|
30
|
+
function _initializeService(
|
30
31
|
address registry,
|
31
32
|
address authority, // real authority for registry service adress(0) for other services
|
32
33
|
address initialOwner
|
33
34
|
)
|
34
|
-
|
35
|
+
internal
|
35
36
|
virtual
|
36
37
|
onlyInitializing()
|
37
38
|
{
|
38
|
-
|
39
|
-
registry,
|
40
|
-
IRegistry(registry).getNftId(),
|
41
|
-
SERVICE(),
|
42
|
-
false, // is interceptor
|
43
|
-
initialOwner,
|
44
|
-
""); // data
|
39
|
+
__ReentrancyGuard_init();
|
45
40
|
|
46
41
|
// externally provided authority
|
47
42
|
if(authority != address(0)) {
|
@@ -53,8 +48,17 @@ abstract contract Service is
|
|
53
48
|
__AccessManaged_init(IAccessManaged(registryServiceAddress).authority());
|
54
49
|
}
|
55
50
|
|
56
|
-
|
57
|
-
|
51
|
+
_initializeRegisterable(
|
52
|
+
registry,
|
53
|
+
IRegistry(registry).getNftId(),
|
54
|
+
SERVICE(),
|
55
|
+
false, // is interceptor
|
56
|
+
initialOwner,
|
57
|
+
""); // data
|
58
|
+
|
59
|
+
|
60
|
+
_registerInterface(type(IAccessManaged).interfaceId);
|
61
|
+
_registerInterface(type(IService).interfaceId);
|
58
62
|
}
|
59
63
|
|
60
64
|
function getDomain() external virtual pure returns(ObjectType serviceDomain) {
|
@@ -1,6 +1,7 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.20;
|
3
3
|
|
4
|
+
import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";
|
4
5
|
import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
|
5
6
|
import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
|
6
7
|
|
@@ -9,50 +10,130 @@ import {Amount} from "../type/Amount.sol";
|
|
9
10
|
/// @dev token specific transfer helper
|
10
11
|
/// a default token contract is provided via contract constructor
|
11
12
|
/// relies internally on oz SafeERC20.safeTransferFrom
|
12
|
-
contract TokenHandler {
|
13
|
+
contract TokenHandler is AccessManaged {
|
14
|
+
error ErrorTokenHandlerAmountIsZero();
|
15
|
+
error ErrorTokenHandlerBalanceTooLow(address token, address from, uint256 balance, uint256 expectedBalance);
|
16
|
+
error ErrorTokenHandlerAllowanceTooSmall(address token, address from, address spender, uint256 allowance, uint256 expectedAllowance);
|
17
|
+
error ErrorTokenHandlerRecipientWalletsMustBeDistinct(address to, address to2, address to3);
|
18
|
+
|
19
|
+
event LogTokenHandlerTokenTransfer(address token, address from, address to, uint256 amountTransferred);
|
20
|
+
|
13
21
|
IERC20Metadata private _token;
|
14
22
|
|
15
|
-
constructor(address token) {
|
23
|
+
constructor(address token, address initialAuthority) AccessManaged(initialAuthority) {
|
16
24
|
_token = IERC20Metadata(token);
|
17
25
|
}
|
18
26
|
|
19
|
-
/// @dev
|
20
|
-
function
|
27
|
+
/// @dev returns the default token defined for this TokenHandler
|
28
|
+
function getToken()
|
29
|
+
external
|
30
|
+
view
|
31
|
+
returns (IERC20Metadata)
|
32
|
+
{
|
33
|
+
return _token;
|
34
|
+
}
|
35
|
+
|
36
|
+
/// @dev collect tokens from outside of the gif and transfer them to one wallet within the scope of gif.
|
37
|
+
/// This method also checks balance and allowance and makes sure the amount is greater than zero.
|
38
|
+
function collectTokens(
|
21
39
|
address from,
|
22
40
|
address to,
|
23
41
|
Amount amount
|
24
42
|
)
|
25
43
|
external
|
44
|
+
restricted()
|
26
45
|
{
|
27
|
-
|
28
|
-
_token,
|
29
|
-
from,
|
30
|
-
to,
|
31
|
-
amount.toInt());
|
46
|
+
_transfer(from, to, amount, true);
|
32
47
|
}
|
33
48
|
|
34
|
-
/// @dev
|
35
|
-
|
36
|
-
|
49
|
+
/// @dev collect tokens from outside of the gif and transfer them to three distinct wallets within the scope of gif
|
50
|
+
/// This method also checks balance and allowance and makes sure the amount is greater than zero.
|
51
|
+
function collectTokensToThreeRecipients(
|
52
|
+
address from,
|
53
|
+
address to,
|
54
|
+
Amount amount,
|
55
|
+
address to2,
|
56
|
+
Amount amount2,
|
57
|
+
address to3,
|
58
|
+
Amount amount3
|
59
|
+
)
|
60
|
+
external
|
61
|
+
restricted()
|
62
|
+
{
|
63
|
+
if (to == to2 || to == to3 || to2 == to3) {
|
64
|
+
revert ErrorTokenHandlerRecipientWalletsMustBeDistinct(to, to2, to3);
|
65
|
+
}
|
66
|
+
|
67
|
+
_checkPreconditions(from, amount + amount2 + amount3);
|
68
|
+
|
69
|
+
if (amount.gtz()) {
|
70
|
+
_transfer(from, to, amount, false);
|
71
|
+
}
|
72
|
+
if (amount2.gtz()) {
|
73
|
+
_transfer(from, to2, amount2, false);
|
74
|
+
}
|
75
|
+
if (amount3.gtz()) {
|
76
|
+
_transfer(from, to3, amount3, false);
|
77
|
+
}
|
78
|
+
}
|
79
|
+
|
80
|
+
/// @dev distribute tokens from a wallet within the scope of gif to an external address.
|
81
|
+
/// This method also checks balance and allowance and makes sure the amount is greater than zero.
|
82
|
+
function distributeTokens(
|
37
83
|
address from,
|
38
84
|
address to,
|
39
85
|
Amount amount
|
40
86
|
)
|
41
87
|
external
|
88
|
+
restricted()
|
89
|
+
{
|
90
|
+
_transfer(from, to, amount, true);
|
91
|
+
}
|
92
|
+
|
93
|
+
function _transfer(
|
94
|
+
address from,
|
95
|
+
address to,
|
96
|
+
Amount amount,
|
97
|
+
bool checkPreconditions
|
98
|
+
)
|
99
|
+
internal
|
42
100
|
{
|
101
|
+
if (checkPreconditions) {
|
102
|
+
// check amount > 0, balance >= amount and allowance >= amount
|
103
|
+
_checkPreconditions(from, amount);
|
104
|
+
}
|
105
|
+
|
106
|
+
// transfer the tokens
|
107
|
+
emit LogTokenHandlerTokenTransfer(address(_token), from, to, amount.toInt());
|
43
108
|
SafeERC20.safeTransferFrom(
|
44
|
-
|
109
|
+
_token,
|
45
110
|
from,
|
46
111
|
to,
|
47
112
|
amount.toInt());
|
48
113
|
}
|
49
114
|
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
115
|
+
function _checkPreconditions(
|
116
|
+
address from,
|
117
|
+
Amount amount
|
118
|
+
)
|
119
|
+
internal
|
120
|
+
view
|
55
121
|
{
|
56
|
-
|
122
|
+
// amount must be greater than zero
|
123
|
+
if (amount.eqz()) {
|
124
|
+
revert ErrorTokenHandlerAmountIsZero();
|
125
|
+
}
|
126
|
+
|
127
|
+
// balance must be >= amount
|
128
|
+
uint256 balance = _token.balanceOf(from);
|
129
|
+
if (balance < amount.toInt()) {
|
130
|
+
revert ErrorTokenHandlerBalanceTooLow(address(_token), from, balance, amount.toInt());
|
131
|
+
}
|
132
|
+
|
133
|
+
// allowance must be >= amount
|
134
|
+
uint256 allowance = _token.allowance(from, address(this));
|
135
|
+
if (allowance < amount.toInt()) {
|
136
|
+
revert ErrorTokenHandlerAllowanceTooSmall(address(_token), from, address(this), allowance, amount.toInt());
|
137
|
+
}
|
57
138
|
}
|
58
139
|
}
|