@etherisc/gif-next 0.0.2-cff6256-424 → 0.0.2-d10d6b3-916
Sign up to get free protection for your applications and to get access to all the features.
- package/README.md +43 -0
- package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +1 -1
- package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +1 -1
- package/artifacts/contracts/components/Distribution.sol/Distribution.json +10 -62
- package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +0 -52
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +28 -2
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
- package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
- package/artifacts/contracts/components/Pool.sol/Pool.json +42 -19
- package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/components/Product.sol/Product.json +18 -64
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.dbg.json +1 -1
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.dbg.json +1 -1
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.dbg.json +1 -1
- package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +1 -1
- package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +1 -1
- package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +1 -1
- package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +1 -1
- package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +1 -1
- package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +1 -1
- package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +1 -1
- package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +1 -1
- package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +1 -1
- package/artifacts/contracts/instance/AccessManagedSimple.sol/AccessManagedSimple.dbg.json +1 -1
- package/artifacts/contracts/instance/AccessManagerSimple.sol/AccessManagerSimple.dbg.json +1 -1
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +4 -0
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +775 -0
- package/artifacts/contracts/instance/Cloneable.sol/Cloneable.dbg.json +4 -0
- package/artifacts/contracts/instance/Cloneable.sol/Cloneable.json +185 -0
- package/artifacts/contracts/instance/IAccessManagerSimple.sol/IAccessManagerSimple.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.json +1347 -93
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +5 -0
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +176 -84
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +2 -2
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +177 -38
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +193 -50
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +70 -26
- package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +4 -0
- package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json +272 -0
- package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.json +59 -0
- package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +1 -1
- package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +1 -1
- package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
- 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/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/instance/module/ISetup.sol/ISetup.dbg.json +1 -1
- package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +16 -16
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +100 -25
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +30 -14
- package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +167 -0
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +40 -31
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +1049 -0
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +464 -0
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +1147 -0
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +488 -0
- 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/IRegistry.sol/IRegistry.json +2 -110
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +94 -0
- 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 +35 -146
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +76 -20
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +26 -34
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +12 -12
- package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +1 -1
- package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
- package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
- package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
- package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +2 -2
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +2 -2
- package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
- package/artifacts/contracts/shared/Registerable.sol/Registerable.json +2 -2
- package/artifacts/contracts/shared/RegisterableUpgradable.sol/RegisterableUpgradable.dbg.json +1 -1
- package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
- package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
- package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
- package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +1 -1
- package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
- package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +4 -4
- package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
- package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +2 -2
- package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
- package/artifacts/contracts/test/TestService.sol/TestService.json +9 -9
- package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +1 -1
- package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +1 -1
- package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +1 -1
- package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +1 -1
- package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +1 -1
- package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
- package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
- package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +1 -1
- package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +1 -1
- package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
- package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.json +26 -3
- package/artifacts/contracts/types/NumberId.sol/NumberIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
- package/artifacts/contracts/types/Referral.sol/ReferralLib.dbg.json +1 -1
- package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +2 -2
- package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
- package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +1 -1
- package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +1 -1
- package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
- package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
- package/contracts/components/Distribution.sol +12 -15
- package/contracts/components/IDistributionComponent.sol +0 -2
- package/contracts/components/IPoolComponent.sol +5 -1
- package/contracts/components/Pool.sol +35 -26
- package/contracts/components/Product.sol +33 -41
- package/contracts/instance/BundleManager.sol +129 -0
- package/contracts/instance/Cloneable.sol +46 -0
- package/contracts/instance/IInstance.sol +30 -7
- package/contracts/instance/IInstanceService.sol +3 -1
- package/contracts/instance/Instance.sol +26 -15
- package/contracts/instance/InstanceReader.sol +26 -1
- package/contracts/instance/InstanceService.sol +90 -16
- package/contracts/instance/InstanceServiceManager.sol +6 -5
- package/contracts/instance/ObjectManager.sol +95 -0
- package/contracts/instance/base/ComponentServiceBase.sol +96 -1
- package/contracts/instance/module/IBundle.sol +1 -0
- package/contracts/instance/module/ISetup.sol +3 -0
- package/contracts/instance/service/DistributionService.sol +12 -20
- package/contracts/instance/service/DistributionServiceManager.sol +6 -5
- package/contracts/instance/service/IPoolService.sol +16 -2
- package/contracts/instance/service/IProductService.sol +6 -3
- package/contracts/instance/service/PoolService.sol +287 -0
- package/contracts/instance/service/PoolServiceManager.sol +54 -0
- package/contracts/instance/service/ProductService.sol +570 -0
- package/contracts/instance/service/ProductServiceManager.sol +54 -0
- package/contracts/registry/IRegistry.sol +5 -18
- package/contracts/registry/IRegistryService.sol +28 -11
- package/contracts/registry/Registry.sol +4 -45
- package/contracts/registry/RegistryService.sol +30 -71
- package/contracts/shared/NftOwnable.sol +2 -4
- package/contracts/shared/Service.sol +1 -0
- package/contracts/types/NftIdSet.sol +26 -24
- package/contracts/types/RoleId.sol +2 -0
- package/package.json +1 -1
package/README.md
CHANGED
@@ -419,3 +419,46 @@ Distribution Service
|
|
419
419
|
- registered via registry service by registry owner
|
420
420
|
- registers distribution components for registered products via registry service by distribution owner (distribution owner role is permissend by the product's instance)
|
421
421
|
- registers distributors for registered distribution components via registry service
|
422
|
+
|
423
|
+
## Contract Organisation
|
424
|
+
|
425
|
+
now
|
426
|
+
|
427
|
+
contracts
|
428
|
+
components
|
429
|
+
instance
|
430
|
+
registry
|
431
|
+
shared
|
432
|
+
types
|
433
|
+
|
434
|
+
|
435
|
+
contracts
|
436
|
+
component
|
437
|
+
pool
|
438
|
+
Pool.sol
|
439
|
+
PoolService.sol
|
440
|
+
oracle
|
441
|
+
distribution
|
442
|
+
product
|
443
|
+
Product.sol
|
444
|
+
ProductService.sol
|
445
|
+
Component.sol
|
446
|
+
ComponentService.sol
|
447
|
+
instance
|
448
|
+
Instance.sol
|
449
|
+
InstanceAccessManager.sol
|
450
|
+
InstanceReader.sol
|
451
|
+
InstanceService.sol
|
452
|
+
InstanceServiceManager.sol
|
453
|
+
registry
|
454
|
+
ChainNft.sol
|
455
|
+
Registry.sol
|
456
|
+
RegistryService.sol
|
457
|
+
RegistryServiceManager.sol
|
458
|
+
shared
|
459
|
+
Registerable.sol
|
460
|
+
RegisterableUpgradable.sol
|
461
|
+
type
|
462
|
+
NftId.sol
|
463
|
+
ObjectType.sol
|
464
|
+
|
@@ -271,58 +271,6 @@
|
|
271
271
|
"stateMutability": "view",
|
272
272
|
"type": "function"
|
273
273
|
},
|
274
|
-
{
|
275
|
-
"inputs": [],
|
276
|
-
"name": "getInitialSetupInfo",
|
277
|
-
"outputs": [
|
278
|
-
{
|
279
|
-
"components": [
|
280
|
-
{
|
281
|
-
"internalType": "NftId",
|
282
|
-
"name": "productNftId",
|
283
|
-
"type": "uint96"
|
284
|
-
},
|
285
|
-
{
|
286
|
-
"internalType": "contract TokenHandler",
|
287
|
-
"name": "tokenHandler",
|
288
|
-
"type": "address"
|
289
|
-
},
|
290
|
-
{
|
291
|
-
"components": [
|
292
|
-
{
|
293
|
-
"internalType": "UFixed",
|
294
|
-
"name": "fractionalFee",
|
295
|
-
"type": "uint256"
|
296
|
-
},
|
297
|
-
{
|
298
|
-
"internalType": "uint256",
|
299
|
-
"name": "fixedFee",
|
300
|
-
"type": "uint256"
|
301
|
-
}
|
302
|
-
],
|
303
|
-
"internalType": "struct Fee",
|
304
|
-
"name": "distributionFee",
|
305
|
-
"type": "tuple"
|
306
|
-
},
|
307
|
-
{
|
308
|
-
"internalType": "bool",
|
309
|
-
"name": "isIntercepting",
|
310
|
-
"type": "bool"
|
311
|
-
},
|
312
|
-
{
|
313
|
-
"internalType": "address",
|
314
|
-
"name": "wallet",
|
315
|
-
"type": "address"
|
316
|
-
}
|
317
|
-
],
|
318
|
-
"internalType": "struct ISetup.DistributionSetupInfo",
|
319
|
-
"name": "setupInfo",
|
320
|
-
"type": "tuple"
|
321
|
-
}
|
322
|
-
],
|
323
|
-
"stateMutability": "view",
|
324
|
-
"type": "function"
|
325
|
-
},
|
326
274
|
{
|
327
275
|
"inputs": [],
|
328
276
|
"name": "getInstance",
|
@@ -613,14 +561,14 @@
|
|
613
561
|
"type": "function"
|
614
562
|
}
|
615
563
|
],
|
616
|
-
"bytecode": "0x60806040523480156200001157600080fd5b5060405162001e2438038062001e24833981016040819052620000349162000738565b85858560786001856200006d6301ffc9a760e01b600090815260205260008051602062001e04833981519152805460ff19166001179055565b600280546001600160a01b031916331790556040805160208101909152600081526200009e878786868686620003d7565b6000620000b36001546001600160a01b031690565b6040516305247a1760e51b81526001600160601b03891660048201526001600160a01b03919091169063a48f42e090602401600060405180830381865afa15801562000103573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526200012d9190810190620008a1565b6080810151600780546001600160a01b0319166001600160a01b0390921691821790556040516301ffc9a760e01b815263e72ac88960e01b6004820152919250906301ffc9a790602401602060405180830381865afa15801562000195573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620001bb919062000987565b620001e75760405162461bcd60e51b815260206004820152600060248201526044015b60405180910390fd5b600760009054906101000a90046001600160a01b03166001600160a01b0316636fa298536040518163ffffffff1660e01b8152600401602060405180830381865afa1580156200023b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620002619190620009ac565b600380546001600160a01b03199081166001600160a01b0393841617909155600580543090831617905560068054909116918816919091179055634c0cba3d60e11b60009081526020527f8605f84a1fdbc6ff75d8a06315d161884729b429561b502d19c5a33135142c3a805460ff191660011790555050600a805460ff19168a1515179055505085516008555050506020808401516009556007546040805163329802c760e21b815290516001600160a01b03909216935063ca600b1c9260048083019391928290030181865afa15801562000342573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620003689190620009ac565b600a80546001600160a01b039290921661010002610100600160a81b03199092169190911790556346956fbb60e01b60009081526020527fde8a87bec5ec8de928fbf3ef0018bfc89cfb626a8f5b139f23c48d93c5c755f4805460ff1916600117905550505050505062000b27565b620004086301ffc9a760e01b600090815260205260008051602062001e04833981519152805460ff19166001179055565b620004148287620004d9565b60007f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30080546001600160601b0388166001600160681b0319909116176c0100000000000000000000000060ff8816021760ff60681b19166d01000000000000000000000000008615150217815590506001810162000493838262000a5b565b506303fb044760e21b60009081526020527fb43e4f3791bfcdefa3a0fbe2a5555f8d6490b90e01de0ff40c66f18b49b562c5805460ff1916600117905550505050505050565b600280546001600160a01b0319166001600160a01b038416179055620004ff8162000503565b5050565b6001546001600160a01b0316156200053e5760015460405163fcdbf2d960e01b81526001600160a01b039091166004820152602401620001de565b6001600160a01b038116620005665760405163f5c4d07d60e01b815260040160405180910390fd5b806001600160a01b03163b6000036200059e5760405163fdeac91f60e01b81526001600160a01b0382166004820152602401620001de565b600180546001600160a01b0319166001600160a01b0383169081179091556040516301ffc9a760e01b815263e14a543960e01b60048201526301ffc9a790602401602060405180830381865afa9250505080156200061b575060408051601f3d908101601f19168201909252620006189181019062000987565b60015b620006455760405163fdeac91f60e01b81526001600160a01b0382166004820152602401620001de565b80620004ff5760405163fdeac91f60e01b81526001600160a01b0383166004820152602401620001de565b50565b6001600160a01b03811681146200067057600080fd5b8051620006968162000673565b919050565b80516001600160601b03811681146200069657600080fd5b805180151581146200069657600080fd5b634e487b7160e01b600052604160045260246000fd5b60405160e081016001600160401b0381118282101715620006ff57620006ff620006c4565b60405290565b604051601f8201601f191681016001600160401b0381118282101715620007305762000730620006c4565b604052919050565b60008060008060008086880360e08112156200075357600080fd5b8751620007608162000673565b965062000770602089016200069b565b95506040880151620007828162000673565b94506200079260608901620006b3565b93506040607f1982011215620007a757600080fd5b50604080519081016001600160401b0381118282101715620007cd57620007cd620006c4565b6040526080880151815260a0880151602082015260c0880151909250620007f48162000673565b809150509295509295509295565b805160ff811681146200069657600080fd5b600082601f8301126200082657600080fd5b81516001600160401b03811115620008425762000842620006c4565b602062000858601f8301601f1916820162000705565b82815285828487010111156200086d57600080fd5b60005b838110156200088d57858101830151828201840152820162000870565b506000928101909101919091529392505050565b600060208284031215620008b457600080fd5b81516001600160401b0380821115620008cc57600080fd5b9083019060e08286031215620008e157600080fd5b620008eb620006da565b620008f6836200069b565b815262000906602084016200069b565b6020820152620009196040840162000802565b60408201526200092c60608401620006b3565b60608201526200093f6080840162000689565b60808201526200095260a0840162000689565b60a082015260c0830151828111156200096a57600080fd5b620009788782860162000814565b60c08301525095945050505050565b6000602082840312156200099a57600080fd5b620009a582620006b3565b9392505050565b600060208284031215620009bf57600080fd5b8151620009a58162000673565b600181811c90821680620009e157607f821691505b60208210810362000a0257634e487b7160e01b600052602260045260246000fd5b50919050565b601f82111562000a5657600081815260208120601f850160051c8101602086101562000a315750805b601f850160051c820191505b8181101562000a525782815560010162000a3d565b5050505b505050565b81516001600160401b0381111562000a775762000a77620006c4565b62000a8f8162000a888454620009cc565b8462000a08565b602080601f83116001811462000ac7576000841562000aae5750858301515b600019600386901b1c1916600185901b17855562000a52565b600085815260208120601f198616915b8281101562000af85788860151825594840194600190910190840162000ad7565b508582101562000b175787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b6112cd8062000b376000396000f3fe608060405234801561001057600080fd5b506004361061014c5760003560e01c8063644c45e0116100c3578063d16d0fe81161007c578063d16d0fe814610336578063de7b5d1414610349578063e21475671461035a578063f7d39dea1461036e578063f80e207214610270578063f83d08ba1461038157600080fd5b8063644c45e01461029457806387ef9ba0146102ac578063893d20e8146102b75780638e7ff97e146102bf578063a69df4b514610326578063c200b8091461032e57600080fd5b80631eff4b22116101155780631eff4b221461020457806321df0da7146102395780632a65c6881461024a5780633f52c0f61461025d5780634cf30a84146102705780635ab1bd531461028357600080fd5b806251884a1461015157806301ffc9a7146101825780630fec111c146101bf57806313299604146101d5578063138461e0146101fa575b600080fd5b600754600160a01b90046001600160601b03165b6040516001600160601b0390911681526020015b60405180910390f35b6101af610190366004610e96565b6001600160e01b03191660009081526020819052604090205460ff1690565b6040519015158152602001610179565b6101c7610389565b604051610179929190610f0d565b6005546001600160a01b03165b6040516001600160a01b039091168152602001610179565b610202610410565b005b61022b7f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30081565b604051908152602001610179565b6006546001600160a01b03166101e2565b610202610258366004610fcc565b610632565b61020261026b366004611020565b610794565b61020261027e36600461106f565b6107fd565b6001546001600160a01b03166101e2565b600154600160a01b90046001600160601b0316610165565b600a5460ff166101af565b6101e2610865565b6102c7610983565b6040805182516001600160601b031681526020808401516001600160a01b0390811682840152848401518051948401949094529201516060808301919091528301511515608080830191909152909201511660a082015260c001610179565b6102026109f4565b6102c7610a71565b61022b61034436600461106f565b610b80565b6007546001600160a01b03166101e2565b6101af610368366004611099565b50600090565b61022b61037c36600461106f565b610b95565b610202610c37565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a0820183905260c082018190529091806103cd610cb4565b50600a546040805160085460208201526009548183015260ff90921615156060808401919091528151808403909101815260809092019052909590945092505050565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015273__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af4158015610472573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061049691906110c4565b156104dd576001546040516316322c0f60e31b81526001600160a01b0382166004820152600160a01b9091046001600160601b031660248201526044015b60405180910390fd5b6001546001600160a01b03166105065760405163cf29926160e01b815260040160405180910390fd5b60015460405163c3c5a54760e01b81523060048201819052916001600160a01b03169063c3c5a54790602401602060405180830381865afa15801561054f573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061057391906110c4565b61059b576040516372657a5160e01b81526001600160a01b03821660048201526024016104d4565b600154604051636939560f60e11b81526001600160a01b0383811660048301529091169063d272ac1e90602401602060405180830381865afa1580156105e5573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061060991906110df565b600160146101000a8154816001600160601b0302191690836001600160601b0316021790555050565b600061063c610865565b90506001600160a01b0381161580159061065f5750336001600160a01b03821614155b1561067f5760405163700dd81160e01b81523360048201526024016104d4565b60075473__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__9063c4cade9d90600160a01b90046001600160601b031660006040516001600160e01b031960e085901b1681526001600160601b03928316600482015291166024820152604401602060405180830381865af41580156106fb573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061071f91906110c4565b61076b5760405162461bcd60e51b815260206004820152601a60248201527f70726f64756374206e667420696420616c72656164792073657400000000000060448201526064016104d4565b50600780546001600160601b03909216600160a01b026001600160a01b03909216919091179055565b600a54604051631fa9607b60e11b81526101009091046001600160a01b031690633f52c0f6906107c89084906004016110fc565b600060405180830381600087803b1580156107e257600080fd5b505af11580156107f6573d6000803e3d6000fd5b5050505050565b600b546001600160a01b031633146108615760405162461bcd60e51b815260206004820152602160248201527f4552524f523a504f4c2d3030323a4e4f545f50524f445543545f5345525649436044820152604560f81b60648201526084016104d4565b5050565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015260009073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af41580156108ca573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108ee91906110c4565b1561097357600154604051631c5da14d60e11b8152600160a01b82046001600160601b031660048201526001600160a01b03909116906338bb429a90602401602060405180830381865afa15801561094a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061096e9190611133565b905090565b506002546001600160a01b031690565b61098b610e3a565b506040805160a081018252600754600160a01b90046001600160601b031681526006546001600160a01b03166020808301919091528251808401845260085481526009549181019190915291810191909152600a5460ff16151560608201526000608082015290565b60006109fe610865565b90506001600160a01b03811615801590610a215750336001600160a01b03821614155b15610a415760405163700dd81160e01b81523360048201526024016104d4565b600354604051630bdb124f60e21b81523060048201526001600160a01b0390911690632f6c493c906024016107c8565b610a79610e3a565b600754604080516302cd307160e01b815290516000926001600160a01b0316916302cd30719160048083019260209291908290030181865afa158015610ac3573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ae79190611133565b9050806001600160a01b0316639ad69c67610b126001546001600160601b03600160a01b9091041690565b6040516001600160e01b031960e084901b1681526001600160601b03909116600482015260240160c060405180830381865afa158015610b56573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b7a9190611150565b91505090565b6000610b8c8282611214565b90505b92915050565b600080610ba0610a71565b604081810151905163012ebd8360e21b81528151600482015260208201516024820152604481018690529192509073__$a23651848365a6a5ca15f07b4331037f48$__906304baf60c906064016040805180830381865af4158015610c09573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c2d9190611239565b5095945050505050565b6000610c41610865565b90506001600160a01b03811615801590610c645750336001600160a01b03821614155b15610c845760405163700dd81160e01b81523360048201526024016104d4565b60035460405163f435f5a760e01b81523060048201526001600160a01b039091169063f435f5a7906024016107c8565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a082019290925260c0810191909152606060007f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30090506040518060e00160405280610d3b6001546001600160601b03600160a01b9091041690565b6001600160601b0390811682528354908116602083015260ff600160601b820481166040840152600160681b909104161515606082015230608082015260a001610d83610865565b6001600160a01b03168152602001826001018054610da09061125d565b80601f0160208091040260200160405190810160405280929190818152602001828054610dcc9061125d565b8015610e195780601f10610dee57610100808354040283529160200191610e19565b820191906000526020600020905b815481529060010190602001808311610dfc57829003601f168201915b50505050508152506040518060200160405280600081525092509250509091565b6040518060a0016040528060006001600160601b0316815260200160006001600160a01b03168152602001610e82604051806040016040528060008152602001600081525090565b815260006020820181905260409091015290565b600060208284031215610ea857600080fd5b81356001600160e01b031981168114610ec057600080fd5b9392505050565b6000815180845260005b81811015610eed57602081850181015186830182015201610ed1565b506000602082860101526020601f19601f83011685010191505092915050565b6040815260006001600160601b038085511660408401528060208601511660608401525060ff60408501511660808301526060840151610f5160a084018215159052565b5060808401516001600160a01b03811660c08401525060a08401516001600160a01b03811660e08401525060c084015160e0610100840152610f97610120840182610ec7565b90508281036020840152610fab8185610ec7565b95945050505050565b6001600160601b0381168114610fc957600080fd5b50565b600060208284031215610fde57600080fd5b8135610ec081610fb4565b6040805190810167ffffffffffffffff8111828210171561101a57634e487b7160e01b600052604160045260246000fd5b60405290565b60006040828403121561103257600080fd5b61103a610fe9565b82358152602083013560208201528091505092915050565b80356001600160c01b03198116811461106a57600080fd5b919050565b6000806040838503121561108257600080fd5b61108b83611052565b946020939093013593505050565b6000602082840312156110ab57600080fd5b610b8c82611052565b8051801515811461106a57600080fd5b6000602082840312156110d657600080fd5b610b8c826110b4565b6000602082840312156110f157600080fd5b8151610ec081610fb4565b815181526020808301519082015260408101610b8f565b6001600160a01b0381168114610fc957600080fd5b805161106a81611113565b60006020828403121561114557600080fd5b8151610ec081611113565b600081830360c081121561116357600080fd5b60405160a0810181811067ffffffffffffffff8211171561119457634e487b7160e01b600052604160045260246000fd5b60405283516111a281610fb4565b815260208401516111b281611113565b60208201526040603f19830112156111c957600080fd5b6111d1610fe9565b915060408401518252606084015160208301528160408201526111f6608085016110b4565b606082015261120760a08501611128565b6080820152949350505050565b8082028115828204841417610b8f57634e487b7160e01b600052601160045260246000fd5b6000806040838503121561124c57600080fd5b505080516020909101519092909150565b600181811c9082168061127157607f821691505b60208210810361129157634e487b7160e01b600052602260045260246000fd5b5091905056fea264697066735822122033711810d8ccde6a74d8981e3945070d75c21c78d55d61eee38e75d49aa9baac64736f6c6343000814003367be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5",
|
617
|
-
"deployedBytecode": "
|
564
|
+
"bytecode": "0x60806040523480156200001157600080fd5b5060405162001ed738038062001ed7833981016040819052620000349162000824565b85858560786001856200006d6301ffc9a760e01b600090815260205260008051602062001eb7833981519152805460ff19166001179055565b600280546001600160a01b031916331790556040805160208101909152600081526200009e8787868686866200046b565b6000620000b36001546001600160a01b031690565b6040516305247a1760e51b81526001600160601b03891660048201526001600160a01b03919091169063a48f42e090602401600060405180830381865afa15801562000103573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526200012d91908101906200098d565b6080810151600780546001600160a01b0319166001600160a01b0390921691821790556040516301ffc9a760e01b815263cb92195b60e01b6004820152919250906301ffc9a790602401602060405180830381865afa15801562000195573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620001bb919062000a73565b620001e75760405162461bcd60e51b815260206004820152600060248201526044015b60405180910390fd5b600760009054906101000a90046001600160a01b03166001600160a01b0316636fa298536040518163ffffffff1660e01b8152600401602060405180830381865afa1580156200023b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019062000261919062000a98565b600380546001600160a01b039283166001600160a01b031991821617909155600580548216301790556006805498831698909116979097179096555050634c0cba3d60e11b600090815260209081527f8605f84a1fdbc6ff75d8a06315d161884729b429561b502d19c5a33135142c3a805460ff19166001179055600a80548a516008558a8301516009556001600160a81b0319168b1515610100600160a81b031916176101008d8816021790556007546040805163329802c760e21b8152905191909616975063ca600b1c96506004808701969295509093509083900301905081865afa15801562000358573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200037e919062000a98565b600b80546001600160a01b0319166001600160a01b0392831617905560075460408051634288121d60e01b815290519190921691634288121d9160048083019260209291908290030181865afa158015620003dd573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019062000403919062000a98565b600c80546001600160a01b0319166001600160a01b039290921691909117905563c8ea96c560e01b60009081526020527f358bf83baf6613c2def0011c88aae44093f6c2a350167255c9453fdf96405794805460ff1916600117905550505050505062000c13565b6200049c6301ffc9a760e01b600090815260205260008051602062001eb7833981519152805460ff19166001179055565b620004a882876200056d565b60007f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30080546001600160601b0388166001600160681b0319909116176c0100000000000000000000000060ff8816021760ff60681b19166d01000000000000000000000000008615150217815590506001810162000527838262000b47565b506303fb044760e21b60009081526020527fb43e4f3791bfcdefa3a0fbe2a5555f8d6490b90e01de0ff40c66f18b49b562c5805460ff1916600117905550505050505050565b6001600160a01b038216620005c55760405162461bcd60e51b815260206004820152601e60248201527f4e66744f776e61626c653a20696e697469616c206f776e6572206973203000006044820152606401620001de565b600280546001600160a01b0319166001600160a01b038416179055620005eb81620005ef565b5050565b6001546001600160a01b0316156200062a5760015460405163fcdbf2d960e01b81526001600160a01b039091166004820152602401620001de565b6001600160a01b038116620006525760405163f5c4d07d60e01b815260040160405180910390fd5b806001600160a01b03163b6000036200068a5760405163fdeac91f60e01b81526001600160a01b0382166004820152602401620001de565b600180546001600160a01b0319166001600160a01b0383169081179091556040516301ffc9a760e01b8152632eaf856d60e11b60048201526301ffc9a790602401602060405180830381865afa92505050801562000707575060408051601f3d908101601f19168201909252620007049181019062000a73565b60015b620007315760405163fdeac91f60e01b81526001600160a01b0382166004820152602401620001de565b80620005eb5760405163fdeac91f60e01b81526001600160a01b0383166004820152602401620001de565b50565b6001600160a01b03811681146200075c57600080fd5b805162000782816200075f565b919050565b80516001600160601b03811681146200078257600080fd5b805180151581146200078257600080fd5b634e487b7160e01b600052604160045260246000fd5b60405160e081016001600160401b0381118282101715620007eb57620007eb620007b0565b60405290565b604051601f8201601f191681016001600160401b03811182821017156200081c576200081c620007b0565b604052919050565b60008060008060008086880360e08112156200083f57600080fd5b87516200084c816200075f565b96506200085c6020890162000787565b955060408801516200086e816200075f565b94506200087e606089016200079f565b93506040607f19820112156200089357600080fd5b50604080519081016001600160401b0381118282101715620008b957620008b9620007b0565b6040526080880151815260a0880151602082015260c0880151909250620008e0816200075f565b809150509295509295509295565b805160ff811681146200078257600080fd5b600082601f8301126200091257600080fd5b81516001600160401b038111156200092e576200092e620007b0565b602062000944601f8301601f19168201620007f1565b82815285828487010111156200095957600080fd5b60005b83811015620009795785810183015182820184015282016200095c565b506000928101909101919091529392505050565b600060208284031215620009a057600080fd5b81516001600160401b0380821115620009b857600080fd5b9083019060e08286031215620009cd57600080fd5b620009d7620007c6565b620009e28362000787565b8152620009f26020840162000787565b602082015262000a0560408401620008ee565b604082015262000a18606084016200079f565b606082015262000a2b6080840162000775565b608082015262000a3e60a0840162000775565b60a082015260c08301518281111562000a5657600080fd5b62000a648782860162000900565b60c08301525095945050505050565b60006020828403121562000a8657600080fd5b62000a91826200079f565b9392505050565b60006020828403121562000aab57600080fd5b815162000a91816200075f565b600181811c9082168062000acd57607f821691505b60208210810362000aee57634e487b7160e01b600052602260045260246000fd5b50919050565b601f82111562000b4257600081815260208120601f850160051c8101602086101562000b1d5750805b601f850160051c820191505b8181101562000b3e5782815560010162000b29565b5050505b505050565b81516001600160401b0381111562000b635762000b63620007b0565b62000b7b8162000b74845462000ab8565b8462000af4565b602080601f83116001811462000bb3576000841562000b9a5750858301515b600019600386901b1c1916600185901b17855562000b3e565b600085815260208120601f198616915b8281101562000be45788860151825594840194600190910190840162000bc3565b508582101562000c035787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b6112948062000c236000396000f3fe608060405234801561001057600080fd5b50600436106101415760003560e01c8063644c45e0116100b8578063d16d0fe81161007c578063d16d0fe8146102d1578063de7b5d14146102e4578063e2147567146102f5578063f7d39dea14610309578063f80e207214610265578063f83d08ba1461031c57600080fd5b8063644c45e01461028957806387ef9ba0146102a1578063893d20e8146102ac578063a69df4b5146102b4578063c200b809146102bc57600080fd5b80631eff4b221161010a5780631eff4b22146101f957806321df0da71461022e5780632a65c6881461023f5780633f52c0f6146102525780634cf30a84146102655780635ab1bd531461027857600080fd5b806251884a1461014657806301ffc9a7146101775780630fec111c146101b457806313299604146101ca578063138461e0146101ef575b600080fd5b600754600160a01b90046001600160601b03165b6040516001600160601b0390911681526020015b60405180910390f35b6101a4610185366004610dfd565b6001600160e01b03191660009081526020819052604090205460ff1690565b604051901515815260200161016e565b6101bc610324565b60405161016e929190610e74565b6005546001600160a01b03165b6040516001600160a01b03909116815260200161016e565b6101f76103f3565b005b6102207f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30081565b60405190815260200161016e565b6006546001600160a01b03166101d7565b6101f761024d366004610f33565b610615565b6101f7610260366004610f87565b610764565b6101f7610273366004610fd6565b6107c9565b6001546001600160a01b03166101d7565b600154600160a01b90046001600160601b031661015a565b600a5460ff166101a4565b6101d7610831565b6101f761094f565b6102c46109ea565b60405161016e9190611000565b6102206102df366004610fd6565b610af9565b6007546001600160a01b03166101d7565b6101a4610303366004611060565b50600090565b610220610317366004610fd6565b610b0e565b6101f7610bb0565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a0820183905260c082018190529091610367610c1b565b506040805160a081018252600754600160a01b90046001600160601b03168152600a5461010081046001600160a01b0316602080840191909152835180850185526008548152600954818301528385015260ff90911615156060830152306080830152915192935083926103db9201611000565b60405160208183030381529060405292509250509091565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015273__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af4158015610455573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610479919061108b565b156104c0576001546040516316322c0f60e31b81526001600160a01b0382166004820152600160a01b9091046001600160601b031660248201526044015b60405180910390fd5b6001546001600160a01b03166104e95760405163cf29926160e01b815260040160405180910390fd5b60015460405163c3c5a54760e01b81523060048201819052916001600160a01b03169063c3c5a54790602401602060405180830381865afa158015610532573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610556919061108b565b61057e576040516372657a5160e01b81526001600160a01b03821660048201526024016104b7565b600154604051636939560f60e11b81526001600160a01b0383811660048301529091169063d272ac1e90602401602060405180830381865afa1580156105c8573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105ec91906110a6565b600160146101000a8154816001600160601b0302191690836001600160601b0316021790555050565b61061d610831565b6001600160a01b0316336001600160a01b0316146106505760405163700dd81160e01b81523360048201526024016104b7565b60075473__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__9063c4cade9d90600160a01b90046001600160601b031660006040516001600160e01b031960e085901b1681526001600160601b03928316600482015291166024820152604401602060405180830381865af41580156106cc573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106f0919061108b565b61073c5760405162461bcd60e51b815260206004820152601a60248201527f70726f64756374206e667420696420616c72656164792073657400000000000060448201526064016104b7565b600780546001600160601b03909216600160a01b026001600160a01b03909216919091179055565b600b54604051631fa9607b60e11b81526001600160a01b0390911690633f52c0f6906107949084906004016110c3565b600060405180830381600087803b1580156107ae57600080fd5b505af11580156107c2573d6000803e3d6000fd5b5050505050565b600c546001600160a01b0316331461082d5760405162461bcd60e51b815260206004820152602160248201527f4552524f523a504f4c2d3030323a4e4f545f50524f445543545f5345525649436044820152604560f81b60648201526084016104b7565b5050565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015260009073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af4158015610896573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108ba919061108b565b1561093f57600154604051631c5da14d60e11b8152600160a01b82046001600160601b031660048201526001600160a01b03909116906338bb429a90602401602060405180830381865afa158015610916573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061093a91906110fa565b905090565b506002546001600160a01b031690565b610957610831565b6001600160a01b0316336001600160a01b03161461098a5760405163700dd81160e01b81523360048201526024016104b7565b600354604051630bdb124f60e21b81523060048201526001600160a01b0390911690632f6c493c906024015b600060405180830381600087803b1580156109d057600080fd5b505af11580156109e4573d6000803e3d6000fd5b50505050565b6109f2610da1565b600754604080516302cd307160e01b815290516000926001600160a01b0316916302cd30719160048083019260209291908290030181865afa158015610a3c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a6091906110fa565b9050806001600160a01b0316639ad69c67610a8b6001546001600160601b03600160a01b9091041690565b6040516001600160e01b031960e084901b1681526001600160601b03909116600482015260240160c060405180830381865afa158015610acf573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610af39190611117565b91505090565b6000610b0582826111db565b90505b92915050565b600080610b196109ea565b604081810151905163012ebd8360e21b81528151600482015260208201516024820152604481018690529192509073__$a23651848365a6a5ca15f07b4331037f48$__906304baf60c906064016040805180830381865af4158015610b82573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ba69190611200565b5095945050505050565b610bb8610831565b6001600160a01b0316336001600160a01b031614610beb5760405163700dd81160e01b81523360048201526024016104b7565b60035460405163f435f5a760e01b81523060048201526001600160a01b039091169063f435f5a7906024016109b6565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a082019290925260c0810191909152606060007f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30090506040518060e00160405280610ca26001546001600160601b03600160a01b9091041690565b6001600160601b0390811682528354908116602083015260ff600160601b820481166040840152600160681b909104161515606082015230608082015260a001610cea610831565b6001600160a01b03168152602001826001018054610d0790611224565b80601f0160208091040260200160405190810160405280929190818152602001828054610d3390611224565b8015610d805780601f10610d5557610100808354040283529160200191610d80565b820191906000526020600020905b815481529060010190602001808311610d6357829003601f168201915b50505050508152506040518060200160405280600081525092509250509091565b6040518060a0016040528060006001600160601b0316815260200160006001600160a01b03168152602001610de9604051806040016040528060008152602001600081525090565b815260006020820181905260409091015290565b600060208284031215610e0f57600080fd5b81356001600160e01b031981168114610e2757600080fd5b9392505050565b6000815180845260005b81811015610e5457602081850181015186830182015201610e38565b506000602082860101526020601f19601f83011685010191505092915050565b6040815260006001600160601b038085511660408401528060208601511660608401525060ff60408501511660808301526060840151610eb860a084018215159052565b5060808401516001600160a01b03811660c08401525060a08401516001600160a01b03811660e08401525060c084015160e0610100840152610efe610120840182610e2e565b90508281036020840152610f128185610e2e565b95945050505050565b6001600160601b0381168114610f3057600080fd5b50565b600060208284031215610f4557600080fd5b8135610e2781610f1b565b6040805190810167ffffffffffffffff81118282101715610f8157634e487b7160e01b600052604160045260246000fd5b60405290565b600060408284031215610f9957600080fd5b610fa1610f50565b82358152602083013560208201528091505092915050565b80356001600160c01b031981168114610fd157600080fd5b919050565b60008060408385031215610fe957600080fd5b610ff283610fb9565b946020939093013593505050565b81516001600160601b031681526020808301516001600160a01b039081168284015260408085015180519185019190915291820151606084015260c0830191906060850151151560808501528060808601511660a0850152505092915050565b60006020828403121561107257600080fd5b610b0582610fb9565b80518015158114610fd157600080fd5b60006020828403121561109d57600080fd5b610b058261107b565b6000602082840312156110b857600080fd5b8151610e2781610f1b565b815181526020808301519082015260408101610b08565b6001600160a01b0381168114610f3057600080fd5b8051610fd1816110da565b60006020828403121561110c57600080fd5b8151610e27816110da565b600081830360c081121561112a57600080fd5b60405160a0810181811067ffffffffffffffff8211171561115b57634e487b7160e01b600052604160045260246000fd5b604052835161116981610f1b565b81526020840151611179816110da565b60208201526040603f198301121561119057600080fd5b611198610f50565b915060408401518252606084015160208301528160408201526111bd6080850161107b565b60608201526111ce60a085016110ef565b6080820152949350505050565b8082028115828204841417610b0857634e487b7160e01b600052601160045260246000fd5b6000806040838503121561121357600080fd5b505080516020909101519092909150565b600181811c9082168061123857607f821691505b60208210810361125857634e487b7160e01b600052602260045260246000fd5b5091905056fea26469706673582212200a13b48176f03c2e9d808074ac411a1fca483569c4e94547be184374001ef6c964736f6c6343000814003367be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5",
|
565
|
+
"deployedBytecode": "0x608060405234801561001057600080fd5b50600436106101415760003560e01c8063644c45e0116100b8578063d16d0fe81161007c578063d16d0fe8146102d1578063de7b5d14146102e4578063e2147567146102f5578063f7d39dea14610309578063f80e207214610265578063f83d08ba1461031c57600080fd5b8063644c45e01461028957806387ef9ba0146102a1578063893d20e8146102ac578063a69df4b5146102b4578063c200b809146102bc57600080fd5b80631eff4b221161010a5780631eff4b22146101f957806321df0da71461022e5780632a65c6881461023f5780633f52c0f6146102525780634cf30a84146102655780635ab1bd531461027857600080fd5b806251884a1461014657806301ffc9a7146101775780630fec111c146101b457806313299604146101ca578063138461e0146101ef575b600080fd5b600754600160a01b90046001600160601b03165b6040516001600160601b0390911681526020015b60405180910390f35b6101a4610185366004610dfd565b6001600160e01b03191660009081526020819052604090205460ff1690565b604051901515815260200161016e565b6101bc610324565b60405161016e929190610e74565b6005546001600160a01b03165b6040516001600160a01b03909116815260200161016e565b6101f76103f3565b005b6102207f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30081565b60405190815260200161016e565b6006546001600160a01b03166101d7565b6101f761024d366004610f33565b610615565b6101f7610260366004610f87565b610764565b6101f7610273366004610fd6565b6107c9565b6001546001600160a01b03166101d7565b600154600160a01b90046001600160601b031661015a565b600a5460ff166101a4565b6101d7610831565b6101f761094f565b6102c46109ea565b60405161016e9190611000565b6102206102df366004610fd6565b610af9565b6007546001600160a01b03166101d7565b6101a4610303366004611060565b50600090565b610220610317366004610fd6565b610b0e565b6101f7610bb0565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a0820183905260c082018190529091610367610c1b565b506040805160a081018252600754600160a01b90046001600160601b03168152600a5461010081046001600160a01b0316602080840191909152835180850185526008548152600954818301528385015260ff90911615156060830152306080830152915192935083926103db9201611000565b60405160208183030381529060405292509250509091565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015273__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af4158015610455573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610479919061108b565b156104c0576001546040516316322c0f60e31b81526001600160a01b0382166004820152600160a01b9091046001600160601b031660248201526044015b60405180910390fd5b6001546001600160a01b03166104e95760405163cf29926160e01b815260040160405180910390fd5b60015460405163c3c5a54760e01b81523060048201819052916001600160a01b03169063c3c5a54790602401602060405180830381865afa158015610532573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610556919061108b565b61057e576040516372657a5160e01b81526001600160a01b03821660048201526024016104b7565b600154604051636939560f60e11b81526001600160a01b0383811660048301529091169063d272ac1e90602401602060405180830381865afa1580156105c8573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105ec91906110a6565b600160146101000a8154816001600160601b0302191690836001600160601b0316021790555050565b61061d610831565b6001600160a01b0316336001600160a01b0316146106505760405163700dd81160e01b81523360048201526024016104b7565b60075473__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__9063c4cade9d90600160a01b90046001600160601b031660006040516001600160e01b031960e085901b1681526001600160601b03928316600482015291166024820152604401602060405180830381865af41580156106cc573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106f0919061108b565b61073c5760405162461bcd60e51b815260206004820152601a60248201527f70726f64756374206e667420696420616c72656164792073657400000000000060448201526064016104b7565b600780546001600160601b03909216600160a01b026001600160a01b03909216919091179055565b600b54604051631fa9607b60e11b81526001600160a01b0390911690633f52c0f6906107949084906004016110c3565b600060405180830381600087803b1580156107ae57600080fd5b505af11580156107c2573d6000803e3d6000fd5b5050505050565b600c546001600160a01b0316331461082d5760405162461bcd60e51b815260206004820152602160248201527f4552524f523a504f4c2d3030323a4e4f545f50524f445543545f5345525649436044820152604560f81b60648201526084016104b7565b5050565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015260009073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af4158015610896573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108ba919061108b565b1561093f57600154604051631c5da14d60e11b8152600160a01b82046001600160601b031660048201526001600160a01b03909116906338bb429a90602401602060405180830381865afa158015610916573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061093a91906110fa565b905090565b506002546001600160a01b031690565b610957610831565b6001600160a01b0316336001600160a01b03161461098a5760405163700dd81160e01b81523360048201526024016104b7565b600354604051630bdb124f60e21b81523060048201526001600160a01b0390911690632f6c493c906024015b600060405180830381600087803b1580156109d057600080fd5b505af11580156109e4573d6000803e3d6000fd5b50505050565b6109f2610da1565b600754604080516302cd307160e01b815290516000926001600160a01b0316916302cd30719160048083019260209291908290030181865afa158015610a3c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a6091906110fa565b9050806001600160a01b0316639ad69c67610a8b6001546001600160601b03600160a01b9091041690565b6040516001600160e01b031960e084901b1681526001600160601b03909116600482015260240160c060405180830381865afa158015610acf573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610af39190611117565b91505090565b6000610b0582826111db565b90505b92915050565b600080610b196109ea565b604081810151905163012ebd8360e21b81528151600482015260208201516024820152604481018690529192509073__$a23651848365a6a5ca15f07b4331037f48$__906304baf60c906064016040805180830381865af4158015610b82573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ba69190611200565b5095945050505050565b610bb8610831565b6001600160a01b0316336001600160a01b031614610beb5760405163700dd81160e01b81523360048201526024016104b7565b60035460405163f435f5a760e01b81523060048201526001600160a01b039091169063f435f5a7906024016109b6565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a082019290925260c0810191909152606060007f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30090506040518060e00160405280610ca26001546001600160601b03600160a01b9091041690565b6001600160601b0390811682528354908116602083015260ff600160601b820481166040840152600160681b909104161515606082015230608082015260a001610cea610831565b6001600160a01b03168152602001826001018054610d0790611224565b80601f0160208091040260200160405190810160405280929190818152602001828054610d3390611224565b8015610d805780601f10610d5557610100808354040283529160200191610d80565b820191906000526020600020905b815481529060010190602001808311610d6357829003601f168201915b50505050508152506040518060200160405280600081525092509250509091565b6040518060a0016040528060006001600160601b0316815260200160006001600160a01b03168152602001610de9604051806040016040528060008152602001600081525090565b815260006020820181905260409091015290565b600060208284031215610e0f57600080fd5b81356001600160e01b031981168114610e2757600080fd5b9392505050565b6000815180845260005b81811015610e5457602081850181015186830182015201610e38565b506000602082860101526020601f19601f83011685010191505092915050565b6040815260006001600160601b038085511660408401528060208601511660608401525060ff60408501511660808301526060840151610eb860a084018215159052565b5060808401516001600160a01b03811660c08401525060a08401516001600160a01b03811660e08401525060c084015160e0610100840152610efe610120840182610e2e565b90508281036020840152610f128185610e2e565b95945050505050565b6001600160601b0381168114610f3057600080fd5b50565b600060208284031215610f4557600080fd5b8135610e2781610f1b565b6040805190810167ffffffffffffffff81118282101715610f8157634e487b7160e01b600052604160045260246000fd5b60405290565b600060408284031215610f9957600080fd5b610fa1610f50565b82358152602083013560208201528091505092915050565b80356001600160c01b031981168114610fd157600080fd5b919050565b60008060408385031215610fe957600080fd5b610ff283610fb9565b946020939093013593505050565b81516001600160601b031681526020808301516001600160a01b039081168284015260408085015180519185019190915291820151606084015260c0830191906060850151151560808501528060808601511660a0850152505092915050565b60006020828403121561107257600080fd5b610b0582610fb9565b80518015158114610fd157600080fd5b60006020828403121561109d57600080fd5b610b058261107b565b6000602082840312156110b857600080fd5b8151610e2781610f1b565b815181526020808301519082015260408101610b08565b6001600160a01b0381168114610f3057600080fd5b8051610fd1816110da565b60006020828403121561110c57600080fd5b8151610e27816110da565b600081830360c081121561112a57600080fd5b60405160a0810181811067ffffffffffffffff8211171561115b57634e487b7160e01b600052604160045260246000fd5b604052835161116981610f1b565b81526020840151611179816110da565b60208201526040603f198301121561119057600080fd5b611198610f50565b915060408401518252606084015160208301528160408201526111bd6080850161107b565b60608201526111ce60a085016110ef565b6080820152949350505050565b8082028115828204841417610b0857634e487b7160e01b600052601160045260246000fd5b6000806040838503121561121357600080fd5b505080516020909101519092909150565b600181811c9082168061123857607f821691505b60208210810361125857634e487b7160e01b600052602260045260246000fd5b5091905056fea26469706673582212200a13b48176f03c2e9d808074ac411a1fca483569c4e94547be184374001ef6c964736f6c63430008140033",
|
618
566
|
"linkReferences": {
|
619
567
|
"contracts/types/Fee.sol": {
|
620
568
|
"FeeLib": [
|
621
569
|
{
|
622
570
|
"length": 20,
|
623
|
-
"start":
|
571
|
+
"start": 5996
|
624
572
|
}
|
625
573
|
]
|
626
574
|
},
|
@@ -628,15 +576,15 @@
|
|
628
576
|
"NftIdLib": [
|
629
577
|
{
|
630
578
|
"length": 20,
|
631
|
-
"start":
|
579
|
+
"start": 4158
|
632
580
|
},
|
633
581
|
{
|
634
582
|
"length": 20,
|
635
|
-
"start":
|
583
|
+
"start": 4728
|
636
584
|
},
|
637
585
|
{
|
638
586
|
"length": 20,
|
639
|
-
"start":
|
587
|
+
"start": 5247
|
640
588
|
}
|
641
589
|
]
|
642
590
|
}
|
@@ -646,7 +594,7 @@
|
|
646
594
|
"FeeLib": [
|
647
595
|
{
|
648
596
|
"length": 20,
|
649
|
-
"start":
|
597
|
+
"start": 2889
|
650
598
|
}
|
651
599
|
]
|
652
600
|
},
|
@@ -654,15 +602,15 @@
|
|
654
602
|
"NftIdLib": [
|
655
603
|
{
|
656
604
|
"length": 20,
|
657
|
-
"start":
|
605
|
+
"start": 1051
|
658
606
|
},
|
659
607
|
{
|
660
608
|
"length": 20,
|
661
|
-
"start":
|
609
|
+
"start": 1621
|
662
610
|
},
|
663
611
|
{
|
664
612
|
"length": 20,
|
665
|
-
"start":
|
613
|
+
"start": 2140
|
666
614
|
}
|
667
615
|
]
|
668
616
|
}
|
package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json
CHANGED
@@ -51,58 +51,6 @@
|
|
51
51
|
"stateMutability": "view",
|
52
52
|
"type": "function"
|
53
53
|
},
|
54
|
-
{
|
55
|
-
"inputs": [],
|
56
|
-
"name": "getInitialSetupInfo",
|
57
|
-
"outputs": [
|
58
|
-
{
|
59
|
-
"components": [
|
60
|
-
{
|
61
|
-
"internalType": "NftId",
|
62
|
-
"name": "productNftId",
|
63
|
-
"type": "uint96"
|
64
|
-
},
|
65
|
-
{
|
66
|
-
"internalType": "contract TokenHandler",
|
67
|
-
"name": "tokenHandler",
|
68
|
-
"type": "address"
|
69
|
-
},
|
70
|
-
{
|
71
|
-
"components": [
|
72
|
-
{
|
73
|
-
"internalType": "UFixed",
|
74
|
-
"name": "fractionalFee",
|
75
|
-
"type": "uint256"
|
76
|
-
},
|
77
|
-
{
|
78
|
-
"internalType": "uint256",
|
79
|
-
"name": "fixedFee",
|
80
|
-
"type": "uint256"
|
81
|
-
}
|
82
|
-
],
|
83
|
-
"internalType": "struct Fee",
|
84
|
-
"name": "distributionFee",
|
85
|
-
"type": "tuple"
|
86
|
-
},
|
87
|
-
{
|
88
|
-
"internalType": "bool",
|
89
|
-
"name": "isIntercepting",
|
90
|
-
"type": "bool"
|
91
|
-
},
|
92
|
-
{
|
93
|
-
"internalType": "address",
|
94
|
-
"name": "wallet",
|
95
|
-
"type": "address"
|
96
|
-
}
|
97
|
-
],
|
98
|
-
"internalType": "struct ISetup.DistributionSetupInfo",
|
99
|
-
"name": "setupInfo",
|
100
|
-
"type": "tuple"
|
101
|
-
}
|
102
|
-
],
|
103
|
-
"stateMutability": "view",
|
104
|
-
"type": "function"
|
105
|
-
},
|
106
54
|
{
|
107
55
|
"inputs": [],
|
108
56
|
"name": "isVerifying",
|
@@ -89,17 +89,30 @@
|
|
89
89
|
},
|
90
90
|
{
|
91
91
|
"inputs": [],
|
92
|
-
"name": "
|
92
|
+
"name": "isConfirmingApplication",
|
93
93
|
"outputs": [
|
94
94
|
{
|
95
95
|
"internalType": "bool",
|
96
|
-
"name": "
|
96
|
+
"name": "isConfirmingApplication",
|
97
97
|
"type": "bool"
|
98
98
|
}
|
99
99
|
],
|
100
100
|
"stateMutability": "view",
|
101
101
|
"type": "function"
|
102
102
|
},
|
103
|
+
{
|
104
|
+
"inputs": [
|
105
|
+
{
|
106
|
+
"internalType": "NftId",
|
107
|
+
"name": "bundleNftId",
|
108
|
+
"type": "uint96"
|
109
|
+
}
|
110
|
+
],
|
111
|
+
"name": "lockBundle",
|
112
|
+
"outputs": [],
|
113
|
+
"stateMutability": "nonpayable",
|
114
|
+
"type": "function"
|
115
|
+
},
|
103
116
|
{
|
104
117
|
"inputs": [
|
105
118
|
{
|
@@ -240,6 +253,19 @@
|
|
240
253
|
"outputs": [],
|
241
254
|
"stateMutability": "nonpayable",
|
242
255
|
"type": "function"
|
256
|
+
},
|
257
|
+
{
|
258
|
+
"inputs": [
|
259
|
+
{
|
260
|
+
"internalType": "NftId",
|
261
|
+
"name": "bundleNftId",
|
262
|
+
"type": "uint96"
|
263
|
+
}
|
264
|
+
],
|
265
|
+
"name": "unlockBundle",
|
266
|
+
"outputs": [],
|
267
|
+
"stateMutability": "nonpayable",
|
268
|
+
"type": "function"
|
243
269
|
}
|
244
270
|
],
|
245
271
|
"bytecode": "0x",
|