@etherisc/gif-next 0.0.2-de7c770-422 → 0.0.2-df73b56-462
Sign up to get free protection for your applications and to get access to all the features.
- package/README.md +1 -1
- package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.dbg.json +1 -1
- package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.json +26 -45
- 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/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 +0 -19
- 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/ModuleAuthorization.sol/ModuleAuthorization.dbg.json +1 -1
- package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.dbg.json +1 -1
- package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.dbg.json +1 -1
- package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.json +2 -2
- package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.dbg.json +1 -1
- package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.json +2 -2
- package/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +1 -1
- package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json +1 -1
- package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.json +9 -4
- package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
- package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +92 -61
- package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
- package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +1 -1
- package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.dbg.json +1 -1
- package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.json +2 -2
- package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.dbg.json +1 -1
- package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.json +2 -2
- package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.dbg.json +1 -1
- package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.json +60 -32
- package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.dbg.json +1 -1
- package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.json +33 -28
- package/artifacts/contracts/instance/BundleSet.sol/BundleSet.dbg.json +1 -1
- package/artifacts/contracts/instance/BundleSet.sol/BundleSet.json +2 -2
- package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +2 -2
- package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.json +88 -91
- package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.json +2 -2
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +70 -60
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +11 -6
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +69 -38
- package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +32 -12
- package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.dbg.json +1 -1
- 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/ObjectLifecycle.sol/ObjectLifecycle.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.json +2 -2
- 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/oracle/BasicOracle.sol/BasicOracle.dbg.json +1 -1
- package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.json +2 -2
- package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.dbg.json +1 -1
- package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.json +2 -2
- 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/IOracleService.sol/IOracleService.dbg.json +1 -1
- package/artifacts/contracts/oracle/Oracle.sol/Oracle.dbg.json +1 -1
- package/artifacts/contracts/oracle/OracleService.sol/OracleService.dbg.json +1 -1
- package/artifacts/contracts/oracle/OracleService.sol/OracleService.json +9 -4
- package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.dbg.json +1 -1
- package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.json +68 -37
- package/artifacts/contracts/pool/BasicPool.sol/BasicPool.dbg.json +1 -1
- package/artifacts/contracts/pool/BasicPool.sol/BasicPool.json +28 -0
- package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.dbg.json +1 -1
- package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.json +2 -2
- package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +1 -1
- package/artifacts/contracts/pool/BundleService.sol/BundleService.json +15 -10
- package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
- package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +90 -59
- package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +1 -1
- package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
- package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.json +28 -0
- package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +1 -1
- package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +1 -1
- package/artifacts/contracts/pool/Pool.sol/Pool.json +28 -0
- package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +1 -1
- package/artifacts/contracts/pool/PoolService.sol/PoolService.json +35 -30
- package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
- package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +71 -40
- package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +1 -1
- package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +17 -12
- package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +65 -34
- package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.dbg.json +1 -1
- package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.json +5 -0
- package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.dbg.json +1 -1
- package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.json +2 -2
- package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +1 -1
- package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +91 -70
- package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +97 -58
- package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +1 -1
- package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +1 -1
- package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +1 -1
- package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.json +82 -0
- package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +1 -1
- package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +1 -1
- package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.json +5 -0
- package/artifacts/contracts/product/IRiskService.sol/IRiskService.dbg.json +1 -1
- package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +1 -1
- package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +167 -48
- package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +92 -45
- package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +1 -1
- package/artifacts/contracts/product/PricingService.sol/PricingService.json +39 -34
- package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +76 -45
- package/artifacts/contracts/product/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/product/Product.sol/Product.json +5 -0
- package/artifacts/contracts/product/RiskService.sol/RiskService.dbg.json +1 -1
- package/artifacts/contracts/product/RiskService.sol/RiskService.json +11 -6
- package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.json +62 -31
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
- 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 +2 -2
- package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.json +108 -111
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +9 -4
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +60 -29
- package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.dbg.json +1 -1
- package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.json +2 -2
- package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.dbg.json +1 -1
- package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.json +2 -2
- 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/ComponentService.sol/ComponentService.dbg.json +1 -1
- package/artifacts/contracts/shared/ComponentService.sol/ComponentService.json +39 -34
- package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.dbg.json +1 -1
- package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.json +97 -56
- package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.dbg.json +1 -1
- package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.json +5 -0
- 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/IComponentService.sol/IComponentService.dbg.json +1 -1
- package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.dbg.json +1 -1
- package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.dbg.json +1 -1
- 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 -5
- 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/InitializableCustom.sol/InitializableCustom.dbg.json +1 -1
- package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.dbg.json +1 -1
- package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.dbg.json +1 -1
- package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.dbg.json +1 -1
- package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.dbg.json +1 -1
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +17 -7
- package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
- package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
- package/artifacts/contracts/shared/Service.sol/Service.json +5 -0
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
- package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.dbg.json +1 -1
- package/artifacts/contracts/staking/IStaking.sol/IStaking.dbg.json +1 -1
- 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 +2 -2
- package/artifacts/contracts/staking/Staking.sol/Staking.dbg.json +1 -1
- package/artifacts/contracts/staking/Staking.sol/Staking.json +2 -2
- package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingManager.sol/StakingManager.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingManager.sol/StakingManager.json +78 -42
- package/artifacts/contracts/staking/StakingReader.sol/StakingReader.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingReader.sol/StakingReader.json +2 -2
- package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingService.sol/StakingService.json +11 -6
- package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +64 -33
- package/artifacts/contracts/staking/StakingStore.sol/StakingStore.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingStore.sol/StakingStore.json +2 -2
- package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.dbg.json +1 -1
- package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.json +2 -2
- 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/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
- package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
- package/artifacts/contracts/type/Fee.sol/FeeLib.dbg.json +1 -1
- package/artifacts/contracts/type/Key32.sol/Key32Lib.dbg.json +1 -1
- package/artifacts/contracts/type/NftId.sol/NftIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
- package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
- package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/Referral.sol/ReferralLib.dbg.json +1 -1
- package/artifacts/contracts/type/RequestId.sol/RequestIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json +1 -1
- 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/String.sol/StrLib.dbg.json +1 -1
- package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json +1 -1
- package/artifacts/contracts/type/UFixed.sol/MathLib.dbg.json +1 -1
- package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json +1 -1
- package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json +1 -1
- package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json +1 -1
- package/artifacts/contracts/upgradeability/IVersionable.sol/IVersionable.dbg.json +1 -1
- package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.dbg.json +1 -1
- package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.json +47 -27
- package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
- package/artifacts/contracts/upgradeability/Versionable.sol/Versionable.dbg.json +1 -1
- package/contracts/authorization/AccessAdmin.sol +24 -21
- package/contracts/authorization/IAccessAdmin.sol +0 -1
- package/contracts/distribution/DistributionService.sol +6 -6
- package/contracts/distribution/DistributionServiceManager.sol +6 -6
- package/contracts/instance/InstanceService.sol +2 -3
- package/contracts/instance/InstanceServiceManager.sol +6 -7
- package/contracts/instance/module/IComponents.sol +3 -1
- package/contracts/oracle/OracleService.sol +6 -4
- package/contracts/oracle/OracleServiceManager.sol +6 -6
- package/contracts/pool/BundleService.sol +6 -6
- package/contracts/pool/BundleServiceManager.sol +6 -6
- package/contracts/pool/IPoolComponent.sol +18 -8
- package/contracts/pool/Pool.sol +26 -10
- package/contracts/pool/PoolService.sol +2 -3
- package/contracts/pool/PoolServiceManager.sol +4 -4
- package/contracts/product/ApplicationService.sol +3 -4
- package/contracts/product/ApplicationServiceManager.sol +4 -4
- package/contracts/product/ClaimService.sol +147 -61
- package/contracts/product/ClaimServiceManager.sol +4 -4
- package/contracts/product/IPolicyService.sol +7 -3
- package/contracts/product/PolicyService.sol +93 -20
- package/contracts/product/PolicyServiceManager.sol +4 -4
- package/contracts/product/PricingService.sol +2 -3
- package/contracts/product/PricingServiceManager.sol +3 -3
- package/contracts/product/Product.sol +1 -0
- package/contracts/product/RiskService.sol +2 -3
- package/contracts/product/RiskServiceManager.sol +4 -4
- package/contracts/registry/RegistryServiceManager.sol +2 -2
- package/contracts/shared/ComponentService.sol +5 -5
- package/contracts/shared/ComponentServiceManager.sol +8 -5
- package/contracts/shared/ContractLib.sol +38 -0
- package/contracts/shared/IPolicyHolder.sol +12 -13
- package/contracts/shared/PolicyHolder.sol +7 -5
- package/contracts/shared/Service.sol +12 -7
- package/contracts/staking/Staking.sol +1 -1
- package/contracts/staking/StakingManager.sol +8 -6
- package/contracts/staking/StakingServiceManager.sol +2 -2
- package/contracts/upgradeability/ProxyManager.sol +67 -34
- package/contracts/upgradeability/Versionable.sol +2 -2
- package/package.json +1 -1
@@ -3,17 +3,6 @@
|
|
3
3
|
"contractName": "ProxyManager",
|
4
4
|
"sourceName": "contracts/upgradeability/ProxyManager.sol",
|
5
5
|
"abi": [
|
6
|
-
{
|
7
|
-
"inputs": [
|
8
|
-
{
|
9
|
-
"internalType": "address",
|
10
|
-
"name": "registry",
|
11
|
-
"type": "address"
|
12
|
-
}
|
13
|
-
],
|
14
|
-
"stateMutability": "nonpayable",
|
15
|
-
"type": "constructor"
|
16
|
-
},
|
17
6
|
{
|
18
7
|
"inputs": [
|
19
8
|
{
|
@@ -165,6 +154,11 @@
|
|
165
154
|
},
|
166
155
|
{
|
167
156
|
"inputs": [
|
157
|
+
{
|
158
|
+
"internalType": "address",
|
159
|
+
"name": "registry",
|
160
|
+
"type": "address"
|
161
|
+
},
|
168
162
|
{
|
169
163
|
"internalType": "address",
|
170
164
|
"name": "initialImplementation",
|
@@ -189,6 +183,11 @@
|
|
189
183
|
},
|
190
184
|
{
|
191
185
|
"inputs": [
|
186
|
+
{
|
187
|
+
"internalType": "address",
|
188
|
+
"name": "registry",
|
189
|
+
"type": "address"
|
190
|
+
},
|
192
191
|
{
|
193
192
|
"internalType": "address",
|
194
193
|
"name": "initialImplementation",
|
@@ -408,10 +407,31 @@
|
|
408
407
|
"internalType": "address",
|
409
408
|
"name": "registry",
|
410
409
|
"type": "address"
|
410
|
+
},
|
411
|
+
{
|
412
|
+
"internalType": "address",
|
413
|
+
"name": "implementation",
|
414
|
+
"type": "address"
|
415
|
+
},
|
416
|
+
{
|
417
|
+
"internalType": "bytes",
|
418
|
+
"name": "data",
|
419
|
+
"type": "bytes"
|
420
|
+
},
|
421
|
+
{
|
422
|
+
"internalType": "bytes32",
|
423
|
+
"name": "salt",
|
424
|
+
"type": "bytes32"
|
425
|
+
}
|
426
|
+
],
|
427
|
+
"name": "initialize",
|
428
|
+
"outputs": [
|
429
|
+
{
|
430
|
+
"internalType": "contract IVersionable",
|
431
|
+
"name": "versionable",
|
432
|
+
"type": "address"
|
411
433
|
}
|
412
434
|
],
|
413
|
-
"name": "initializeProxyManager",
|
414
|
-
"outputs": [],
|
415
435
|
"stateMutability": "nonpayable",
|
416
436
|
"type": "function"
|
417
437
|
},
|
@@ -485,18 +505,18 @@
|
|
485
505
|
"type": "function"
|
486
506
|
}
|
487
507
|
],
|
488
|
-
"bytecode": "0x608060405234801561000f575f80fd5b50604051612a69380380612a6983398101604081905261002e9161038b565b6100378161003d565b506103d7565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a00805468010000000000000000810460ff1615906001600160401b03165f811580156100865750825b90505f826001600160401b031660011480156100a15750303b155b9050811580156100af575080155b156100cd5760405163f92ee8a960e01b815260040160405180910390fd5b84546001600160401b031916600117855583156100fb57845460ff60401b1916680100000000000000001785555b6101053387610153565b831561014b57845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b505050505050565b61015b6101e5565b61016481610235565b61016c610346565b6001600160a01b0382166101935760405163f17ef42d60e01b815260040160405180910390fd5b507f07ebcf49758b6ed3af50fa146bec0abe157c0218fe65dc0874c286e9d5da4f0080546001600160601b03166c010000000000000000000000006001600160a01b0390931692909202919091179055565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a005468010000000000000000900460ff1661023357604051631afcd79f60e31b815260040160405180910390fd5b565b61023d6101e5565b806001600160a01b03163b5f036102775760405163fdeac91f60e01b81526001600160a01b03821660048201526024015b60405180910390fd5b600180546001600160a01b0319166001600160a01b0383169081179091556040516301ffc9a760e01b8152632f6da6f960e01b60048201526301ffc9a790602401602060405180830381865afa9250505080156102f1575060408051601f3d908101601f191682019092526102ee918101906103b8565b60015b6103195760405163fdeac91f60e01b81526001600160a01b038216600482015260240161026e565b806103425760405163fdeac91f60e01b81526001600160a01b038316600482015260240161026e565b5050565b61034e6101e5565b6301ffc9a760e01b5f9081526020527f67be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5805460ff19166001179055565b5f6020828403121561039b575f80fd5b81516001600160a01b03811681146103b1575f80fd5b9392505050565b5f602082840312156103c8575f80fd5b815180151581146103b1575f80fd5b612685806103e45f395ff3fe608060405234801561000f575f80fd5b5060043610610111575f3560e01c8063893d20e81161009e578063ada9652e1161006e578063ada9652e1461036b578063b88da7591461037f578063c987336c14610392578063e97fac05146103a5578063fd0c63d9146103b8575f80fd5b8063893d20e81461032d5780638e9afce614610335578063933a9ce814610348578063946dfcfe14610359575f80fd5b8063138461e0116100e4578063138461e0146101b25780631775564d146101d25780634d459c90146101f25780635ab1bd53146102ff578063644c45e014610310575f80fd5b806301ffc9a714610115578063058f7a971461015657806307484e801461016b5780630d8e6e2c14610196575b5f80fd5b610141610123366004611449565b6001600160e01b0319165f9081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b61016961016436600461148b565b6103c0565b005b61017e610179366004611545565b6104cf565b6040516001600160a01b03909116815260200161014d565b61019e610658565b60405162ffffff909116815260200161014d565b6101ba6106c8565b6040516001600160601b03909116815260200161014d565b6101e56101e036600461159a565b6106d2565b60405161014d9190611615565b6102a2610200366004611637565b6040805160a0810182525f808252602082018190529181018290526060810182905260808101919091525062ffffff9081165f90815260036020908152604091829020825160a0810184528154948516815263010000009094046001600160a01b03908116928501929092526001015490811691830191909152600160a01b810464ffffffffff166060830152600160c81b900463ffffffff16608082015290565b60408051825162ffffff1681526020808401516001600160a01b039081169183019190915283830151169181019190915260608083015164ffffffffff169082015260809182015163ffffffff169181019190915260a00161014d565b6001546001600160a01b031661017e565b5f80516020612630833981519152546001600160601b03166101ba565b61017e61072a565b6101e5610343366004611652565b61085b565b6002546001600160a01b031661017e565b6004545b60405190815260200161014d565b61035d5f8051602061263083398151915281565b61019e61038d36600461168c565b6108ae565b61017e6103a036600461159a565b6108ec565b61017e6103b336600461159a565b610b05565b6101ba610c83565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a008054600160401b810460ff16159067ffffffffffffffff165f811580156104055750825b90505f8267ffffffffffffffff1660011480156104215750303b155b90508115801561042f575080155b1561044d5760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff19166001178555831561047757845460ff60401b1916600160401b1785555b6104813387610c9a565b83156104c757845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b505050505050565b5f6104d861072a565b6001600160a01b0316336001600160a01b0316146105105760405163086391f760e31b81523360048201526024015b60405180910390fd5b600454156105315760405163402b135f60e11b815260040160405180910390fd5b5f61053a61072a565b90503083868261054a85896106d2565b6040516105569061143c565b610562939291906116a3565b8190604051809103905ff590508015801561057f573d5f803e3d5ffd5b50600280546001600160a01b0319166001600160a01b03929092169182179055604080516303639b8b60e21b8152905191945061060b918591630d8e6e2c9160048083019260209291908290030181865afa1580156105e0573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061060491906116d7565b8784610d10565b6002546040516001600160a01b038881168252909116907f78922e3fa1abc96399973cb25528ba892214b57da9d1a573937c460d9f5eb4759060200160405180910390a250509392505050565b600254604080516303639b8b60e21b815290515f926001600160a01b031691630d8e6e2c9160048083019260209291908290030181865afa15801561069f573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906106c391906116d7565b905090565b5f6106c3306110a6565b60606349bb9e4b60e01b83836040516024016106ef9291906116f2565b60408051601f198184030181529190526020810180516001600160e01b03166001600160e01b03199093169290921790915290505b92915050565b5f805f8051602061263083398151915280546040516330b8415f60e01b81526001600160601b03909116600482015290915073__$94a2c899be079b00d952d0d84fffaa5c34$__906330b8415f90602401602060405180830381865af4158015610796573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906107ba9190611715565b15610845576001546001600160a01b03168154604051631c5da14d60e11b81526001600160601b0390911660048201526001600160a01b0391909116906338bb429a90602401602060405180830381865afa15801561081b573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061083f9190611734565b91505090565b54600160601b90046001600160a01b0316919050565b606063329d6e7460e01b826040516024016108769190611615565b60408051601f198184030181529190526020810180516001600160e01b03166001600160e01b03199093169290921790915292915050565b5f600482815481106108c2576108c261174f565b905f5260205f2090600a91828204019190066003029054906101000a900462ffffff169050919050565b5f6108f561072a565b6001600160a01b0316336001600160a01b0316146109285760405163086391f760e31b8152336004820152602401610507565b6004545f0361094a5760405163366dfd2160e21b815260040160405180910390fd5b5f61095361072a565b90505f6109686002546001600160a01b031690565b6001600160a01b0316638b3240a06040518163ffffffff1660e01b81526004016020604051808303815f875af11580156109a4573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906109c89190611734565b6002549091506001600160a01b03908116908216639623609d82886109ec8961085b565b6040518463ffffffff1660e01b8152600401610a0a939291906116a3565b5f604051808303815f87803b158015610a21575f80fd5b505af1158015610a33573d5f803e3d5ffd5b5050505060025f9054906101000a90046001600160a01b03169350610ab8846001600160a01b0316630d8e6e2c6040518163ffffffff1660e01b8152600401602060405180830381865afa158015610a8d573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610ab191906116d7565b8785610d10565b6002546040516001600160a01b038881168252909116907f1356a2c922be684528fa1759d1808395e5c5010181dd333cdb6f03e2d8545b659060200160405180910390a250505092915050565b5f610b0e61072a565b6001600160a01b0316336001600160a01b031614610b415760405163086391f760e31b8152336004820152602401610507565b60045415610b625760405163402b135f60e11b815260040160405180910390fd5b5f610b6b61072a565b9050308481610b7a84876106d2565b604051610b869061143c565b610b92939291906116a3565b604051809103905ff080158015610bab573d5f803e3d5ffd5b50600280546001600160a01b0319166001600160a01b03929092169182179055604080516303639b8b60e21b81529051919450610c37918591630d8e6e2c9160048083019260209291908290030181865afa158015610c0c573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610c3091906116d7565b8684610d10565b6002546040516001600160a01b038781168252909116907f78922e3fa1abc96399973cb25528ba892214b57da9d1a573937c460d9f5eb4759060200160405180910390a2505092915050565b6002545f906106c3906001600160a01b03166110a6565b610ca261129f565b610cab816112ea565b610cb36113f7565b6001600160a01b038216610cda5760405163f17ef42d60e01b815260040160405180910390fd5b505f8051602061263083398151915280546001600160601b0316600160601b6001600160a01b0390931692909202919091179055565b610d8c8373__$8eede297b65ed5a56eb3f84d8232ae93f5$__6304b8f6c56040518163ffffffff1660e01b8152600401602060405180830381865af4158015610d5b573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610d7f91906116d7565b62ffffff90811691161490565b15610daa576040516348c618db60e01b815260040160405180910390fd5b60045415610f025760048054610dc290600190611763565b81548110610dd257610dd261174f565b5f9182526020909120600a80830490910154604051635560100760e01b8152919092066003026101000a90910462ffffff16600482015273__$8eede297b65ed5a56eb3f84d8232ae93f5$__90635560100790602401602060405180830381865af4158015610e43573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610e679190611782565b604051635560100760e01b815262ffffff8516600482015273__$8eede297b65ed5a56eb3f84d8232ae93f5$__90635560100790602401602060405180830381865af4158015610eb9573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610edd9190611782565b11610f0257604051633e614b6d60e11b815262ffffff84166004820152602401610507565b600480546001810182555f829052600a8082047f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b01805462ffffff808916600394909506939093026101000a848102930219169190911790556040805160a0810182529182526001600160a01b038086166020848101919091529085168383015281516356db0c1960e11b815291519293606085019373__$91d01b1eccbca8d6f94a5eb2a0acb040e9$__9363adb6183293818401939092918290030181865af4158015610fd2573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610ff69190611799565b64ffffffffff90811682524363ffffffff90811660209384015262ffffff9687165f90815260038452604090819020855181549587015199166001600160b81b03199095169490941763010000006001600160a01b03998a1602178455840151600190930180546060860151608090960151949098166001600160c81b031990981697909717600160a01b94909216939093021763ffffffff60c81b1916600160c81b9190921602179092555050565b5f805f8051602061263083398151915280546040516330b8415f60e01b81526001600160601b03909116600482015290915073__$94a2c899be079b00d952d0d84fffaa5c34$__906330b8415f90602401602060405180830381865af4158015611112573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906111369190611715565b156111625780546040516301ab8b6760e21b81526001600160601b039091166004820152602401610507565b6001546001600160a01b031660405163c3c5a54760e01b81526001600160a01b038581166004830152919091169063c3c5a54790602401602060405180830381865afa1580156111b4573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906111d89190611715565b6112005760405163b9304b0d60e01b81526001600160a01b0384166004820152602401610507565b6001546001600160a01b0316604051632f2a35f760e11b81526001600160a01b0385811660048301529190911690635e546bee90602401602060405180830381865afa158015611252573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061127691906117bd565b81546bffffffffffffffffffffffff19166001600160601b039190911690811790915592915050565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a0054600160401b900460ff166112e857604051631afcd79f60e31b815260040160405180910390fd5b565b6112f261129f565b806001600160a01b03163b5f036113275760405163fdeac91f60e01b81526001600160a01b0382166004820152602401610507565b600180546001600160a01b0319166001600160a01b0383169081179091556040516301ffc9a760e01b8152632f6da6f960e01b60048201526301ffc9a790602401602060405180830381865afa9250505080156113a1575060408051601f3d908101601f1916820190925261139e91810190611715565b60015b6113c95760405163fdeac91f60e01b81526001600160a01b0382166004820152602401610507565b806113f25760405163fdeac91f60e01b81526001600160a01b0383166004820152602401610507565b505b50565b6113ff61129f565b6301ffc9a760e01b5f9081526020527f67be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5805460ff19166001179055565b610e4c806117e483390190565b5f60208284031215611459575f80fd5b81356001600160e01b031981168114611470575f80fd5b9392505050565b6001600160a01b03811681146113f4575f80fd5b5f6020828403121561149b575f80fd5b813561147081611477565b634e487b7160e01b5f52604160045260245ffd5b5f82601f8301126114c9575f80fd5b813567ffffffffffffffff8111156114e3576114e36114a6565b604051601f8201601f19908116603f0116810167ffffffffffffffff81118282101715611512576115126114a6565b604052818152838201602001851015611529575f80fd5b816020850160208301375f918101602001919091529392505050565b5f805f60608486031215611557575f80fd5b833561156281611477565b9250602084013567ffffffffffffffff81111561157d575f80fd5b611589868287016114ba565b925050604084013590509250925092565b5f80604083850312156115ab575f80fd5b82356115b681611477565b9150602083013567ffffffffffffffff8111156115d1575f80fd5b6115dd858286016114ba565b9150509250929050565b5f81518084528060208401602086015e5f602082860101526020601f19601f83011685010191505092915050565b602081525f61147060208301846115e7565b62ffffff811681146113f4575f80fd5b5f60208284031215611647575f80fd5b813561147081611627565b5f60208284031215611662575f80fd5b813567ffffffffffffffff811115611678575f80fd5b611684848285016114ba565b949350505050565b5f6020828403121561169c575f80fd5b5035919050565b6001600160a01b038481168252831660208201526060604082018190525f906116ce908301846115e7565b95945050505050565b5f602082840312156116e7575f80fd5b815161147081611627565b6001600160a01b03831681526040602082018190525f90611684908301846115e7565b5f60208284031215611725575f80fd5b81518015158114611470575f80fd5b5f60208284031215611744575f80fd5b815161147081611477565b634e487b7160e01b5f52603260045260245ffd5b8181038181111561072457634e487b7160e01b5f52601160045260245ffd5b5f60208284031215611792575f80fd5b5051919050565b5f602082840312156117a9575f80fd5b815164ffffffffff81168114611470575f80fd5b5f602082840312156117cd575f80fd5b81516001600160601b0381168114611470575f80fdfe60a060405234801561000f575f80fd5b50604051610e4c380380610e4c83398101604081905261002e9161037c565b828282828161003d828261009e565b50508160405161004c90610340565b6001600160a01b039091168152602001604051809103905ff080158015610075573d5f803e3d5ffd5b506001600160a01b031660805261009361008e60805190565b6100fc565b505050505050610463565b6100a782610169565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b905f90a28051156100f0576100eb82826101e7565b505050565b6100f861025a565b5050565b7f7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f61013b5f80516020610e2c833981519152546001600160a01b031690565b604080516001600160a01b03928316815291841660208301520160405180910390a16101668161027b565b50565b806001600160a01b03163b5f036101a357604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b807f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc5b80546001600160a01b0319166001600160a01b039290921691909117905550565b60605f80846001600160a01b031684604051610203919061044d565b5f60405180830381855af49150503d805f811461023b576040519150601f19603f3d011682016040523d82523d5f602084013e610240565b606091505b5090925090506102518583836102b8565b95945050505050565b34156102795760405163b398979f60e01b815260040160405180910390fd5b565b6001600160a01b0381166102a457604051633173bdd160e11b81525f600482015260240161019a565b805f80516020610e2c8339815191526101c6565b6060826102cd576102c882610317565b610310565b81511580156102e457506001600160a01b0384163b155b1561030d57604051639996b31560e01b81526001600160a01b038516600482015260240161019a565b50805b9392505050565b8051156103275780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b6104ef8061093d83390190565b80516001600160a01b0381168114610363575f80fd5b919050565b634e487b7160e01b5f52604160045260245ffd5b5f805f6060848603121561038e575f80fd5b6103978461034d565b92506103a56020850161034d565b60408501519092506001600160401b038111156103c0575f80fd5b8401601f810186136103d0575f80fd5b80516001600160401b038111156103e9576103e9610368565b604051601f8201601f19908116603f011681016001600160401b038111828210171561041757610417610368565b60405281815282820160200188101561042e575f80fd5b8160208401602083015e5f602083830101528093505050509250925092565b5f82518060208501845e5f920191825250919050565b6080516104bd6104805f395f818160350152607201526104bd5ff3fe60806040526004361061001d575f3560e01c80638b3240a014610027575b610025610070565b005b348015610032575f80fd5b507f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f35b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031633036100dc575f356001600160e01b03191663278f794360e11b146100d2576040516334ad5dbb60e21b815260040160405180910390fd5b6100da6100e9565b565b6100da610117565b905090565b5f806100f83660048184610365565b81019061010591906103a0565b915091506101138282610127565b5050565b6100da610122610181565b6101b3565b610130826101d1565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b905f90a280511561017957610174828261024c565b505050565b6101136102be565b5f6100e47f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc546001600160a01b031690565b365f80375f80365f845af43d5f803e8080156101cd573d5ff35b3d5ffd5b806001600160a01b03163b5f0361020b57604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc80546001600160a01b0319166001600160a01b0392909216919091179055565b60605f80846001600160a01b0316846040516102689190610471565b5f60405180830381855af49150503d805f81146102a0576040519150601f19603f3d011682016040523d82523d5f602084013e6102a5565b606091505b50915091506102b58583836102dd565b95945050505050565b34156100da5760405163b398979f60e01b815260040160405180910390fd5b6060826102f2576102ed8261033c565b610335565b815115801561030957506001600160a01b0384163b155b1561033257604051639996b31560e01b81526001600160a01b0385166004820152602401610202565b50805b9392505050565b80511561034c5780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b5f8085851115610373575f80fd5b8386111561037f575f80fd5b5050820193919092039150565b634e487b7160e01b5f52604160045260245ffd5b5f80604083850312156103b1575f80fd5b82356001600160a01b03811681146103c7575f80fd5b9150602083013567ffffffffffffffff8111156103e2575f80fd5b8301601f810185136103f2575f80fd5b803567ffffffffffffffff81111561040c5761040c61038c565b604051601f8201601f19908116603f0116810167ffffffffffffffff8111828210171561043b5761043b61038c565b604052818152828201602001871015610452575f80fd5b816020840160208301375f602083830101528093505050509250929050565b5f82518060208501845e5f92019182525091905056fea26469706673582212205f12e4d638be8d591db7c67d942f3e9eeb14e9e44f78ba8cddaca37631bdc49764736f6c634300081a0033608060405234801561000f575f80fd5b506040516104ef3803806104ef83398101604081905261002e916100bb565b806001600160a01b03811661005c57604051631e4fbdf760e01b81525f600482015260240160405180910390fd5b6100658161006c565b50506100e8565b5f80546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b5f602082840312156100cb575f80fd5b81516001600160a01b03811681146100e1575f80fd5b9392505050565b6103fa806100f55f395ff3fe608060405260043610610049575f3560e01c8063715018a61461004d5780638da5cb5b146100635780639623609d1461008e578063ad3cb1cc146100a1578063f2fde38b146100de575b5f80fd5b348015610058575f80fd5b506100616100fd565b005b34801561006e575f80fd5b505f546040516001600160a01b0390911681526020015b60405180910390f35b61006161009c366004610260565b610110565b3480156100ac575f80fd5b506100d1604051806040016040528060058152602001640352e302e360dc1b81525081565b6040516100859190610365565b3480156100e9575f80fd5b506100616100f836600461037e565b61017b565b6101056101bd565b61010e5f6101e9565b565b6101186101bd565b60405163278f794360e11b81526001600160a01b03841690634f1ef2869034906101489086908690600401610399565b5f604051808303818588803b15801561015f575f80fd5b505af1158015610171573d5f803e3d5ffd5b5050505050505050565b6101836101bd565b6001600160a01b0381166101b157604051631e4fbdf760e01b81525f60048201526024015b60405180910390fd5b6101ba816101e9565b50565b5f546001600160a01b0316331461010e5760405163118cdaa760e01b81523360048201526024016101a8565b5f80546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b6001600160a01b03811681146101ba575f80fd5b634e487b7160e01b5f52604160045260245ffd5b5f805f60608486031215610272575f80fd5b833561027d81610238565b9250602084013561028d81610238565b9150604084013567ffffffffffffffff8111156102a8575f80fd5b8401601f810186136102b8575f80fd5b803567ffffffffffffffff8111156102d2576102d261024c565b604051601f8201601f19908116603f0116810167ffffffffffffffff811182821017156103015761030161024c565b604052818152828201602001881015610318575f80fd5b816020840160208301375f602083830101528093505050509250925092565b5f81518084528060208401602086015e5f602082860101526020601f19601f83011685010191505092915050565b602081525f6103776020830184610337565b9392505050565b5f6020828403121561038e575f80fd5b813561037781610238565b6001600160a01b03831681526040602082018190525f906103bc90830184610337565b94935050505056fea264697066735822122063012ab3c3421087c307802be7295f03bec95db9eea702a4c2db9595befa162464736f6c634300081a0033b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d610307ebcf49758b6ed3af50fa146bec0abe157c0218fe65dc0874c286e9d5da4f00a2646970667358221220e1f14fd592674438d64f9d4092f4bbd644bb8644fb1d8bcfccbedce47e7a27ab64736f6c634300081a0033",
|
489
|
-
"deployedBytecode": "0x608060405234801561000f575f80fd5b5060043610610111575f3560e01c8063893d20e81161009e578063ada9652e1161006e578063ada9652e1461036b578063b88da7591461037f578063c987336c14610392578063e97fac05146103a5578063fd0c63d9146103b8575f80fd5b8063893d20e81461032d5780638e9afce614610335578063933a9ce814610348578063946dfcfe14610359575f80fd5b8063138461e0116100e4578063138461e0146101b25780631775564d146101d25780634d459c90146101f25780635ab1bd53146102ff578063644c45e014610310575f80fd5b806301ffc9a714610115578063058f7a971461015657806307484e801461016b5780630d8e6e2c14610196575b5f80fd5b610141610123366004611449565b6001600160e01b0319165f9081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b61016961016436600461148b565b6103c0565b005b61017e610179366004611545565b6104cf565b6040516001600160a01b03909116815260200161014d565b61019e610658565b60405162ffffff909116815260200161014d565b6101ba6106c8565b6040516001600160601b03909116815260200161014d565b6101e56101e036600461159a565b6106d2565b60405161014d9190611615565b6102a2610200366004611637565b6040805160a0810182525f808252602082018190529181018290526060810182905260808101919091525062ffffff9081165f90815260036020908152604091829020825160a0810184528154948516815263010000009094046001600160a01b03908116928501929092526001015490811691830191909152600160a01b810464ffffffffff166060830152600160c81b900463ffffffff16608082015290565b60408051825162ffffff1681526020808401516001600160a01b039081169183019190915283830151169181019190915260608083015164ffffffffff169082015260809182015163ffffffff169181019190915260a00161014d565b6001546001600160a01b031661017e565b5f80516020612630833981519152546001600160601b03166101ba565b61017e61072a565b6101e5610343366004611652565b61085b565b6002546001600160a01b031661017e565b6004545b60405190815260200161014d565b61035d5f8051602061263083398151915281565b61019e61038d36600461168c565b6108ae565b61017e6103a036600461159a565b6108ec565b61017e6103b336600461159a565b610b05565b6101ba610c83565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a008054600160401b810460ff16159067ffffffffffffffff165f811580156104055750825b90505f8267ffffffffffffffff1660011480156104215750303b155b90508115801561042f575080155b1561044d5760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff19166001178555831561047757845460ff60401b1916600160401b1785555b6104813387610c9a565b83156104c757845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b505050505050565b5f6104d861072a565b6001600160a01b0316336001600160a01b0316146105105760405163086391f760e31b81523360048201526024015b60405180910390fd5b600454156105315760405163402b135f60e11b815260040160405180910390fd5b5f61053a61072a565b90503083868261054a85896106d2565b6040516105569061143c565b610562939291906116a3565b8190604051809103905ff590508015801561057f573d5f803e3d5ffd5b50600280546001600160a01b0319166001600160a01b03929092169182179055604080516303639b8b60e21b8152905191945061060b918591630d8e6e2c9160048083019260209291908290030181865afa1580156105e0573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061060491906116d7565b8784610d10565b6002546040516001600160a01b038881168252909116907f78922e3fa1abc96399973cb25528ba892214b57da9d1a573937c460d9f5eb4759060200160405180910390a250509392505050565b600254604080516303639b8b60e21b815290515f926001600160a01b031691630d8e6e2c9160048083019260209291908290030181865afa15801561069f573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906106c391906116d7565b905090565b5f6106c3306110a6565b60606349bb9e4b60e01b83836040516024016106ef9291906116f2565b60408051601f198184030181529190526020810180516001600160e01b03166001600160e01b03199093169290921790915290505b92915050565b5f805f8051602061263083398151915280546040516330b8415f60e01b81526001600160601b03909116600482015290915073__$94a2c899be079b00d952d0d84fffaa5c34$__906330b8415f90602401602060405180830381865af4158015610796573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906107ba9190611715565b15610845576001546001600160a01b03168154604051631c5da14d60e11b81526001600160601b0390911660048201526001600160a01b0391909116906338bb429a90602401602060405180830381865afa15801561081b573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061083f9190611734565b91505090565b54600160601b90046001600160a01b0316919050565b606063329d6e7460e01b826040516024016108769190611615565b60408051601f198184030181529190526020810180516001600160e01b03166001600160e01b03199093169290921790915292915050565b5f600482815481106108c2576108c261174f565b905f5260205f2090600a91828204019190066003029054906101000a900462ffffff169050919050565b5f6108f561072a565b6001600160a01b0316336001600160a01b0316146109285760405163086391f760e31b8152336004820152602401610507565b6004545f0361094a5760405163366dfd2160e21b815260040160405180910390fd5b5f61095361072a565b90505f6109686002546001600160a01b031690565b6001600160a01b0316638b3240a06040518163ffffffff1660e01b81526004016020604051808303815f875af11580156109a4573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906109c89190611734565b6002549091506001600160a01b03908116908216639623609d82886109ec8961085b565b6040518463ffffffff1660e01b8152600401610a0a939291906116a3565b5f604051808303815f87803b158015610a21575f80fd5b505af1158015610a33573d5f803e3d5ffd5b5050505060025f9054906101000a90046001600160a01b03169350610ab8846001600160a01b0316630d8e6e2c6040518163ffffffff1660e01b8152600401602060405180830381865afa158015610a8d573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610ab191906116d7565b8785610d10565b6002546040516001600160a01b038881168252909116907f1356a2c922be684528fa1759d1808395e5c5010181dd333cdb6f03e2d8545b659060200160405180910390a250505092915050565b5f610b0e61072a565b6001600160a01b0316336001600160a01b031614610b415760405163086391f760e31b8152336004820152602401610507565b60045415610b625760405163402b135f60e11b815260040160405180910390fd5b5f610b6b61072a565b9050308481610b7a84876106d2565b604051610b869061143c565b610b92939291906116a3565b604051809103905ff080158015610bab573d5f803e3d5ffd5b50600280546001600160a01b0319166001600160a01b03929092169182179055604080516303639b8b60e21b81529051919450610c37918591630d8e6e2c9160048083019260209291908290030181865afa158015610c0c573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610c3091906116d7565b8684610d10565b6002546040516001600160a01b038781168252909116907f78922e3fa1abc96399973cb25528ba892214b57da9d1a573937c460d9f5eb4759060200160405180910390a2505092915050565b6002545f906106c3906001600160a01b03166110a6565b610ca261129f565b610cab816112ea565b610cb36113f7565b6001600160a01b038216610cda5760405163f17ef42d60e01b815260040160405180910390fd5b505f8051602061263083398151915280546001600160601b0316600160601b6001600160a01b0390931692909202919091179055565b610d8c8373__$8eede297b65ed5a56eb3f84d8232ae93f5$__6304b8f6c56040518163ffffffff1660e01b8152600401602060405180830381865af4158015610d5b573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610d7f91906116d7565b62ffffff90811691161490565b15610daa576040516348c618db60e01b815260040160405180910390fd5b60045415610f025760048054610dc290600190611763565b81548110610dd257610dd261174f565b5f9182526020909120600a80830490910154604051635560100760e01b8152919092066003026101000a90910462ffffff16600482015273__$8eede297b65ed5a56eb3f84d8232ae93f5$__90635560100790602401602060405180830381865af4158015610e43573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610e679190611782565b604051635560100760e01b815262ffffff8516600482015273__$8eede297b65ed5a56eb3f84d8232ae93f5$__90635560100790602401602060405180830381865af4158015610eb9573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610edd9190611782565b11610f0257604051633e614b6d60e11b815262ffffff84166004820152602401610507565b600480546001810182555f829052600a8082047f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b01805462ffffff808916600394909506939093026101000a848102930219169190911790556040805160a0810182529182526001600160a01b038086166020848101919091529085168383015281516356db0c1960e11b815291519293606085019373__$91d01b1eccbca8d6f94a5eb2a0acb040e9$__9363adb6183293818401939092918290030181865af4158015610fd2573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610ff69190611799565b64ffffffffff90811682524363ffffffff90811660209384015262ffffff9687165f90815260038452604090819020855181549587015199166001600160b81b03199095169490941763010000006001600160a01b03998a1602178455840151600190930180546060860151608090960151949098166001600160c81b031990981697909717600160a01b94909216939093021763ffffffff60c81b1916600160c81b9190921602179092555050565b5f805f8051602061263083398151915280546040516330b8415f60e01b81526001600160601b03909116600482015290915073__$94a2c899be079b00d952d0d84fffaa5c34$__906330b8415f90602401602060405180830381865af4158015611112573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906111369190611715565b156111625780546040516301ab8b6760e21b81526001600160601b039091166004820152602401610507565b6001546001600160a01b031660405163c3c5a54760e01b81526001600160a01b038581166004830152919091169063c3c5a54790602401602060405180830381865afa1580156111b4573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906111d89190611715565b6112005760405163b9304b0d60e01b81526001600160a01b0384166004820152602401610507565b6001546001600160a01b0316604051632f2a35f760e11b81526001600160a01b0385811660048301529190911690635e546bee90602401602060405180830381865afa158015611252573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061127691906117bd565b81546bffffffffffffffffffffffff19166001600160601b039190911690811790915592915050565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a0054600160401b900460ff166112e857604051631afcd79f60e31b815260040160405180910390fd5b565b6112f261129f565b806001600160a01b03163b5f036113275760405163fdeac91f60e01b81526001600160a01b0382166004820152602401610507565b600180546001600160a01b0319166001600160a01b0383169081179091556040516301ffc9a760e01b8152632f6da6f960e01b60048201526301ffc9a790602401602060405180830381865afa9250505080156113a1575060408051601f3d908101601f1916820190925261139e91810190611715565b60015b6113c95760405163fdeac91f60e01b81526001600160a01b0382166004820152602401610507565b806113f25760405163fdeac91f60e01b81526001600160a01b0383166004820152602401610507565b505b50565b6113ff61129f565b6301ffc9a760e01b5f9081526020527f67be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5805460ff19166001179055565b610e4c806117e483390190565b5f60208284031215611459575f80fd5b81356001600160e01b031981168114611470575f80fd5b9392505050565b6001600160a01b03811681146113f4575f80fd5b5f6020828403121561149b575f80fd5b813561147081611477565b634e487b7160e01b5f52604160045260245ffd5b5f82601f8301126114c9575f80fd5b813567ffffffffffffffff8111156114e3576114e36114a6565b604051601f8201601f19908116603f0116810167ffffffffffffffff81118282101715611512576115126114a6565b604052818152838201602001851015611529575f80fd5b816020850160208301375f918101602001919091529392505050565b5f805f60608486031215611557575f80fd5b833561156281611477565b9250602084013567ffffffffffffffff81111561157d575f80fd5b611589868287016114ba565b925050604084013590509250925092565b5f80604083850312156115ab575f80fd5b82356115b681611477565b9150602083013567ffffffffffffffff8111156115d1575f80fd5b6115dd858286016114ba565b9150509250929050565b5f81518084528060208401602086015e5f602082860101526020601f19601f83011685010191505092915050565b602081525f61147060208301846115e7565b62ffffff811681146113f4575f80fd5b5f60208284031215611647575f80fd5b813561147081611627565b5f60208284031215611662575f80fd5b813567ffffffffffffffff811115611678575f80fd5b611684848285016114ba565b949350505050565b5f6020828403121561169c575f80fd5b5035919050565b6001600160a01b038481168252831660208201526060604082018190525f906116ce908301846115e7565b95945050505050565b5f602082840312156116e7575f80fd5b815161147081611627565b6001600160a01b03831681526040602082018190525f90611684908301846115e7565b5f60208284031215611725575f80fd5b81518015158114611470575f80fd5b5f60208284031215611744575f80fd5b815161147081611477565b634e487b7160e01b5f52603260045260245ffd5b8181038181111561072457634e487b7160e01b5f52601160045260245ffd5b5f60208284031215611792575f80fd5b5051919050565b5f602082840312156117a9575f80fd5b815164ffffffffff81168114611470575f80fd5b5f602082840312156117cd575f80fd5b81516001600160601b0381168114611470575f80fdfe60a060405234801561000f575f80fd5b50604051610e4c380380610e4c83398101604081905261002e9161037c565b828282828161003d828261009e565b50508160405161004c90610340565b6001600160a01b039091168152602001604051809103905ff080158015610075573d5f803e3d5ffd5b506001600160a01b031660805261009361008e60805190565b6100fc565b505050505050610463565b6100a782610169565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b905f90a28051156100f0576100eb82826101e7565b505050565b6100f861025a565b5050565b7f7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f61013b5f80516020610e2c833981519152546001600160a01b031690565b604080516001600160a01b03928316815291841660208301520160405180910390a16101668161027b565b50565b806001600160a01b03163b5f036101a357604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b807f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc5b80546001600160a01b0319166001600160a01b039290921691909117905550565b60605f80846001600160a01b031684604051610203919061044d565b5f60405180830381855af49150503d805f811461023b576040519150601f19603f3d011682016040523d82523d5f602084013e610240565b606091505b5090925090506102518583836102b8565b95945050505050565b34156102795760405163b398979f60e01b815260040160405180910390fd5b565b6001600160a01b0381166102a457604051633173bdd160e11b81525f600482015260240161019a565b805f80516020610e2c8339815191526101c6565b6060826102cd576102c882610317565b610310565b81511580156102e457506001600160a01b0384163b155b1561030d57604051639996b31560e01b81526001600160a01b038516600482015260240161019a565b50805b9392505050565b8051156103275780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b6104ef8061093d83390190565b80516001600160a01b0381168114610363575f80fd5b919050565b634e487b7160e01b5f52604160045260245ffd5b5f805f6060848603121561038e575f80fd5b6103978461034d565b92506103a56020850161034d565b60408501519092506001600160401b038111156103c0575f80fd5b8401601f810186136103d0575f80fd5b80516001600160401b038111156103e9576103e9610368565b604051601f8201601f19908116603f011681016001600160401b038111828210171561041757610417610368565b60405281815282820160200188101561042e575f80fd5b8160208401602083015e5f602083830101528093505050509250925092565b5f82518060208501845e5f920191825250919050565b6080516104bd6104805f395f818160350152607201526104bd5ff3fe60806040526004361061001d575f3560e01c80638b3240a014610027575b610025610070565b005b348015610032575f80fd5b507f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f35b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031633036100dc575f356001600160e01b03191663278f794360e11b146100d2576040516334ad5dbb60e21b815260040160405180910390fd5b6100da6100e9565b565b6100da610117565b905090565b5f806100f83660048184610365565b81019061010591906103a0565b915091506101138282610127565b5050565b6100da610122610181565b6101b3565b610130826101d1565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b905f90a280511561017957610174828261024c565b505050565b6101136102be565b5f6100e47f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc546001600160a01b031690565b365f80375f80365f845af43d5f803e8080156101cd573d5ff35b3d5ffd5b806001600160a01b03163b5f0361020b57604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc80546001600160a01b0319166001600160a01b0392909216919091179055565b60605f80846001600160a01b0316846040516102689190610471565b5f60405180830381855af49150503d805f81146102a0576040519150601f19603f3d011682016040523d82523d5f602084013e6102a5565b606091505b50915091506102b58583836102dd565b95945050505050565b34156100da5760405163b398979f60e01b815260040160405180910390fd5b6060826102f2576102ed8261033c565b610335565b815115801561030957506001600160a01b0384163b155b1561033257604051639996b31560e01b81526001600160a01b0385166004820152602401610202565b50805b9392505050565b80511561034c5780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b5f8085851115610373575f80fd5b8386111561037f575f80fd5b5050820193919092039150565b634e487b7160e01b5f52604160045260245ffd5b5f80604083850312156103b1575f80fd5b82356001600160a01b03811681146103c7575f80fd5b9150602083013567ffffffffffffffff8111156103e2575f80fd5b8301601f810185136103f2575f80fd5b803567ffffffffffffffff81111561040c5761040c61038c565b604051601f8201601f19908116603f0116810167ffffffffffffffff8111828210171561043b5761043b61038c565b604052818152828201602001871015610452575f80fd5b816020840160208301375f602083830101528093505050509250929050565b5f82518060208501845e5f92019182525091905056fea26469706673582212205f12e4d638be8d591db7c67d942f3e9eeb14e9e44f78ba8cddaca37631bdc49764736f6c634300081a0033608060405234801561000f575f80fd5b506040516104ef3803806104ef83398101604081905261002e916100bb565b806001600160a01b03811661005c57604051631e4fbdf760e01b81525f600482015260240160405180910390fd5b6100658161006c565b50506100e8565b5f80546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b5f602082840312156100cb575f80fd5b81516001600160a01b03811681146100e1575f80fd5b9392505050565b6103fa806100f55f395ff3fe608060405260043610610049575f3560e01c8063715018a61461004d5780638da5cb5b146100635780639623609d1461008e578063ad3cb1cc146100a1578063f2fde38b146100de575b5f80fd5b348015610058575f80fd5b506100616100fd565b005b34801561006e575f80fd5b505f546040516001600160a01b0390911681526020015b60405180910390f35b61006161009c366004610260565b610110565b3480156100ac575f80fd5b506100d1604051806040016040528060058152602001640352e302e360dc1b81525081565b6040516100859190610365565b3480156100e9575f80fd5b506100616100f836600461037e565b61017b565b6101056101bd565b61010e5f6101e9565b565b6101186101bd565b60405163278f794360e11b81526001600160a01b03841690634f1ef2869034906101489086908690600401610399565b5f604051808303818588803b15801561015f575f80fd5b505af1158015610171573d5f803e3d5ffd5b5050505050505050565b6101836101bd565b6001600160a01b0381166101b157604051631e4fbdf760e01b81525f60048201526024015b60405180910390fd5b6101ba816101e9565b50565b5f546001600160a01b0316331461010e5760405163118cdaa760e01b81523360048201526024016101a8565b5f80546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b6001600160a01b03811681146101ba575f80fd5b634e487b7160e01b5f52604160045260245ffd5b5f805f60608486031215610272575f80fd5b833561027d81610238565b9250602084013561028d81610238565b9150604084013567ffffffffffffffff8111156102a8575f80fd5b8401601f810186136102b8575f80fd5b803567ffffffffffffffff8111156102d2576102d261024c565b604051601f8201601f19908116603f0116810167ffffffffffffffff811182821017156103015761030161024c565b604052818152828201602001881015610318575f80fd5b816020840160208301375f602083830101528093505050509250925092565b5f81518084528060208401602086015e5f602082860101526020601f19601f83011685010191505092915050565b602081525f6103776020830184610337565b9392505050565b5f6020828403121561038e575f80fd5b813561037781610238565b6001600160a01b03831681526040602082018190525f906103bc90830184610337565b94935050505056fea264697066735822122063012ab3c3421087c307802be7295f03bec95db9eea702a4c2db9595befa162464736f6c634300081a0033b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d610307ebcf49758b6ed3af50fa146bec0abe157c0218fe65dc0874c286e9d5da4f00a2646970667358221220e1f14fd592674438d64f9d4092f4bbd644bb8644fb1d8bcfccbedce47e7a27ab64736f6c634300081a0033",
|
508
|
+
"bytecode": "0x6080604052348015600e575f80fd5b506125bd8061001c5f395ff3fe608060405234801561000f575f80fd5b5060043610610111575f3560e01c8063893d20e81161009e578063ada9652e1161006e578063ada9652e14610369578063b88da7591461037d578063c987336c14610390578063f5c1b5a7146103a3578063fd0c63d9146103b6575f80fd5b8063893d20e81461032b5780638e9afce614610333578063933a9ce814610346578063946dfcfe14610357575f80fd5b80631775564d116100e45780631775564d146101bd5780632db5b86f146101dd5780634d459c90146101f05780635ab1bd53146102fd578063644c45e01461030e575f80fd5b806301ffc9a71461011557806304499582146101565780630d8e6e2c14610181578063138461e01461019d575b5f80fd5b61014161012336600461132d565b6001600160e01b0319165f9081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b61016961016436600461140e565b6103be565b6040516001600160a01b03909116815260200161014d565b610189610491565b60405162ffffff909116815260200161014d565b6101a5610501565b6040516001600160601b03909116815260200161014d565b6101d06101cb366004611474565b61050b565b60405161014d91906114ef565b6101696101eb366004611501565b610563565b6102a06101fe36600461156f565b6040805160a0810182525f808252602082018190529181018290526060810182905260808101919091525062ffffff9081165f90815260036020908152604091829020825160a0810184528154948516815263010000009094046001600160a01b03908116928501929092526001015490811691830191909152600160a01b810464ffffffffff166060830152600160c81b900463ffffffff16608082015290565b60408051825162ffffff1681526020808401516001600160a01b039081169183019190915283830151169181019190915260608083015164ffffffffff169082015260809182015163ffffffff169181019190915260a00161014d565b6001546001600160a01b0316610169565b5f80516020612568833981519152546001600160601b03166101a5565b610169610630565b6101d061034136600461158a565b610761565b6002546001600160a01b0316610169565b6004545b60405190815260200161014d565b61035b5f8051602061256883398151915281565b61018961038b3660046115c4565b6107b4565b61016961039e366004611474565b6107f2565b6101696103b136600461140e565b610999565b6101a5610ab4565b5f6103c7610acb565b5f806103d287610b16565b915091508386826103e3858961050b565b6040516103ef90611320565b6103fb939291906115db565b8190604051809103905ff5905080158015610418573d5f803e3d5ffd5b50600280546001600160a01b0319166001600160a01b03929092169190911790556104438683610b56565b6040516001600160a01b038881168252919450908416907f78922e3fa1abc96399973cb25528ba892214b57da9d1a573937c460d9f5eb4759060200160405180910390a25050949350505050565b600254604080516303639b8b60e21b815290515f926001600160a01b031691630d8e6e2c9160048083019260209291908290030181865afa1580156104d8573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906104fc919061160f565b905090565b5f6104fc30610f5f565b60606349bb9e4b60e01b838360405160240161052892919061162a565b60408051601f198184030181529190526020810180516001600160e01b03166001600160e01b03199093169290921790915290505b92915050565b5f61056c610acb565b5f8061057786610b16565b915091508481610587848761050b565b60405161059390611320565b61059f939291906115db565b604051809103905ff0801580156105b8573d5f803e3d5ffd5b50600280546001600160a01b0319166001600160a01b03929092169190911790556105e38583610b56565b6040516001600160a01b038781168252919450908416907f78922e3fa1abc96399973cb25528ba892214b57da9d1a573937c460d9f5eb4759060200160405180910390a250509392505050565b5f805f8051602061256883398151915280546040516330b8415f60e01b81526001600160601b03909116600482015290915073__$94a2c899be079b00d952d0d84fffaa5c34$__906330b8415f90602401602060405180830381865af415801561069c573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906106c0919061164d565b1561074b576001546001600160a01b03168154604051631c5da14d60e11b81526001600160601b0390911660048201526001600160a01b0391909116906338bb429a90602401602060405180830381865afa158015610721573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610745919061166c565b91505090565b54600160601b90046001600160a01b0316919050565b606063329d6e7460e01b8260405160240161077c91906114ef565b60408051601f198184030181529190526020810180516001600160e01b03166001600160e01b03199093169290921790915292915050565b5f600482815481106107c8576107c8611687565b905f5260205f2090600a91828204019190066003029054906101000a900462ffffff169050919050565b5f6107fb610630565b6001600160a01b0316336001600160a01b0316146108335760405163086391f760e31b81523360048201526024015b60405180910390fd5b6004545f036108555760405163366dfd2160e21b815260040160405180910390fd5b5f61085e610630565b90505f6108736002546001600160a01b031690565b6001600160a01b0316638b3240a06040518163ffffffff1660e01b81526004016020604051808303815f875af11580156108af573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906108d3919061166c565b6002549091506001600160a01b03908116908216639623609d82886108f789610761565b6040518463ffffffff1660e01b8152600401610915939291906115db565b5f604051808303815f87803b15801561092c575f80fd5b505af115801561093e573d5f803e3d5ffd5b5050505061094c8684610b56565b6040516001600160a01b038881168252919550908516907f1356a2c922be684528fa1759d1808395e5c5010181dd333cdb6f03e2d8545b659060200160405180910390a250505092915050565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a0080545f9190600160401b810460ff16159067ffffffffffffffff1683811580156109e15750825b90505f8267ffffffffffffffff1660011480156109fd5750303b155b905081158015610a0b575080155b15610a295760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff191660011785558315610a5357845460ff60401b1916600160401b1785555b610a5f8a8a8a8a6103be565b95508315610aa757845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b5050505050949350505050565b6002545f906104fc906001600160a01b0316610f5f565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a0054600160401b900460ff16610b1457604051631afcd79f60e31b815260040160405180910390fd5b565b6004545f90819015610b3b5760405163402b135f60e11b815260040160405180910390fd5b610b453384611158565b610b4d610630565b93309350915050565b600254604080516303639b8b60e21b815290516001600160a01b03909216915f918391630d8e6e2c916004808201926020929091908290030181865afa158015610ba2573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610bc6919061160f565b9050610c448173__$8eede297b65ed5a56eb3f84d8232ae93f5$__6304b8f6c56040518163ffffffff1660e01b8152600401602060405180830381865af4158015610c13573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610c37919061160f565b62ffffff90811691161490565b15610c62576040516348c618db60e01b815260040160405180910390fd5b60045415610dba5760048054610c7a9060019061169b565b81548110610c8a57610c8a611687565b5f9182526020909120600a80830490910154604051635560100760e01b8152919092066003026101000a90910462ffffff16600482015273__$8eede297b65ed5a56eb3f84d8232ae93f5$__90635560100790602401602060405180830381865af4158015610cfb573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610d1f91906116ba565b604051635560100760e01b815262ffffff8316600482015273__$8eede297b65ed5a56eb3f84d8232ae93f5$__90635560100790602401602060405180830381865af4158015610d71573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610d9591906116ba565b11610dba57604051633e614b6d60e11b815262ffffff8216600482015260240161082a565b600480546001810182555f829052600a8082047f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b01805462ffffff808716600394909506939093026101000a848102930219169190911790556040805160a0810182529182526001600160a01b038088166020848101919091529087168383015281516356db0c1960e11b815291519293606085019373__$91d01b1eccbca8d6f94a5eb2a0acb040e9$__9363adb6183293818401939092918290030181865af4158015610e8a573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610eae91906116d1565b64ffffffffff90811682524363ffffffff90811660209384015262ffffff9485165f90815260038452604090819020855181549587015197166001600160b81b03199095169490941763010000006001600160a01b0397881602178455840151600190930180546060860151608090960151949096166001600160c81b031990961695909517600160a01b94909216939093021763ffffffff60c81b1916600160c81b919092160217905592915050565b5f805f8051602061256883398151915280546040516330b8415f60e01b81526001600160601b03909116600482015290915073__$94a2c899be079b00d952d0d84fffaa5c34$__906330b8415f90602401602060405180830381865af4158015610fcb573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610fef919061164d565b1561101b5780546040516301ab8b6760e21b81526001600160601b03909116600482015260240161082a565b6001546001600160a01b031660405163c3c5a54760e01b81526001600160a01b038581166004830152919091169063c3c5a54790602401602060405180830381865afa15801561106d573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190611091919061164d565b6110b95760405163b9304b0d60e01b81526001600160a01b038416600482015260240161082a565b6001546001600160a01b0316604051632f2a35f760e11b81526001600160a01b0385811660048301529190911690635e546bee90602401602060405180830381865afa15801561110b573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061112f91906116f5565b81546bffffffffffffffffffffffff19166001600160601b039190911690811790915592915050565b611160610acb565b611169816111ce565b6111716112db565b6001600160a01b0382166111985760405163f17ef42d60e01b815260040160405180910390fd5b505f8051602061256883398151915280546001600160601b0316600160601b6001600160a01b0390931692909202919091179055565b6111d6610acb565b806001600160a01b03163b5f0361120b5760405163fdeac91f60e01b81526001600160a01b038216600482015260240161082a565b600180546001600160a01b0319166001600160a01b0383169081179091556040516301ffc9a760e01b8152632f6da6f960e01b60048201526301ffc9a790602401602060405180830381865afa925050508015611285575060408051601f3d908101601f191682019092526112829181019061164d565b60015b6112ad5760405163fdeac91f60e01b81526001600160a01b038216600482015260240161082a565b806112d65760405163fdeac91f60e01b81526001600160a01b038316600482015260240161082a565b505b50565b6112e3610acb565b6301ffc9a760e01b5f9081526020527f67be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5805460ff19166001179055565b610e4c8061171c83390190565b5f6020828403121561133d575f80fd5b81356001600160e01b031981168114611354575f80fd5b9392505050565b6001600160a01b03811681146112d8575f80fd5b634e487b7160e01b5f52604160045260245ffd5b5f82601f830112611392575f80fd5b813567ffffffffffffffff8111156113ac576113ac61136f565b604051601f8201601f19908116603f0116810167ffffffffffffffff811182821017156113db576113db61136f565b6040528181528382016020018510156113f2575f80fd5b816020850160208301375f918101602001919091529392505050565b5f805f8060808587031215611421575f80fd5b843561142c8161135b565b9350602085013561143c8161135b565b9250604085013567ffffffffffffffff811115611457575f80fd5b61146387828801611383565b949793965093946060013593505050565b5f8060408385031215611485575f80fd5b82356114908161135b565b9150602083013567ffffffffffffffff8111156114ab575f80fd5b6114b785828601611383565b9150509250929050565b5f81518084528060208401602086015e5f602082860101526020601f19601f83011685010191505092915050565b602081525f61135460208301846114c1565b5f805f60608486031215611513575f80fd5b833561151e8161135b565b9250602084013561152e8161135b565b9150604084013567ffffffffffffffff811115611549575f80fd5b61155586828701611383565b9150509250925092565b62ffffff811681146112d8575f80fd5b5f6020828403121561157f575f80fd5b81356113548161155f565b5f6020828403121561159a575f80fd5b813567ffffffffffffffff8111156115b0575f80fd5b6115bc84828501611383565b949350505050565b5f602082840312156115d4575f80fd5b5035919050565b6001600160a01b038481168252831660208201526060604082018190525f90611606908301846114c1565b95945050505050565b5f6020828403121561161f575f80fd5b81516113548161155f565b6001600160a01b03831681526040602082018190525f906115bc908301846114c1565b5f6020828403121561165d575f80fd5b81518015158114611354575f80fd5b5f6020828403121561167c575f80fd5b81516113548161135b565b634e487b7160e01b5f52603260045260245ffd5b8181038181111561055d57634e487b7160e01b5f52601160045260245ffd5b5f602082840312156116ca575f80fd5b5051919050565b5f602082840312156116e1575f80fd5b815164ffffffffff81168114611354575f80fd5b5f60208284031215611705575f80fd5b81516001600160601b0381168114611354575f80fdfe60a060405234801561000f575f80fd5b50604051610e4c380380610e4c83398101604081905261002e9161037c565b828282828161003d828261009e565b50508160405161004c90610340565b6001600160a01b039091168152602001604051809103905ff080158015610075573d5f803e3d5ffd5b506001600160a01b031660805261009361008e60805190565b6100fc565b505050505050610463565b6100a782610169565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b905f90a28051156100f0576100eb82826101e7565b505050565b6100f861025a565b5050565b7f7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f61013b5f80516020610e2c833981519152546001600160a01b031690565b604080516001600160a01b03928316815291841660208301520160405180910390a16101668161027b565b50565b806001600160a01b03163b5f036101a357604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b807f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc5b80546001600160a01b0319166001600160a01b039290921691909117905550565b60605f80846001600160a01b031684604051610203919061044d565b5f60405180830381855af49150503d805f811461023b576040519150601f19603f3d011682016040523d82523d5f602084013e610240565b606091505b5090925090506102518583836102b8565b95945050505050565b34156102795760405163b398979f60e01b815260040160405180910390fd5b565b6001600160a01b0381166102a457604051633173bdd160e11b81525f600482015260240161019a565b805f80516020610e2c8339815191526101c6565b6060826102cd576102c882610317565b610310565b81511580156102e457506001600160a01b0384163b155b1561030d57604051639996b31560e01b81526001600160a01b038516600482015260240161019a565b50805b9392505050565b8051156103275780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b6104ef8061093d83390190565b80516001600160a01b0381168114610363575f80fd5b919050565b634e487b7160e01b5f52604160045260245ffd5b5f805f6060848603121561038e575f80fd5b6103978461034d565b92506103a56020850161034d565b60408501519092506001600160401b038111156103c0575f80fd5b8401601f810186136103d0575f80fd5b80516001600160401b038111156103e9576103e9610368565b604051601f8201601f19908116603f011681016001600160401b038111828210171561041757610417610368565b60405281815282820160200188101561042e575f80fd5b8160208401602083015e5f602083830101528093505050509250925092565b5f82518060208501845e5f920191825250919050565b6080516104bd6104805f395f818160350152607201526104bd5ff3fe60806040526004361061001d575f3560e01c80638b3240a014610027575b610025610070565b005b348015610032575f80fd5b507f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f35b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031633036100dc575f356001600160e01b03191663278f794360e11b146100d2576040516334ad5dbb60e21b815260040160405180910390fd5b6100da6100e9565b565b6100da610117565b905090565b5f806100f83660048184610365565b81019061010591906103a0565b915091506101138282610127565b5050565b6100da610122610181565b6101b3565b610130826101d1565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b905f90a280511561017957610174828261024c565b505050565b6101136102be565b5f6100e47f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc546001600160a01b031690565b365f80375f80365f845af43d5f803e8080156101cd573d5ff35b3d5ffd5b806001600160a01b03163b5f0361020b57604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc80546001600160a01b0319166001600160a01b0392909216919091179055565b60605f80846001600160a01b0316846040516102689190610471565b5f60405180830381855af49150503d805f81146102a0576040519150601f19603f3d011682016040523d82523d5f602084013e6102a5565b606091505b50915091506102b58583836102dd565b95945050505050565b34156100da5760405163b398979f60e01b815260040160405180910390fd5b6060826102f2576102ed8261033c565b610335565b815115801561030957506001600160a01b0384163b155b1561033257604051639996b31560e01b81526001600160a01b0385166004820152602401610202565b50805b9392505050565b80511561034c5780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b5f8085851115610373575f80fd5b8386111561037f575f80fd5b5050820193919092039150565b634e487b7160e01b5f52604160045260245ffd5b5f80604083850312156103b1575f80fd5b82356001600160a01b03811681146103c7575f80fd5b9150602083013567ffffffffffffffff8111156103e2575f80fd5b8301601f810185136103f2575f80fd5b803567ffffffffffffffff81111561040c5761040c61038c565b604051601f8201601f19908116603f0116810167ffffffffffffffff8111828210171561043b5761043b61038c565b604052818152828201602001871015610452575f80fd5b816020840160208301375f602083830101528093505050509250929050565b5f82518060208501845e5f92019182525091905056fea26469706673582212205f12e4d638be8d591db7c67d942f3e9eeb14e9e44f78ba8cddaca37631bdc49764736f6c634300081a0033608060405234801561000f575f80fd5b506040516104ef3803806104ef83398101604081905261002e916100bb565b806001600160a01b03811661005c57604051631e4fbdf760e01b81525f600482015260240160405180910390fd5b6100658161006c565b50506100e8565b5f80546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b5f602082840312156100cb575f80fd5b81516001600160a01b03811681146100e1575f80fd5b9392505050565b6103fa806100f55f395ff3fe608060405260043610610049575f3560e01c8063715018a61461004d5780638da5cb5b146100635780639623609d1461008e578063ad3cb1cc146100a1578063f2fde38b146100de575b5f80fd5b348015610058575f80fd5b506100616100fd565b005b34801561006e575f80fd5b505f546040516001600160a01b0390911681526020015b60405180910390f35b61006161009c366004610260565b610110565b3480156100ac575f80fd5b506100d1604051806040016040528060058152602001640352e302e360dc1b81525081565b6040516100859190610365565b3480156100e9575f80fd5b506100616100f836600461037e565b61017b565b6101056101bd565b61010e5f6101e9565b565b6101186101bd565b60405163278f794360e11b81526001600160a01b03841690634f1ef2869034906101489086908690600401610399565b5f604051808303818588803b15801561015f575f80fd5b505af1158015610171573d5f803e3d5ffd5b5050505050505050565b6101836101bd565b6001600160a01b0381166101b157604051631e4fbdf760e01b81525f60048201526024015b60405180910390fd5b6101ba816101e9565b50565b5f546001600160a01b0316331461010e5760405163118cdaa760e01b81523360048201526024016101a8565b5f80546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b6001600160a01b03811681146101ba575f80fd5b634e487b7160e01b5f52604160045260245ffd5b5f805f60608486031215610272575f80fd5b833561027d81610238565b9250602084013561028d81610238565b9150604084013567ffffffffffffffff8111156102a8575f80fd5b8401601f810186136102b8575f80fd5b803567ffffffffffffffff8111156102d2576102d261024c565b604051601f8201601f19908116603f0116810167ffffffffffffffff811182821017156103015761030161024c565b604052818152828201602001881015610318575f80fd5b816020840160208301375f602083830101528093505050509250925092565b5f81518084528060208401602086015e5f602082860101526020601f19601f83011685010191505092915050565b602081525f6103776020830184610337565b9392505050565b5f6020828403121561038e575f80fd5b813561037781610238565b6001600160a01b03831681526040602082018190525f906103bc90830184610337565b94935050505056fea264697066735822122063012ab3c3421087c307802be7295f03bec95db9eea702a4c2db9595befa162464736f6c634300081a0033b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d610307ebcf49758b6ed3af50fa146bec0abe157c0218fe65dc0874c286e9d5da4f00a26469706673582212206c769522c70c889288968656e83e755f0d8c383273b9bdf5c01bb4792387a0bb64736f6c634300081a0033",
|
509
|
+
"deployedBytecode": "0x608060405234801561000f575f80fd5b5060043610610111575f3560e01c8063893d20e81161009e578063ada9652e1161006e578063ada9652e14610369578063b88da7591461037d578063c987336c14610390578063f5c1b5a7146103a3578063fd0c63d9146103b6575f80fd5b8063893d20e81461032b5780638e9afce614610333578063933a9ce814610346578063946dfcfe14610357575f80fd5b80631775564d116100e45780631775564d146101bd5780632db5b86f146101dd5780634d459c90146101f05780635ab1bd53146102fd578063644c45e01461030e575f80fd5b806301ffc9a71461011557806304499582146101565780630d8e6e2c14610181578063138461e01461019d575b5f80fd5b61014161012336600461132d565b6001600160e01b0319165f9081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b61016961016436600461140e565b6103be565b6040516001600160a01b03909116815260200161014d565b610189610491565b60405162ffffff909116815260200161014d565b6101a5610501565b6040516001600160601b03909116815260200161014d565b6101d06101cb366004611474565b61050b565b60405161014d91906114ef565b6101696101eb366004611501565b610563565b6102a06101fe36600461156f565b6040805160a0810182525f808252602082018190529181018290526060810182905260808101919091525062ffffff9081165f90815260036020908152604091829020825160a0810184528154948516815263010000009094046001600160a01b03908116928501929092526001015490811691830191909152600160a01b810464ffffffffff166060830152600160c81b900463ffffffff16608082015290565b60408051825162ffffff1681526020808401516001600160a01b039081169183019190915283830151169181019190915260608083015164ffffffffff169082015260809182015163ffffffff169181019190915260a00161014d565b6001546001600160a01b0316610169565b5f80516020612568833981519152546001600160601b03166101a5565b610169610630565b6101d061034136600461158a565b610761565b6002546001600160a01b0316610169565b6004545b60405190815260200161014d565b61035b5f8051602061256883398151915281565b61018961038b3660046115c4565b6107b4565b61016961039e366004611474565b6107f2565b6101696103b136600461140e565b610999565b6101a5610ab4565b5f6103c7610acb565b5f806103d287610b16565b915091508386826103e3858961050b565b6040516103ef90611320565b6103fb939291906115db565b8190604051809103905ff5905080158015610418573d5f803e3d5ffd5b50600280546001600160a01b0319166001600160a01b03929092169190911790556104438683610b56565b6040516001600160a01b038881168252919450908416907f78922e3fa1abc96399973cb25528ba892214b57da9d1a573937c460d9f5eb4759060200160405180910390a25050949350505050565b600254604080516303639b8b60e21b815290515f926001600160a01b031691630d8e6e2c9160048083019260209291908290030181865afa1580156104d8573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906104fc919061160f565b905090565b5f6104fc30610f5f565b60606349bb9e4b60e01b838360405160240161052892919061162a565b60408051601f198184030181529190526020810180516001600160e01b03166001600160e01b03199093169290921790915290505b92915050565b5f61056c610acb565b5f8061057786610b16565b915091508481610587848761050b565b60405161059390611320565b61059f939291906115db565b604051809103905ff0801580156105b8573d5f803e3d5ffd5b50600280546001600160a01b0319166001600160a01b03929092169190911790556105e38583610b56565b6040516001600160a01b038781168252919450908416907f78922e3fa1abc96399973cb25528ba892214b57da9d1a573937c460d9f5eb4759060200160405180910390a250509392505050565b5f805f8051602061256883398151915280546040516330b8415f60e01b81526001600160601b03909116600482015290915073__$94a2c899be079b00d952d0d84fffaa5c34$__906330b8415f90602401602060405180830381865af415801561069c573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906106c0919061164d565b1561074b576001546001600160a01b03168154604051631c5da14d60e11b81526001600160601b0390911660048201526001600160a01b0391909116906338bb429a90602401602060405180830381865afa158015610721573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610745919061166c565b91505090565b54600160601b90046001600160a01b0316919050565b606063329d6e7460e01b8260405160240161077c91906114ef565b60408051601f198184030181529190526020810180516001600160e01b03166001600160e01b03199093169290921790915292915050565b5f600482815481106107c8576107c8611687565b905f5260205f2090600a91828204019190066003029054906101000a900462ffffff169050919050565b5f6107fb610630565b6001600160a01b0316336001600160a01b0316146108335760405163086391f760e31b81523360048201526024015b60405180910390fd5b6004545f036108555760405163366dfd2160e21b815260040160405180910390fd5b5f61085e610630565b90505f6108736002546001600160a01b031690565b6001600160a01b0316638b3240a06040518163ffffffff1660e01b81526004016020604051808303815f875af11580156108af573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906108d3919061166c565b6002549091506001600160a01b03908116908216639623609d82886108f789610761565b6040518463ffffffff1660e01b8152600401610915939291906115db565b5f604051808303815f87803b15801561092c575f80fd5b505af115801561093e573d5f803e3d5ffd5b5050505061094c8684610b56565b6040516001600160a01b038881168252919550908516907f1356a2c922be684528fa1759d1808395e5c5010181dd333cdb6f03e2d8545b659060200160405180910390a250505092915050565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a0080545f9190600160401b810460ff16159067ffffffffffffffff1683811580156109e15750825b90505f8267ffffffffffffffff1660011480156109fd5750303b155b905081158015610a0b575080155b15610a295760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff191660011785558315610a5357845460ff60401b1916600160401b1785555b610a5f8a8a8a8a6103be565b95508315610aa757845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b5050505050949350505050565b6002545f906104fc906001600160a01b0316610f5f565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a0054600160401b900460ff16610b1457604051631afcd79f60e31b815260040160405180910390fd5b565b6004545f90819015610b3b5760405163402b135f60e11b815260040160405180910390fd5b610b453384611158565b610b4d610630565b93309350915050565b600254604080516303639b8b60e21b815290516001600160a01b03909216915f918391630d8e6e2c916004808201926020929091908290030181865afa158015610ba2573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610bc6919061160f565b9050610c448173__$8eede297b65ed5a56eb3f84d8232ae93f5$__6304b8f6c56040518163ffffffff1660e01b8152600401602060405180830381865af4158015610c13573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610c37919061160f565b62ffffff90811691161490565b15610c62576040516348c618db60e01b815260040160405180910390fd5b60045415610dba5760048054610c7a9060019061169b565b81548110610c8a57610c8a611687565b5f9182526020909120600a80830490910154604051635560100760e01b8152919092066003026101000a90910462ffffff16600482015273__$8eede297b65ed5a56eb3f84d8232ae93f5$__90635560100790602401602060405180830381865af4158015610cfb573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610d1f91906116ba565b604051635560100760e01b815262ffffff8316600482015273__$8eede297b65ed5a56eb3f84d8232ae93f5$__90635560100790602401602060405180830381865af4158015610d71573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610d9591906116ba565b11610dba57604051633e614b6d60e11b815262ffffff8216600482015260240161082a565b600480546001810182555f829052600a8082047f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b01805462ffffff808716600394909506939093026101000a848102930219169190911790556040805160a0810182529182526001600160a01b038088166020848101919091529087168383015281516356db0c1960e11b815291519293606085019373__$91d01b1eccbca8d6f94a5eb2a0acb040e9$__9363adb6183293818401939092918290030181865af4158015610e8a573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610eae91906116d1565b64ffffffffff90811682524363ffffffff90811660209384015262ffffff9485165f90815260038452604090819020855181549587015197166001600160b81b03199095169490941763010000006001600160a01b0397881602178455840151600190930180546060860151608090960151949096166001600160c81b031990961695909517600160a01b94909216939093021763ffffffff60c81b1916600160c81b919092160217905592915050565b5f805f8051602061256883398151915280546040516330b8415f60e01b81526001600160601b03909116600482015290915073__$94a2c899be079b00d952d0d84fffaa5c34$__906330b8415f90602401602060405180830381865af4158015610fcb573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610fef919061164d565b1561101b5780546040516301ab8b6760e21b81526001600160601b03909116600482015260240161082a565b6001546001600160a01b031660405163c3c5a54760e01b81526001600160a01b038581166004830152919091169063c3c5a54790602401602060405180830381865afa15801561106d573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190611091919061164d565b6110b95760405163b9304b0d60e01b81526001600160a01b038416600482015260240161082a565b6001546001600160a01b0316604051632f2a35f760e11b81526001600160a01b0385811660048301529190911690635e546bee90602401602060405180830381865afa15801561110b573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061112f91906116f5565b81546bffffffffffffffffffffffff19166001600160601b039190911690811790915592915050565b611160610acb565b611169816111ce565b6111716112db565b6001600160a01b0382166111985760405163f17ef42d60e01b815260040160405180910390fd5b505f8051602061256883398151915280546001600160601b0316600160601b6001600160a01b0390931692909202919091179055565b6111d6610acb565b806001600160a01b03163b5f0361120b5760405163fdeac91f60e01b81526001600160a01b038216600482015260240161082a565b600180546001600160a01b0319166001600160a01b0383169081179091556040516301ffc9a760e01b8152632f6da6f960e01b60048201526301ffc9a790602401602060405180830381865afa925050508015611285575060408051601f3d908101601f191682019092526112829181019061164d565b60015b6112ad5760405163fdeac91f60e01b81526001600160a01b038216600482015260240161082a565b806112d65760405163fdeac91f60e01b81526001600160a01b038316600482015260240161082a565b505b50565b6112e3610acb565b6301ffc9a760e01b5f9081526020527f67be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5805460ff19166001179055565b610e4c8061171c83390190565b5f6020828403121561133d575f80fd5b81356001600160e01b031981168114611354575f80fd5b9392505050565b6001600160a01b03811681146112d8575f80fd5b634e487b7160e01b5f52604160045260245ffd5b5f82601f830112611392575f80fd5b813567ffffffffffffffff8111156113ac576113ac61136f565b604051601f8201601f19908116603f0116810167ffffffffffffffff811182821017156113db576113db61136f565b6040528181528382016020018510156113f2575f80fd5b816020850160208301375f918101602001919091529392505050565b5f805f8060808587031215611421575f80fd5b843561142c8161135b565b9350602085013561143c8161135b565b9250604085013567ffffffffffffffff811115611457575f80fd5b61146387828801611383565b949793965093946060013593505050565b5f8060408385031215611485575f80fd5b82356114908161135b565b9150602083013567ffffffffffffffff8111156114ab575f80fd5b6114b785828601611383565b9150509250929050565b5f81518084528060208401602086015e5f602082860101526020601f19601f83011685010191505092915050565b602081525f61135460208301846114c1565b5f805f60608486031215611513575f80fd5b833561151e8161135b565b9250602084013561152e8161135b565b9150604084013567ffffffffffffffff811115611549575f80fd5b61155586828701611383565b9150509250925092565b62ffffff811681146112d8575f80fd5b5f6020828403121561157f575f80fd5b81356113548161155f565b5f6020828403121561159a575f80fd5b813567ffffffffffffffff8111156115b0575f80fd5b6115bc84828501611383565b949350505050565b5f602082840312156115d4575f80fd5b5035919050565b6001600160a01b038481168252831660208201526060604082018190525f90611606908301846114c1565b95945050505050565b5f6020828403121561161f575f80fd5b81516113548161155f565b6001600160a01b03831681526040602082018190525f906115bc908301846114c1565b5f6020828403121561165d575f80fd5b81518015158114611354575f80fd5b5f6020828403121561167c575f80fd5b81516113548161135b565b634e487b7160e01b5f52603260045260245ffd5b8181038181111561055d57634e487b7160e01b5f52601160045260245ffd5b5f602082840312156116ca575f80fd5b5051919050565b5f602082840312156116e1575f80fd5b815164ffffffffff81168114611354575f80fd5b5f60208284031215611705575f80fd5b81516001600160601b0381168114611354575f80fdfe60a060405234801561000f575f80fd5b50604051610e4c380380610e4c83398101604081905261002e9161037c565b828282828161003d828261009e565b50508160405161004c90610340565b6001600160a01b039091168152602001604051809103905ff080158015610075573d5f803e3d5ffd5b506001600160a01b031660805261009361008e60805190565b6100fc565b505050505050610463565b6100a782610169565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b905f90a28051156100f0576100eb82826101e7565b505050565b6100f861025a565b5050565b7f7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f61013b5f80516020610e2c833981519152546001600160a01b031690565b604080516001600160a01b03928316815291841660208301520160405180910390a16101668161027b565b50565b806001600160a01b03163b5f036101a357604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b807f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc5b80546001600160a01b0319166001600160a01b039290921691909117905550565b60605f80846001600160a01b031684604051610203919061044d565b5f60405180830381855af49150503d805f811461023b576040519150601f19603f3d011682016040523d82523d5f602084013e610240565b606091505b5090925090506102518583836102b8565b95945050505050565b34156102795760405163b398979f60e01b815260040160405180910390fd5b565b6001600160a01b0381166102a457604051633173bdd160e11b81525f600482015260240161019a565b805f80516020610e2c8339815191526101c6565b6060826102cd576102c882610317565b610310565b81511580156102e457506001600160a01b0384163b155b1561030d57604051639996b31560e01b81526001600160a01b038516600482015260240161019a565b50805b9392505050565b8051156103275780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b6104ef8061093d83390190565b80516001600160a01b0381168114610363575f80fd5b919050565b634e487b7160e01b5f52604160045260245ffd5b5f805f6060848603121561038e575f80fd5b6103978461034d565b92506103a56020850161034d565b60408501519092506001600160401b038111156103c0575f80fd5b8401601f810186136103d0575f80fd5b80516001600160401b038111156103e9576103e9610368565b604051601f8201601f19908116603f011681016001600160401b038111828210171561041757610417610368565b60405281815282820160200188101561042e575f80fd5b8160208401602083015e5f602083830101528093505050509250925092565b5f82518060208501845e5f920191825250919050565b6080516104bd6104805f395f818160350152607201526104bd5ff3fe60806040526004361061001d575f3560e01c80638b3240a014610027575b610025610070565b005b348015610032575f80fd5b507f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f35b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031633036100dc575f356001600160e01b03191663278f794360e11b146100d2576040516334ad5dbb60e21b815260040160405180910390fd5b6100da6100e9565b565b6100da610117565b905090565b5f806100f83660048184610365565b81019061010591906103a0565b915091506101138282610127565b5050565b6100da610122610181565b6101b3565b610130826101d1565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b905f90a280511561017957610174828261024c565b505050565b6101136102be565b5f6100e47f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc546001600160a01b031690565b365f80375f80365f845af43d5f803e8080156101cd573d5ff35b3d5ffd5b806001600160a01b03163b5f0361020b57604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc80546001600160a01b0319166001600160a01b0392909216919091179055565b60605f80846001600160a01b0316846040516102689190610471565b5f60405180830381855af49150503d805f81146102a0576040519150601f19603f3d011682016040523d82523d5f602084013e6102a5565b606091505b50915091506102b58583836102dd565b95945050505050565b34156100da5760405163b398979f60e01b815260040160405180910390fd5b6060826102f2576102ed8261033c565b610335565b815115801561030957506001600160a01b0384163b155b1561033257604051639996b31560e01b81526001600160a01b0385166004820152602401610202565b50805b9392505050565b80511561034c5780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b5f8085851115610373575f80fd5b8386111561037f575f80fd5b5050820193919092039150565b634e487b7160e01b5f52604160045260245ffd5b5f80604083850312156103b1575f80fd5b82356001600160a01b03811681146103c7575f80fd5b9150602083013567ffffffffffffffff8111156103e2575f80fd5b8301601f810185136103f2575f80fd5b803567ffffffffffffffff81111561040c5761040c61038c565b604051601f8201601f19908116603f0116810167ffffffffffffffff8111828210171561043b5761043b61038c565b604052818152828201602001871015610452575f80fd5b816020840160208301375f602083830101528093505050509250929050565b5f82518060208501845e5f92019182525091905056fea26469706673582212205f12e4d638be8d591db7c67d942f3e9eeb14e9e44f78ba8cddaca37631bdc49764736f6c634300081a0033608060405234801561000f575f80fd5b506040516104ef3803806104ef83398101604081905261002e916100bb565b806001600160a01b03811661005c57604051631e4fbdf760e01b81525f600482015260240160405180910390fd5b6100658161006c565b50506100e8565b5f80546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b5f602082840312156100cb575f80fd5b81516001600160a01b03811681146100e1575f80fd5b9392505050565b6103fa806100f55f395ff3fe608060405260043610610049575f3560e01c8063715018a61461004d5780638da5cb5b146100635780639623609d1461008e578063ad3cb1cc146100a1578063f2fde38b146100de575b5f80fd5b348015610058575f80fd5b506100616100fd565b005b34801561006e575f80fd5b505f546040516001600160a01b0390911681526020015b60405180910390f35b61006161009c366004610260565b610110565b3480156100ac575f80fd5b506100d1604051806040016040528060058152602001640352e302e360dc1b81525081565b6040516100859190610365565b3480156100e9575f80fd5b506100616100f836600461037e565b61017b565b6101056101bd565b61010e5f6101e9565b565b6101186101bd565b60405163278f794360e11b81526001600160a01b03841690634f1ef2869034906101489086908690600401610399565b5f604051808303818588803b15801561015f575f80fd5b505af1158015610171573d5f803e3d5ffd5b5050505050505050565b6101836101bd565b6001600160a01b0381166101b157604051631e4fbdf760e01b81525f60048201526024015b60405180910390fd5b6101ba816101e9565b50565b5f546001600160a01b0316331461010e5760405163118cdaa760e01b81523360048201526024016101a8565b5f80546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b6001600160a01b03811681146101ba575f80fd5b634e487b7160e01b5f52604160045260245ffd5b5f805f60608486031215610272575f80fd5b833561027d81610238565b9250602084013561028d81610238565b9150604084013567ffffffffffffffff8111156102a8575f80fd5b8401601f810186136102b8575f80fd5b803567ffffffffffffffff8111156102d2576102d261024c565b604051601f8201601f19908116603f0116810167ffffffffffffffff811182821017156103015761030161024c565b604052818152828201602001881015610318575f80fd5b816020840160208301375f602083830101528093505050509250925092565b5f81518084528060208401602086015e5f602082860101526020601f19601f83011685010191505092915050565b602081525f6103776020830184610337565b9392505050565b5f6020828403121561038e575f80fd5b813561037781610238565b6001600160a01b03831681526040602082018190525f906103bc90830184610337565b94935050505056fea264697066735822122063012ab3c3421087c307802be7295f03bec95db9eea702a4c2db9595befa162464736f6c634300081a0033b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d610307ebcf49758b6ed3af50fa146bec0abe157c0218fe65dc0874c286e9d5da4f00a26469706673582212206c769522c70c889288968656e83e755f0d8c383273b9bdf5c01bb4792387a0bb64736f6c634300081a0033",
|
490
510
|
"linkReferences": {
|
491
511
|
"contracts/type/NftId.sol": {
|
492
512
|
"NftIdLib": [
|
493
513
|
{
|
494
514
|
"length": 20,
|
495
|
-
"start":
|
515
|
+
"start": 1664
|
496
516
|
},
|
497
517
|
{
|
498
518
|
"length": 20,
|
499
|
-
"start":
|
519
|
+
"start": 4015
|
500
520
|
}
|
501
521
|
]
|
502
522
|
},
|
@@ -504,7 +524,7 @@
|
|
504
524
|
"TimestampLib": [
|
505
525
|
{
|
506
526
|
"length": 20,
|
507
|
-
"start":
|
527
|
+
"start": 3694
|
508
528
|
}
|
509
529
|
]
|
510
530
|
},
|
@@ -512,15 +532,15 @@
|
|
512
532
|
"VersionLib": [
|
513
533
|
{
|
514
534
|
"length": 20,
|
515
|
-
"start":
|
535
|
+
"start": 3050
|
516
536
|
},
|
517
537
|
{
|
518
538
|
"length": 20,
|
519
|
-
"start":
|
539
|
+
"start": 3295
|
520
540
|
},
|
521
541
|
{
|
522
542
|
"length": 20,
|
523
|
-
"start":
|
543
|
+
"start": 3413
|
524
544
|
}
|
525
545
|
]
|
526
546
|
}
|
@@ -530,11 +550,11 @@
|
|
530
550
|
"NftIdLib": [
|
531
551
|
{
|
532
552
|
"length": 20,
|
533
|
-
"start":
|
553
|
+
"start": 1636
|
534
554
|
},
|
535
555
|
{
|
536
556
|
"length": 20,
|
537
|
-
"start":
|
557
|
+
"start": 3987
|
538
558
|
}
|
539
559
|
]
|
540
560
|
},
|
@@ -542,7 +562,7 @@
|
|
542
562
|
"TimestampLib": [
|
543
563
|
{
|
544
564
|
"length": 20,
|
545
|
-
"start":
|
565
|
+
"start": 3666
|
546
566
|
}
|
547
567
|
]
|
548
568
|
},
|
@@ -550,15 +570,15 @@
|
|
550
570
|
"VersionLib": [
|
551
571
|
{
|
552
572
|
"length": 20,
|
553
|
-
"start":
|
573
|
+
"start": 3022
|
554
574
|
},
|
555
575
|
{
|
556
576
|
"length": 20,
|
557
|
-
"start":
|
577
|
+
"start": 3267
|
558
578
|
},
|
559
579
|
{
|
560
580
|
"length": 20,
|
561
|
-
"start":
|
581
|
+
"start": 3385
|
562
582
|
}
|
563
583
|
]
|
564
584
|
}
|
@@ -6,6 +6,7 @@ import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet
|
|
6
6
|
import {ReentrancyGuardUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/ReentrancyGuardUpgradeable.sol";
|
7
7
|
|
8
8
|
import {AccessManagerCloneable} from "./AccessManagerCloneable.sol";
|
9
|
+
import {ContractLib} from "../shared/ContractLib.sol";
|
9
10
|
import {IAccessAdmin} from "./IAccessAdmin.sol";
|
10
11
|
import {RoleId, RoleIdLib, ADMIN_ROLE, PUBLIC_ROLE} from "../type/RoleId.sol";
|
11
12
|
import {Selector, SelectorLib, SelectorSetLib} from "../type/Selector.sol";
|
@@ -218,17 +219,18 @@ contract AccessAdmin is
|
|
218
219
|
selector.toBytes4()));
|
219
220
|
}
|
220
221
|
|
221
|
-
|
222
|
-
|
223
|
-
|
224
|
-
|
222
|
+
// TODO cleanup
|
223
|
+
// function isAccessManaged(address target) public view returns (bool) {
|
224
|
+
// if (!_isContract(target)) {
|
225
|
+
// return false;
|
226
|
+
// }
|
225
227
|
|
226
|
-
|
227
|
-
|
228
|
-
|
228
|
+
// (bool success, ) = target.staticcall(
|
229
|
+
// abi.encodeWithSelector(
|
230
|
+
// AccessManagedUpgradeable.authority.selector));
|
229
231
|
|
230
|
-
|
231
|
-
}
|
232
|
+
// return success;
|
233
|
+
// }
|
232
234
|
|
233
235
|
function canCall(address caller, address target, Selector selector) external virtual view returns (bool can) {
|
234
236
|
(can, ) = _authority.canCall(caller, target, selector.toBytes4());
|
@@ -546,7 +548,7 @@ contract AccessAdmin is
|
|
546
548
|
}
|
547
549
|
|
548
550
|
// check target is an access managed contract
|
549
|
-
if (!isAccessManaged(target)) {
|
551
|
+
if (!ContractLib.isAccessManaged(target)) {
|
550
552
|
revert ErrorTargetNotAccessManaged(target);
|
551
553
|
}
|
552
554
|
|
@@ -574,16 +576,17 @@ contract AccessAdmin is
|
|
574
576
|
emit LogTargetCreated(target, targetName);
|
575
577
|
}
|
576
578
|
|
577
|
-
|
578
|
-
|
579
|
-
|
580
|
-
|
581
|
-
|
582
|
-
|
583
|
-
|
584
|
-
|
585
|
-
|
586
|
-
|
587
|
-
|
579
|
+
// TODO cleanup
|
580
|
+
// function _isContract(address target)
|
581
|
+
// internal
|
582
|
+
// view
|
583
|
+
// returns (bool)
|
584
|
+
// {
|
585
|
+
// uint256 size;
|
586
|
+
// assembly {
|
587
|
+
// size := extcodesize(target)
|
588
|
+
// }
|
589
|
+
// return size > 0;
|
590
|
+
// }
|
588
591
|
|
589
592
|
}
|
@@ -131,6 +131,5 @@ interface IAccessAdmin is
|
|
131
131
|
|
132
132
|
function toRole(RoleId adminRoleId, RoleType roleType, uint32 maxMemberCount, string memory name) external view returns (RoleInfo memory);
|
133
133
|
function toFunction(bytes4 selector, string memory name) external view returns (FunctionInfo memory);
|
134
|
-
function isAccessManaged(address target) external view returns (bool);
|
135
134
|
function deployer() external view returns (address);
|
136
135
|
}
|
@@ -40,12 +40,12 @@ contract DistributionService is
|
|
40
40
|
virtual override
|
41
41
|
initializer()
|
42
42
|
{
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
_initializeService(registryAddress,
|
43
|
+
(
|
44
|
+
address registryAddress,
|
45
|
+
address authority
|
46
|
+
) = abi.decode(data, (address, address));
|
47
|
+
|
48
|
+
_initializeService(registryAddress, authority, owner);
|
49
49
|
|
50
50
|
_componentService = IComponentService(_getServiceAddress(COMPONENT()));
|
51
51
|
_instanceService = IInstanceService(_getServiceAddress(INSTANCE()));
|
@@ -12,15 +12,15 @@ contract DistributionServiceManager is ProxyManager {
|
|
12
12
|
/// @dev initializes proxy manager with distribution service implementation and deploys instance
|
13
13
|
constructor(
|
14
14
|
address authority,
|
15
|
-
address
|
15
|
+
address registry,
|
16
16
|
bytes32 salt
|
17
17
|
)
|
18
|
-
ProxyManager(registryAddress)
|
19
18
|
{
|
20
|
-
DistributionService
|
21
|
-
bytes memory data = abi.encode(
|
22
|
-
IVersionable versionable =
|
23
|
-
|
19
|
+
DistributionService svc = new DistributionService{salt: salt}();
|
20
|
+
bytes memory data = abi.encode(registry, authority);
|
21
|
+
IVersionable versionable = initialize(
|
22
|
+
registry,
|
23
|
+
address(svc),
|
24
24
|
data,
|
25
25
|
salt);
|
26
26
|
|
@@ -426,10 +426,9 @@ contract InstanceService is
|
|
426
426
|
initializer()
|
427
427
|
{
|
428
428
|
(
|
429
|
-
address registryAddress
|
430
|
-
//address managerAddress
|
429
|
+
address registryAddress,
|
431
430
|
address authority
|
432
|
-
) = abi.decode(data, (address, address
|
431
|
+
) = abi.decode(data, (address, address));
|
433
432
|
|
434
433
|
_initializeService(registryAddress, authority, owner);
|
435
434
|
|
@@ -12,16 +12,15 @@ contract InstanceServiceManager is ProxyManager {
|
|
12
12
|
/// @dev initializes proxy manager with instance service implementation
|
13
13
|
constructor(
|
14
14
|
address authority,
|
15
|
-
address
|
15
|
+
address registry,
|
16
16
|
bytes32 salt
|
17
17
|
)
|
18
|
-
ProxyManager(registryAddress)
|
19
18
|
{
|
20
|
-
InstanceService
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
address(
|
19
|
+
InstanceService svc = new InstanceService{salt: salt}();
|
20
|
+
bytes memory data = abi.encode(registry, authority);
|
21
|
+
IVersionable versionable = initialize(
|
22
|
+
registry,
|
23
|
+
address(svc),
|
25
24
|
data,
|
26
25
|
salt);
|
27
26
|
|