@etherisc/gif-next 0.0.2-cc4a5cb-898 → 0.0.2-cd89a0b-062
Sign up to get free protection for your applications and to get access to all the features.
- package/README.md +40 -25
- package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +1 -1
- package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.json +80 -41
- package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +1 -1
- package/artifacts/contracts/components/Distribution.sol/Distribution.json +101 -61
- package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.json +43 -40
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +55 -52
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +100 -113
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +50 -47
- package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
- package/artifacts/contracts/components/Pool.sol/Pool.json +150 -126
- package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/components/Product.sol/Product.json +110 -52
- package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +1 -1
- package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +1 -1
- package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +1 -1
- package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +1 -1
- package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +1 -1
- package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +1 -1
- package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +1 -1
- package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +1 -1
- package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.json +256 -91
- package/artifacts/contracts/instance/IInstanceLinked.sol/IInstanceLinked.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +364 -170
- package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.json +139 -46
- package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +1 -1
- package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.json +1 -1
- package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +1 -1
- package/artifacts/contracts/instance/base/IService.sol/IService.dbg.json +1 -1
- package/artifacts/contracts/instance/base/IService.sol/IService.json +99 -55
- package/artifacts/contracts/instance/base/InstanceBase.sol/InstanceBase.dbg.json +1 -1
- package/artifacts/contracts/instance/base/InstanceBase.sol/InstanceBase.json +139 -59
- package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ModuleBase.sol/ModuleBase.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ServiceBase.sol/ServiceBase.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ServiceBase.sol/ServiceBase.json +135 -55
- package/artifacts/contracts/instance/module/access/Access.sol/AccessModule.dbg.json +1 -1
- package/artifacts/contracts/instance/module/access/IAccess.sol/IAccess.dbg.json +1 -1
- package/artifacts/contracts/instance/module/access/IAccess.sol/IAccessModule.dbg.json +1 -1
- package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.dbg.json +1 -1
- package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundle.dbg.json +1 -1
- package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.dbg.json +1 -1
- package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.dbg.json +1 -1
- package/artifacts/contracts/instance/module/component/IComponent.sol/IComponent.dbg.json +1 -1
- package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.dbg.json +1 -1
- package/artifacts/contracts/instance/module/distribution/DistributionModule.sol/DistributionModule.dbg.json +1 -1
- package/artifacts/contracts/instance/module/distribution/DistributionModule.sol/DistributionModule.json +2 -2
- package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistribution.dbg.json +1 -1
- package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistributionModule.dbg.json +1 -1
- package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicy.dbg.json +1 -1
- package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.dbg.json +1 -1
- package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.dbg.json +1 -1
- package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPool.dbg.json +1 -1
- package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.dbg.json +1 -1
- package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.json +29 -9
- package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.dbg.json +1 -1
- package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.json +28 -8
- package/artifacts/contracts/instance/module/risk/IRisk.sol/IRisk.dbg.json +1 -1
- package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.dbg.json +1 -1
- package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.dbg.json +1 -1
- package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.json +2 -2
- package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasury.dbg.json +1 -1
- package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.dbg.json +1 -1
- package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.json +138 -11
- package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.dbg.json +1 -1
- package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.json +2 -2
- package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.dbg.json +1 -1
- package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.json +138 -11
- package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +245 -86
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +167 -61
- package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.json +99 -74
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +99 -55
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +104 -60
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +104 -60
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +169 -63
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +197 -91
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +141 -12
- package/artifacts/contracts/registry/IChainNft.sol/IChainNft.dbg.json +1 -1
- package/artifacts/contracts/registry/IChainNft.sol/IChainNft.json +5 -0
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +293 -40
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +4 -0
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +668 -0
- package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +4 -0
- package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.json +34 -0
- package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registry.json +483 -120
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +4 -0
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +885 -0
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +4 -0
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +460 -0
- package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +4 -0
- package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.json +107 -0
- package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
- package/artifacts/contracts/shared/ERC165.sol/ERC165.json +2 -2
- package/artifacts/contracts/shared/IOwnable.sol/IOwnable.dbg.json +1 -1
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +43 -40
- package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
- package/artifacts/contracts/shared/IVersionable.sol/IVersionable.json +55 -14
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +4 -0
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +132 -0
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +4 -0
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +344 -0
- package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
- package/artifacts/contracts/shared/Registerable.sol/Registerable.json +76 -37
- package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +4 -0
- package/artifacts/contracts/shared/{Proxy.sol/ProxyWithProxyAdminGetter.json → UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json} +4 -4
- package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
- package/artifacts/contracts/shared/Versionable.sol/Versionable.json +78 -14
- package/artifacts/contracts/test/TestDistribution.sol/TestDistribution.dbg.json +1 -1
- package/artifacts/contracts/test/TestDistribution.sol/TestDistribution.json +101 -61
- package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +1 -1
- package/artifacts/contracts/test/TestPool.sol/TestPool.dbg.json +1 -1
- package/artifacts/contracts/test/TestPool.sol/TestPool.json +150 -126
- package/artifacts/contracts/test/TestProduct.sol/TestProduct.dbg.json +1 -1
- package/artifacts/contracts/test/TestProduct.sol/TestProduct.json +115 -58
- package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
- package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +93 -39
- package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
- package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
- package/artifacts/contracts/test/TestService.sol/TestService.json +161 -68
- package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +1 -1
- package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +1 -1
- package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +2 -2
- package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +1 -1
- package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +89 -25
- package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +1 -1
- package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +1 -1
- package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
- package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +1 -1
- package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +1 -1
- package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
- package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
- package/artifacts/contracts/types/ReferralId.sol/ReferralIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
- package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.dbg.json +1 -1
- package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
- package/artifacts/contracts/types/Version.sol/VersionLib.json +40 -2
- package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
- package/artifacts/contracts/types/Version.sol/VersionPartLib.json +2 -2
- package/contracts/components/BaseComponent.sol +12 -27
- package/contracts/components/Distribution.sol +29 -6
- package/contracts/components/IBaseComponent.sol +2 -2
- package/contracts/components/IPoolComponent.sol +2 -8
- package/contracts/components/IProductComponent.sol +2 -1
- package/contracts/components/Pool.sol +84 -73
- package/contracts/components/Product.sol +85 -13
- package/contracts/instance/IInstance.sol +4 -3
- package/contracts/instance/Instance.sol +14 -3
- package/contracts/instance/base/ComponentServiceBase.sol +13 -6
- package/contracts/instance/base/IInstanceBase.sol +3 -2
- package/contracts/instance/base/InstanceBase.sol +6 -8
- package/contracts/instance/base/ServiceBase.sol +19 -13
- package/contracts/instance/module/component/ComponentModule.sol +5 -4
- package/contracts/instance/module/component/IComponent.sol +2 -2
- package/contracts/instance/module/pool/IPoolModule.sol +4 -3
- package/contracts/instance/module/pool/PoolModule.sol +12 -7
- package/contracts/instance/module/treasury/ITreasury.sol +7 -5
- package/contracts/instance/module/treasury/TokenHandler.sol +2 -2
- package/contracts/instance/module/treasury/TreasuryModule.sol +21 -28
- package/contracts/instance/service/ComponentOwnerService.sol +181 -66
- package/contracts/instance/service/DistributionService.sol +6 -11
- package/contracts/instance/service/IComponentOwnerService.sol +0 -2
- package/contracts/instance/service/PoolService.sol +19 -19
- package/contracts/instance/service/ProductService.sol +20 -20
- package/contracts/registry/ChainNft.sol +43 -15
- package/contracts/registry/IChainNft.sol +3 -2
- package/contracts/registry/IRegistry.sol +44 -28
- package/contracts/registry/IRegistryService.sol +29 -0
- package/contracts/registry/ITransferInterceptor.sol +6 -0
- package/contracts/registry/Registry.sol +382 -273
- package/contracts/registry/RegistryService.sol +375 -0
- package/contracts/registry/RegistryServiceManager.sol +52 -0
- package/contracts/shared/ContractDeployerLib.sol +72 -0
- package/contracts/shared/ERC165.sol +1 -1
- package/contracts/shared/IRegisterable.sol +7 -9
- package/contracts/shared/IVersionable.sol +55 -11
- package/contracts/shared/NftOwnable.sol +87 -0
- package/contracts/shared/ProxyManager.sol +103 -0
- package/contracts/shared/Registerable.sol +74 -43
- package/contracts/shared/UpgradableProxyWithAdmin.sol +16 -0
- package/contracts/shared/Versionable.sol +112 -54
- package/contracts/test/TestDistribution.sol +3 -2
- package/contracts/test/TestPool.sol +4 -2
- package/contracts/test/TestProduct.sol +4 -2
- package/contracts/test/TestRegisterable.sol +5 -6
- package/contracts/test/TestService.sol +5 -11
- package/contracts/types/Version.sol +9 -0
- package/package.json +1 -1
- package/artifacts/contracts/registry/IRegistryLinked.sol/IRegistryLinked.dbg.json +0 -4
- package/artifacts/contracts/registry/IRegistryLinked.sol/IRegistryLinked.json +0 -24
- package/artifacts/contracts/shared/Proxy.sol/Proxy.dbg.json +0 -4
- package/artifacts/contracts/shared/Proxy.sol/Proxy.json +0 -178
- package/artifacts/contracts/shared/Proxy.sol/ProxyWithProxyAdminGetter.dbg.json +0 -4
- package/contracts/experiment/statemachine/README.md +0 -112
- package/contracts/registry/IRegistryLinked.sol +0 -8
- package/contracts/shared/Proxy.sol +0 -83
@@ -23,6 +23,7 @@ using {
|
|
23
23
|
versionGt as >,
|
24
24
|
versionEq as ==,
|
25
25
|
VersionLib.toInt,
|
26
|
+
VersionLib.toUint64,
|
26
27
|
VersionLib.toMajorPart,
|
27
28
|
VersionLib.toVersionParts
|
28
29
|
}
|
@@ -34,6 +35,8 @@ function versionEq(Version a, Version b) pure returns(bool isSame) { return Vers
|
|
34
35
|
library VersionLib {
|
35
36
|
function toInt(Version version) external pure returns(uint) { return Version.unwrap(version); }
|
36
37
|
|
38
|
+
function toUint64(Version version) external pure returns(uint64) { return Version.unwrap(version); }
|
39
|
+
|
37
40
|
function toMajorPart(Version version)
|
38
41
|
external
|
39
42
|
pure
|
@@ -89,6 +92,12 @@ library VersionLib {
|
|
89
92
|
(major << 16) + (minor << 8) + patch));
|
90
93
|
}
|
91
94
|
|
95
|
+
// TODO check for overflow?
|
96
|
+
function toVersion(uint64 versionNumber) external pure returns(Version) {
|
97
|
+
//assert(versionNumber <= type(Version).max);
|
98
|
+
return Version.wrap(uint24(versionNumber));
|
99
|
+
}
|
100
|
+
|
92
101
|
function zeroVersion() external pure returns(Version) {
|
93
102
|
return Version.wrap(0);
|
94
103
|
}
|
package/package.json
CHANGED
@@ -1,24 +0,0 @@
|
|
1
|
-
{
|
2
|
-
"_format": "hh-sol-artifact-1",
|
3
|
-
"contractName": "IRegistryLinked",
|
4
|
-
"sourceName": "contracts/registry/IRegistryLinked.sol",
|
5
|
-
"abi": [
|
6
|
-
{
|
7
|
-
"inputs": [],
|
8
|
-
"name": "getRegistry",
|
9
|
-
"outputs": [
|
10
|
-
{
|
11
|
-
"internalType": "contract IRegistry",
|
12
|
-
"name": "registry",
|
13
|
-
"type": "address"
|
14
|
-
}
|
15
|
-
],
|
16
|
-
"stateMutability": "view",
|
17
|
-
"type": "function"
|
18
|
-
}
|
19
|
-
],
|
20
|
-
"bytecode": "0x",
|
21
|
-
"deployedBytecode": "0x",
|
22
|
-
"linkReferences": {},
|
23
|
-
"deployedLinkReferences": {}
|
24
|
-
}
|
@@ -1,178 +0,0 @@
|
|
1
|
-
{
|
2
|
-
"_format": "hh-sol-artifact-1",
|
3
|
-
"contractName": "Proxy",
|
4
|
-
"sourceName": "contracts/shared/Proxy.sol",
|
5
|
-
"abi": [
|
6
|
-
{
|
7
|
-
"inputs": [],
|
8
|
-
"stateMutability": "nonpayable",
|
9
|
-
"type": "constructor"
|
10
|
-
},
|
11
|
-
{
|
12
|
-
"inputs": [
|
13
|
-
{
|
14
|
-
"internalType": "address",
|
15
|
-
"name": "owner",
|
16
|
-
"type": "address"
|
17
|
-
}
|
18
|
-
],
|
19
|
-
"name": "OwnableInvalidOwner",
|
20
|
-
"type": "error"
|
21
|
-
},
|
22
|
-
{
|
23
|
-
"inputs": [
|
24
|
-
{
|
25
|
-
"internalType": "address",
|
26
|
-
"name": "account",
|
27
|
-
"type": "address"
|
28
|
-
}
|
29
|
-
],
|
30
|
-
"name": "OwnableUnauthorizedAccount",
|
31
|
-
"type": "error"
|
32
|
-
},
|
33
|
-
{
|
34
|
-
"anonymous": false,
|
35
|
-
"inputs": [
|
36
|
-
{
|
37
|
-
"indexed": true,
|
38
|
-
"internalType": "address",
|
39
|
-
"name": "previousOwner",
|
40
|
-
"type": "address"
|
41
|
-
},
|
42
|
-
{
|
43
|
-
"indexed": true,
|
44
|
-
"internalType": "address",
|
45
|
-
"name": "newOwner",
|
46
|
-
"type": "address"
|
47
|
-
}
|
48
|
-
],
|
49
|
-
"name": "OwnershipTransferred",
|
50
|
-
"type": "event"
|
51
|
-
},
|
52
|
-
{
|
53
|
-
"inputs": [],
|
54
|
-
"name": "ACTIVATE_SIGNATURE",
|
55
|
-
"outputs": [
|
56
|
-
{
|
57
|
-
"internalType": "string",
|
58
|
-
"name": "",
|
59
|
-
"type": "string"
|
60
|
-
}
|
61
|
-
],
|
62
|
-
"stateMutability": "view",
|
63
|
-
"type": "function"
|
64
|
-
},
|
65
|
-
{
|
66
|
-
"inputs": [
|
67
|
-
{
|
68
|
-
"internalType": "address",
|
69
|
-
"name": "initialImplementation",
|
70
|
-
"type": "address"
|
71
|
-
}
|
72
|
-
],
|
73
|
-
"name": "deploy",
|
74
|
-
"outputs": [
|
75
|
-
{
|
76
|
-
"internalType": "contract IVersionable",
|
77
|
-
"name": "versionable",
|
78
|
-
"type": "address"
|
79
|
-
}
|
80
|
-
],
|
81
|
-
"stateMutability": "nonpayable",
|
82
|
-
"type": "function"
|
83
|
-
},
|
84
|
-
{
|
85
|
-
"inputs": [
|
86
|
-
{
|
87
|
-
"internalType": "address",
|
88
|
-
"name": "implementation",
|
89
|
-
"type": "address"
|
90
|
-
},
|
91
|
-
{
|
92
|
-
"internalType": "address",
|
93
|
-
"name": "proxyOwner",
|
94
|
-
"type": "address"
|
95
|
-
}
|
96
|
-
],
|
97
|
-
"name": "getData",
|
98
|
-
"outputs": [
|
99
|
-
{
|
100
|
-
"internalType": "bytes",
|
101
|
-
"name": "data",
|
102
|
-
"type": "bytes"
|
103
|
-
}
|
104
|
-
],
|
105
|
-
"stateMutability": "pure",
|
106
|
-
"type": "function"
|
107
|
-
},
|
108
|
-
{
|
109
|
-
"inputs": [],
|
110
|
-
"name": "getProxyAdmin",
|
111
|
-
"outputs": [
|
112
|
-
{
|
113
|
-
"internalType": "contract ProxyAdmin",
|
114
|
-
"name": "",
|
115
|
-
"type": "address"
|
116
|
-
}
|
117
|
-
],
|
118
|
-
"stateMutability": "nonpayable",
|
119
|
-
"type": "function"
|
120
|
-
},
|
121
|
-
{
|
122
|
-
"inputs": [],
|
123
|
-
"name": "owner",
|
124
|
-
"outputs": [
|
125
|
-
{
|
126
|
-
"internalType": "address",
|
127
|
-
"name": "",
|
128
|
-
"type": "address"
|
129
|
-
}
|
130
|
-
],
|
131
|
-
"stateMutability": "view",
|
132
|
-
"type": "function"
|
133
|
-
},
|
134
|
-
{
|
135
|
-
"inputs": [],
|
136
|
-
"name": "renounceOwnership",
|
137
|
-
"outputs": [],
|
138
|
-
"stateMutability": "nonpayable",
|
139
|
-
"type": "function"
|
140
|
-
},
|
141
|
-
{
|
142
|
-
"inputs": [
|
143
|
-
{
|
144
|
-
"internalType": "address",
|
145
|
-
"name": "newOwner",
|
146
|
-
"type": "address"
|
147
|
-
}
|
148
|
-
],
|
149
|
-
"name": "transferOwnership",
|
150
|
-
"outputs": [],
|
151
|
-
"stateMutability": "nonpayable",
|
152
|
-
"type": "function"
|
153
|
-
},
|
154
|
-
{
|
155
|
-
"inputs": [
|
156
|
-
{
|
157
|
-
"internalType": "address",
|
158
|
-
"name": "newImplementation",
|
159
|
-
"type": "address"
|
160
|
-
}
|
161
|
-
],
|
162
|
-
"name": "upgrade",
|
163
|
-
"outputs": [
|
164
|
-
{
|
165
|
-
"internalType": "contract IVersionable",
|
166
|
-
"name": "versionable",
|
167
|
-
"type": "address"
|
168
|
-
}
|
169
|
-
],
|
170
|
-
"stateMutability": "nonpayable",
|
171
|
-
"type": "function"
|
172
|
-
}
|
173
|
-
],
|
174
|
-
"bytecode": "0x608060405234801561001057600080fd5b50338061003757604051631e4fbdf760e01b81526000600482015260240160405180910390fd5b61004081610046565b50610096565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b61164d806100a56000396000f3fe60806040523480156200001157600080fd5b5060043610620000935760003560e01c80638b3240a011620000625780638b3240a014620001375780638da5cb5b1462000141578063b49093071462000153578063f2fde38b146200016a57600080fd5b80630900f01014620000985780634c96a38914620000cc5780636838076514620000e3578063715018a6146200012b575b600080fd5b620000af620000a9366004620005a5565b62000181565b6040516001600160a01b0390911681526020015b60405180910390f35b620000af620000dd366004620005a5565b620002a0565b6200011c60405180604001604052806019815260200178616374697661746528616464726573732c616464726573732960381b81525081565b604051620000c3919062000620565b6200013562000391565b005b620000af620003a9565b6000546001600160a01b0316620000af565b6200011c6200016436600462000635565b62000420565b620001356200017b366004620005a5565b620004be565b60006200018d62000502565b600154600160a01b900460ff16620001ec5760405162461bcd60e51b815260206004820152601e60248201527f4552524f523a5052582d3032303a4e4f545f5945545f4445504c4f594544000060448201526064015b60405180910390fd5b600080546001600160a01b03169062000204620003a9565b6001549091506001600160a01b0316600062000221868562000420565b604051639623609d60e01b81529091506001600160a01b03841690639623609d90620002569085908a90869060040162000673565b600060405180830381600087803b1580156200027157600080fd5b505af115801562000286573d6000803e3d6000fd5b50506001546001600160a01b031698975050505050505050565b6000620002ac62000502565b600154600160a01b900460ff1615620003085760405162461bcd60e51b815260206004820152601e60248201527f4552524f523a5052582d3031303a414c52454144595f4445504c4f59454400006044820152606401620001e3565b600080546001600160a01b031690309062000324858462000420565b9050848282604051620003379062000581565b620003459392919062000673565b604051809103906000f08015801562000362573d6000803e3d6000fd5b50600180546001600160a81b0319166001600160a01b0392831617600160a01b17908190551695945050505050565b6200039b62000502565b620003a7600062000531565b565b60015460408051630459920560e51b815290516000926001600160a01b031691638b3240a0916004808301926020929190829003018187875af1158015620003f5573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200041b9190620006aa565b905090565b6040805180820182526019815278616374697661746528616464726573732c616464726573732960381b602082015290516001600160a01b038085166024830152831660448201526060919060640160408051601f1981840301815290829052916200048c91620006ca565b6040519081900390206020820180516001600160e01b03166001600160e01b0319909216919091179052905092915050565b620004c862000502565b6001600160a01b038116620004f457604051631e4fbdf760e01b815260006004820152602401620001e3565b620004ff8162000531565b50565b6000546001600160a01b03163314620003a75760405163118cdaa760e01b8152336004820152602401620001e3565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b610f2f80620006e983390190565b6001600160a01b0381168114620004ff57600080fd5b600060208284031215620005b857600080fd5b8135620005c5816200058f565b9392505050565b60005b83811015620005e9578181015183820152602001620005cf565b50506000910152565b600081518084526200060c816020860160208601620005cc565b601f01601f19169290920160200192915050565b602081526000620005c56020830184620005f2565b600080604083850312156200064957600080fd5b823562000656816200058f565b9150602083013562000668816200058f565b809150509250929050565b6001600160a01b03848116825283166020820152606060408201819052600090620006a190830184620005f2565b95945050505050565b600060208284031215620006bd57600080fd5b8151620005c5816200058f565b60008251620006de818460208701620005cc565b919091019291505056fe60a06040523480156200001157600080fd5b5060405162000f2f38038062000f2f8339810160408190526200003491620003e1565b8282828281620000458282620000b0565b50508160405162000056906200037a565b6001600160a01b039091168152602001604051809103906000f08015801562000083573d6000803e3d6000fd5b506001600160a01b0316608052620000a46200009e60805190565b62000116565b505050505050620004df565b620000bb8262000188565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a2805115620001085762000103828262000208565b505050565b6200011262000285565b5050565b7f7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f6200015860008051602062000f0f833981519152546001600160a01b031690565b604080516001600160a01b03928316815291841660208301520160405180910390a16200018581620002a7565b50565b806001600160a01b03163b600003620001c457604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b807f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc5b80546001600160a01b0319166001600160a01b039290921691909117905550565b6060600080846001600160a01b031684604051620002279190620004c1565b600060405180830381855af49150503d806000811462000264576040519150601f19603f3d011682016040523d82523d6000602084013e62000269565b606091505b5090925090506200027c858383620002ea565b95945050505050565b3415620002a55760405163b398979f60e01b815260040160405180910390fd5b565b6001600160a01b038116620002d357604051633173bdd160e11b815260006004820152602401620001bb565b8060008051602062000f0f833981519152620001e7565b6060826200030357620002fd8262000350565b62000349565b81511580156200031b57506001600160a01b0384163b155b156200034657604051639996b31560e01b81526001600160a01b0385166004820152602401620001bb565b50805b9392505050565b805115620003615780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b61052480620009eb83390190565b80516001600160a01b0381168114620003a057600080fd5b919050565b634e487b7160e01b600052604160045260246000fd5b60005b83811015620003d8578181015183820152602001620003be565b50506000910152565b600080600060608486031215620003f757600080fd5b620004028462000388565b9250620004126020850162000388565b60408501519092506001600160401b03808211156200043057600080fd5b818601915086601f8301126200044557600080fd5b8151818111156200045a576200045a620003a5565b604051601f8201601f19908116603f01168101908382118183101715620004855762000485620003a5565b816040528281528960208487010111156200049f57600080fd5b620004b2836020830160208801620003bb565b80955050505050509250925092565b60008251620004d5818460208701620003bb565b9190910192915050565b6080516104eb620005006000396000818160370152607401526104eb6000f3fe60806040526004361061001e5760003560e01c80638b3240a014610028575b610026610072565b005b34801561003457600080fd5b507f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f35b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031633036100df576000356001600160e01b03191663278f794360e11b146100d5576040516334ad5dbb60e21b815260040160405180910390fd5b6100dd6100ec565b565b6100dd61011b565b905090565b6000806100fc3660048184610376565b81019061010991906103b6565b91509150610117828261012b565b5050565b6100dd610126610186565b6101b9565b610134826101dd565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a280511561017e576101798282610259565b505050565b6101176102cf565b60006100e77f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc546001600160a01b031690565b3660008037600080366000845af43d6000803e8080156101d8573d6000f35b3d6000fd5b806001600160a01b03163b60000361021857604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc80546001600160a01b0319166001600160a01b0392909216919091179055565b6060600080846001600160a01b0316846040516102769190610486565b600060405180830381855af49150503d80600081146102b1576040519150601f19603f3d011682016040523d82523d6000602084013e6102b6565b606091505b50915091506102c68583836102ee565b95945050505050565b34156100dd5760405163b398979f60e01b815260040160405180910390fd5b606082610303576102fe8261034d565b610346565b815115801561031a57506001600160a01b0384163b155b1561034357604051639996b31560e01b81526001600160a01b038516600482015260240161020f565b50805b9392505050565b80511561035d5780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b6000808585111561038657600080fd5b8386111561039357600080fd5b5050820193919092039150565b634e487b7160e01b600052604160045260246000fd5b600080604083850312156103c957600080fd5b82356001600160a01b03811681146103e057600080fd5b9150602083013567ffffffffffffffff808211156103fd57600080fd5b818501915085601f83011261041157600080fd5b813581811115610423576104236103a0565b604051601f8201601f19908116603f0116810190838211818310171561044b5761044b6103a0565b8160405282815288602084870101111561046457600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b6000825160005b818110156104a7576020818601810151858301520161048d565b50600092019182525091905056fea264697066735822122055cfd46b5a3d4a3c1418690b1d5bf1f819f7694cfda90b2d241c0a59be802d5964736f6c63430008140033608060405234801561001057600080fd5b5060405161052438038061052483398101604081905261002f916100be565b806001600160a01b03811661005e57604051631e4fbdf760e01b81526000600482015260240160405180910390fd5b6100678161006e565b50506100ee565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b6000602082840312156100d057600080fd5b81516001600160a01b03811681146100e757600080fd5b9392505050565b610427806100fd6000396000f3fe60806040526004361061004a5760003560e01c8063715018a61461004f5780638da5cb5b146100665780639623609d14610093578063ad3cb1cc146100a6578063f2fde38b146100e4575b600080fd5b34801561005b57600080fd5b50610064610104565b005b34801561007257600080fd5b506000546040516001600160a01b0390911681526020015b60405180910390f35b6100646100a1366004610272565b610118565b3480156100b257600080fd5b506100d7604051806040016040528060058152602001640352e302e360dc1b81525081565b60405161008a919061038e565b3480156100f057600080fd5b506100646100ff3660046103a8565b610187565b61010c6101ca565b61011660006101f7565b565b6101206101ca565b60405163278f794360e11b81526001600160a01b03841690634f1ef28690349061015090869086906004016103c5565b6000604051808303818588803b15801561016957600080fd5b505af115801561017d573d6000803e3d6000fd5b5050505050505050565b61018f6101ca565b6001600160a01b0381166101be57604051631e4fbdf760e01b8152600060048201526024015b60405180910390fd5b6101c7816101f7565b50565b6000546001600160a01b031633146101165760405163118cdaa760e01b81523360048201526024016101b5565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b6001600160a01b03811681146101c757600080fd5b634e487b7160e01b600052604160045260246000fd5b60008060006060848603121561028757600080fd5b833561029281610247565b925060208401356102a281610247565b9150604084013567ffffffffffffffff808211156102bf57600080fd5b818601915086601f8301126102d357600080fd5b8135818111156102e5576102e561025c565b604051601f8201601f19908116603f0116810190838211818310171561030d5761030d61025c565b8160405282815289602084870101111561032657600080fd5b8260208601602083013760006020848301015280955050505050509250925092565b6000815180845260005b8181101561036e57602081850181015186830182015201610352565b506000602082860101526020601f19601f83011685010191505092915050565b6020815260006103a16020830184610348565b9392505050565b6000602082840312156103ba57600080fd5b81356103a181610247565b6001600160a01b03831681526040602082018190526000906103e990830184610348565b94935050505056fea2646970667358221220f0b2d68a0060e1e014170ca14fc6dc543adce5c23840b5caa5f84f10d50459b364736f6c63430008140033b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103a264697066735822122044cb54e58a600ef2249d5d9e18094f8aedf0b4b0477d75b6ba1bfc87c07f3d2864736f6c63430008140033",
|
175
|
-
"deployedBytecode": "0x60806040523480156200001157600080fd5b5060043610620000935760003560e01c80638b3240a011620000625780638b3240a014620001375780638da5cb5b1462000141578063b49093071462000153578063f2fde38b146200016a57600080fd5b80630900f01014620000985780634c96a38914620000cc5780636838076514620000e3578063715018a6146200012b575b600080fd5b620000af620000a9366004620005a5565b62000181565b6040516001600160a01b0390911681526020015b60405180910390f35b620000af620000dd366004620005a5565b620002a0565b6200011c60405180604001604052806019815260200178616374697661746528616464726573732c616464726573732960381b81525081565b604051620000c3919062000620565b6200013562000391565b005b620000af620003a9565b6000546001600160a01b0316620000af565b6200011c6200016436600462000635565b62000420565b620001356200017b366004620005a5565b620004be565b60006200018d62000502565b600154600160a01b900460ff16620001ec5760405162461bcd60e51b815260206004820152601e60248201527f4552524f523a5052582d3032303a4e4f545f5945545f4445504c4f594544000060448201526064015b60405180910390fd5b600080546001600160a01b03169062000204620003a9565b6001549091506001600160a01b0316600062000221868562000420565b604051639623609d60e01b81529091506001600160a01b03841690639623609d90620002569085908a90869060040162000673565b600060405180830381600087803b1580156200027157600080fd5b505af115801562000286573d6000803e3d6000fd5b50506001546001600160a01b031698975050505050505050565b6000620002ac62000502565b600154600160a01b900460ff1615620003085760405162461bcd60e51b815260206004820152601e60248201527f4552524f523a5052582d3031303a414c52454144595f4445504c4f59454400006044820152606401620001e3565b600080546001600160a01b031690309062000324858462000420565b9050848282604051620003379062000581565b620003459392919062000673565b604051809103906000f08015801562000362573d6000803e3d6000fd5b50600180546001600160a81b0319166001600160a01b0392831617600160a01b17908190551695945050505050565b6200039b62000502565b620003a7600062000531565b565b60015460408051630459920560e51b815290516000926001600160a01b031691638b3240a0916004808301926020929190829003018187875af1158015620003f5573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200041b9190620006aa565b905090565b6040805180820182526019815278616374697661746528616464726573732c616464726573732960381b602082015290516001600160a01b038085166024830152831660448201526060919060640160408051601f1981840301815290829052916200048c91620006ca565b6040519081900390206020820180516001600160e01b03166001600160e01b0319909216919091179052905092915050565b620004c862000502565b6001600160a01b038116620004f457604051631e4fbdf760e01b815260006004820152602401620001e3565b620004ff8162000531565b50565b6000546001600160a01b03163314620003a75760405163118cdaa760e01b8152336004820152602401620001e3565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b610f2f80620006e983390190565b6001600160a01b0381168114620004ff57600080fd5b600060208284031215620005b857600080fd5b8135620005c5816200058f565b9392505050565b60005b83811015620005e9578181015183820152602001620005cf565b50506000910152565b600081518084526200060c816020860160208601620005cc565b601f01601f19169290920160200192915050565b602081526000620005c56020830184620005f2565b600080604083850312156200064957600080fd5b823562000656816200058f565b9150602083013562000668816200058f565b809150509250929050565b6001600160a01b03848116825283166020820152606060408201819052600090620006a190830184620005f2565b95945050505050565b600060208284031215620006bd57600080fd5b8151620005c5816200058f565b60008251620006de818460208701620005cc565b919091019291505056fe60a06040523480156200001157600080fd5b5060405162000f2f38038062000f2f8339810160408190526200003491620003e1565b8282828281620000458282620000b0565b50508160405162000056906200037a565b6001600160a01b039091168152602001604051809103906000f08015801562000083573d6000803e3d6000fd5b506001600160a01b0316608052620000a46200009e60805190565b62000116565b505050505050620004df565b620000bb8262000188565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a2805115620001085762000103828262000208565b505050565b6200011262000285565b5050565b7f7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f6200015860008051602062000f0f833981519152546001600160a01b031690565b604080516001600160a01b03928316815291841660208301520160405180910390a16200018581620002a7565b50565b806001600160a01b03163b600003620001c457604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b807f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc5b80546001600160a01b0319166001600160a01b039290921691909117905550565b6060600080846001600160a01b031684604051620002279190620004c1565b600060405180830381855af49150503d806000811462000264576040519150601f19603f3d011682016040523d82523d6000602084013e62000269565b606091505b5090925090506200027c858383620002ea565b95945050505050565b3415620002a55760405163b398979f60e01b815260040160405180910390fd5b565b6001600160a01b038116620002d357604051633173bdd160e11b815260006004820152602401620001bb565b8060008051602062000f0f833981519152620001e7565b6060826200030357620002fd8262000350565b62000349565b81511580156200031b57506001600160a01b0384163b155b156200034657604051639996b31560e01b81526001600160a01b0385166004820152602401620001bb565b50805b9392505050565b805115620003615780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b61052480620009eb83390190565b80516001600160a01b0381168114620003a057600080fd5b919050565b634e487b7160e01b600052604160045260246000fd5b60005b83811015620003d8578181015183820152602001620003be565b50506000910152565b600080600060608486031215620003f757600080fd5b620004028462000388565b9250620004126020850162000388565b60408501519092506001600160401b03808211156200043057600080fd5b818601915086601f8301126200044557600080fd5b8151818111156200045a576200045a620003a5565b604051601f8201601f19908116603f01168101908382118183101715620004855762000485620003a5565b816040528281528960208487010111156200049f57600080fd5b620004b2836020830160208801620003bb565b80955050505050509250925092565b60008251620004d5818460208701620003bb565b9190910192915050565b6080516104eb620005006000396000818160370152607401526104eb6000f3fe60806040526004361061001e5760003560e01c80638b3240a014610028575b610026610072565b005b34801561003457600080fd5b507f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f35b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031633036100df576000356001600160e01b03191663278f794360e11b146100d5576040516334ad5dbb60e21b815260040160405180910390fd5b6100dd6100ec565b565b6100dd61011b565b905090565b6000806100fc3660048184610376565b81019061010991906103b6565b91509150610117828261012b565b5050565b6100dd610126610186565b6101b9565b610134826101dd565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a280511561017e576101798282610259565b505050565b6101176102cf565b60006100e77f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc546001600160a01b031690565b3660008037600080366000845af43d6000803e8080156101d8573d6000f35b3d6000fd5b806001600160a01b03163b60000361021857604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc80546001600160a01b0319166001600160a01b0392909216919091179055565b6060600080846001600160a01b0316846040516102769190610486565b600060405180830381855af49150503d80600081146102b1576040519150601f19603f3d011682016040523d82523d6000602084013e6102b6565b606091505b50915091506102c68583836102ee565b95945050505050565b34156100dd5760405163b398979f60e01b815260040160405180910390fd5b606082610303576102fe8261034d565b610346565b815115801561031a57506001600160a01b0384163b155b1561034357604051639996b31560e01b81526001600160a01b038516600482015260240161020f565b50805b9392505050565b80511561035d5780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b6000808585111561038657600080fd5b8386111561039357600080fd5b5050820193919092039150565b634e487b7160e01b600052604160045260246000fd5b600080604083850312156103c957600080fd5b82356001600160a01b03811681146103e057600080fd5b9150602083013567ffffffffffffffff808211156103fd57600080fd5b818501915085601f83011261041157600080fd5b813581811115610423576104236103a0565b604051601f8201601f19908116603f0116810190838211818310171561044b5761044b6103a0565b8160405282815288602084870101111561046457600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b6000825160005b818110156104a7576020818601810151858301520161048d565b50600092019182525091905056fea264697066735822122055cfd46b5a3d4a3c1418690b1d5bf1f819f7694cfda90b2d241c0a59be802d5964736f6c63430008140033608060405234801561001057600080fd5b5060405161052438038061052483398101604081905261002f916100be565b806001600160a01b03811661005e57604051631e4fbdf760e01b81526000600482015260240160405180910390fd5b6100678161006e565b50506100ee565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b6000602082840312156100d057600080fd5b81516001600160a01b03811681146100e757600080fd5b9392505050565b610427806100fd6000396000f3fe60806040526004361061004a5760003560e01c8063715018a61461004f5780638da5cb5b146100665780639623609d14610093578063ad3cb1cc146100a6578063f2fde38b146100e4575b600080fd5b34801561005b57600080fd5b50610064610104565b005b34801561007257600080fd5b506000546040516001600160a01b0390911681526020015b60405180910390f35b6100646100a1366004610272565b610118565b3480156100b257600080fd5b506100d7604051806040016040528060058152602001640352e302e360dc1b81525081565b60405161008a919061038e565b3480156100f057600080fd5b506100646100ff3660046103a8565b610187565b61010c6101ca565b61011660006101f7565b565b6101206101ca565b60405163278f794360e11b81526001600160a01b03841690634f1ef28690349061015090869086906004016103c5565b6000604051808303818588803b15801561016957600080fd5b505af115801561017d573d6000803e3d6000fd5b5050505050505050565b61018f6101ca565b6001600160a01b0381166101be57604051631e4fbdf760e01b8152600060048201526024015b60405180910390fd5b6101c7816101f7565b50565b6000546001600160a01b031633146101165760405163118cdaa760e01b81523360048201526024016101b5565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b6001600160a01b03811681146101c757600080fd5b634e487b7160e01b600052604160045260246000fd5b60008060006060848603121561028757600080fd5b833561029281610247565b925060208401356102a281610247565b9150604084013567ffffffffffffffff808211156102bf57600080fd5b818601915086601f8301126102d357600080fd5b8135818111156102e5576102e561025c565b604051601f8201601f19908116603f0116810190838211818310171561030d5761030d61025c565b8160405282815289602084870101111561032657600080fd5b8260208601602083013760006020848301015280955050505050509250925092565b6000815180845260005b8181101561036e57602081850181015186830182015201610352565b506000602082860101526020601f19601f83011685010191505092915050565b6020815260006103a16020830184610348565b9392505050565b6000602082840312156103ba57600080fd5b81356103a181610247565b6001600160a01b03831681526040602082018190526000906103e990830184610348565b94935050505056fea2646970667358221220f0b2d68a0060e1e014170ca14fc6dc543adce5c23840b5caa5f84f10d50459b364736f6c63430008140033b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103a264697066735822122044cb54e58a600ef2249d5d9e18094f8aedf0b4b0477d75b6ba1bfc87c07f3d2864736f6c63430008140033",
|
176
|
-
"linkReferences": {},
|
177
|
-
"deployedLinkReferences": {}
|
178
|
-
}
|
@@ -1,112 +0,0 @@
|
|
1
|
-
# State Machines
|
2
|
-
|
3
|
-
Most GIF objects have a life cycle defined by a state machine.
|
4
|
-
|
5
|
-
For each object type the set of possible states is defined together with its initial state and the set of valid state transitions.
|
6
|
-
|
7
|
-
## Object Types without States
|
8
|
-
|
9
|
-
* Protocol
|
10
|
-
* Chains
|
11
|
-
* Registries (both chain and main registry)
|
12
|
-
|
13
|
-
## Object Types with States
|
14
|
-
|
15
|
-
* Tokens
|
16
|
-
* Instances
|
17
|
-
* Products
|
18
|
-
* Oracles
|
19
|
-
* Pools
|
20
|
-
* Bundles
|
21
|
-
* Policies
|
22
|
-
* Claim (non-NFT)
|
23
|
-
* Payout (non-NFT)
|
24
|
-
|
25
|
-
### Simple State Machine
|
26
|
-
|
27
|
-
Valid states
|
28
|
-
|
29
|
-
* Active (initial state)
|
30
|
-
* Paused
|
31
|
-
* Archived (final state)
|
32
|
-
|
33
|
-
Valid state transitions:
|
34
|
-
|
35
|
-
* Active -> Paused
|
36
|
-
* Paused -> Active
|
37
|
-
* Paused -> Archived
|
38
|
-
|
39
|
-
|
40
|
-
Candidate object types for simple state machine
|
41
|
-
|
42
|
-
* Token
|
43
|
-
* Instance
|
44
|
-
* Product
|
45
|
-
* Oracle
|
46
|
-
* Pool
|
47
|
-
|
48
|
-
To discuss:
|
49
|
-
|
50
|
-
* Archived is final state
|
51
|
-
* What mechanism should exist to revert an unintended transition to 'Archived' state. Should there be such a mechanism?
|
52
|
-
* What mechanism should exist when the NFT of such an object is burned prematurely. Should there be such a mechanism
|
53
|
-
|
54
|
-
### Bundle State Machine
|
55
|
-
|
56
|
-
Valid states
|
57
|
-
|
58
|
-
* Active (initial state)
|
59
|
-
* Paused
|
60
|
-
* Expired (implicit state)
|
61
|
-
* Closed (final state)
|
62
|
-
|
63
|
-
Expired is not an explicit state.
|
64
|
-
A bundle is expired for block.timestamp >= expiredAt
|
65
|
-
|
66
|
-
### Policy State Machine
|
67
|
-
|
68
|
-
Valid states
|
69
|
-
|
70
|
-
* Applied (initial state)
|
71
|
-
* Revoked (final state)
|
72
|
-
* Declined (final state)
|
73
|
-
* Active
|
74
|
-
* Expired (implicit state)
|
75
|
-
* Closed (final state)
|
76
|
-
|
77
|
-
Expired is not an explicit state.
|
78
|
-
A policy is expired for block.timestamp >= expiredAt
|
79
|
-
|
80
|
-
To discuss:
|
81
|
-
|
82
|
-
* Should 'Closed' be less explicit using a closedAt state variable?
|
83
|
-
* Or even more lighweight? ie. block.timestamp >= expiredAt and no open claims
|
84
|
-
|
85
|
-
Valid state transitions:
|
86
|
-
|
87
|
-
* Applied -> Revoked
|
88
|
-
* Applied -> Declined
|
89
|
-
* Applied -> Active
|
90
|
-
* Active -> Closed (needs to be expired)
|
91
|
-
|
92
|
-
### Claim State Machine
|
93
|
-
|
94
|
-
Valid states
|
95
|
-
* Applied (initial state)
|
96
|
-
* Confirmed
|
97
|
-
* Declined (final state)
|
98
|
-
* Closed (final state)
|
99
|
-
|
100
|
-
Valid state transitions:
|
101
|
-
* Applied -> Confirmed
|
102
|
-
* Applied -> Declined
|
103
|
-
* Confirmed -> Closed
|
104
|
-
|
105
|
-
### Payout State Machine
|
106
|
-
|
107
|
-
Valid states
|
108
|
-
* Expected
|
109
|
-
* PaidOut
|
110
|
-
|
111
|
-
Valid state transitions:
|
112
|
-
* Expected -> PaidOut
|
@@ -1,83 +0,0 @@
|
|
1
|
-
// SPDX-License-Identifier: Apache-2.0
|
2
|
-
pragma solidity ^0.8.20;
|
3
|
-
|
4
|
-
import {Ownable} from "@openzeppelin5/contracts/access/Ownable.sol";
|
5
|
-
import {ProxyAdmin} from "@openzeppelin5/contracts/proxy/transparent/ProxyAdmin.sol";
|
6
|
-
import {TransparentUpgradeableProxy, ITransparentUpgradeableProxy} from "@openzeppelin5/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
|
7
|
-
|
8
|
-
import {IVersionable} from "./IVersionable.sol";
|
9
|
-
|
10
|
-
contract ProxyWithProxyAdminGetter is TransparentUpgradeableProxy {
|
11
|
-
|
12
|
-
constructor(address implementation, address initialProxyAdminOwner,bytes memory data)
|
13
|
-
TransparentUpgradeableProxy(implementation, initialProxyAdminOwner, data)
|
14
|
-
{}
|
15
|
-
|
16
|
-
function getProxyAdmin() external returns (ProxyAdmin) { return ProxyAdmin(_proxyAdmin()); }
|
17
|
-
}
|
18
|
-
|
19
|
-
contract Proxy is Ownable {
|
20
|
-
|
21
|
-
string public constant ACTIVATE_SIGNATURE = "activate(address,address)";
|
22
|
-
|
23
|
-
ProxyWithProxyAdminGetter private _proxy;
|
24
|
-
bool private _isDeployed;
|
25
|
-
|
26
|
-
/// @dev only used to capture proxy owner
|
27
|
-
constructor()
|
28
|
-
Ownable(msg.sender)
|
29
|
-
{
|
30
|
-
}
|
31
|
-
|
32
|
-
function getData(address implementation, address proxyOwner) public pure returns (bytes memory data) {
|
33
|
-
return abi.encodeWithSignature(ACTIVATE_SIGNATURE, implementation, proxyOwner);
|
34
|
-
}
|
35
|
-
|
36
|
-
/// @dev deploy initial contract
|
37
|
-
function deploy(address initialImplementation)
|
38
|
-
external
|
39
|
-
onlyOwner()
|
40
|
-
returns (IVersionable versionable)
|
41
|
-
{
|
42
|
-
require(!_isDeployed, "ERROR:PRX-010:ALREADY_DEPLOYED");
|
43
|
-
|
44
|
-
address currentProxyOwner = owner();
|
45
|
-
address initialProxyAdminOwner = address(this);
|
46
|
-
bytes memory data = getData(initialImplementation, currentProxyOwner);
|
47
|
-
|
48
|
-
_proxy = new ProxyWithProxyAdminGetter(
|
49
|
-
initialImplementation,
|
50
|
-
initialProxyAdminOwner,
|
51
|
-
data
|
52
|
-
);
|
53
|
-
|
54
|
-
_isDeployed = true;
|
55
|
-
versionable = IVersionable(address(_proxy));
|
56
|
-
}
|
57
|
-
|
58
|
-
/// @dev upgrade existing contract
|
59
|
-
function upgrade(address newImplementation)
|
60
|
-
external
|
61
|
-
onlyOwner
|
62
|
-
returns (IVersionable versionable)
|
63
|
-
{
|
64
|
-
require(_isDeployed, "ERROR:PRX-020:NOT_YET_DEPLOYED");
|
65
|
-
|
66
|
-
address currentProxyOwner = owner();
|
67
|
-
// ProxyAdmin proxyAdmin = _proxy.getProxyAdmin();
|
68
|
-
ProxyAdmin proxyAdmin = getProxyAdmin();
|
69
|
-
ITransparentUpgradeableProxy proxy = ITransparentUpgradeableProxy(address(_proxy));
|
70
|
-
bytes memory data = getData(newImplementation, currentProxyOwner);
|
71
|
-
|
72
|
-
proxyAdmin.upgradeAndCall(
|
73
|
-
proxy,
|
74
|
-
newImplementation,
|
75
|
-
data);
|
76
|
-
|
77
|
-
versionable = IVersionable(address(_proxy));
|
78
|
-
}
|
79
|
-
|
80
|
-
function getProxyAdmin() public returns (ProxyAdmin) {
|
81
|
-
return _proxy.getProxyAdmin();
|
82
|
-
}
|
83
|
-
}
|