@etherisc/gif-next 0.0.2-f619be3-760 → 0.0.2-f72939c-380
Sign up to get free protection for your applications and to get access to all the features.
- package/README.md +114 -11
- package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +4 -0
- package/artifacts/contracts/components/{Component.sol/Component.json → BaseComponent.sol/BaseComponent.json} +26 -57
- package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +4 -0
- package/artifacts/contracts/{instance/component/IComponent.sol/IComponentContract.json → components/IBaseComponent.sol/IBaseComponent.json} +26 -57
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +4 -0
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +356 -0
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +4 -0
- package/artifacts/contracts/components/{IPool.sol/IPoolComponent.json → IProductComponent.sol/IProductComponent.json} +89 -65
- package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
- package/artifacts/contracts/components/Pool.sol/Pool.json +156 -29
- package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/components/Product.sol/Product.json +74 -72
- package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +1 -1
- package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +1 -1
- package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +1 -1
- package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.json +2 -2
- package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +1 -1
- package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +1 -1
- package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +1 -1
- package/artifacts/contracts/experiment/statemachine/SM.sol/SM.json +2 -2
- package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +1 -1
- package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.json +2 -2
- package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +1 -1
- package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.json +1124 -598
- package/artifacts/contracts/instance/IInstanceLinked.sol/IInstanceLinked.dbg.json +4 -0
- package/artifacts/contracts/instance/{component/IComponent.sol → IInstanceLinked.sol}/IInstanceLinked.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +1424 -782
- package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +4 -0
- package/artifacts/contracts/instance/{component/ComponentModule.sol/ComponentModule.json → base/ComponentServiceBase.sol/ComponentServiceBase.json} +133 -132
- package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +4 -0
- package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.json +81 -0
- package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +4 -0
- package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.json +560 -0
- package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +4 -0
- package/artifacts/contracts/instance/{lifecycle/ILifecycle.sol/ILifecycleModule.json → base/ILifecycle.sol/ILifecycle.json} +10 -77
- package/artifacts/contracts/instance/base/IService.sol/IService.dbg.json +4 -0
- package/artifacts/contracts/instance/base/IService.sol/IService.json +300 -0
- package/artifacts/contracts/instance/base/InstanceBase.sol/InstanceBase.dbg.json +4 -0
- package/artifacts/contracts/instance/base/InstanceBase.sol/InstanceBase.json +344 -0
- package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +4 -0
- package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +710 -0
- package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +4 -0
- package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +169 -0
- package/artifacts/contracts/instance/base/ModuleBase.sol/ModuleBase.dbg.json +4 -0
- package/artifacts/contracts/instance/base/ModuleBase.sol/ModuleBase.json +10 -0
- package/artifacts/contracts/instance/base/ServiceBase.sol/ServiceBase.dbg.json +4 -0
- package/artifacts/contracts/instance/base/ServiceBase.sol/ServiceBase.json +300 -0
- package/artifacts/contracts/instance/module/access/Access.sol/AccessModule.dbg.json +4 -0
- package/artifacts/contracts/instance/{access → module/access}/Access.sol/AccessModule.json +85 -152
- package/artifacts/contracts/instance/module/access/IAccess.sol/IAccess.dbg.json +4 -0
- package/artifacts/contracts/instance/{access → module/access}/IAccess.sol/IAccess.json +1 -1
- package/artifacts/contracts/instance/module/access/IAccess.sol/IAccessModule.dbg.json +4 -0
- package/artifacts/contracts/instance/{access → module/access}/IAccess.sol/IAccessModule.json +96 -99
- package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.dbg.json +4 -0
- package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.json +265 -0
- package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundle.dbg.json +4 -0
- package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundle.json +10 -0
- package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.dbg.json +4 -0
- package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.json +265 -0
- package/artifacts/contracts/instance/module/compensation/CompensationModule.sol/CompensationModule.dbg.json +4 -0
- package/artifacts/contracts/instance/module/compensation/CompensationModule.sol/CompensationModule.json +10 -0
- package/artifacts/contracts/instance/module/compensation/ICompensation.sol/ICompensation.dbg.json +4 -0
- package/artifacts/contracts/instance/module/compensation/ICompensation.sol/ICompensation.json +10 -0
- package/artifacts/contracts/instance/module/compensation/ICompensation.sol/ICompensationModule.dbg.json +4 -0
- package/artifacts/contracts/instance/module/compensation/ICompensation.sol/ICompensationModule.json +10 -0
- package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.dbg.json +4 -0
- package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.json +136 -0
- package/artifacts/contracts/instance/module/component/IComponent.sol/IComponent.dbg.json +4 -0
- package/artifacts/contracts/instance/{component → module/component}/IComponent.sol/IComponent.json +1 -1
- package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.dbg.json +4 -0
- package/artifacts/contracts/instance/{product/IProductService.sol/IProductService.json → module/component/IComponent.sol/IComponentModule.json} +66 -57
- package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicy.dbg.json +4 -0
- package/artifacts/contracts/instance/{policy → module/policy}/IPolicy.sol/IPolicy.json +1 -1
- package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.dbg.json +4 -0
- package/artifacts/contracts/instance/{policy → module/policy}/IPolicy.sol/IPolicyModule.json +145 -111
- package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.dbg.json +4 -0
- package/artifacts/contracts/instance/{policy → module/policy}/PolicyModule.sol/PolicyModule.json +146 -112
- package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPool.dbg.json +4 -0
- package/artifacts/contracts/instance/{pool → module/pool}/IPoolModule.sol/IPool.json +1 -1
- package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.dbg.json +4 -0
- package/artifacts/contracts/instance/{pool → module/pool}/IPoolModule.sol/IPoolModule.json +67 -52
- package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.dbg.json +4 -0
- package/artifacts/contracts/instance/{pool → module/pool}/PoolModule.sol/PoolModule.json +51 -62
- package/artifacts/contracts/instance/module/risk/IRisk.sol/IRisk.dbg.json +4 -0
- package/artifacts/contracts/instance/module/risk/IRisk.sol/IRisk.json +10 -0
- package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.dbg.json +4 -0
- package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.json +132 -0
- package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.dbg.json +4 -0
- package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.json +150 -0
- package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasury.dbg.json +4 -0
- package/artifacts/contracts/instance/{treasury → module/treasury}/ITreasury.sol/ITreasury.json +1 -1
- package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.dbg.json +4 -0
- package/artifacts/contracts/instance/{treasury → module/treasury}/ITreasury.sol/ITreasuryModule.json +231 -190
- package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.dbg.json +4 -0
- package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.json +76 -0
- package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.dbg.json +4 -0
- package/artifacts/contracts/instance/{treasury → module/treasury}/TreasuryModule.sol/TreasuryModule.json +232 -191
- package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +523 -0
- package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.json +364 -0
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +376 -0
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +548 -0
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +471 -0
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +744 -0
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +65 -2
- package/artifacts/contracts/registry/IChainNft.sol/IChainNft.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +147 -30
- package/artifacts/contracts/registry/IRegistryLinked.sol/IRegistryLinked.dbg.json +4 -0
- package/artifacts/contracts/registry/IRegistryLinked.sol/IRegistryLinked.json +24 -0
- package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registry.json +241 -25
- package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +4 -0
- package/artifacts/contracts/shared/ERC165.sol/ERC165.json +35 -0
- package/artifacts/contracts/shared/IOwnable.sol/IOwnable.dbg.json +4 -0
- package/artifacts/contracts/{registry/IRegistry.sol → shared/IOwnable.sol}/IOwnable.json +1 -1
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +4 -0
- package/artifacts/contracts/{registry/IRegistry.sol → shared/IRegisterable.sol}/IRegisterable.json +16 -61
- package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +4 -0
- package/artifacts/contracts/shared/IVersionable.sol/IVersionable.json +164 -0
- package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +4 -0
- package/artifacts/contracts/{registry/Registry.sol → shared/Registerable.sol}/Registerable.json +16 -61
- package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +4 -0
- package/artifacts/contracts/shared/Versionable.sol/Versionable.json +164 -0
- package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +4 -0
- package/artifacts/contracts/test/TestFee.sol/TestFee.json +119 -0
- package/artifacts/contracts/test/TestPool.sol/TestPool.dbg.json +4 -0
- package/artifacts/contracts/test/TestPool.sol/TestPool.json +455 -0
- package/artifacts/contracts/test/TestProduct.sol/TestProduct.dbg.json +4 -0
- package/artifacts/contracts/test/TestProduct.sol/TestProduct.json +479 -0
- package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +4 -0
- package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +137 -0
- package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +4 -0
- package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +116 -0
- package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +4 -0
- package/artifacts/contracts/test/TestService.sol/TestService.json +379 -0
- package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +4 -0
- package/artifacts/contracts/test/TestToken.sol/TestUsdc.json +338 -0
- package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +4 -0
- package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +218 -0
- package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +4 -0
- package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +206 -0
- package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +4 -0
- package/artifacts/contracts/{mock → test}/Usdc.sol/USDC.json +3 -3
- package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +4 -0
- package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.json +10 -0
- package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
- package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +4 -0
- package/artifacts/contracts/types/Fee.sol/FeeLib.json +218 -0
- package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +4 -0
- package/artifacts/contracts/types/Key32.sol/Key32Lib.json +111 -0
- package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/NftId.sol/NftIdLib.json +65 -4
- package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +4 -0
- package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.json +10 -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/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 +4 -0
- package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +30 -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 +64 -2
- package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.dbg.json +1 -1
- package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.json +58 -58
- package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +4 -0
- package/artifacts/contracts/types/Version.sol/VersionLib.json +139 -0
- package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +4 -0
- package/artifacts/contracts/types/Version.sol/VersionPartLib.json +30 -0
- package/contracts/components/BaseComponent.sol +94 -0
- package/contracts/components/IBaseComponent.sol +19 -0
- package/contracts/components/IPoolComponent.sol +57 -0
- package/contracts/components/{IProduct.sol → IProductComponent.sol} +9 -6
- package/contracts/components/Pool.sol +155 -16
- package/contracts/components/Product.sol +116 -24
- package/contracts/instance/IInstance.sol +37 -11
- package/contracts/instance/IInstanceLinked.sol +8 -0
- package/contracts/instance/Instance.sol +48 -49
- package/contracts/instance/base/ComponentServiceBase.sol +42 -0
- package/contracts/instance/base/IInstanceBase.sol +19 -0
- package/contracts/instance/base/IKeyValueStore.sol +50 -0
- package/contracts/instance/{lifecycle → base}/ILifecycle.sol +4 -21
- package/contracts/instance/base/IService.sol +15 -0
- package/contracts/instance/base/InstanceBase.sol +84 -0
- package/contracts/instance/base/KeyValueStore.sol +161 -0
- package/contracts/instance/base/Lifecycle.sol +100 -0
- package/contracts/instance/base/ModuleBase.sol +53 -0
- package/contracts/instance/base/ServiceBase.sol +37 -0
- package/contracts/instance/module/access/Access.sol +149 -0
- package/contracts/instance/module/access/IAccess.sol +53 -0
- package/contracts/instance/module/bundle/BundleModule.sol +135 -0
- package/contracts/instance/module/bundle/IBundle.sol +51 -0
- package/contracts/instance/module/compensation/CompensationModule.sol +17 -0
- package/contracts/instance/module/compensation/ICompensation.sol +10 -0
- package/contracts/instance/module/component/ComponentModule.sol +81 -0
- package/contracts/instance/module/component/IComponent.sol +29 -0
- package/contracts/instance/module/policy/IPolicy.sol +62 -0
- package/contracts/instance/module/policy/PolicyModule.sol +92 -0
- package/contracts/instance/module/pool/IPoolModule.sol +40 -0
- package/contracts/instance/module/pool/PoolModule.sol +90 -0
- package/contracts/instance/module/risk/IRisk.sol +27 -0
- package/contracts/instance/module/risk/RiskModule.sol +70 -0
- package/contracts/instance/module/treasury/ITreasury.sol +96 -0
- package/contracts/instance/module/treasury/TokenHandler.sol +48 -0
- package/contracts/instance/module/treasury/TreasuryModule.sol +171 -0
- package/contracts/instance/service/ComponentOwnerService.sol +155 -0
- package/contracts/instance/service/IComponentOwnerService.sol +22 -0
- package/contracts/instance/service/IPoolService.sol +30 -0
- package/contracts/instance/service/IProductService.sol +78 -0
- package/contracts/instance/service/PoolService.sol +129 -0
- package/contracts/instance/service/ProductService.sol +406 -0
- package/contracts/registry/ChainNft.sol +61 -37
- package/contracts/registry/IRegistry.sol +24 -34
- package/contracts/registry/IRegistryLinked.sol +8 -0
- package/contracts/registry/Registry.sol +284 -85
- package/contracts/shared/ERC165.sol +21 -0
- package/contracts/shared/IOwnable.sol +6 -0
- package/contracts/shared/IRegisterable.sol +24 -0
- package/contracts/shared/IVersionable.sol +52 -0
- package/contracts/shared/Registerable.sol +86 -0
- package/contracts/shared/Versionable.sol +89 -0
- package/contracts/test/TestFee.sol +25 -0
- package/contracts/test/TestPool.sol +24 -0
- package/contracts/test/TestProduct.sol +66 -0
- package/contracts/test/TestRegisterable.sol +19 -0
- package/contracts/test/TestRoleId.sol +14 -0
- package/contracts/test/TestService.sol +32 -0
- package/contracts/{mock/Dip.sol → test/TestToken.sol} +5 -5
- package/contracts/test/TestVersion.sol +44 -0
- package/contracts/test/TestVersionable.sol +17 -0
- package/contracts/{mock → test}/Usdc.sol +1 -1
- package/contracts/types/AddressSet.sol +58 -0
- package/contracts/types/Fee.sol +39 -20
- package/contracts/types/Key32.sol +45 -0
- package/contracts/types/NftId.sol +22 -1
- package/contracts/types/NftIdSet.sol +60 -0
- package/contracts/types/ObjectType.sol +33 -13
- package/contracts/types/RiskId.sol +43 -0
- package/contracts/types/RoleId.sol +38 -0
- package/contracts/types/StateId.sol +13 -3
- package/contracts/types/Timestamp.sol +22 -1
- package/contracts/types/UFixed.sol +12 -13
- package/contracts/types/Version.sol +95 -0
- package/package.json +8 -3
- package/artifacts/contracts/components/Component.sol/Component.dbg.json +0 -4
- package/artifacts/contracts/components/Component.sol/InstanceLinked.dbg.json +0 -4
- package/artifacts/contracts/components/Component.sol/InstanceLinked.json +0 -35
- package/artifacts/contracts/components/IPool.sol/IPoolComponent.dbg.json +0 -4
- package/artifacts/contracts/components/IProduct.sol/IProductComponent.dbg.json +0 -4
- package/artifacts/contracts/components/IProduct.sol/IProductComponent.json +0 -74
- package/artifacts/contracts/instance/access/Access.sol/AccessModule.dbg.json +0 -4
- package/artifacts/contracts/instance/access/IAccess.sol/IAccess.dbg.json +0 -4
- package/artifacts/contracts/instance/access/IAccess.sol/IAccessCheckRole.dbg.json +0 -4
- package/artifacts/contracts/instance/access/IAccess.sol/IAccessCheckRole.json +0 -35
- package/artifacts/contracts/instance/access/IAccess.sol/IAccessComponentTypeRoles.dbg.json +0 -4
- package/artifacts/contracts/instance/access/IAccess.sol/IAccessComponentTypeRoles.json +0 -50
- package/artifacts/contracts/instance/access/IAccess.sol/IAccessModule.dbg.json +0 -4
- package/artifacts/contracts/instance/component/ComponentModule.sol/ComponentModule.dbg.json +0 -4
- package/artifacts/contracts/instance/component/ComponentModule.sol/ComponentOwnerService.dbg.json +0 -4
- package/artifacts/contracts/instance/component/ComponentModule.sol/ComponentOwnerService.json +0 -202
- package/artifacts/contracts/instance/component/IComponent.sol/IComponent.dbg.json +0 -4
- package/artifacts/contracts/instance/component/IComponent.sol/IComponentContract.dbg.json +0 -4
- package/artifacts/contracts/instance/component/IComponent.sol/IComponentModule.dbg.json +0 -4
- package/artifacts/contracts/instance/component/IComponent.sol/IComponentModule.json +0 -217
- package/artifacts/contracts/instance/component/IComponent.sol/IComponentOwnerService.dbg.json +0 -4
- package/artifacts/contracts/instance/component/IComponent.sol/IComponentOwnerService.json +0 -141
- package/artifacts/contracts/instance/component/IComponent.sol/IInstanceLinked.dbg.json +0 -4
- package/artifacts/contracts/instance/lifecycle/ILifecycle.sol/ILifecycle.dbg.json +0 -4
- package/artifacts/contracts/instance/lifecycle/ILifecycle.sol/ILifecycle.json +0 -134
- package/artifacts/contracts/instance/lifecycle/ILifecycle.sol/ILifecycleModule.dbg.json +0 -4
- package/artifacts/contracts/instance/lifecycle/LifecycleModule.sol/LifecycleModule.dbg.json +0 -4
- package/artifacts/contracts/instance/lifecycle/LifecycleModule.sol/LifecycleModule.json +0 -221
- package/artifacts/contracts/instance/policy/IPolicy.sol/IPolicy.dbg.json +0 -4
- package/artifacts/contracts/instance/policy/IPolicy.sol/IPolicyModule.dbg.json +0 -4
- package/artifacts/contracts/instance/policy/PolicyModule.sol/PolicyModule.dbg.json +0 -4
- package/artifacts/contracts/instance/pool/IPoolModule.sol/IPool.dbg.json +0 -4
- package/artifacts/contracts/instance/pool/IPoolModule.sol/IPoolModule.dbg.json +0 -4
- package/artifacts/contracts/instance/pool/PoolModule.sol/PoolModule.dbg.json +0 -4
- package/artifacts/contracts/instance/product/IProductService.sol/IProductModule.dbg.json +0 -4
- package/artifacts/contracts/instance/product/IProductService.sol/IProductModule.json +0 -75
- package/artifacts/contracts/instance/product/IProductService.sol/IProductService.dbg.json +0 -4
- package/artifacts/contracts/instance/product/ProductService.sol/ProductModule.dbg.json +0 -4
- package/artifacts/contracts/instance/product/ProductService.sol/ProductModule.json +0 -75
- package/artifacts/contracts/instance/product/ProductService.sol/ProductService.dbg.json +0 -4
- package/artifacts/contracts/instance/product/ProductService.sol/ProductService.json +0 -196
- package/artifacts/contracts/instance/treasury/ITreasury.sol/ITreasury.dbg.json +0 -4
- package/artifacts/contracts/instance/treasury/ITreasury.sol/ITreasuryModule.dbg.json +0 -4
- package/artifacts/contracts/instance/treasury/TokenHandler.sol/TokenHandler.dbg.json +0 -4
- package/artifacts/contracts/instance/treasury/TokenHandler.sol/TokenHandler.json +0 -45
- package/artifacts/contracts/instance/treasury/TreasuryModule.sol/TreasuryModule.dbg.json +0 -4
- package/artifacts/contracts/mock/Dip.sol/DIP.dbg.json +0 -4
- package/artifacts/contracts/mock/Dip.sol/DIP.json +0 -338
- package/artifacts/contracts/mock/TestPool.sol/TestPool.dbg.json +0 -4
- package/artifacts/contracts/mock/TestPool.sol/TestPool.json +0 -294
- package/artifacts/contracts/mock/TestProduct.sol/TestProduct.dbg.json +0 -4
- package/artifacts/contracts/mock/TestProduct.sol/TestProduct.json +0 -384
- package/artifacts/contracts/mock/Usdc.sol/USDC.dbg.json +0 -4
- package/artifacts/contracts/registry/IRegistry.sol/IOwnable.dbg.json +0 -4
- package/artifacts/contracts/registry/IRegistry.sol/IRegisterable.dbg.json +0 -4
- package/artifacts/contracts/registry/IRegistry.sol/IRegistryLinked.dbg.json +0 -4
- package/artifacts/contracts/registry/IRegistry.sol/IRegistryLinked.json +0 -49
- package/artifacts/contracts/registry/Registry.sol/Registerable.dbg.json +0 -4
- package/artifacts/contracts/registry/Registry.sol/RegistryLinked.dbg.json +0 -4
- package/artifacts/contracts/registry/Registry.sol/RegistryLinked.json +0 -60
- package/contracts/components/Component.sol +0 -77
- package/contracts/components/IPool.sol +0 -15
- package/contracts/instance/access/Access.sol +0 -165
- package/contracts/instance/access/IAccess.sol +0 -63
- package/contracts/instance/component/ComponentModule.sol +0 -274
- package/contracts/instance/component/IComponent.sol +0 -74
- package/contracts/instance/lifecycle/LifecycleModule.sol +0 -88
- package/contracts/instance/policy/IPolicy.sol +0 -50
- package/contracts/instance/policy/PolicyModule.sol +0 -114
- package/contracts/instance/pool/IPoolModule.sol +0 -23
- package/contracts/instance/pool/PoolModule.sol +0 -81
- package/contracts/instance/product/IProductService.sol +0 -36
- package/contracts/instance/product/ProductService.sol +0 -136
- package/contracts/instance/treasury/ITreasury.sol +0 -91
- package/contracts/instance/treasury/TokenHandler.sol +0 -24
- package/contracts/instance/treasury/TreasuryModule.sol +0 -168
- package/contracts/mock/TestPool.sol +0 -16
- package/contracts/mock/TestProduct.sol +0 -39
@@ -0,0 +1,86 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.19;
|
3
|
+
|
4
|
+
import {NftId, zeroNftId} from "../types/NftId.sol";
|
5
|
+
import {ObjectType} from "../types/ObjectType.sol";
|
6
|
+
|
7
|
+
import {IRegistry} from "../registry/IRegistry.sol";
|
8
|
+
import {IRegisterable} from "./IRegisterable.sol";
|
9
|
+
|
10
|
+
import {ERC165} from "./ERC165.sol";
|
11
|
+
|
12
|
+
abstract contract Registerable is
|
13
|
+
ERC165,
|
14
|
+
IRegisterable
|
15
|
+
{
|
16
|
+
IRegistry internal immutable _registry;
|
17
|
+
NftId internal immutable _parentNftId;
|
18
|
+
address internal immutable _initialOwner;
|
19
|
+
|
20
|
+
modifier onlyOwner() virtual {
|
21
|
+
require(
|
22
|
+
msg.sender == getOwner(),
|
23
|
+
"ERROR:RGB-001:NOT_OWNER"
|
24
|
+
);
|
25
|
+
_;
|
26
|
+
}
|
27
|
+
|
28
|
+
constructor(
|
29
|
+
address registryAddress,
|
30
|
+
NftId parentNftId
|
31
|
+
)
|
32
|
+
ERC165()
|
33
|
+
{
|
34
|
+
require(
|
35
|
+
address(registryAddress) != address(0),
|
36
|
+
"ERROR:RGB-010:REGISTRY_ZERO"
|
37
|
+
);
|
38
|
+
|
39
|
+
_registry = IRegistry(registryAddress);
|
40
|
+
require(
|
41
|
+
_registry.supportsInterface(type(IRegistry).interfaceId),
|
42
|
+
"ERROR:RGB-011:NOT_REGISTRY"
|
43
|
+
);
|
44
|
+
|
45
|
+
_parentNftId = parentNftId;
|
46
|
+
require(
|
47
|
+
_registry.isRegistered(_parentNftId),
|
48
|
+
"ERROR:RGB-012:PARENT_NOT_REGISTERED"
|
49
|
+
);
|
50
|
+
|
51
|
+
_initialOwner = msg.sender;
|
52
|
+
|
53
|
+
// register support for IRegisterable
|
54
|
+
_registerInterface(type(IRegisterable).interfaceId);
|
55
|
+
}
|
56
|
+
|
57
|
+
// from IRegistryLinked
|
58
|
+
function register() public onlyOwner virtual override returns (NftId nftId) {
|
59
|
+
return _registry.register(address(this));
|
60
|
+
}
|
61
|
+
|
62
|
+
function getRegistry() public view virtual override returns (IRegistry registry) {
|
63
|
+
return _registry;
|
64
|
+
}
|
65
|
+
|
66
|
+
function getOwner() public view virtual override returns (address owner) {
|
67
|
+
NftId nftId = _registry.getNftId(address(this));
|
68
|
+
if(nftId == zeroNftId()) {
|
69
|
+
return _initialOwner;
|
70
|
+
}
|
71
|
+
|
72
|
+
return _registry.getOwner(nftId);
|
73
|
+
}
|
74
|
+
|
75
|
+
function getNftId() public view override returns (NftId nftId) {
|
76
|
+
return _registry.getNftId(address(this));
|
77
|
+
}
|
78
|
+
|
79
|
+
function getParentNftId() public view override returns (NftId nftId) {
|
80
|
+
return _parentNftId;
|
81
|
+
}
|
82
|
+
|
83
|
+
function getData() public view virtual override returns (bytes memory data) {
|
84
|
+
return "";
|
85
|
+
}
|
86
|
+
}
|
@@ -0,0 +1,89 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.19;
|
3
|
+
|
4
|
+
import {Blocknumber, blockNumber} from "../types/Blocknumber.sol";
|
5
|
+
import {Timestamp, blockTimestamp} from "../types/Timestamp.sol";
|
6
|
+
import {Version, VersionPart} from "../types/Version.sol";
|
7
|
+
|
8
|
+
import {IVersionable} from "./IVersionable.sol";
|
9
|
+
|
10
|
+
abstract contract Versionable is IVersionable {
|
11
|
+
|
12
|
+
mapping(Version version => VersionInfo info) private _versionHistory;
|
13
|
+
Version [] private _versions;
|
14
|
+
|
15
|
+
|
16
|
+
// controlled activation for controller contract
|
17
|
+
constructor() {
|
18
|
+
_activate(address(0), msg.sender);
|
19
|
+
}
|
20
|
+
|
21
|
+
// IMPORTANT this function needs to be implemented by each new version
|
22
|
+
// and needs to call internal function call _activate()
|
23
|
+
function activate(address implementation, address activatedBy)
|
24
|
+
external
|
25
|
+
override
|
26
|
+
{
|
27
|
+
_activate(implementation, activatedBy);
|
28
|
+
}
|
29
|
+
|
30
|
+
|
31
|
+
// can only be called once per contract
|
32
|
+
// needs bo be called inside the proxy upgrade tx
|
33
|
+
function _activate(
|
34
|
+
address implementation,
|
35
|
+
address activatedBy
|
36
|
+
)
|
37
|
+
internal
|
38
|
+
{
|
39
|
+
Version thisVersion = getVersion();
|
40
|
+
require(
|
41
|
+
!isActivated(thisVersion),
|
42
|
+
"ERROR:VRN-001:VERSION_ALREADY_ACTIVATED"
|
43
|
+
);
|
44
|
+
|
45
|
+
// require increasing version number
|
46
|
+
if(_versions.length > 0) {
|
47
|
+
Version lastVersion = _versions[_versions.length - 1];
|
48
|
+
require(
|
49
|
+
thisVersion > lastVersion,
|
50
|
+
"ERROR:VRN-002:VERSION_NOT_INCREASING"
|
51
|
+
);
|
52
|
+
}
|
53
|
+
|
54
|
+
// update version history
|
55
|
+
_versions.push(thisVersion);
|
56
|
+
_versionHistory[thisVersion] = VersionInfo(
|
57
|
+
thisVersion,
|
58
|
+
implementation,
|
59
|
+
activatedBy,
|
60
|
+
blockTimestamp(),
|
61
|
+
blockNumber()
|
62
|
+
);
|
63
|
+
|
64
|
+
emit LogVersionableActivated(thisVersion, implementation, activatedBy);
|
65
|
+
}
|
66
|
+
|
67
|
+
|
68
|
+
function isActivated(Version _version) public override view returns(bool) {
|
69
|
+
return _versionHistory[_version].activatedIn.toInt() > 0;
|
70
|
+
}
|
71
|
+
|
72
|
+
|
73
|
+
function getVersion() public pure virtual returns(Version);
|
74
|
+
|
75
|
+
|
76
|
+
function getVersionCount() external view override returns(uint256) {
|
77
|
+
return _versions.length;
|
78
|
+
}
|
79
|
+
|
80
|
+
|
81
|
+
function getVersion(uint256 idx) external view override returns(Version) {
|
82
|
+
return _versions[idx];
|
83
|
+
}
|
84
|
+
|
85
|
+
|
86
|
+
function getVersionInfo(Version _version) external override view returns(VersionInfo memory) {
|
87
|
+
return _versionHistory[_version];
|
88
|
+
}
|
89
|
+
}
|
@@ -0,0 +1,25 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.19;
|
3
|
+
|
4
|
+
import {UFixed, UFixedMathLib} from "../types/UFixed.sol";
|
5
|
+
import {Fee, FeeLib} from "../types/Fee.sol";
|
6
|
+
|
7
|
+
contract TestFee {
|
8
|
+
|
9
|
+
function createFee(
|
10
|
+
uint256 fractionalValue,
|
11
|
+
int8 exponent,
|
12
|
+
uint256 fixedValue
|
13
|
+
)
|
14
|
+
external
|
15
|
+
pure
|
16
|
+
returns(Fee memory fee)
|
17
|
+
{
|
18
|
+
return FeeLib.toFee(UFixedMathLib.toUFixed(fractionalValue, exponent), fixedValue);
|
19
|
+
}
|
20
|
+
|
21
|
+
function getZeroFee() external pure returns(Fee memory fee) {
|
22
|
+
return FeeLib.zeroFee();
|
23
|
+
}
|
24
|
+
|
25
|
+
}
|
@@ -0,0 +1,24 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.19;
|
3
|
+
|
4
|
+
import {NftId} from "../../contracts/types/NftId.sol";
|
5
|
+
import {UFixed} from "../../contracts/types/UFixed.sol";
|
6
|
+
import {Fee} from "../../contracts/types/Fee.sol";
|
7
|
+
import {Pool} from "../../contracts/components/Pool.sol";
|
8
|
+
|
9
|
+
|
10
|
+
contract TestPool is Pool {
|
11
|
+
|
12
|
+
constructor(
|
13
|
+
address registry,
|
14
|
+
NftId instanceNftid,
|
15
|
+
address token,
|
16
|
+
bool isVerifying,
|
17
|
+
UFixed collateralizationLevel,
|
18
|
+
Fee memory stakingFee,
|
19
|
+
Fee memory performanceFee
|
20
|
+
)
|
21
|
+
Pool(registry, instanceNftid, token, isVerifying, collateralizationLevel, stakingFee, performanceFee)
|
22
|
+
// solhint-disable-next-line no-empty-blocks
|
23
|
+
{}
|
24
|
+
}
|
@@ -0,0 +1,66 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.19;
|
3
|
+
|
4
|
+
import {Product} from "../../contracts/components/Product.sol";
|
5
|
+
import {NftId, toNftId} from "../../contracts/types/NftId.sol";
|
6
|
+
import {RiskId} from "../../contracts/types/RiskId.sol";
|
7
|
+
import {Timestamp, blockTimestamp} from "../../contracts/types/Timestamp.sol";
|
8
|
+
import {Fee} from "../../contracts/types/Fee.sol";
|
9
|
+
|
10
|
+
contract TestProduct is Product {
|
11
|
+
|
12
|
+
event LogTestProductSender(address sender);
|
13
|
+
|
14
|
+
string public constant DEFAULT_RISK_NAME = "DEFAULT_RISK";
|
15
|
+
bool private defaultRiskCreated;
|
16
|
+
|
17
|
+
constructor(
|
18
|
+
address registry,
|
19
|
+
NftId instanceNftid,
|
20
|
+
address token,
|
21
|
+
address pool,
|
22
|
+
Fee memory policyFee,
|
23
|
+
Fee memory processingFee
|
24
|
+
)
|
25
|
+
Product(registry, instanceNftid, token, pool, policyFee, processingFee)
|
26
|
+
// solhint-disable-next-line no-empty-blocks
|
27
|
+
{
|
28
|
+
}
|
29
|
+
|
30
|
+
function getDefaultRiskId() public pure returns (RiskId) {
|
31
|
+
return _toRiskId(DEFAULT_RISK_NAME);
|
32
|
+
}
|
33
|
+
|
34
|
+
function applyForPolicy(
|
35
|
+
uint256 sumInsuredAmount,
|
36
|
+
uint256 premiumAmount,
|
37
|
+
uint256 lifetime,
|
38
|
+
NftId bundleNftId
|
39
|
+
)
|
40
|
+
external
|
41
|
+
returns(NftId nftId)
|
42
|
+
{
|
43
|
+
if (!defaultRiskCreated) {
|
44
|
+
_createRisk(getDefaultRiskId() , "");
|
45
|
+
defaultRiskCreated = true;
|
46
|
+
}
|
47
|
+
|
48
|
+
nftId = _createApplication(
|
49
|
+
msg.sender, // policy holder
|
50
|
+
getDefaultRiskId(),
|
51
|
+
sumInsuredAmount,
|
52
|
+
premiumAmount,
|
53
|
+
lifetime,
|
54
|
+
bundleNftId
|
55
|
+
);
|
56
|
+
}
|
57
|
+
|
58
|
+
function underwrite(NftId nftId, bool requirePremiumPayment, Timestamp activateAt) external {
|
59
|
+
emit LogTestProductSender(msg.sender);
|
60
|
+
_underwrite(nftId, requirePremiumPayment, activateAt);
|
61
|
+
}
|
62
|
+
|
63
|
+
function collectPremium(NftId nftId, Timestamp activateAt) external {
|
64
|
+
_collectPremium(nftId, activateAt);
|
65
|
+
}
|
66
|
+
}
|
@@ -0,0 +1,19 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.19;
|
3
|
+
|
4
|
+
import {NftId} from "../../contracts/types/NftId.sol";
|
5
|
+
import {ObjectType, TOKEN} from "../../contracts/types/ObjectType.sol";
|
6
|
+
import {IRegistry} from "../../contracts/registry/IRegistry.sol";
|
7
|
+
import {Registerable} from "../../contracts/shared/Registerable.sol";
|
8
|
+
|
9
|
+
contract TestRegisterable is Registerable {
|
10
|
+
|
11
|
+
constructor(address registry, NftId registryNftId)
|
12
|
+
Registerable(registry, registryNftId)
|
13
|
+
// solhint-disable-next-line no-empty-blocks
|
14
|
+
{}
|
15
|
+
|
16
|
+
function getType() external pure override returns (ObjectType) {
|
17
|
+
return TOKEN();
|
18
|
+
}
|
19
|
+
}
|
@@ -0,0 +1,14 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.19;
|
3
|
+
|
4
|
+
import {RoleId, RoleIdLib, PRODUCT_OWNER_ROLE_NAME, PRODUCT_OWNER_ROLE, POOL_OWNER_ROLE_NAME, POOL_OWNER_ROLE} from "../../contracts/types/RoleId.sol";
|
5
|
+
|
6
|
+
contract TestRoleId {
|
7
|
+
function getRole(string memory roleName) external pure returns (RoleId) { return RoleIdLib.toRoleId(roleName); }
|
8
|
+
|
9
|
+
function getProductOwnerRoleName() external pure returns (string memory) { return PRODUCT_OWNER_ROLE_NAME(); }
|
10
|
+
function getProductOwnerRole() external pure returns (RoleId) { return PRODUCT_OWNER_ROLE(); }
|
11
|
+
|
12
|
+
function getPoolOwnerRoleName() external pure returns (string memory) { return POOL_OWNER_ROLE_NAME(); }
|
13
|
+
function getPoolOwnerRole() external pure returns (RoleId) { return POOL_OWNER_ROLE(); }
|
14
|
+
}
|
@@ -0,0 +1,32 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.19;
|
3
|
+
|
4
|
+
import {NftId} from "../../contracts/types/NftId.sol";
|
5
|
+
import {Version, VersionLib} from "../../contracts/types/Version.sol";
|
6
|
+
import {ServiceBase} from "../../contracts/instance/base/ServiceBase.sol";
|
7
|
+
|
8
|
+
import {IVersionable} from "../../contracts/shared/IVersionable.sol";
|
9
|
+
import {Versionable} from "../../contracts/shared/Versionable.sol";
|
10
|
+
|
11
|
+
contract TestService is ServiceBase {
|
12
|
+
|
13
|
+
string public constant NAME = "TestService";
|
14
|
+
|
15
|
+
constructor(address registry, NftId registryNftId)
|
16
|
+
ServiceBase(registry, registryNftId)
|
17
|
+
// solhint-disable-next-line no-empty-blocks
|
18
|
+
{}
|
19
|
+
|
20
|
+
function getVersion()
|
21
|
+
public
|
22
|
+
pure
|
23
|
+
virtual override (IVersionable, Versionable)
|
24
|
+
returns(Version)
|
25
|
+
{
|
26
|
+
return VersionLib.toVersion(3,0,0);
|
27
|
+
}
|
28
|
+
|
29
|
+
function getName() external pure override returns(string memory name) {
|
30
|
+
return NAME;
|
31
|
+
}
|
32
|
+
}
|
@@ -1,14 +1,14 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
|
-
pragma solidity ^0.8.
|
2
|
+
pragma solidity ^0.8.19;
|
3
3
|
|
4
4
|
import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
|
5
5
|
|
6
|
-
contract
|
6
|
+
contract TestUsdc is ERC20 {
|
7
7
|
|
8
8
|
// https://etherscan.io/token/0xc719d010b63e5bbf2c0551872cd5316ed26acd83#readContract
|
9
|
-
string public constant NAME = "
|
10
|
-
string public constant SYMBOL = "
|
11
|
-
uint8 public constant DECIMALS =
|
9
|
+
string public constant NAME = "USDC - Test";
|
10
|
+
string public constant SYMBOL = "USDC";
|
11
|
+
uint8 public constant DECIMALS = 6;
|
12
12
|
uint256 public constant INITIAL_SUPPLY = 10**9 * 10**DECIMALS; // 1 Billion 1'000'000'000
|
13
13
|
// decimals == 18 (openzeppelin erc20 default)
|
14
14
|
constructor()
|
@@ -0,0 +1,44 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.19;
|
3
|
+
|
4
|
+
import {Version, VersionPart, VersionLib} from "../types/Version.sol";
|
5
|
+
|
6
|
+
contract TestVersion {
|
7
|
+
|
8
|
+
function createVersion(uint major, uint minor, uint patch) external pure returns(Version) {
|
9
|
+
return VersionLib.toVersion(major, minor, patch);
|
10
|
+
}
|
11
|
+
|
12
|
+
function createVersionPart(uint versionPart) external pure returns(VersionPart) {
|
13
|
+
return VersionLib.toVersionPart(uint8(versionPart));
|
14
|
+
}
|
15
|
+
|
16
|
+
function getVersionParts(Version version)
|
17
|
+
external
|
18
|
+
pure
|
19
|
+
returns(
|
20
|
+
VersionPart major,
|
21
|
+
VersionPart minor,
|
22
|
+
VersionPart patch
|
23
|
+
)
|
24
|
+
{
|
25
|
+
return version.toVersionParts();
|
26
|
+
}
|
27
|
+
|
28
|
+
function getMajorPart(Version version) external pure returns(VersionPart major) {
|
29
|
+
return version.toMajorPart();
|
30
|
+
}
|
31
|
+
|
32
|
+
function getZeroVersion() external pure returns(Version) {
|
33
|
+
return VersionLib.zeroVersion();
|
34
|
+
}
|
35
|
+
|
36
|
+
function isSameVersion(Version a, Version b) external pure returns(bool) {
|
37
|
+
return a == b;
|
38
|
+
}
|
39
|
+
|
40
|
+
function isLargerVersion(Version a, Version b) external pure returns(bool) {
|
41
|
+
return a > b;
|
42
|
+
}
|
43
|
+
|
44
|
+
}
|
@@ -0,0 +1,17 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.19;
|
3
|
+
|
4
|
+
import {Version, VersionLib} from "../../contracts/types/Version.sol";
|
5
|
+
import {Versionable} from "../../contracts/shared/Versionable.sol";
|
6
|
+
|
7
|
+
contract TestVersionable is Versionable {
|
8
|
+
|
9
|
+
function getVersion()
|
10
|
+
public
|
11
|
+
pure
|
12
|
+
virtual override
|
13
|
+
returns(Version)
|
14
|
+
{
|
15
|
+
return VersionLib.toVersion(3,0,0);
|
16
|
+
}
|
17
|
+
}
|
@@ -0,0 +1,58 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.19;
|
3
|
+
|
4
|
+
// based on https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/contracts/utils/structs/EnumerableSet.sol
|
5
|
+
library LibAddressSet {
|
6
|
+
|
7
|
+
struct Set {
|
8
|
+
address[] elements;
|
9
|
+
mapping(address element => uint256 index) at;
|
10
|
+
}
|
11
|
+
|
12
|
+
function add(Set storage set, address element) external returns(bool added) {
|
13
|
+
if (set.at[element] == 0) {
|
14
|
+
set.elements.push(element);
|
15
|
+
set.at[element] = set.elements.length;
|
16
|
+
return true;
|
17
|
+
} else {
|
18
|
+
return false;
|
19
|
+
}
|
20
|
+
}
|
21
|
+
|
22
|
+
function remove(Set storage set, address element) external returns(bool removed) {
|
23
|
+
uint256 elementIndex = set.at[element];
|
24
|
+
|
25
|
+
if (elementIndex > 0) {
|
26
|
+
uint256 toDeleteIndex = elementIndex - 1;
|
27
|
+
uint256 lastIndex = set.elements.length - 1;
|
28
|
+
|
29
|
+
if (lastIndex != toDeleteIndex) {
|
30
|
+
address lastElement = set.elements[lastIndex];
|
31
|
+
set.elements[toDeleteIndex] = lastElement;
|
32
|
+
set.at[lastElement] = elementIndex; // Replace lastValue's index to valueIndex
|
33
|
+
}
|
34
|
+
|
35
|
+
set.elements.pop();
|
36
|
+
delete set.at[element];
|
37
|
+
return true;
|
38
|
+
}
|
39
|
+
|
40
|
+
return false;
|
41
|
+
}
|
42
|
+
|
43
|
+
function isEmpty(Set storage set) external view returns(bool empty) {
|
44
|
+
return set.elements.length == 0;
|
45
|
+
}
|
46
|
+
|
47
|
+
function contains(Set storage set, address element) external view returns(bool inSet) {
|
48
|
+
return set.at[element] > 0;
|
49
|
+
}
|
50
|
+
|
51
|
+
function getLength(Set storage set) external view returns(uint256 length) {
|
52
|
+
return set.elements.length;
|
53
|
+
}
|
54
|
+
|
55
|
+
function getElementAt(Set storage set, uint256 index) external view returns(address element) {
|
56
|
+
return set.elements[index];
|
57
|
+
}
|
58
|
+
}
|
package/contracts/types/Fee.sol
CHANGED
@@ -1,32 +1,51 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.19;
|
3
3
|
|
4
|
-
import {UFixed} from "./UFixed.sol";
|
4
|
+
import {UFixed, UFixedMathLib} from "./UFixed.sol";
|
5
5
|
|
6
6
|
struct Fee {
|
7
7
|
UFixed fractionalFee;
|
8
8
|
uint256 fixedFee;
|
9
9
|
}
|
10
10
|
|
11
|
-
|
12
|
-
/// @dev Converts the uint256 to a NftId.
|
13
|
-
function toFee(
|
14
|
-
UFixed fractionalFee,
|
15
|
-
uint256 fixedFee
|
16
|
-
) pure returns (Fee memory fee) {
|
17
|
-
return Fee(fractionalFee, fixedFee);
|
18
|
-
}
|
11
|
+
library FeeLib {
|
19
12
|
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
13
|
+
function calculateFee(
|
14
|
+
uint256 amount,
|
15
|
+
Fee memory fee
|
16
|
+
)
|
17
|
+
public
|
18
|
+
pure
|
19
|
+
returns (
|
20
|
+
uint256 feeAmount,
|
21
|
+
uint256 netAmount
|
22
|
+
)
|
23
|
+
{
|
24
|
+
UFixed fractionalAmount = UFixedMathLib.toUFixed(amount) *
|
25
|
+
fee.fractionalFee;
|
26
|
+
feeAmount = fractionalAmount.toInt() + fee.fixedFee;
|
27
|
+
netAmount = amount - feeAmount;
|
28
|
+
}
|
24
29
|
|
25
|
-
|
26
|
-
function
|
27
|
-
|
28
|
-
|
30
|
+
/// @dev Converts the uint256 to a fee struct.
|
31
|
+
function toFee(
|
32
|
+
UFixed fractionalFee,
|
33
|
+
uint256 fixedFee
|
34
|
+
) public pure returns (Fee memory fee) {
|
35
|
+
return Fee(fractionalFee, fixedFee);
|
36
|
+
}
|
29
37
|
|
30
|
-
|
31
|
-
|
32
|
-
|
38
|
+
/// @dev Return the zero fee struct (0, 0)
|
39
|
+
function zeroFee() public pure returns (Fee memory fee) {
|
40
|
+
return Fee(UFixed.wrap(0), 0);
|
41
|
+
}
|
42
|
+
|
43
|
+
// pure free functions for operators
|
44
|
+
function feeIsSame(Fee memory a, Fee memory b) public pure returns (bool isSame) {
|
45
|
+
return a.fixedFee == b.fixedFee && a.fractionalFee == b.fractionalFee;
|
46
|
+
}
|
47
|
+
|
48
|
+
function feeIsZero(Fee memory fee) public pure returns (bool) {
|
49
|
+
return fee.fixedFee == 0 && UFixed.unwrap(fee.fractionalFee) == 0;
|
50
|
+
}
|
51
|
+
}
|
@@ -0,0 +1,45 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.19;
|
3
|
+
|
4
|
+
import {ObjectType} from "./ObjectType.sol";
|
5
|
+
|
6
|
+
type Key32 is bytes32;
|
7
|
+
type KeyId is bytes31;
|
8
|
+
|
9
|
+
// type bindings
|
10
|
+
using {
|
11
|
+
eqKey32 as ==,
|
12
|
+
neKey32 as !=,
|
13
|
+
Key32Lib.toKey
|
14
|
+
} for Key32 global;
|
15
|
+
|
16
|
+
// @dev Returns true iff keys are identical
|
17
|
+
function eqKey32(Key32 a, Key32 b) pure returns (bool isSame) {
|
18
|
+
return Key32.unwrap(a) == Key32.unwrap(b);
|
19
|
+
}
|
20
|
+
|
21
|
+
// @dev Returns true iff keys are different
|
22
|
+
function neKey32(Key32 a, Key32 b) pure returns (bool isDifferent) {
|
23
|
+
return Key32.unwrap(a) != Key32.unwrap(b);
|
24
|
+
}
|
25
|
+
|
26
|
+
library Key32Lib {
|
27
|
+
|
28
|
+
uint8 public constant TYPE_SHIFT = 31 * 8;
|
29
|
+
uint8 public constant ID_SHIFT = uint8(32 * 8 - TYPE_SHIFT);
|
30
|
+
bytes32 public constant TYPE_MASK = bytes32(bytes1(type(uint8).max)); // first byte in bytes32
|
31
|
+
bytes32 public constant ID_MASK = bytes32(~TYPE_MASK); // remaining bytes in bytes32
|
32
|
+
|
33
|
+
function toKey32(ObjectType objectType, KeyId id) public pure returns (Key32) {
|
34
|
+
uint256 uintObjectType = ObjectType.unwrap(objectType);
|
35
|
+
uint256 uintId = uint248(KeyId.unwrap(id));
|
36
|
+
uint256 uintKey = (uintObjectType << TYPE_SHIFT) + uintId;
|
37
|
+
return Key32.wrap(bytes32(uintKey));
|
38
|
+
}
|
39
|
+
|
40
|
+
function toKey(Key32 key) public pure returns (ObjectType objectType, KeyId id) {
|
41
|
+
bytes32 key32 = Key32.unwrap(key);
|
42
|
+
objectType = ObjectType.wrap(uint8(uint256(key32 & TYPE_MASK) >> TYPE_SHIFT));
|
43
|
+
id = KeyId.wrap(bytes31((key32 & ID_MASK) << ID_SHIFT));
|
44
|
+
}
|
45
|
+
}
|
@@ -1,11 +1,22 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.19;
|
3
3
|
|
4
|
+
import {Key32, KeyId, Key32Lib} from "./Key32.sol";
|
5
|
+
import {ObjectType} from "./ObjectType.sol";
|
6
|
+
|
4
7
|
// uint96 allows for chain ids up to 13 digits
|
5
8
|
type NftId is uint96;
|
6
9
|
|
7
10
|
// type bindings
|
8
|
-
using {
|
11
|
+
using {
|
12
|
+
eqNftId as ==,
|
13
|
+
neNftId as !=,
|
14
|
+
NftIdLib.toInt,
|
15
|
+
NftIdLib.gtz,
|
16
|
+
NftIdLib.eqz,
|
17
|
+
NftIdLib.toKeyId,
|
18
|
+
NftIdLib.toKey32
|
19
|
+
} for NftId global;
|
9
20
|
|
10
21
|
// general pure free functions
|
11
22
|
/// @dev Converts the uint256 to a NftId.
|
@@ -48,4 +59,14 @@ library NftIdLib {
|
|
48
59
|
function eq(NftId a, NftId b) public pure returns (bool isSame) {
|
49
60
|
return eqNftId(a, b);
|
50
61
|
}
|
62
|
+
|
63
|
+
/// @dev Returns the key32 value for the specified nft id and object type.
|
64
|
+
function toKey32(NftId id, ObjectType objectType) public pure returns (Key32 key) {
|
65
|
+
return Key32Lib.toKey32(objectType, toKeyId(id));
|
66
|
+
}
|
67
|
+
|
68
|
+
/// @dev Returns the key id value for the specified nft id
|
69
|
+
function toKeyId(NftId id) public pure returns (KeyId keyId) {
|
70
|
+
return KeyId.wrap(bytes31(uint248(NftId.unwrap(id))));
|
71
|
+
}
|
51
72
|
}
|