@etherisc/gif-next 0.0.2-de0a1d3-009 → 0.0.2-e37834a-021
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +40 -25
- package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +1 -1
- package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.json +80 -41
- package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +1 -1
- package/artifacts/contracts/components/Distribution.sol/Distribution.json +101 -61
- package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.json +43 -40
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +0 -163
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +6 -185
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +0 -163
- package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
- package/artifacts/contracts/components/Pool.sol/Pool.json +150 -126
- package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/components/Product.sol/Product.json +110 -52
- 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/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/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +1 -1
- 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 +198 -74
- package/artifacts/contracts/instance/IInstanceLinked.sol/IInstanceLinked.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +285 -178
- package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.json +59 -53
- package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +1 -1
- package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.json +1 -1
- package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +1 -1
- package/artifacts/contracts/instance/base/IService.sol/IService.dbg.json +1 -1
- package/artifacts/contracts/instance/base/IService.sol/IService.json +45 -42
- package/artifacts/contracts/instance/base/InstanceBase.sol/InstanceBase.dbg.json +1 -1
- package/artifacts/contracts/instance/base/InstanceBase.sol/InstanceBase.json +62 -69
- package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ModuleBase.sol/ModuleBase.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ServiceBase.sol/ServiceBase.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ServiceBase.sol/ServiceBase.json +55 -62
- package/artifacts/contracts/instance/module/access/Access.sol/AccessModule.dbg.json +1 -1
- package/artifacts/contracts/instance/module/access/IAccess.sol/IAccess.dbg.json +1 -1
- package/artifacts/contracts/instance/module/access/IAccess.sol/IAccessModule.dbg.json +1 -1
- package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.dbg.json +1 -1
- package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundle.dbg.json +1 -1
- package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.dbg.json +1 -1
- package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.dbg.json +1 -1
- package/artifacts/contracts/instance/module/component/IComponent.sol/IComponent.dbg.json +1 -1
- package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.dbg.json +1 -1
- package/artifacts/contracts/instance/module/distribution/DistributionModule.sol/DistributionModule.dbg.json +1 -1
- package/artifacts/contracts/instance/module/distribution/DistributionModule.sol/DistributionModule.json +2 -2
- package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistribution.dbg.json +1 -1
- package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistributionModule.dbg.json +1 -1
- package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicy.dbg.json +1 -1
- package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.dbg.json +1 -1
- package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.dbg.json +1 -1
- package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPool.dbg.json +1 -1
- package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.dbg.json +1 -1
- package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.json +29 -9
- package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.dbg.json +1 -1
- package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.json +28 -8
- package/artifacts/contracts/instance/module/risk/IRisk.sol/IRisk.dbg.json +1 -1
- package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.dbg.json +1 -1
- package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.dbg.json +1 -1
- package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.json +2 -2
- package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasury.dbg.json +1 -1
- package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.dbg.json +1 -1
- package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.json +138 -11
- package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.dbg.json +1 -1
- package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.json +2 -2
- package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.dbg.json +1 -1
- package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.json +138 -11
- package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +165 -93
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +87 -68
- package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.json +45 -61
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +45 -42
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +45 -42
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +45 -42
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +89 -70
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +117 -98
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +141 -12
- package/artifacts/contracts/registry/IChainNft.sol/IChainNft.dbg.json +1 -1
- package/artifacts/contracts/registry/IChainNft.sol/IChainNft.json +5 -0
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +293 -40
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +4 -0
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +668 -0
- package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +4 -0
- package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.json +34 -0
- package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registry.json +483 -120
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +4 -0
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +885 -0
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +4 -0
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +460 -0
- package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +4 -0
- package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.json +107 -0
- package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
- package/artifacts/contracts/shared/ERC165.sol/ERC165.json +2 -2
- package/artifacts/contracts/shared/IOwnable.sol/IOwnable.dbg.json +1 -1
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +43 -40
- package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
- package/artifacts/contracts/shared/IVersionable.sol/IVersionable.json +2 -2
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +4 -0
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +132 -0
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +4 -0
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +344 -0
- package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
- package/artifacts/contracts/shared/Registerable.sol/Registerable.json +76 -37
- package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +4 -0
- package/artifacts/contracts/shared/{Proxy.sol/ProxyWithProxyAdminGetter.json → UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json} +4 -4
- package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
- package/artifacts/contracts/shared/Versionable.sol/Versionable.json +4 -27
- package/artifacts/contracts/test/TestDistribution.sol/TestDistribution.dbg.json +1 -1
- package/artifacts/contracts/test/TestDistribution.sol/TestDistribution.json +101 -61
- package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +1 -1
- package/artifacts/contracts/test/TestPool.sol/TestPool.dbg.json +1 -1
- package/artifacts/contracts/test/TestPool.sol/TestPool.json +150 -126
- package/artifacts/contracts/test/TestProduct.sol/TestProduct.dbg.json +1 -1
- package/artifacts/contracts/test/TestProduct.sol/TestProduct.json +115 -58
- package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
- package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +93 -39
- package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
- package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
- package/artifacts/contracts/test/TestService.sol/TestService.json +81 -75
- package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +1 -1
- package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +1 -1
- package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +2 -2
- package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +1 -1
- package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +15 -38
- package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +1 -1
- package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +1 -1
- package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
- package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +1 -1
- package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +1 -1
- package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
- package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
- package/artifacts/contracts/types/ReferralId.sol/ReferralIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
- package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.dbg.json +1 -1
- package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
- package/artifacts/contracts/types/Version.sol/VersionLib.json +2 -2
- package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
- package/artifacts/contracts/types/Version.sol/VersionPartLib.json +2 -2
- package/contracts/components/BaseComponent.sol +12 -27
- package/contracts/components/Distribution.sol +29 -6
- package/contracts/components/IBaseComponent.sol +2 -2
- package/contracts/components/IDistributionComponent.sol +1 -2
- package/contracts/components/IPoolComponent.sol +3 -10
- package/contracts/components/IProductComponent.sol +2 -3
- package/contracts/components/Pool.sol +84 -73
- package/contracts/components/Product.sol +85 -13
- package/contracts/instance/IInstance.sol +4 -3
- package/contracts/instance/Instance.sol +14 -3
- package/contracts/instance/base/ComponentServiceBase.sol +13 -6
- package/contracts/instance/base/IInstanceBase.sol +3 -2
- package/contracts/instance/base/InstanceBase.sol +6 -8
- package/contracts/instance/base/ServiceBase.sol +19 -13
- package/contracts/instance/module/component/ComponentModule.sol +5 -4
- package/contracts/instance/module/component/IComponent.sol +2 -2
- package/contracts/instance/module/pool/IPoolModule.sol +4 -3
- package/contracts/instance/module/pool/PoolModule.sol +12 -7
- package/contracts/instance/module/treasury/ITreasury.sol +7 -5
- package/contracts/instance/module/treasury/TokenHandler.sol +2 -2
- package/contracts/instance/module/treasury/TreasuryModule.sol +21 -28
- package/contracts/instance/service/ComponentOwnerService.sol +181 -66
- package/contracts/instance/service/DistributionService.sol +6 -11
- package/contracts/instance/service/IComponentOwnerService.sol +0 -2
- package/contracts/instance/service/PoolService.sol +19 -19
- package/contracts/instance/service/ProductService.sol +25 -24
- package/contracts/registry/ChainNft.sol +43 -15
- package/contracts/registry/IChainNft.sol +3 -2
- package/contracts/registry/IRegistry.sol +44 -28
- package/contracts/registry/IRegistryService.sol +29 -0
- package/contracts/registry/ITransferInterceptor.sol +6 -0
- package/contracts/registry/Registry.sol +382 -273
- package/contracts/registry/RegistryService.sol +375 -0
- package/contracts/registry/RegistryServiceManager.sol +52 -0
- package/contracts/shared/ContractDeployerLib.sol +72 -0
- package/contracts/shared/ERC165.sol +1 -1
- package/contracts/shared/IRegisterable.sol +7 -9
- package/contracts/shared/IVersionable.sol +40 -9
- package/contracts/shared/NftOwnable.sol +87 -0
- package/contracts/shared/ProxyManager.sol +103 -0
- package/contracts/shared/Registerable.sol +74 -43
- package/contracts/shared/UpgradableProxyWithAdmin.sol +16 -0
- package/contracts/shared/Versionable.sol +108 -60
- package/contracts/test/TestDistribution.sol +3 -2
- package/contracts/test/TestPool.sol +4 -2
- package/contracts/test/TestProduct.sol +4 -2
- package/contracts/test/TestRegisterable.sol +5 -6
- package/contracts/test/TestService.sol +5 -11
- package/contracts/types/Version.sol +1 -0
- package/package.json +1 -1
- package/artifacts/contracts/registry/IRegistryLinked.sol/IRegistryLinked.dbg.json +0 -4
- package/artifacts/contracts/registry/IRegistryLinked.sol/IRegistryLinked.json +0 -24
- package/artifacts/contracts/registry/RegistryUpgradeable.sol/RegistryUpgradeable.dbg.json +0 -4
- package/artifacts/contracts/registry/RegistryUpgradeable.sol/RegistryUpgradeable.json +0 -724
- package/artifacts/contracts/shared/Proxy.sol/ProxyDeployer.dbg.json +0 -4
- package/artifacts/contracts/shared/Proxy.sol/ProxyDeployer.json +0 -248
- package/artifacts/contracts/shared/Proxy.sol/ProxyWithProxyAdminGetter.dbg.json +0 -4
- package/artifacts/contracts/shared/VersionableUpgradeable.sol/VersionableUpgradeable.dbg.json +0 -4
- package/artifacts/contracts/shared/VersionableUpgradeable.sol/VersionableUpgradeable.json +0 -228
- package/contracts/experiment/statemachine/README.md +0 -112
- package/contracts/registry/IRegistryLinked.sol +0 -8
- package/contracts/registry/RegistryUpgradeable.sol +0 -473
- package/contracts/shared/Proxy.sol +0 -94
- package/contracts/shared/VersionableUpgradeable.sol +0 -133
@@ -170,8 +170,8 @@
|
|
170
170
|
"type": "function"
|
171
171
|
}
|
172
172
|
],
|
173
|
-
"bytecode": "
|
174
|
-
"deployedBytecode": "
|
173
|
+
"bytecode": "0x61039161003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100925760003560e01c80638e4ad86c116100655780638e4ad86c1461012157806394aa449c14610144578063a123b37c14610152578063c9e66e291461017957600080fd5b806304b8f6c5146100975780632efe0113146100b357806349a7111a146100c657806355601007146100fd575b600080fd5b60005b60405162ffffff90911681526020015b60405180910390f35b61009a6100c136600461026e565b610190565b6100d96100d436600461029a565b610231565b6040805160ff948516815292841660208401529216918101919091526060016100aa565b61011361010b36600461029a565b62ffffff1690565b6040519081526020016100aa565b61013261012f3660046102c6565b90565b60405160ff90911681526020016100aa565b61009a61012f3660046102df565b61016061010b36600461029a565b60405167ffffffffffffffff90911681526020016100aa565b61013261018736600461029a565b60101c60ff1690565b6000610100841080156101a4575061010083105b80156101b1575061010082105b61020c5760405162461bcd60e51b815260206004820152602260248201527f4552524f523a5652532d3031303a56455253494f4e5f504152545f544f4f5f42604482015261494760f01b606482015260840160405180910390fd5b8161021f600885901b601087901b61031f565b610229919061031f565b949350505050565b600080808360ff601082901c166102488383610338565b915061ffff600883901c16600061025f8185610338565b92989197509195509350505050565b60008060006060848603121561028357600080fd5b505081359360208301359350604090920135919050565b6000602082840312156102ac57600080fd5b813562ffffff811681146102bf57600080fd5b9392505050565b6000602082840312156102d857600080fd5b5035919050565b6000602082840312156102f157600080fd5b813567ffffffffffffffff811681146102bf57600080fd5b634e487b7160e01b600052601160045260246000fd5b8082018082111561033257610332610309565b92915050565b62ffffff82811682821603908082111561035457610354610309565b509291505056fea2646970667358221220e42f77cfda39708b26a423d08fb99d9e3d65c337357ab7291eb4fdfec94256eb64736f6c63430008140033",
|
174
|
+
"deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100925760003560e01c80638e4ad86c116100655780638e4ad86c1461012157806394aa449c14610144578063a123b37c14610152578063c9e66e291461017957600080fd5b806304b8f6c5146100975780632efe0113146100b357806349a7111a146100c657806355601007146100fd575b600080fd5b60005b60405162ffffff90911681526020015b60405180910390f35b61009a6100c136600461026e565b610190565b6100d96100d436600461029a565b610231565b6040805160ff948516815292841660208401529216918101919091526060016100aa565b61011361010b36600461029a565b62ffffff1690565b6040519081526020016100aa565b61013261012f3660046102c6565b90565b60405160ff90911681526020016100aa565b61009a61012f3660046102df565b61016061010b36600461029a565b60405167ffffffffffffffff90911681526020016100aa565b61013261018736600461029a565b60101c60ff1690565b6000610100841080156101a4575061010083105b80156101b1575061010082105b61020c5760405162461bcd60e51b815260206004820152602260248201527f4552524f523a5652532d3031303a56455253494f4e5f504152545f544f4f5f42604482015261494760f01b606482015260840160405180910390fd5b8161021f600885901b601087901b61031f565b610229919061031f565b949350505050565b600080808360ff601082901c166102488383610338565b915061ffff600883901c16600061025f8185610338565b92989197509195509350505050565b60008060006060848603121561028357600080fd5b505081359360208301359350604090920135919050565b6000602082840312156102ac57600080fd5b813562ffffff811681146102bf57600080fd5b9392505050565b6000602082840312156102d857600080fd5b5035919050565b6000602082840312156102f157600080fd5b813567ffffffffffffffff811681146102bf57600080fd5b634e487b7160e01b600052601160045260246000fd5b8082018082111561033257610332610309565b92915050565b62ffffff82811682821603908082111561035457610354610309565b509291505056fea2646970667358221220e42f77cfda39708b26a423d08fb99d9e3d65c337357ab7291eb4fdfec94256eb64736f6c63430008140033",
|
175
175
|
"linkReferences": {},
|
176
176
|
"deployedLinkReferences": {}
|
177
177
|
}
|
@@ -23,8 +23,8 @@
|
|
23
23
|
"type": "function"
|
24
24
|
}
|
25
25
|
],
|
26
|
-
"bytecode": "
|
27
|
-
"deployedBytecode": "
|
26
|
+
"bytecode": "0x60b9610039600b82828239805160001a60731461002c57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe730000000000000000000000000000000000000000301460806040526004361060335760003560e01c8063ac43d834146038575b600080fd5b60496043366004605b565b60ff1690565b60405190815260200160405180910390f35b600060208284031215606c57600080fd5b813560ff81168114607c57600080fd5b939250505056fea264697066735822122028c6578af7cf354c26921be53c7bafd817914c3fa380a53d5f0e3935a1b47c8b64736f6c63430008140033",
|
27
|
+
"deployedBytecode": "0x730000000000000000000000000000000000000000301460806040526004361060335760003560e01c8063ac43d834146038575b600080fd5b60496043366004605b565b60ff1690565b60405190815260200160405180910390f35b600060208284031215606c57600080fd5b813560ff81168114607c57600080fd5b939250505056fea264697066735822122028c6578af7cf354c26921be53c7bafd817914c3fa380a53d5f0e3935a1b47c8b64736f6c63430008140033",
|
28
28
|
"linkReferences": {},
|
29
29
|
"deployedLinkReferences": {}
|
30
30
|
}
|
@@ -1,20 +1,18 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
|
-
pragma solidity ^0.8.
|
2
|
+
pragma solidity ^0.8.20;
|
3
3
|
|
4
|
-
import {IERC20Metadata} from "@
|
4
|
+
import {IERC20Metadata} from "@openzeppelin5/contracts/token/ERC20/extensions/IERC20Metadata.sol";
|
5
5
|
|
6
|
-
import {IRegisterable} from "../shared/IRegisterable.sol";
|
7
6
|
import {Registerable} from "../shared/Registerable.sol";
|
8
7
|
|
9
8
|
import {IRegistry} from "../registry/IRegistry.sol";
|
10
9
|
import {IInstance} from "../instance/IInstance.sol";
|
11
10
|
|
12
11
|
import {IInstance} from "../instance/IInstance.sol";
|
13
|
-
import {IComponent, IComponentModule} from "../instance/module/component/IComponent.sol";
|
14
12
|
import {IComponentOwnerService} from "../instance/service/IComponentOwnerService.sol";
|
15
13
|
import {IBaseComponent} from "./IBaseComponent.sol";
|
16
|
-
import {Fee, FeeLib} from "../types/Fee.sol";
|
17
14
|
import {NftId} from "../types/NftId.sol";
|
15
|
+
import {ObjectType} from "../types/ObjectType.sol";
|
18
16
|
|
19
17
|
abstract contract BaseComponent is
|
20
18
|
Registerable,
|
@@ -26,17 +24,20 @@ abstract contract BaseComponent is
|
|
26
24
|
address internal _wallet;
|
27
25
|
IERC20Metadata internal _token;
|
28
26
|
IInstance internal _instance;
|
29
|
-
bool internal _isRegistered;
|
30
|
-
Fee internal _zeroFee;
|
31
27
|
|
32
28
|
constructor(
|
33
29
|
address registry,
|
34
30
|
NftId instanceNftId,
|
35
|
-
address token
|
31
|
+
address token,
|
32
|
+
ObjectType componentType,
|
33
|
+
bool isInterceptor,
|
34
|
+
address initialOwner
|
36
35
|
)
|
37
|
-
Registerable(registry, instanceNftId)
|
38
36
|
{
|
39
|
-
|
37
|
+
bytes memory data = "";
|
38
|
+
_initializeRegisterable(registry, instanceNftId, componentType, isInterceptor, initialOwner, data);
|
39
|
+
|
40
|
+
IRegistry.ObjectInfo memory instanceInfo = getRegistry().getObjectInfo(instanceNftId);
|
40
41
|
_instance = IInstance(instanceInfo.objectAddress);
|
41
42
|
require(
|
42
43
|
_instance.supportsInterface(type(IInstance).interfaceId),
|
@@ -46,24 +47,8 @@ abstract contract BaseComponent is
|
|
46
47
|
_componentOwnerService = _instance.getComponentOwnerService();
|
47
48
|
_wallet = address(this);
|
48
49
|
_token = IERC20Metadata(token);
|
49
|
-
_isRegistered = false;
|
50
|
-
_zeroFee = FeeLib.zeroFee();
|
51
|
-
}
|
52
|
-
|
53
|
-
// from registerable
|
54
|
-
function register() public override(IRegisterable, Registerable) returns (NftId componentId) {
|
55
|
-
require(msg.sender == getOwner(), "");
|
56
|
-
require(
|
57
|
-
address(_registry) != address(0),
|
58
|
-
"ERROR:COB-001:REGISTRY_ZERO"
|
59
|
-
);
|
60
|
-
require(
|
61
|
-
_registry.isRegistered(address(_instance)),
|
62
|
-
"ERROR:COB:INSTANCE_NOT_REGISTERED"
|
63
|
-
);
|
64
50
|
|
65
|
-
|
66
|
-
return _componentOwnerService.register(this);
|
51
|
+
_registerInterface(type(IBaseComponent).interfaceId);
|
67
52
|
}
|
68
53
|
|
69
54
|
// from component contract
|
@@ -1,7 +1,7 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.19;
|
3
3
|
|
4
|
-
import {
|
4
|
+
import {DISTRIBUTION} from "../types/ObjectType.sol";
|
5
5
|
import {IDistributionService} from "../instance/service/IDistributionService.sol";
|
6
6
|
import {IProductService} from "../instance/service/IProductService.sol";
|
7
7
|
import {NftId} from "../types/NftId.sol";
|
@@ -9,6 +9,9 @@ import {ReferralId} from "../types/ReferralId.sol";
|
|
9
9
|
import {Fee, FeeLib} from "../types/Fee.sol";
|
10
10
|
import {BaseComponent} from "./BaseComponent.sol";
|
11
11
|
import {IDistributionComponent} from "./IDistributionComponent.sol";
|
12
|
+
import {IRegistry} from "../registry/IRegistry.sol";
|
13
|
+
import {IRegisterable} from "../shared/IRegisterable.sol";
|
14
|
+
import {Registerable} from "../shared/Registerable.sol";
|
12
15
|
|
13
16
|
contract Distribution is
|
14
17
|
BaseComponent,
|
@@ -34,15 +37,18 @@ contract Distribution is
|
|
34
37
|
// TODO refactor into tokenNftId
|
35
38
|
address token,
|
36
39
|
bool verifying,
|
37
|
-
Fee memory distributionFee
|
40
|
+
Fee memory distributionFee,
|
41
|
+
address initialOwner
|
38
42
|
)
|
39
|
-
BaseComponent(registry, instanceNftId, token)
|
43
|
+
BaseComponent(registry, instanceNftId, token, DISTRIBUTION(), true, initialOwner)
|
40
44
|
{
|
41
45
|
_isVerifying = verifying;
|
42
46
|
_initialDistributionFee = distributionFee;
|
43
47
|
|
44
48
|
_distributionService = _instance.getDistributionService();
|
45
49
|
_productService = _instance.getProductService();
|
50
|
+
|
51
|
+
_registerInterface(type(IDistributionComponent).interfaceId);
|
46
52
|
}
|
47
53
|
|
48
54
|
|
@@ -125,8 +131,25 @@ contract Distribution is
|
|
125
131
|
return _isVerifying;
|
126
132
|
}
|
127
133
|
|
128
|
-
// from
|
129
|
-
|
130
|
-
|
134
|
+
// from IRegisterable
|
135
|
+
|
136
|
+
function getInitialInfo()
|
137
|
+
public
|
138
|
+
view
|
139
|
+
override (IRegisterable, Registerable)
|
140
|
+
returns(IRegistry.ObjectInfo memory, bytes memory)
|
141
|
+
{
|
142
|
+
(
|
143
|
+
IRegistry.ObjectInfo memory info,
|
144
|
+
bytes memory data
|
145
|
+
) = super.getInitialInfo();
|
146
|
+
|
147
|
+
return (
|
148
|
+
info,
|
149
|
+
abi.encode(
|
150
|
+
_initialDistributionFee,
|
151
|
+
_isVerifying
|
152
|
+
)
|
153
|
+
);
|
131
154
|
}
|
132
155
|
}
|
@@ -1,7 +1,7 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
|
-
pragma solidity ^0.8.
|
2
|
+
pragma solidity ^0.8.20;
|
3
3
|
|
4
|
-
import {IERC20Metadata} from "@
|
4
|
+
import {IERC20Metadata} from "@openzeppelin5/contracts/token/ERC20/extensions/IERC20Metadata.sol";
|
5
5
|
|
6
6
|
import {IRegisterable} from "../shared/IRegisterable.sol";
|
7
7
|
import {IInstanceLinked} from "../instance/IInstanceLinked.sol";
|
@@ -4,9 +4,8 @@ pragma solidity ^0.8.19;
|
|
4
4
|
import {Fee} from "../types/Fee.sol";
|
5
5
|
import {ReferralId} from "../types/ReferralId.sol";
|
6
6
|
import {NftId} from "../types/NftId.sol";
|
7
|
-
import {IBaseComponent} from "./IBaseComponent.sol";
|
8
7
|
|
9
|
-
interface IDistributionComponent
|
8
|
+
interface IDistributionComponent {
|
10
9
|
|
11
10
|
function setFees(
|
12
11
|
Fee memory distributionFee
|
@@ -1,12 +1,11 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
|
-
pragma solidity ^0.8.
|
2
|
+
pragma solidity ^0.8.20;
|
3
3
|
|
4
4
|
import {NftId} from "../types/NftId.sol";
|
5
5
|
import {Fee} from "../types/Fee.sol";
|
6
6
|
import {UFixed} from "../types/UFixed.sol";
|
7
|
-
import {IBaseComponent} from "./IBaseComponent.sol";
|
8
7
|
|
9
|
-
interface IPoolComponent
|
8
|
+
interface IPoolComponent {
|
10
9
|
|
11
10
|
event LogUnderwrittenByPool(NftId policyNftId, uint256 collateralizationAmount, address pool);
|
12
11
|
|
@@ -60,12 +59,6 @@ interface IPoolComponent is IBaseComponent {
|
|
60
59
|
|
61
60
|
function getCollateralizationLevel() external view returns (UFixed collateralizationLevel);
|
62
61
|
|
63
|
-
function
|
62
|
+
function getFees() external view returns (Fee memory poolFee, Fee memory stakingFee, Fee memory performanceFee);
|
64
63
|
|
65
|
-
function getStakingFee() external view returns (Fee memory stakingFee);
|
66
|
-
|
67
|
-
function getPerformanceFee()
|
68
|
-
external
|
69
|
-
view
|
70
|
-
returns (Fee memory performanceFee);
|
71
64
|
}
|
@@ -1,14 +1,13 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
|
-
pragma solidity ^0.8.
|
2
|
+
pragma solidity ^0.8.20;
|
3
3
|
|
4
4
|
import {Fee} from "../types/Fee.sol";
|
5
5
|
import {NftId} from "../types/NftId.sol";
|
6
6
|
import {ReferralId} from "../types/ReferralId.sol";
|
7
7
|
import {RiskId} from "../types/RiskId.sol";
|
8
8
|
|
9
|
-
|
9
|
+
interface IProductComponent {
|
10
10
|
|
11
|
-
interface IProductComponent is IBaseComponent {
|
12
11
|
function setFees(
|
13
12
|
Fee memory productFee,
|
14
13
|
Fee memory processingFee
|
@@ -1,5 +1,5 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
|
-
pragma solidity ^0.8.
|
2
|
+
pragma solidity ^0.8.20;
|
3
3
|
|
4
4
|
import {ObjectType, POOL} from "../types/ObjectType.sol";
|
5
5
|
import {IProductService} from "../instance/service/IProductService.sol";
|
@@ -10,6 +10,13 @@ import {UFixed} from "../types/UFixed.sol";
|
|
10
10
|
import {IPoolComponent} from "./IPoolComponent.sol";
|
11
11
|
import {BaseComponent} from "./BaseComponent.sol";
|
12
12
|
|
13
|
+
import {IRegistry} from "../registry/IRegistry.sol";
|
14
|
+
import {IPool} from "../instance/module/pool/IPoolModule.sol";
|
15
|
+
import {ITreasury} from "../instance/module/treasury/ITreasury.sol";
|
16
|
+
|
17
|
+
import {IRegisterable} from "../shared/IRegisterable.sol";
|
18
|
+
import {Registerable} from "../shared/Registerable.sol";
|
19
|
+
|
13
20
|
contract Pool is BaseComponent, IPoolComponent {
|
14
21
|
|
15
22
|
bool internal _isVerifying;
|
@@ -44,13 +51,15 @@ contract Pool is BaseComponent, IPoolComponent {
|
|
44
51
|
NftId instanceNftId,
|
45
52
|
// TODO refactor into tokenNftId
|
46
53
|
address token,
|
54
|
+
bool isInterceptor,
|
47
55
|
bool verifying,
|
48
56
|
UFixed collateralizationLevel,
|
49
57
|
Fee memory poolFee,
|
50
58
|
Fee memory stakingFee,
|
51
|
-
Fee memory performanceFee
|
59
|
+
Fee memory performanceFee,
|
60
|
+
address initialOwner
|
52
61
|
)
|
53
|
-
BaseComponent(registry, instanceNftId, token)
|
62
|
+
BaseComponent(registry, instanceNftId, token, POOL(), isInterceptor, initialOwner)
|
54
63
|
{
|
55
64
|
_isVerifying = verifying;
|
56
65
|
// TODO add validation
|
@@ -61,18 +70,8 @@ contract Pool is BaseComponent, IPoolComponent {
|
|
61
70
|
|
62
71
|
_poolService = _instance.getPoolService();
|
63
72
|
_productService = _instance.getProductService();
|
64
|
-
}
|
65
73
|
|
66
|
-
|
67
|
-
Fee memory poolFee,
|
68
|
-
Fee memory stakingFee,
|
69
|
-
Fee memory performanceFee
|
70
|
-
)
|
71
|
-
external
|
72
|
-
onlyOwner
|
73
|
-
override
|
74
|
-
{
|
75
|
-
_poolService.setFees(poolFee, stakingFee, performanceFee);
|
74
|
+
_registerInterface(type(IPoolComponent).interfaceId);
|
76
75
|
}
|
77
76
|
|
78
77
|
function createBundle(
|
@@ -97,17 +96,6 @@ contract Pool is BaseComponent, IPoolComponent {
|
|
97
96
|
// TODO add logging
|
98
97
|
}
|
99
98
|
|
100
|
-
function setBundleFee(
|
101
|
-
NftId bundleNftId,
|
102
|
-
Fee memory fee
|
103
|
-
)
|
104
|
-
external
|
105
|
-
override
|
106
|
-
// TODO add onlyBundleOwner
|
107
|
-
{
|
108
|
-
_poolService.setBundleFee(bundleNftId, fee);
|
109
|
-
}
|
110
|
-
|
111
99
|
/**
|
112
100
|
* @dev see {IPool.underwrite}.
|
113
101
|
* Default implementation that only writes a {LogUnderwrittenByPool} entry.
|
@@ -150,6 +138,77 @@ contract Pool is BaseComponent, IPoolComponent {
|
|
150
138
|
return _collateralizationLevel;
|
151
139
|
}
|
152
140
|
|
141
|
+
function setFees(
|
142
|
+
Fee memory poolFee,
|
143
|
+
Fee memory stakingFee,
|
144
|
+
Fee memory performanceFee
|
145
|
+
)
|
146
|
+
external
|
147
|
+
onlyOwner
|
148
|
+
override
|
149
|
+
{
|
150
|
+
_poolService.setFees(poolFee, stakingFee, performanceFee);
|
151
|
+
}
|
152
|
+
|
153
|
+
function setBundleFee(
|
154
|
+
NftId bundleNftId,
|
155
|
+
Fee memory fee
|
156
|
+
)
|
157
|
+
external
|
158
|
+
override
|
159
|
+
// TODO add onlyBundleOwner
|
160
|
+
{
|
161
|
+
_poolService.setBundleFee(bundleNftId, fee);
|
162
|
+
}
|
163
|
+
// TODO delete, call instance instead
|
164
|
+
function getFees()
|
165
|
+
external
|
166
|
+
view
|
167
|
+
override
|
168
|
+
returns (Fee memory, Fee memory, Fee memory)
|
169
|
+
{
|
170
|
+
NftId productNftId = _instance.getProductNftId(getNftId());
|
171
|
+
//if (_instance.hasTreasuryInfo(productNftId)) {
|
172
|
+
ITreasury.TreasuryInfo memory info = _instance.getTreasuryInfo(productNftId);
|
173
|
+
return (info.poolFee, info.stakingFee, info.performanceFee);
|
174
|
+
//} else {
|
175
|
+
// return (_initialPoolFee, _initialStakingFee, _initialPerformanceFee);
|
176
|
+
//}
|
177
|
+
}
|
178
|
+
|
179
|
+
// from IRegisterable
|
180
|
+
|
181
|
+
// TODO used only once, occupies space
|
182
|
+
// TODO do not use super
|
183
|
+
function getInitialInfo()
|
184
|
+
public
|
185
|
+
view
|
186
|
+
override (IRegisterable, Registerable)
|
187
|
+
returns (IRegistry.ObjectInfo memory, bytes memory)
|
188
|
+
{
|
189
|
+
(
|
190
|
+
IRegistry.ObjectInfo memory info,
|
191
|
+
bytes memory data
|
192
|
+
) = super.getInitialInfo();
|
193
|
+
|
194
|
+
return (
|
195
|
+
info,
|
196
|
+
abi.encode(
|
197
|
+
IPool.PoolInfo(
|
198
|
+
_isVerifying,
|
199
|
+
_collateralizationLevel
|
200
|
+
),
|
201
|
+
_wallet,
|
202
|
+
_token,
|
203
|
+
_initialPoolFee,
|
204
|
+
_initialStakingFee,
|
205
|
+
_initialPerformanceFee
|
206
|
+
)
|
207
|
+
);
|
208
|
+
}
|
209
|
+
|
210
|
+
// Internals
|
211
|
+
|
153
212
|
function _underwrite(
|
154
213
|
NftId policyNftId,
|
155
214
|
bytes memory policyData,
|
@@ -184,52 +243,4 @@ contract Pool is BaseComponent, IPoolComponent {
|
|
184
243
|
filter
|
185
244
|
);
|
186
245
|
}
|
187
|
-
|
188
|
-
// from pool component
|
189
|
-
function getPoolFee()
|
190
|
-
external
|
191
|
-
view
|
192
|
-
override
|
193
|
-
returns (Fee memory poolFee)
|
194
|
-
{
|
195
|
-
NftId productNftId = _instance.getProductNftId(getNftId());
|
196
|
-
if (_instance.hasTreasuryInfo(productNftId)) {
|
197
|
-
return _instance.getTreasuryInfo(productNftId).poolFee;
|
198
|
-
} else {
|
199
|
-
return _initialPoolFee;
|
200
|
-
}
|
201
|
-
}
|
202
|
-
|
203
|
-
function getStakingFee()
|
204
|
-
external
|
205
|
-
view
|
206
|
-
override
|
207
|
-
returns (Fee memory stakingFee)
|
208
|
-
{
|
209
|
-
NftId productNftId = _instance.getProductNftId(getNftId());
|
210
|
-
if (_instance.hasTreasuryInfo(productNftId)) {
|
211
|
-
return _instance.getTreasuryInfo(productNftId).stakingFee;
|
212
|
-
} else {
|
213
|
-
return _initialStakingFee;
|
214
|
-
}
|
215
|
-
}
|
216
|
-
|
217
|
-
function getPerformanceFee()
|
218
|
-
external
|
219
|
-
view
|
220
|
-
override
|
221
|
-
returns (Fee memory performanceFee)
|
222
|
-
{
|
223
|
-
NftId productNftId = _instance.getProductNftId(getNftId());
|
224
|
-
if (_instance.hasTreasuryInfo(productNftId)) {
|
225
|
-
return _instance.getTreasuryInfo(productNftId).performanceFee;
|
226
|
-
} else {
|
227
|
-
return _initialPerformanceFee;
|
228
|
-
}
|
229
|
-
}
|
230
|
-
|
231
|
-
// from registerable
|
232
|
-
function getType() public pure override returns (ObjectType) {
|
233
|
-
return POOL();
|
234
|
-
}
|
235
246
|
}
|