@etherisc/gif-next 0.0.2-de0a1d3-009 → 0.0.2-e1e92ab-754

Sign up to get free protection for your applications and to get access to all the features.
Files changed (263) hide show
  1. package/README.md +51 -25
  2. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +1 -1
  3. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.json +166 -39
  4. package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +1 -1
  5. package/artifacts/contracts/components/Distribution.sol/Distribution.json +212 -60
  6. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +1 -1
  7. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.json +119 -39
  8. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  9. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +0 -163
  10. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  11. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +6 -185
  12. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  13. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +0 -163
  14. package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
  15. package/artifacts/contracts/components/Pool.sol/Pool.json +257 -119
  16. package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
  17. package/artifacts/contracts/components/Product.sol/Product.json +220 -50
  18. package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +1 -1
  19. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +1 -1
  20. package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +1 -1
  21. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +1 -1
  22. package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +1 -1
  23. package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +1 -1
  24. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +1 -1
  25. package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +1 -1
  26. package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +1 -1
  27. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +1 -1
  28. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +1 -1
  29. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +1 -1
  30. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +1 -1
  31. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +1 -1
  32. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +1 -1
  33. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +1 -1
  34. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +1 -1
  35. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  36. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +247 -355
  37. package/artifacts/contracts/instance/IInstanceLinked.sol/IInstanceLinked.dbg.json +1 -1
  38. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  39. package/artifacts/contracts/instance/Instance.sol/Instance.json +369 -507
  40. package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +1 -1
  41. package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.json +144 -50
  42. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +1 -1
  43. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.json +1 -1
  44. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  45. package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  46. package/artifacts/contracts/instance/base/IService.sol/IService.dbg.json +1 -1
  47. package/artifacts/contracts/instance/base/IService.sol/IService.json +120 -40
  48. package/artifacts/contracts/instance/base/InstanceBase.sol/InstanceBase.dbg.json +1 -1
  49. package/artifacts/contracts/instance/base/InstanceBase.sol/InstanceBase.json +147 -66
  50. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  51. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  52. package/artifacts/contracts/instance/base/ModuleBase.sol/ModuleBase.dbg.json +1 -1
  53. package/artifacts/contracts/instance/base/ServiceBase.sol/ServiceBase.dbg.json +1 -1
  54. package/artifacts/contracts/instance/base/ServiceBase.sol/ServiceBase.json +140 -59
  55. package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.dbg.json +1 -1
  56. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundle.dbg.json +1 -1
  57. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.dbg.json +1 -1
  58. package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.dbg.json +1 -1
  59. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponent.dbg.json +1 -1
  60. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.dbg.json +1 -1
  61. package/artifacts/contracts/instance/module/distribution/DistributionModule.sol/DistributionModule.dbg.json +1 -1
  62. package/artifacts/contracts/instance/module/distribution/DistributionModule.sol/DistributionModule.json +2 -2
  63. package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistribution.dbg.json +1 -1
  64. package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistributionModule.dbg.json +1 -1
  65. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicy.dbg.json +1 -1
  66. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.dbg.json +1 -1
  67. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.json +0 -13
  68. package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.dbg.json +1 -1
  69. package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.json +0 -13
  70. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPool.dbg.json +1 -1
  71. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.dbg.json +1 -1
  72. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.json +29 -9
  73. package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.dbg.json +1 -1
  74. package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.json +28 -8
  75. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRisk.dbg.json +1 -1
  76. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.dbg.json +1 -1
  77. package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.dbg.json +1 -1
  78. package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.json +2 -2
  79. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasury.dbg.json +1 -1
  80. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.dbg.json +1 -1
  81. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.json +138 -11
  82. package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  83. package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.json +2 -2
  84. package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.dbg.json +1 -1
  85. package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.json +138 -11
  86. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +1 -1
  87. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +288 -79
  88. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +1 -1
  89. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +188 -65
  90. package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +1 -1
  91. package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.json +122 -61
  92. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  93. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +120 -40
  94. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
  95. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +120 -40
  96. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
  97. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +120 -40
  98. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
  99. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +190 -67
  100. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +1 -1
  101. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +220 -97
  102. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  103. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +141 -12
  104. package/artifacts/contracts/registry/IChainNft.sol/IChainNft.dbg.json +1 -1
  105. package/artifacts/contracts/registry/IChainNft.sol/IChainNft.json +5 -0
  106. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  107. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +190 -51
  108. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +4 -0
  109. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +872 -0
  110. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +4 -0
  111. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.json +34 -0
  112. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  113. package/artifacts/contracts/registry/Registry.sol/Registry.json +380 -139
  114. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +4 -0
  115. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +1245 -0
  116. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +4 -0
  117. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +490 -0
  118. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +4 -0
  119. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.json +107 -0
  120. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
  121. package/artifacts/contracts/shared/ERC165.sol/ERC165.json +2 -2
  122. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +4 -0
  123. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +127 -0
  124. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  125. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +117 -37
  126. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
  127. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.json +2 -2
  128. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +4 -0
  129. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +158 -0
  130. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +4 -0
  131. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +349 -0
  132. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  133. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +190 -37
  134. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +4 -0
  135. package/artifacts/contracts/shared/{Proxy.sol/ProxyWithProxyAdminGetter.json → UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json} +4 -4
  136. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
  137. package/artifacts/contracts/shared/Versionable.sol/Versionable.json +4 -27
  138. package/artifacts/contracts/test/TestDistribution.sol/TestDistribution.dbg.json +1 -1
  139. package/artifacts/contracts/test/TestDistribution.sol/TestDistribution.json +212 -60
  140. package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +1 -1
  141. package/artifacts/contracts/test/TestFee.sol/TestFee.json +4 -4
  142. package/artifacts/contracts/test/TestPool.sol/TestPool.dbg.json +1 -1
  143. package/artifacts/contracts/test/TestPool.sol/TestPool.json +257 -119
  144. package/artifacts/contracts/test/TestProduct.sol/TestProduct.dbg.json +1 -1
  145. package/artifacts/contracts/test/TestProduct.sol/TestProduct.json +225 -56
  146. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
  147. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +204 -36
  148. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
  149. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +2 -2
  150. package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
  151. package/artifacts/contracts/test/TestService.sol/TestService.json +187 -69
  152. package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +1 -1
  153. package/artifacts/contracts/test/TestToken.sol/TestUsdc.json +91 -53
  154. package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +1 -1
  155. package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +2 -2
  156. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +1 -1
  157. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +15 -38
  158. package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +1 -1
  159. package/artifacts/contracts/test/Usdc.sol/USDC.json +91 -53
  160. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  161. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  162. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
  163. package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +1 -1
  164. package/artifacts/contracts/types/Fee.sol/FeeLib.json +4 -4
  165. package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +1 -1
  166. package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
  167. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  168. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  169. package/artifacts/contracts/types/ReferralId.sol/ReferralIdLib.dbg.json +1 -1
  170. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +1 -1
  171. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +1 -1
  172. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +2 -2
  173. package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +1 -1
  174. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
  175. package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +4 -0
  176. package/artifacts/contracts/types/UFixed.sol/MathLib.json +10 -0
  177. package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +4 -0
  178. package/artifacts/contracts/types/UFixed.sol/{UFixedMathLib.json → UFixedLib.json} +3 -3
  179. package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
  180. package/artifacts/contracts/types/Version.sol/VersionLib.json +2 -2
  181. package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
  182. package/artifacts/contracts/types/Version.sol/VersionPartLib.json +2 -2
  183. package/contracts/components/BaseComponent.sol +11 -26
  184. package/contracts/components/Distribution.sol +29 -6
  185. package/contracts/components/IBaseComponent.sol +1 -1
  186. package/contracts/components/IDistributionComponent.sol +1 -2
  187. package/contracts/components/IPoolComponent.sol +3 -10
  188. package/contracts/components/IProductComponent.sol +2 -3
  189. package/contracts/components/Pool.sol +84 -73
  190. package/contracts/components/Product.sol +85 -13
  191. package/contracts/instance/IInstance.sol +6 -7
  192. package/contracts/instance/Instance.sol +18 -9
  193. package/contracts/instance/base/ComponentServiceBase.sol +13 -6
  194. package/contracts/instance/base/IInstanceBase.sol +3 -2
  195. package/contracts/instance/base/InstanceBase.sol +6 -8
  196. package/contracts/instance/base/ServiceBase.sol +20 -13
  197. package/contracts/instance/module/component/ComponentModule.sol +4 -3
  198. package/contracts/instance/module/component/IComponent.sol +1 -1
  199. package/contracts/instance/module/policy/IPolicy.sol +1 -1
  200. package/contracts/instance/module/pool/IPoolModule.sol +4 -3
  201. package/contracts/instance/module/pool/PoolModule.sol +12 -7
  202. package/contracts/instance/module/treasury/ITreasury.sol +6 -4
  203. package/contracts/instance/module/treasury/TokenHandler.sol +1 -1
  204. package/contracts/instance/module/treasury/TreasuryModule.sol +23 -30
  205. package/contracts/instance/service/ComponentOwnerService.sol +224 -66
  206. package/contracts/instance/service/DistributionService.sol +6 -11
  207. package/contracts/instance/service/IComponentOwnerService.sol +0 -2
  208. package/contracts/instance/service/PoolService.sol +19 -19
  209. package/contracts/instance/service/ProductService.sol +27 -26
  210. package/contracts/registry/ChainNft.sol +42 -14
  211. package/contracts/registry/IChainNft.sol +2 -1
  212. package/contracts/registry/IRegistry.sol +27 -27
  213. package/contracts/registry/IRegistryService.sol +35 -0
  214. package/contracts/registry/ITransferInterceptor.sol +6 -0
  215. package/contracts/registry/Registry.sol +312 -267
  216. package/contracts/registry/RegistryService.sol +441 -0
  217. package/contracts/registry/RegistryServiceManager.sol +63 -0
  218. package/contracts/shared/ContractDeployerLib.sol +72 -0
  219. package/contracts/shared/INftOwnable.sol +22 -0
  220. package/contracts/shared/IRegisterable.sol +8 -15
  221. package/contracts/shared/IVersionable.sol +40 -9
  222. package/contracts/shared/NftOwnable.sol +136 -0
  223. package/contracts/shared/ProxyManager.sol +94 -0
  224. package/contracts/shared/Registerable.sol +62 -59
  225. package/contracts/shared/UpgradableProxyWithAdmin.sol +16 -0
  226. package/contracts/shared/Versionable.sol +109 -61
  227. package/contracts/test/TestDistribution.sol +3 -2
  228. package/contracts/test/TestFee.sol +2 -2
  229. package/contracts/test/TestPool.sol +4 -2
  230. package/contracts/test/TestProduct.sol +4 -2
  231. package/contracts/test/TestRegisterable.sol +5 -6
  232. package/contracts/test/TestService.sol +5 -11
  233. package/contracts/types/Fee.sol +3 -3
  234. package/contracts/types/RoleId.sol +7 -0
  235. package/contracts/types/UFixed.sol +128 -12
  236. package/contracts/types/Version.sol +1 -0
  237. package/package.json +4 -3
  238. package/artifacts/contracts/instance/module/access/Access.sol/AccessModule.dbg.json +0 -4
  239. package/artifacts/contracts/instance/module/access/Access.sol/AccessModule.json +0 -333
  240. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccess.dbg.json +0 -4
  241. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccess.json +0 -10
  242. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccessModule.dbg.json +0 -4
  243. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccessModule.json +0 -333
  244. package/artifacts/contracts/registry/IRegistryLinked.sol/IRegistryLinked.dbg.json +0 -4
  245. package/artifacts/contracts/registry/IRegistryLinked.sol/IRegistryLinked.json +0 -24
  246. package/artifacts/contracts/registry/RegistryUpgradeable.sol/RegistryUpgradeable.dbg.json +0 -4
  247. package/artifacts/contracts/registry/RegistryUpgradeable.sol/RegistryUpgradeable.json +0 -724
  248. package/artifacts/contracts/shared/IOwnable.sol/IOwnable.dbg.json +0 -4
  249. package/artifacts/contracts/shared/IOwnable.sol/IOwnable.json +0 -24
  250. package/artifacts/contracts/shared/Proxy.sol/ProxyDeployer.dbg.json +0 -4
  251. package/artifacts/contracts/shared/Proxy.sol/ProxyDeployer.json +0 -248
  252. package/artifacts/contracts/shared/Proxy.sol/ProxyWithProxyAdminGetter.dbg.json +0 -4
  253. package/artifacts/contracts/shared/VersionableUpgradeable.sol/VersionableUpgradeable.dbg.json +0 -4
  254. package/artifacts/contracts/shared/VersionableUpgradeable.sol/VersionableUpgradeable.json +0 -228
  255. package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.dbg.json +0 -4
  256. package/contracts/experiment/statemachine/README.md +0 -112
  257. package/contracts/instance/module/access/Access.sol +0 -149
  258. package/contracts/instance/module/access/IAccess.sol +0 -53
  259. package/contracts/registry/IRegistryLinked.sol +0 -8
  260. package/contracts/registry/RegistryUpgradeable.sol +0 -473
  261. package/contracts/shared/IOwnable.sol +0 -6
  262. package/contracts/shared/Proxy.sol +0 -94
  263. package/contracts/shared/VersionableUpgradeable.sol +0 -133
package/artifacts/contracts/test/TestToken.sol/TestUsdc.json CHANGED
@@ -8,6 +8,92 @@
8
8
  "stateMutability": "nonpayable",
9
9
  "type": "constructor"
10
10
  },
11
+ {
12
+ "inputs": [
13
+ {
14
+ "internalType": "address",
15
+ "name": "spender",
16
+ "type": "address"
17
+ },
18
+ {
19
+ "internalType": "uint256",
20
+ "name": "allowance",
21
+ "type": "uint256"
22
+ },
23
+ {
24
+ "internalType": "uint256",
25
+ "name": "needed",
26
+ "type": "uint256"
27
+ }
28
+ ],
29
+ "name": "ERC20InsufficientAllowance",
30
+ "type": "error"
31
+ },
32
+ {
33
+ "inputs": [
34
+ {
35
+ "internalType": "address",
36
+ "name": "sender",
37
+ "type": "address"
38
+ },
39
+ {
40
+ "internalType": "uint256",
41
+ "name": "balance",
42
+ "type": "uint256"
43
+ },
44
+ {
45
+ "internalType": "uint256",
46
+ "name": "needed",
47
+ "type": "uint256"
48
+ }
49
+ ],
50
+ "name": "ERC20InsufficientBalance",
51
+ "type": "error"
52
+ },
53
+ {
54
+ "inputs": [
55
+ {
56
+ "internalType": "address",
57
+ "name": "approver",
58
+ "type": "address"
59
+ }
60
+ ],
61
+ "name": "ERC20InvalidApprover",
62
+ "type": "error"
63
+ },
64
+ {
65
+ "inputs": [
66
+ {
67
+ "internalType": "address",
68
+ "name": "receiver",
69
+ "type": "address"
70
+ }
71
+ ],
72
+ "name": "ERC20InvalidReceiver",
73
+ "type": "error"
74
+ },
75
+ {
76
+ "inputs": [
77
+ {
78
+ "internalType": "address",
79
+ "name": "sender",
80
+ "type": "address"
81
+ }
82
+ ],
83
+ "name": "ERC20InvalidSender",
84
+ "type": "error"
85
+ },
86
+ {
87
+ "inputs": [
88
+ {
89
+ "internalType": "address",
90
+ "name": "spender",
91
+ "type": "address"
92
+ }
93
+ ],
94
+ "name": "ERC20InvalidSpender",
95
+ "type": "error"
96
+ },
11
97
  {
12
98
  "anonymous": false,
13
99
  "inputs": [
@@ -143,7 +229,7 @@
143
229
  },
144
230
  {
145
231
  "internalType": "uint256",
146
- "name": "amount",
232
+ "name": "value",
147
233
  "type": "uint256"
148
234
  }
149
235
  ],
@@ -190,54 +276,6 @@
190
276
  "stateMutability": "pure",
191
277
  "type": "function"
192
278
  },
193
- {
194
- "inputs": [
195
- {
196
- "internalType": "address",
197
- "name": "spender",
198
- "type": "address"
199
- },
200
- {
201
- "internalType": "uint256",
202
- "name": "subtractedValue",
203
- "type": "uint256"
204
- }
205
- ],
206
- "name": "decreaseAllowance",
207
- "outputs": [
208
- {
209
- "internalType": "bool",
210
- "name": "",
211
- "type": "bool"
212
- }
213
- ],
214
- "stateMutability": "nonpayable",
215
- "type": "function"
216
- },
217
- {
218
- "inputs": [
219
- {
220
- "internalType": "address",
221
- "name": "spender",
222
- "type": "address"
223
- },
224
- {
225
- "internalType": "uint256",
226
- "name": "addedValue",
227
- "type": "uint256"
228
- }
229
- ],
230
- "name": "increaseAllowance",
231
- "outputs": [
232
- {
233
- "internalType": "bool",
234
- "name": "",
235
- "type": "bool"
236
- }
237
- ],
238
- "stateMutability": "nonpayable",
239
- "type": "function"
240
- },
241
279
  {
242
280
  "inputs": [],
243
281
  "name": "name",
@@ -286,7 +324,7 @@
286
324
  },
287
325
  {
288
326
  "internalType": "uint256",
289
- "name": "amount",
327
+ "name": "value",
290
328
  "type": "uint256"
291
329
  }
292
330
  ],
@@ -315,7 +353,7 @@
315
353
  },
316
354
  {
317
355
  "internalType": "uint256",
318
- "name": "amount",
356
+ "name": "value",
319
357
  "type": "uint256"
320
358
  }
321
359
  ],
@@ -331,8 +369,8 @@
331
369
  "type": "function"
332
370
  }
333
371
  ],
334
- "bytecode": "0x60806040523480156200001157600080fd5b506040518060400160405280600b81526020016a1554d110c80b4815195cdd60aa1b815250604051806040016040528060048152602001635553444360e01b815250816003908162000064919062000227565b50600462000073828262000227565b505050620000ae6200008a620000b460201b60201c565b620000986006600a62000408565b620000a890633b9aca0062000420565b620000b8565b62000450565b3390565b6001600160a01b038216620001135760405162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f206164647265737300604482015260640160405180910390fd5b80600260008282546200012791906200043a565b90915550506001600160a01b038216600081815260208181526040808320805486019055518481527fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef910160405180910390a35050565b505050565b634e487b7160e01b600052604160045260246000fd5b600181811c90821680620001ae57607f821691505b602082108103620001cf57634e487b7160e01b600052602260045260246000fd5b50919050565b601f8211156200017e57600081815260208120601f850160051c81016020861015620001fe5750805b601f850160051c820191505b818110156200021f578281556001016200020a565b505050505050565b81516001600160401b0381111562000243576200024362000183565b6200025b8162000254845462000199565b84620001d5565b602080601f8311600181146200029357600084156200027a5750858301515b600019600386901b1c1916600185901b1785556200021f565b600085815260208120601f198616915b82811015620002c457888601518255948401946001909101908401620002a3565b5085821015620002e35787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b634e487b7160e01b600052601160045260246000fd5b600181815b808511156200034a5781600019048211156200032e576200032e620002f3565b808516156200033c57918102915b93841c93908002906200030e565b509250929050565b600082620003635750600162000402565b81620003725750600062000402565b81600181146200038b57600281146200039657620003b6565b600191505062000402565b60ff841115620003aa57620003aa620002f3565b50506001821b62000402565b5060208310610133831016604e8410600b8410161715620003db575081810a62000402565b620003e7838362000309565b8060001904821115620003fe57620003fe620002f3565b0290505b92915050565b60006200041960ff84168362000352565b9392505050565b8082028115828204841417620004025762000402620002f3565b80820180821115620004025762000402620002f3565b610a3480620004606000396000f3fe608060405234801561001057600080fd5b50600436106100f55760003560e01c80633950935111610097578063a457c2d711610066578063a457c2d7146101f7578063a9059cbb1461020a578063dd62ed3e1461021d578063f76f8d781461023057600080fd5b8063395093511461018957806370a082311461019c57806395d89b41146101c5578063a3f4df7e146101cd57600080fd5b806323b872dd116100d357806323b872dd1461014d5780632e0f2625146101605780632ff2e9dc1461017a578063313ce5671461018257600080fd5b806306fdde03146100fa578063095ea7b31461011857806318160ddd1461013b575b600080fd5b610102610253565b60405161010f919061076c565b60405180910390f35b61012b6101263660046107d6565b6102e5565b604051901515815260200161010f565b6002545b60405190815260200161010f565b61012b61015b366004610800565b6102ff565b610168600681565b60405160ff909116815260200161010f565b61013f610323565b6006610168565b61012b6101973660046107d6565b610340565b61013f6101aa36600461083c565b6001600160a01b031660009081526020819052604090205490565b610102610362565b6101026040518060400160405280600b81526020016a1554d110c80b4815195cdd60aa1b81525081565b61012b6102053660046107d6565b610371565b61012b6102183660046107d6565b6103f1565b61013f61022b36600461085e565b6103ff565b610102604051806040016040528060048152602001635553444360e01b81525081565b60606003805461026290610891565b80601f016020809104026020016040519081016040528092919081815260200182805461028e90610891565b80156102db5780601f106102b0576101008083540402835291602001916102db565b820191906000526020600020905b8154815290600101906020018083116102be57829003601f168201915b5050505050905090565b6000336102f381858561042a565b60019150505b92915050565b60003361030d85828561054e565b6103188585856105c8565b506001949350505050565b61032f6006600a6109c5565b61033d90633b9aca006109d4565b81565b6000336102f381858561035383836103ff565b61035d91906109eb565b61042a565b60606004805461026290610891565b6000338161037f82866103ff565b9050838110156103e45760405162461bcd60e51b815260206004820152602560248201527f45524332303a2064656372656173656420616c6c6f77616e63652062656c6f77604482015264207a65726f60d81b60648201526084015b60405180910390fd5b610318828686840361042a565b6000336102f38185856105c8565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b6001600160a01b03831661048c5760405162461bcd60e51b8152602060048201526024808201527f45524332303a20617070726f76652066726f6d20746865207a65726f206164646044820152637265737360e01b60648201526084016103db565b6001600160a01b0382166104ed5760405162461bcd60e51b815260206004820152602260248201527f45524332303a20617070726f766520746f20746865207a65726f206164647265604482015261737360f01b60648201526084016103db565b6001600160a01b0383811660008181526001602090815260408083209487168084529482529182902085905590518481527f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925910160405180910390a3505050565b600061055a84846103ff565b905060001981146105c257818110156105b55760405162461bcd60e51b815260206004820152601d60248201527f45524332303a20696e73756666696369656e7420616c6c6f77616e636500000060448201526064016103db565b6105c2848484840361042a565b50505050565b6001600160a01b03831661062c5760405162461bcd60e51b815260206004820152602560248201527f45524332303a207472616e736665722066726f6d20746865207a65726f206164604482015264647265737360d81b60648201526084016103db565b6001600160a01b03821661068e5760405162461bcd60e51b815260206004820152602360248201527f45524332303a207472616e7366657220746f20746865207a65726f206164647260448201526265737360e81b60648201526084016103db565b6001600160a01b038316600090815260208190526040902054818110156107065760405162461bcd60e51b815260206004820152602660248201527f45524332303a207472616e7366657220616d6f756e7420657863656564732062604482015265616c616e636560d01b60648201526084016103db565b6001600160a01b03848116600081815260208181526040808320878703905593871680835291849020805487019055925185815290927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef910160405180910390a36105c2565b600060208083528351808285015260005b818110156107995785810183015185820160400152820161077d565b506000604082860101526040601f19601f8301168501019250505092915050565b80356001600160a01b03811681146107d157600080fd5b919050565b600080604083850312156107e957600080fd5b6107f2836107ba565b946020939093013593505050565b60008060006060848603121561081557600080fd5b61081e846107ba565b925061082c602085016107ba565b9150604084013590509250925092565b60006020828403121561084e57600080fd5b610857826107ba565b9392505050565b6000806040838503121561087157600080fd5b61087a836107ba565b9150610888602084016107ba565b90509250929050565b600181811c908216806108a557607f821691505b6020821081036108c557634e487b7160e01b600052602260045260246000fd5b50919050565b634e487b7160e01b600052601160045260246000fd5b600181815b8085111561091c578160001904821115610902576109026108cb565b8085161561090f57918102915b93841c93908002906108e6565b509250929050565b600082610933575060016102f9565b81610940575060006102f9565b816001811461095657600281146109605761097c565b60019150506102f9565b60ff841115610971576109716108cb565b50506001821b6102f9565b5060208310610133831016604e8410600b841016171561099f575081810a6102f9565b6109a983836108e1565b80600019048211156109bd576109bd6108cb565b029392505050565b600061085760ff841683610924565b80820281158282048414176102f9576102f96108cb565b808201808211156102f9576102f96108cb56fea2646970667358221220f5bae286a22b700b52fd354d2d62092b6c97ab36290cdada62a88b4dc72512b864736f6c63430008140033",
335
- "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100f55760003560e01c80633950935111610097578063a457c2d711610066578063a457c2d7146101f7578063a9059cbb1461020a578063dd62ed3e1461021d578063f76f8d781461023057600080fd5b8063395093511461018957806370a082311461019c57806395d89b41146101c5578063a3f4df7e146101cd57600080fd5b806323b872dd116100d357806323b872dd1461014d5780632e0f2625146101605780632ff2e9dc1461017a578063313ce5671461018257600080fd5b806306fdde03146100fa578063095ea7b31461011857806318160ddd1461013b575b600080fd5b610102610253565b60405161010f919061076c565b60405180910390f35b61012b6101263660046107d6565b6102e5565b604051901515815260200161010f565b6002545b60405190815260200161010f565b61012b61015b366004610800565b6102ff565b610168600681565b60405160ff909116815260200161010f565b61013f610323565b6006610168565b61012b6101973660046107d6565b610340565b61013f6101aa36600461083c565b6001600160a01b031660009081526020819052604090205490565b610102610362565b6101026040518060400160405280600b81526020016a1554d110c80b4815195cdd60aa1b81525081565b61012b6102053660046107d6565b610371565b61012b6102183660046107d6565b6103f1565b61013f61022b36600461085e565b6103ff565b610102604051806040016040528060048152602001635553444360e01b81525081565b60606003805461026290610891565b80601f016020809104026020016040519081016040528092919081815260200182805461028e90610891565b80156102db5780601f106102b0576101008083540402835291602001916102db565b820191906000526020600020905b8154815290600101906020018083116102be57829003601f168201915b5050505050905090565b6000336102f381858561042a565b60019150505b92915050565b60003361030d85828561054e565b6103188585856105c8565b506001949350505050565b61032f6006600a6109c5565b61033d90633b9aca006109d4565b81565b6000336102f381858561035383836103ff565b61035d91906109eb565b61042a565b60606004805461026290610891565b6000338161037f82866103ff565b9050838110156103e45760405162461bcd60e51b815260206004820152602560248201527f45524332303a2064656372656173656420616c6c6f77616e63652062656c6f77604482015264207a65726f60d81b60648201526084015b60405180910390fd5b610318828686840361042a565b6000336102f38185856105c8565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b6001600160a01b03831661048c5760405162461bcd60e51b8152602060048201526024808201527f45524332303a20617070726f76652066726f6d20746865207a65726f206164646044820152637265737360e01b60648201526084016103db565b6001600160a01b0382166104ed5760405162461bcd60e51b815260206004820152602260248201527f45524332303a20617070726f766520746f20746865207a65726f206164647265604482015261737360f01b60648201526084016103db565b6001600160a01b0383811660008181526001602090815260408083209487168084529482529182902085905590518481527f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925910160405180910390a3505050565b600061055a84846103ff565b905060001981146105c257818110156105b55760405162461bcd60e51b815260206004820152601d60248201527f45524332303a20696e73756666696369656e7420616c6c6f77616e636500000060448201526064016103db565b6105c2848484840361042a565b50505050565b6001600160a01b03831661062c5760405162461bcd60e51b815260206004820152602560248201527f45524332303a207472616e736665722066726f6d20746865207a65726f206164604482015264647265737360d81b60648201526084016103db565b6001600160a01b03821661068e5760405162461bcd60e51b815260206004820152602360248201527f45524332303a207472616e7366657220746f20746865207a65726f206164647260448201526265737360e81b60648201526084016103db565b6001600160a01b038316600090815260208190526040902054818110156107065760405162461bcd60e51b815260206004820152602660248201527f45524332303a207472616e7366657220616d6f756e7420657863656564732062604482015265616c616e636560d01b60648201526084016103db565b6001600160a01b03848116600081815260208181526040808320878703905593871680835291849020805487019055925185815290927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef910160405180910390a36105c2565b600060208083528351808285015260005b818110156107995785810183015185820160400152820161077d565b506000604082860101526040601f19601f8301168501019250505092915050565b80356001600160a01b03811681146107d157600080fd5b919050565b600080604083850312156107e957600080fd5b6107f2836107ba565b946020939093013593505050565b60008060006060848603121561081557600080fd5b61081e846107ba565b925061082c602085016107ba565b9150604084013590509250925092565b60006020828403121561084e57600080fd5b610857826107ba565b9392505050565b6000806040838503121561087157600080fd5b61087a836107ba565b9150610888602084016107ba565b90509250929050565b600181811c908216806108a557607f821691505b6020821081036108c557634e487b7160e01b600052602260045260246000fd5b50919050565b634e487b7160e01b600052601160045260246000fd5b600181815b8085111561091c578160001904821115610902576109026108cb565b8085161561090f57918102915b93841c93908002906108e6565b509250929050565b600082610933575060016102f9565b81610940575060006102f9565b816001811461095657600281146109605761097c565b60019150506102f9565b60ff841115610971576109716108cb565b50506001821b6102f9565b5060208310610133831016604e8410600b841016171561099f575081810a6102f9565b6109a983836108e1565b80600019048211156109bd576109bd6108cb565b029392505050565b600061085760ff841683610924565b80820281158282048414176102f9576102f96108cb565b808201808211156102f9576102f96108cb56fea2646970667358221220f5bae286a22b700b52fd354d2d62092b6c97ab36290cdada62a88b4dc72512b864736f6c63430008140033",
372
+ "bytecode": "0x60806040523480156200001157600080fd5b506040518060400160405280600b81526020016a1554d110c80b4815195cdd60aa1b815250604051806040016040528060048152602001635553444360e01b8152508160039081620000649190620002d2565b506004620000738282620002d2565b505050620000ae6200008a620000b460201b60201c565b620000986006600a620004b3565b620000a890633b9aca00620004cb565b620000b8565b620004fb565b3390565b6001600160a01b038216620000e85760405163ec442f0560e01b8152600060048201526024015b60405180910390fd5b620000f660008383620000fa565b5050565b6001600160a01b038316620001295780600260008282546200011d9190620004e5565b909155506200019d9050565b6001600160a01b038316600090815260208190526040902054818110156200017e5760405163391434e360e21b81526001600160a01b03851660048201526024810182905260448101839052606401620000df565b6001600160a01b03841660009081526020819052604090209082900390555b6001600160a01b038216620001bb57600280548290039055620001da565b6001600160a01b03821660009081526020819052604090208054820190555b816001600160a01b0316836001600160a01b03167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040516200022091815260200190565b60405180910390a3505050565b634e487b7160e01b600052604160045260246000fd5b600181811c908216806200025857607f821691505b6020821081036200027957634e487b7160e01b600052602260045260246000fd5b50919050565b601f821115620002cd57600081815260208120601f850160051c81016020861015620002a85750805b601f850160051c820191505b81811015620002c957828155600101620002b4565b5050505b505050565b81516001600160401b03811115620002ee57620002ee6200022d565b6200030681620002ff845462000243565b846200027f565b602080601f8311600181146200033e5760008415620003255750858301515b600019600386901b1c1916600185901b178555620002c9565b600085815260208120601f198616915b828110156200036f578886015182559484019460019091019084016200034e565b50858210156200038e5787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b634e487b7160e01b600052601160045260246000fd5b600181815b80851115620003f5578160001904821115620003d957620003d96200039e565b80851615620003e757918102915b93841c9390800290620003b9565b509250929050565b6000826200040e57506001620004ad565b816200041d57506000620004ad565b8160018114620004365760028114620004415762000461565b6001915050620004ad565b60ff8411156200045557620004556200039e565b50506001821b620004ad565b5060208310610133831016604e8410600b841016171562000486575081810a620004ad565b620004928383620003b4565b8060001904821115620004a957620004a96200039e565b0290505b92915050565b6000620004c460ff841683620003fd565b9392505050565b8082028115828204841417620004ad57620004ad6200039e565b80820180821115620004ad57620004ad6200039e565b6108f2806200050b6000396000f3fe608060405234801561001057600080fd5b50600436106100cf5760003560e01c8063313ce5671161008c578063a3f4df7e11610066578063a3f4df7e14610194578063a9059cbb146101be578063dd62ed3e146101d1578063f76f8d781461020a57600080fd5b8063313ce5671461015c57806370a082311461016357806395d89b411461018c57600080fd5b806306fdde03146100d4578063095ea7b3146100f257806318160ddd1461011557806323b872dd146101275780632e0f26251461013a5780632ff2e9dc14610154575b600080fd5b6100dc61022d565b6040516100e9919061062a565b60405180910390f35b610105610100366004610694565b6102bf565b60405190151581526020016100e9565b6002545b6040519081526020016100e9565b6101056101353660046106be565b6102d9565b610142600681565b60405160ff90911681526020016100e9565b6101196102fd565b6006610142565b6101196101713660046106fa565b6001600160a01b031660009081526020819052604090205490565b6100dc61031a565b6100dc6040518060400160405280600b81526020016a1554d110c80b4815195cdd60aa1b81525081565b6101056101cc366004610694565b610329565b6101196101df36600461071c565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b6100dc604051806040016040528060048152602001635553444360e01b81525081565b60606003805461023c9061074f565b80601f01602080910402602001604051908101604052809291908181526020018280546102689061074f565b80156102b55780601f1061028a576101008083540402835291602001916102b5565b820191906000526020600020905b81548152906001019060200180831161029857829003601f168201915b5050505050905090565b6000336102cd818585610337565b60019150505b92915050565b6000336102e7858285610349565b6102f28585856103cc565b506001949350505050565b6103096006600a610883565b61031790633b9aca00610892565b81565b60606004805461023c9061074f565b6000336102cd8185856103cc565b610344838383600161042b565b505050565b6001600160a01b0383811660009081526001602090815260408083209386168352929052205460001981146103c657818110156103b757604051637dc7a0d960e11b81526001600160a01b038416600482015260248101829052604481018390526064015b60405180910390fd5b6103c68484848403600061042b565b50505050565b6001600160a01b0383166103f657604051634b637e8f60e11b8152600060048201526024016103ae565b6001600160a01b0382166104205760405163ec442f0560e01b8152600060048201526024016103ae565b610344838383610500565b6001600160a01b0384166104555760405163e602df0560e01b8152600060048201526024016103ae565b6001600160a01b03831661047f57604051634a1406b160e11b8152600060048201526024016103ae565b6001600160a01b03808516600090815260016020908152604080832093871683529290522082905580156103c657826001600160a01b0316846001600160a01b03167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925846040516104f291815260200190565b60405180910390a350505050565b6001600160a01b03831661052b57806002600082825461052091906108a9565b9091555061059d9050565b6001600160a01b0383166000908152602081905260409020548181101561057e5760405163391434e360e21b81526001600160a01b038516600482015260248101829052604481018390526064016103ae565b6001600160a01b03841660009081526020819052604090209082900390555b6001600160a01b0382166105b9576002805482900390556105d8565b6001600160a01b03821660009081526020819052604090208054820190555b816001600160a01b0316836001600160a01b03167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef8360405161061d91815260200190565b60405180910390a3505050565b600060208083528351808285015260005b818110156106575785810183015185820160400152820161063b565b506000604082860101526040601f19601f8301168501019250505092915050565b80356001600160a01b038116811461068f57600080fd5b919050565b600080604083850312156106a757600080fd5b6106b083610678565b946020939093013593505050565b6000806000606084860312156106d357600080fd5b6106dc84610678565b92506106ea60208501610678565b9150604084013590509250925092565b60006020828403121561070c57600080fd5b61071582610678565b9392505050565b6000806040838503121561072f57600080fd5b61073883610678565b915061074660208401610678565b90509250929050565b600181811c9082168061076357607f821691505b60208210810361078357634e487b7160e01b600052602260045260246000fd5b50919050565b634e487b7160e01b600052601160045260246000fd5b600181815b808511156107da5781600019048211156107c0576107c0610789565b808516156107cd57918102915b93841c93908002906107a4565b509250929050565b6000826107f1575060016102d3565b816107fe575060006102d3565b8160018114610814576002811461081e5761083a565b60019150506102d3565b60ff84111561082f5761082f610789565b50506001821b6102d3565b5060208310610133831016604e8410600b841016171561085d575081810a6102d3565b610867838361079f565b806000190482111561087b5761087b610789565b029392505050565b600061071560ff8416836107e2565b80820281158282048414176102d3576102d3610789565b808201808211156102d3576102d361078956fea2646970667358221220ce285ac8359b39ea9974e26ea7d0f956b6b879df7ebf8ae43077c020f2fd566864736f6c63430008140033",
373
+ "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100cf5760003560e01c8063313ce5671161008c578063a3f4df7e11610066578063a3f4df7e14610194578063a9059cbb146101be578063dd62ed3e146101d1578063f76f8d781461020a57600080fd5b8063313ce5671461015c57806370a082311461016357806395d89b411461018c57600080fd5b806306fdde03146100d4578063095ea7b3146100f257806318160ddd1461011557806323b872dd146101275780632e0f26251461013a5780632ff2e9dc14610154575b600080fd5b6100dc61022d565b6040516100e9919061062a565b60405180910390f35b610105610100366004610694565b6102bf565b60405190151581526020016100e9565b6002545b6040519081526020016100e9565b6101056101353660046106be565b6102d9565b610142600681565b60405160ff90911681526020016100e9565b6101196102fd565b6006610142565b6101196101713660046106fa565b6001600160a01b031660009081526020819052604090205490565b6100dc61031a565b6100dc6040518060400160405280600b81526020016a1554d110c80b4815195cdd60aa1b81525081565b6101056101cc366004610694565b610329565b6101196101df36600461071c565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b6100dc604051806040016040528060048152602001635553444360e01b81525081565b60606003805461023c9061074f565b80601f01602080910402602001604051908101604052809291908181526020018280546102689061074f565b80156102b55780601f1061028a576101008083540402835291602001916102b5565b820191906000526020600020905b81548152906001019060200180831161029857829003601f168201915b5050505050905090565b6000336102cd818585610337565b60019150505b92915050565b6000336102e7858285610349565b6102f28585856103cc565b506001949350505050565b6103096006600a610883565b61031790633b9aca00610892565b81565b60606004805461023c9061074f565b6000336102cd8185856103cc565b610344838383600161042b565b505050565b6001600160a01b0383811660009081526001602090815260408083209386168352929052205460001981146103c657818110156103b757604051637dc7a0d960e11b81526001600160a01b038416600482015260248101829052604481018390526064015b60405180910390fd5b6103c68484848403600061042b565b50505050565b6001600160a01b0383166103f657604051634b637e8f60e11b8152600060048201526024016103ae565b6001600160a01b0382166104205760405163ec442f0560e01b8152600060048201526024016103ae565b610344838383610500565b6001600160a01b0384166104555760405163e602df0560e01b8152600060048201526024016103ae565b6001600160a01b03831661047f57604051634a1406b160e11b8152600060048201526024016103ae565b6001600160a01b03808516600090815260016020908152604080832093871683529290522082905580156103c657826001600160a01b0316846001600160a01b03167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925846040516104f291815260200190565b60405180910390a350505050565b6001600160a01b03831661052b57806002600082825461052091906108a9565b9091555061059d9050565b6001600160a01b0383166000908152602081905260409020548181101561057e5760405163391434e360e21b81526001600160a01b038516600482015260248101829052604481018390526064016103ae565b6001600160a01b03841660009081526020819052604090209082900390555b6001600160a01b0382166105b9576002805482900390556105d8565b6001600160a01b03821660009081526020819052604090208054820190555b816001600160a01b0316836001600160a01b03167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef8360405161061d91815260200190565b60405180910390a3505050565b600060208083528351808285015260005b818110156106575785810183015185820160400152820161063b565b506000604082860101526040601f19601f8301168501019250505092915050565b80356001600160a01b038116811461068f57600080fd5b919050565b600080604083850312156106a757600080fd5b6106b083610678565b946020939093013593505050565b6000806000606084860312156106d357600080fd5b6106dc84610678565b92506106ea60208501610678565b9150604084013590509250925092565b60006020828403121561070c57600080fd5b61071582610678565b9392505050565b6000806040838503121561072f57600080fd5b61073883610678565b915061074660208401610678565b90509250929050565b600181811c9082168061076357607f821691505b60208210810361078357634e487b7160e01b600052602260045260246000fd5b50919050565b634e487b7160e01b600052601160045260246000fd5b600181815b808511156107da5781600019048211156107c0576107c0610789565b808516156107cd57918102915b93841c93908002906107a4565b509250929050565b6000826107f1575060016102d3565b816107fe575060006102d3565b8160018114610814576002811461081e5761083a565b60019150506102d3565b60ff84111561082f5761082f610789565b50506001821b6102d3565b5060208310610133831016604e8410600b841016171561085d575081810a6102d3565b610867838361079f565b806000190482111561087b5761087b610789565b029392505050565b600061071560ff8416836107e2565b80820281158282048414176102d3576102d3610789565b808201808211156102d3576102d361078956fea2646970667358221220ce285ac8359b39ea9974e26ea7d0f956b6b879df7ebf8ae43077c020f2fd566864736f6c63430008140033",
336
374
  "linkReferences": {},
337
375
  "deployedLinkReferences": {}
338
376
  }
package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/ddc9b0b487d1eff0b437a694ef8bc6d1.json"
3
+ "buildInfo": "../../../build-info/b012f4ed156d977fd771c60cd60f52df.json"
4
4
  }
package/artifacts/contracts/test/TestVersion.sol/TestVersion.json CHANGED
@@ -161,8 +161,8 @@
161
161
  "type": "function"
162
162
  }
163
163
  ],
164
- "bytecode": "0x608060405234801561001057600080fd5b50610544806100206000396000f3fe608060405234801561001057600080fd5b506004361061007d5760003560e01c80636a3dc0ee1161005b5780636a3dc0ee146100ed57806389818c3c1461011057806389d5976814610135578063e038c6251461014857600080fd5b80630f40f5951461008257806312cf04de146100a357806364d4e5d8146100b6575b600080fd5b61008a61015b565b60405162ffffff90911681526020015b60405180910390f35b61008a6100b13660046103ce565b6101cf565b6100c96100c436600461040e565b61025c565b6040805160ff9485168152928416602084015292169181019190915260600161009a565b6101006100fb36600461042b565b6102e8565b604051901515815260200161009a565b61012361011e366004610464565b6102fd565b60405160ff909116815260200161009a565b61010061014336600461042b565b61037d565b61012361015636600461040e565b61038f565b600073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__6304b8f6c56040518163ffffffff1660e01b8152600401602060405180830381865af41580156101a6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101ca919061047d565b905090565b604051632efe011360e01b815260048101849052602481018390526044810182905260009073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af4158015610230573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610254919061047d565b949350505050565b6040516324d3888d60e11b815262ffffff821660048201526000908190819073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__906349a7111a90602401606060405180830381865af41580156102b7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102db91906104b0565b9250925092509193909250565b600062ffffff808316908416115b9392505050565b604051632392b61b60e21b815260ff8216600482015260009073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90638e4ad86c906024015b602060405180830381865af4158015610353573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061037791906104f3565b92915050565b600062ffffff808416908316146102f6565b60405163c9e66e2960e01b815262ffffff8216600482015260009073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__9063c9e66e2990602401610336565b6000806000606084860312156103e357600080fd5b505081359360208301359350604090920135919050565b62ffffff8116811461040b57600080fd5b50565b60006020828403121561042057600080fd5b81356102f6816103fa565b6000806040838503121561043e57600080fd5b8235610449816103fa565b91506020830135610459816103fa565b809150509250929050565b60006020828403121561047657600080fd5b5035919050565b60006020828403121561048f57600080fd5b81516102f6816103fa565b805160ff811681146104ab57600080fd5b919050565b6000806000606084860312156104c557600080fd5b6104ce8461049a565b92506104dc6020850161049a565b91506104ea6040850161049a565b90509250925092565b60006020828403121561050557600080fd5b6102f68261049a56fea2646970667358221220f19043d0a02e1b8e1b6b65109d61c8a46b38352b73b29196b595115cec87eae664736f6c63430008140033",
165
- "deployedBytecode": "0x608060405234801561001057600080fd5b506004361061007d5760003560e01c80636a3dc0ee1161005b5780636a3dc0ee146100ed57806389818c3c1461011057806389d5976814610135578063e038c6251461014857600080fd5b80630f40f5951461008257806312cf04de146100a357806364d4e5d8146100b6575b600080fd5b61008a61015b565b60405162ffffff90911681526020015b60405180910390f35b61008a6100b13660046103ce565b6101cf565b6100c96100c436600461040e565b61025c565b6040805160ff9485168152928416602084015292169181019190915260600161009a565b6101006100fb36600461042b565b6102e8565b604051901515815260200161009a565b61012361011e366004610464565b6102fd565b60405160ff909116815260200161009a565b61010061014336600461042b565b61037d565b61012361015636600461040e565b61038f565b600073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__6304b8f6c56040518163ffffffff1660e01b8152600401602060405180830381865af41580156101a6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101ca919061047d565b905090565b604051632efe011360e01b815260048101849052602481018390526044810182905260009073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af4158015610230573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610254919061047d565b949350505050565b6040516324d3888d60e11b815262ffffff821660048201526000908190819073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__906349a7111a90602401606060405180830381865af41580156102b7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102db91906104b0565b9250925092509193909250565b600062ffffff808316908416115b9392505050565b604051632392b61b60e21b815260ff8216600482015260009073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90638e4ad86c906024015b602060405180830381865af4158015610353573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061037791906104f3565b92915050565b600062ffffff808416908316146102f6565b60405163c9e66e2960e01b815262ffffff8216600482015260009073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__9063c9e66e2990602401610336565b6000806000606084860312156103e357600080fd5b505081359360208301359350604090920135919050565b62ffffff8116811461040b57600080fd5b50565b60006020828403121561042057600080fd5b81356102f6816103fa565b6000806040838503121561043e57600080fd5b8235610449816103fa565b91506020830135610459816103fa565b809150509250929050565b60006020828403121561047657600080fd5b5035919050565b60006020828403121561048f57600080fd5b81516102f6816103fa565b805160ff811681146104ab57600080fd5b919050565b6000806000606084860312156104c557600080fd5b6104ce8461049a565b92506104dc6020850161049a565b91506104ea6040850161049a565b90509250925092565b60006020828403121561050557600080fd5b6102f68261049a56fea2646970667358221220f19043d0a02e1b8e1b6b65109d61c8a46b38352b73b29196b595115cec87eae664736f6c63430008140033",
164
+ "bytecode": "0x608060405234801561001057600080fd5b50610544806100206000396000f3fe608060405234801561001057600080fd5b506004361061007d5760003560e01c80636a3dc0ee1161005b5780636a3dc0ee146100ed57806389818c3c1461011057806389d5976814610135578063e038c6251461014857600080fd5b80630f40f5951461008257806312cf04de146100a357806364d4e5d8146100b6575b600080fd5b61008a61015b565b60405162ffffff90911681526020015b60405180910390f35b61008a6100b13660046103ce565b6101cf565b6100c96100c436600461040e565b61025c565b6040805160ff9485168152928416602084015292169181019190915260600161009a565b6101006100fb36600461042b565b6102e8565b604051901515815260200161009a565b61012361011e366004610464565b6102fd565b60405160ff909116815260200161009a565b61010061014336600461042b565b61037d565b61012361015636600461040e565b61038f565b600073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__6304b8f6c56040518163ffffffff1660e01b8152600401602060405180830381865af41580156101a6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101ca919061047d565b905090565b604051632efe011360e01b815260048101849052602481018390526044810182905260009073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af4158015610230573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610254919061047d565b949350505050565b6040516324d3888d60e11b815262ffffff821660048201526000908190819073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__906349a7111a90602401606060405180830381865af41580156102b7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102db91906104b0565b9250925092509193909250565b600062ffffff808316908416115b9392505050565b604051632392b61b60e21b815260ff8216600482015260009073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90638e4ad86c906024015b602060405180830381865af4158015610353573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061037791906104f3565b92915050565b600062ffffff808416908316146102f6565b60405163c9e66e2960e01b815262ffffff8216600482015260009073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__9063c9e66e2990602401610336565b6000806000606084860312156103e357600080fd5b505081359360208301359350604090920135919050565b62ffffff8116811461040b57600080fd5b50565b60006020828403121561042057600080fd5b81356102f6816103fa565b6000806040838503121561043e57600080fd5b8235610449816103fa565b91506020830135610459816103fa565b809150509250929050565b60006020828403121561047657600080fd5b5035919050565b60006020828403121561048f57600080fd5b81516102f6816103fa565b805160ff811681146104ab57600080fd5b919050565b6000806000606084860312156104c557600080fd5b6104ce8461049a565b92506104dc6020850161049a565b91506104ea6040850161049a565b90509250925092565b60006020828403121561050557600080fd5b6102f68261049a56fea264697066735822122080f150de8b61ad3f87c071a3e90af61131794db3f3d57c03e041374b81317b1564736f6c63430008140033",
165
+ "deployedBytecode": "0x608060405234801561001057600080fd5b506004361061007d5760003560e01c80636a3dc0ee1161005b5780636a3dc0ee146100ed57806389818c3c1461011057806389d5976814610135578063e038c6251461014857600080fd5b80630f40f5951461008257806312cf04de146100a357806364d4e5d8146100b6575b600080fd5b61008a61015b565b60405162ffffff90911681526020015b60405180910390f35b61008a6100b13660046103ce565b6101cf565b6100c96100c436600461040e565b61025c565b6040805160ff9485168152928416602084015292169181019190915260600161009a565b6101006100fb36600461042b565b6102e8565b604051901515815260200161009a565b61012361011e366004610464565b6102fd565b60405160ff909116815260200161009a565b61010061014336600461042b565b61037d565b61012361015636600461040e565b61038f565b600073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__6304b8f6c56040518163ffffffff1660e01b8152600401602060405180830381865af41580156101a6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101ca919061047d565b905090565b604051632efe011360e01b815260048101849052602481018390526044810182905260009073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af4158015610230573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610254919061047d565b949350505050565b6040516324d3888d60e11b815262ffffff821660048201526000908190819073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__906349a7111a90602401606060405180830381865af41580156102b7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102db91906104b0565b9250925092509193909250565b600062ffffff808316908416115b9392505050565b604051632392b61b60e21b815260ff8216600482015260009073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90638e4ad86c906024015b602060405180830381865af4158015610353573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061037791906104f3565b92915050565b600062ffffff808416908316146102f6565b60405163c9e66e2960e01b815262ffffff8216600482015260009073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__9063c9e66e2990602401610336565b6000806000606084860312156103e357600080fd5b505081359360208301359350604090920135919050565b62ffffff8116811461040b57600080fd5b50565b60006020828403121561042057600080fd5b81356102f6816103fa565b6000806040838503121561043e57600080fd5b8235610449816103fa565b91506020830135610459816103fa565b809150509250929050565b60006020828403121561047657600080fd5b5035919050565b60006020828403121561048f57600080fd5b81516102f6816103fa565b805160ff811681146104ab57600080fd5b919050565b6000806000606084860312156104c557600080fd5b6104ce8461049a565b92506104dc6020850161049a565b91506104ea6040850161049a565b90509250925092565b60006020828403121561050557600080fd5b6102f68261049a56fea264697066735822122080f150de8b61ad3f87c071a3e90af61131794db3f3d57c03e041374b81317b1564736f6c63430008140033",
166
166
  "linkReferences": {
167
167
  "contracts/types/Version.sol": {
168
168
  "VersionLib": [
package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/ddc9b0b487d1eff0b437a694ef8bc6d1.json"
3
+ "buildInfo": "../../../build-info/b012f4ed156d977fd771c60cd60f52df.json"
4
4
  }
package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json CHANGED
@@ -48,32 +48,9 @@
48
48
  "type": "address"
49
49
  }
50
50
  ],
51
- "name": "LogVersionableActivated",
51
+ "name": "LogVersionableInitialized",
52
52
  "type": "event"
53
53
  },
54
- {
55
- "inputs": [
56
- {
57
- "internalType": "address",
58
- "name": "implementation",
59
- "type": "address"
60
- },
61
- {
62
- "internalType": "address",
63
- "name": "activatedBy",
64
- "type": "address"
65
- },
66
- {
67
- "internalType": "bytes",
68
- "name": "activatinData",
69
- "type": "bytes"
70
- }
71
- ],
72
- "name": "activate",
73
- "outputs": [],
74
- "stateMutability": "nonpayable",
75
- "type": "function"
76
- },
77
54
  {
78
55
  "inputs": [],
79
56
  "name": "getInitializedVersion",
@@ -192,7 +169,7 @@
192
169
  },
193
170
  {
194
171
  "internalType": "bytes",
195
- "name": "initializationData",
172
+ "name": "data",
196
173
  "type": "bytes"
197
174
  }
198
175
  ],
@@ -209,7 +186,7 @@
209
186
  "type": "uint24"
210
187
  }
211
188
  ],
212
- "name": "isActivated",
189
+ "name": "isInitialized",
213
190
  "outputs": [
214
191
  {
215
192
  "internalType": "bool",
@@ -234,7 +211,7 @@
234
211
  },
235
212
  {
236
213
  "internalType": "bytes",
237
- "name": "upgradeData",
214
+ "name": "data",
238
215
  "type": "bytes"
239
216
  }
240
217
  ],
@@ -244,18 +221,14 @@
244
221
  "type": "function"
245
222
  }
246
223
  ],
247
- "bytecode": "0x60806040523480156200001157600080fd5b506200001f60003362000025565b620004c3565b60006200003162000300565b90506200003e816200038d565b15620000a15760405162461bcd60e51b815260206004820152602760248201527f4552524f523a56524e2d3030313a56455253494f4e5f414c52454144595f41436044820152661512559055115160ca1b60648201526084015b60405180910390fd5b6001541562000161576001805460009190620000bf90829062000443565b81548110620000d257620000d262000465565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff16905062000105828262000431565b6200015f5760405162461bcd60e51b8152602060048201526024808201527f4552524f523a56524e2d3030323a56455253494f4e5f4e4f545f494e4352454160448201526353494e4760e01b606482015260840162000098565b505b600180548082018255600091909152600a8082047fb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf601805462ffffff808616600394909506939093026101000a848102930219169190911790556040805160a0810182529182526001600160a01b03808616602084015284169082015260608101620001ea4290565b64ffffffffff1681526020014363ffffffff90811690915262ffffff8084166000908152602081815260409182902085518154928701516001600160a01b039081166301000000026001600160b81b0319909416919095161791909117815584820151600190910180546060870151608090970151909516600160c81b0263ffffffff60c81b1964ffffffffff909716600160a01b026001600160c81b031990961692909416919091179390931793909316179055517f68e7327fca0057a787cde34ababb9ef9844ba8065ee03e8781d8122fc15d441990620002f39083908690869062ffffff9390931683526001600160a01b03918216602084015216604082015260600190565b60405180910390a1505050565b604051632efe011360e01b815260036004820152600060248201819052604482018190529073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af415801562000362573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200038891906200047b565b905090565b62ffffff8116600090815260208190526040808220600101549051631bbffab160e21b8152600160c81b90910463ffffffff166004820152819073__$5f476116ae21c5294e0c0761c07efa7e1c$__90636effeac490602401602060405180830381865af415801562000404573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200042a9190620004a9565b1192915050565b62ffffff808216908316115b92915050565b818103818111156200043d57634e487b7160e01b600052601160045260246000fd5b634e487b7160e01b600052603260045260246000fd5b6000602082840312156200048e57600080fd5b815162ffffff81168114620004a257600080fd5b9392505050565b600060208284031215620004bc57600080fd5b5051919050565b6108cf80620004d36000396000f3fe608060405234801561001057600080fd5b50600436106100935760003560e01c8063946dfcfe11610066578063946dfcfe146101fe578063a745e3df146101e9578063b3c650151461020f578063b88da75914610230578063cf7a1d771461024357600080fd5b80630abd8434146100985780630d8e6e2c146100c05780634d459c90146100dc5780635b5b48f5146101e9575b600080fd5b6100ab6100a63660046106eb565b610256565b60405190151581526020015b60405180910390f35b6100c86102f7565b60405162ffffff90911681526020016100b7565b61018c6100ea3660046106eb565b6040805160a0810182526000808252602082018190529181018290526060810182905260808101919091525062ffffff90811660009081526020818152604091829020825160a0810184528154948516815263010000009094046001600160a01b03908116928501929092526001015490811691830191909152600160a01b810464ffffffffff166060830152600160c81b900463ffffffff16608082015290565b60408051825162ffffff1681526020808401516001600160a01b039081169183019190915283830151169181019190915260608083015164ffffffffff169082015260809182015163ffffffff169181019190915260a0016100b7565b6101fc6101f7366004610741565b505050565b005b6001546040519081526020016100b7565b610217610381565b60405167ffffffffffffffff90911681526020016100b7565b6100c861023e366004610813565b6103b5565b6101fc610251366004610741565b6103f6565b62ffffff8116600090815260208190526040808220600101549051631bbffab160e21b8152600160c81b90910463ffffffff166004820152819073__$5f476116ae21c5294e0c0761c07efa7e1c$__90636effeac490602401602060405180830381865af41580156102cc573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102f0919061082c565b1192915050565b604051632efe011360e01b815260036004820152600060248201819052604482018190529073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af4158015610358573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061037c9190610845565b905090565b600061037c7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a005467ffffffffffffffff1690565b6000600182815481106103ca576103ca610862565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff169050919050565b6101f7838360006104056102f7565b905061041081610256565b156104725760405162461bcd60e51b815260206004820152602760248201527f4552524f523a56524e2d3030313a56455253494f4e5f414c52454144595f41436044820152661512559055115160ca1b60648201526084015b60405180910390fd5b6001541561052857600180546000919061048d908290610878565b8154811061049d5761049d610862565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff1690506104ce82826106c5565b6105265760405162461bcd60e51b8152602060048201526024808201527f4552524f523a56524e2d3030323a56455253494f4e5f4e4f545f494e4352454160448201526353494e4760e01b6064820152608401610469565b505b600180548082018255600091909152600a8082047fb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf601805462ffffff808616600394909506939093026101000a848102930219169190911790556040805160a0810182529182526001600160a01b038086166020840152841690820152606081016105b04290565b64ffffffffff1681526020014363ffffffff90811690915262ffffff8084166000908152602081815260409182902085518154928701516001600160a01b039081166301000000026001600160b81b0319909416919095161791909117815584820151600190910180546060870151608090970151909516600160c81b0263ffffffff60c81b1964ffffffffff909716600160a01b026001600160c81b031990961692909416919091179390931793909316179055517f68e7327fca0057a787cde34ababb9ef9844ba8065ee03e8781d8122fc15d4419906106b89083908690869062ffffff9390931683526001600160a01b03918216602084015216604082015260600190565b60405180910390a1505050565b62ffffff808216908316115b92915050565b62ffffff811681146106e857600080fd5b50565b6000602082840312156106fd57600080fd5b8135610708816106d7565b9392505050565b80356001600160a01b038116811461072657600080fd5b919050565b634e487b7160e01b600052604160045260246000fd5b60008060006060848603121561075657600080fd5b61075f8461070f565b925061076d6020850161070f565b9150604084013567ffffffffffffffff8082111561078a57600080fd5b818601915086601f83011261079e57600080fd5b8135818111156107b0576107b061072b565b604051601f8201601f19908116603f011681019083821181831017156107d8576107d861072b565b816040528281528960208487010111156107f157600080fd5b8260208601602083013760006020848301015280955050505050509250925092565b60006020828403121561082557600080fd5b5035919050565b60006020828403121561083e57600080fd5b5051919050565b60006020828403121561085757600080fd5b8151610708816106d7565b634e487b7160e01b600052603260045260246000fd5b818103818111156106d157634e487b7160e01b600052601160045260246000fdfea2646970667358221220f616dbba054c88918a6cb2a8d173478e16770656e2fba5875e2e42be4650483f64736f6c63430008140033",
248
- "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100935760003560e01c8063946dfcfe11610066578063946dfcfe146101fe578063a745e3df146101e9578063b3c650151461020f578063b88da75914610230578063cf7a1d771461024357600080fd5b80630abd8434146100985780630d8e6e2c146100c05780634d459c90146100dc5780635b5b48f5146101e9575b600080fd5b6100ab6100a63660046106eb565b610256565b60405190151581526020015b60405180910390f35b6100c86102f7565b60405162ffffff90911681526020016100b7565b61018c6100ea3660046106eb565b6040805160a0810182526000808252602082018190529181018290526060810182905260808101919091525062ffffff90811660009081526020818152604091829020825160a0810184528154948516815263010000009094046001600160a01b03908116928501929092526001015490811691830191909152600160a01b810464ffffffffff166060830152600160c81b900463ffffffff16608082015290565b60408051825162ffffff1681526020808401516001600160a01b039081169183019190915283830151169181019190915260608083015164ffffffffff169082015260809182015163ffffffff169181019190915260a0016100b7565b6101fc6101f7366004610741565b505050565b005b6001546040519081526020016100b7565b610217610381565b60405167ffffffffffffffff90911681526020016100b7565b6100c861023e366004610813565b6103b5565b6101fc610251366004610741565b6103f6565b62ffffff8116600090815260208190526040808220600101549051631bbffab160e21b8152600160c81b90910463ffffffff166004820152819073__$5f476116ae21c5294e0c0761c07efa7e1c$__90636effeac490602401602060405180830381865af41580156102cc573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102f0919061082c565b1192915050565b604051632efe011360e01b815260036004820152600060248201819052604482018190529073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af4158015610358573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061037c9190610845565b905090565b600061037c7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a005467ffffffffffffffff1690565b6000600182815481106103ca576103ca610862565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff169050919050565b6101f7838360006104056102f7565b905061041081610256565b156104725760405162461bcd60e51b815260206004820152602760248201527f4552524f523a56524e2d3030313a56455253494f4e5f414c52454144595f41436044820152661512559055115160ca1b60648201526084015b60405180910390fd5b6001541561052857600180546000919061048d908290610878565b8154811061049d5761049d610862565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff1690506104ce82826106c5565b6105265760405162461bcd60e51b8152602060048201526024808201527f4552524f523a56524e2d3030323a56455253494f4e5f4e4f545f494e4352454160448201526353494e4760e01b6064820152608401610469565b505b600180548082018255600091909152600a8082047fb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf601805462ffffff808616600394909506939093026101000a848102930219169190911790556040805160a0810182529182526001600160a01b038086166020840152841690820152606081016105b04290565b64ffffffffff1681526020014363ffffffff90811690915262ffffff8084166000908152602081815260409182902085518154928701516001600160a01b039081166301000000026001600160b81b0319909416919095161791909117815584820151600190910180546060870151608090970151909516600160c81b0263ffffffff60c81b1964ffffffffff909716600160a01b026001600160c81b031990961692909416919091179390931793909316179055517f68e7327fca0057a787cde34ababb9ef9844ba8065ee03e8781d8122fc15d4419906106b89083908690869062ffffff9390931683526001600160a01b03918216602084015216604082015260600190565b60405180910390a1505050565b62ffffff808216908316115b92915050565b62ffffff811681146106e857600080fd5b50565b6000602082840312156106fd57600080fd5b8135610708816106d7565b9392505050565b80356001600160a01b038116811461072657600080fd5b919050565b634e487b7160e01b600052604160045260246000fd5b60008060006060848603121561075657600080fd5b61075f8461070f565b925061076d6020850161070f565b9150604084013567ffffffffffffffff8082111561078a57600080fd5b818601915086601f83011261079e57600080fd5b8135818111156107b0576107b061072b565b604051601f8201601f19908116603f011681019083821181831017156107d8576107d861072b565b816040528281528960208487010111156107f157600080fd5b8260208601602083013760006020848301015280955050505050509250925092565b60006020828403121561082557600080fd5b5035919050565b60006020828403121561083e57600080fd5b5051919050565b60006020828403121561085757600080fd5b8151610708816106d7565b634e487b7160e01b600052603260045260246000fd5b818103818111156106d157634e487b7160e01b600052601160045260246000fdfea2646970667358221220f616dbba054c88918a6cb2a8d173478e16770656e2fba5875e2e42be4650483f64736f6c63430008140033",
224
+ "bytecode": "0x608060405234801561001057600080fd5b5061001961001e565b6100d0565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a00805468010000000000000000900460ff161561006e5760405163f92ee8a960e01b815260040160405180910390fd5b80546001600160401b03908116146100cd5780546001600160401b0319166001600160401b0390811782556040519081527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b50565b610b4d806100df6000396000f3fe608060405234801561001057600080fd5b50600436106100885760003560e01c8063a745e3df1161005b578063a745e3df1461021a578063b3c650151461022f578063b88da75914610250578063cf7a1d771461026357600080fd5b80630d8e6e2c1461008d5780634d459c90146100ae5780634f421333146101c7578063946dfcfe146101ea575b600080fd5b610095610276565b60405162ffffff90911681526020015b60405180910390f35b61016a6100bc366004610920565b6040805160a081018252600080825260208201819052918101829052606081018290526080810191909152600080516020610af883398151915262ffffff92831660009081526020918252604090819020815160a0810183528154958616815263010000009095046001600160a01b03908116938601939093526001015491821690840152600160a01b810464ffffffffff166060840152600160c81b900463ffffffff1660808301525090565b60408051825162ffffff1681526020808401516001600160a01b039081169183019190915283830151169181019190915260608083015164ffffffffff169082015260809182015163ffffffff169181019190915260a0016100a5565b6101da6101d5366004610920565b610300565b60405190151581526020016100a5565b7f4f61291a8ac3d020d0a7d919a76b8592aa88385744dee3f8b4f3873b969ed901546040519081526020016100a5565b61022d610228366004610976565b6103b3565b005b610237610510565b60405167ffffffffffffffff90911681526020016100a5565b61009561025e366004610a48565b610532565b61022d610271366004610976565b610583565b604051632efe011360e01b815260036004820152600060248201819052604482018190529073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af41580156102d7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102fb9190610a61565b905090565b600080600080516020610af883398151915262ffffff84166000908152602091909152604090819020600101549051631bbffab160e21b8152600160c81b90910463ffffffff16600482015273__$5f476116ae21c5294e0c0761c07efa7e1c$__90636effeac490602401602060405180830381865af4158015610388573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103ac9190610a7e565b1192915050565b73__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__63a123b37c6103d5610276565b6040516001600160e01b031960e084901b16815262ffffff9091166004820152602401602060405180830381865af4158015610415573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104399190610a97565b600080516020610ad88339815191528054600160401b900460ff168061046d5750805467ffffffffffffffff808416911610155b1561048b5760405163f92ee8a960e01b815260040160405180910390fd5b805468ffffffffffffffffff191667ffffffffffffffff831617600160401b1781556104b7858561068e565b6104c0836108cf565b805460ff60401b1916815560405167ffffffffffffffff831681527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d2906020015b60405180910390a15050505050565b60006102fb600080516020610ad88339815191525467ffffffffffffffff1690565b6000600080516020610af8833981519152600101828154811061055757610557610ac1565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff169050919050565b600080516020610ad88339815191528054600160401b810460ff16159067ffffffffffffffff166000811580156105b75750825b905060008267ffffffffffffffff1660011480156105d45750303b155b9050811580156105e2575080155b156106005760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff19166001178555831561062a57845460ff60401b1916600160401b1785555b610634888861068e565b61063e87876108cf565b831561068457845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b5050505050505050565b6106966108d3565b600080516020610af883398151915260006106c7600080516020610ad88339815191525467ffffffffffffffff1690565b905060006106d3610276565b90508167ffffffffffffffff166001036107015760028301805462ffffff191662ffffff8316179055610753565b600283015462ffffff908116908216116107535760405162461bcd60e51b815260206004820152600f60248201526e24a72b20a624a2102b22a929a4a7a760891b604482015260640160405180910390fd5b6001808401805491820181556000908152602090819020600a808404909101805462ffffff808716600394909606939093026101000a858102930219169190911790556040805160a0810182529283526001600160a01b038089169284019290925290861690820152606081016107c74290565b64ffffffffff1681526020014363ffffffff90811690915262ffffff8084166000908152602087815260409182902085518154928701516001600160a01b039081166301000000026001600160b81b0319909416919095161791909117815584820151600190910180546060870151608090970151909516600160c81b0263ffffffff60c81b1964ffffffffff909716600160a01b026001600160c81b031990961692909416919091179390931793909316179055517fad0a0fc10465a8dd9da3ad5f43e1a7fff4b4578551c76f0ae8deb844f0d0bf68906105019083908890889062ffffff9390931683526001600160a01b03918216602084015216604082015260600190565b6100885b600080516020610ad883398151915254600160401b900460ff1661090a57604051631afcd79f60e31b815260040160405180910390fd5b565b62ffffff8116811461091d57600080fd5b50565b60006020828403121561093257600080fd5b813561093d8161090c565b9392505050565b80356001600160a01b038116811461095b57600080fd5b919050565b634e487b7160e01b600052604160045260246000fd5b60008060006060848603121561098b57600080fd5b61099484610944565b92506109a260208501610944565b9150604084013567ffffffffffffffff808211156109bf57600080fd5b818601915086601f8301126109d357600080fd5b8135818111156109e5576109e5610960565b604051601f8201601f19908116603f01168101908382118183101715610a0d57610a0d610960565b81604052828152896020848701011115610a2657600080fd5b8260208601602083013760006020848301015280955050505050509250925092565b600060208284031215610a5a57600080fd5b5035919050565b600060208284031215610a7357600080fd5b815161093d8161090c565b600060208284031215610a9057600080fd5b5051919050565b600060208284031215610aa957600080fd5b815167ffffffffffffffff8116811461093d57600080fd5b634e487b7160e01b600052603260045260246000fdfef0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a004f61291a8ac3d020d0a7d919a76b8592aa88385744dee3f8b4f3873b969ed900a2646970667358221220eee7a6a4c6a512f9719d058e4726dfb0335a572b4b5539c9b19c3174e26e5dc464736f6c63430008140033",
225
+ "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100885760003560e01c8063a745e3df1161005b578063a745e3df1461021a578063b3c650151461022f578063b88da75914610250578063cf7a1d771461026357600080fd5b80630d8e6e2c1461008d5780634d459c90146100ae5780634f421333146101c7578063946dfcfe146101ea575b600080fd5b610095610276565b60405162ffffff90911681526020015b60405180910390f35b61016a6100bc366004610920565b6040805160a081018252600080825260208201819052918101829052606081018290526080810191909152600080516020610af883398151915262ffffff92831660009081526020918252604090819020815160a0810183528154958616815263010000009095046001600160a01b03908116938601939093526001015491821690840152600160a01b810464ffffffffff166060840152600160c81b900463ffffffff1660808301525090565b60408051825162ffffff1681526020808401516001600160a01b039081169183019190915283830151169181019190915260608083015164ffffffffff169082015260809182015163ffffffff169181019190915260a0016100a5565b6101da6101d5366004610920565b610300565b60405190151581526020016100a5565b7f4f61291a8ac3d020d0a7d919a76b8592aa88385744dee3f8b4f3873b969ed901546040519081526020016100a5565b61022d610228366004610976565b6103b3565b005b610237610510565b60405167ffffffffffffffff90911681526020016100a5565b61009561025e366004610a48565b610532565b61022d610271366004610976565b610583565b604051632efe011360e01b815260036004820152600060248201819052604482018190529073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af41580156102d7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102fb9190610a61565b905090565b600080600080516020610af883398151915262ffffff84166000908152602091909152604090819020600101549051631bbffab160e21b8152600160c81b90910463ffffffff16600482015273__$5f476116ae21c5294e0c0761c07efa7e1c$__90636effeac490602401602060405180830381865af4158015610388573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103ac9190610a7e565b1192915050565b73__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__63a123b37c6103d5610276565b6040516001600160e01b031960e084901b16815262ffffff9091166004820152602401602060405180830381865af4158015610415573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104399190610a97565b600080516020610ad88339815191528054600160401b900460ff168061046d5750805467ffffffffffffffff808416911610155b1561048b5760405163f92ee8a960e01b815260040160405180910390fd5b805468ffffffffffffffffff191667ffffffffffffffff831617600160401b1781556104b7858561068e565b6104c0836108cf565b805460ff60401b1916815560405167ffffffffffffffff831681527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d2906020015b60405180910390a15050505050565b60006102fb600080516020610ad88339815191525467ffffffffffffffff1690565b6000600080516020610af8833981519152600101828154811061055757610557610ac1565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff169050919050565b600080516020610ad88339815191528054600160401b810460ff16159067ffffffffffffffff166000811580156105b75750825b905060008267ffffffffffffffff1660011480156105d45750303b155b9050811580156105e2575080155b156106005760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff19166001178555831561062a57845460ff60401b1916600160401b1785555b610634888861068e565b61063e87876108cf565b831561068457845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b5050505050505050565b6106966108d3565b600080516020610af883398151915260006106c7600080516020610ad88339815191525467ffffffffffffffff1690565b905060006106d3610276565b90508167ffffffffffffffff166001036107015760028301805462ffffff191662ffffff8316179055610753565b600283015462ffffff908116908216116107535760405162461bcd60e51b815260206004820152600f60248201526e24a72b20a624a2102b22a929a4a7a760891b604482015260640160405180910390fd5b6001808401805491820181556000908152602090819020600a808404909101805462ffffff808716600394909606939093026101000a858102930219169190911790556040805160a0810182529283526001600160a01b038089169284019290925290861690820152606081016107c74290565b64ffffffffff1681526020014363ffffffff90811690915262ffffff8084166000908152602087815260409182902085518154928701516001600160a01b039081166301000000026001600160b81b0319909416919095161791909117815584820151600190910180546060870151608090970151909516600160c81b0263ffffffff60c81b1964ffffffffff909716600160a01b026001600160c81b031990961692909416919091179390931793909316179055517fad0a0fc10465a8dd9da3ad5f43e1a7fff4b4578551c76f0ae8deb844f0d0bf68906105019083908890889062ffffff9390931683526001600160a01b03918216602084015216604082015260600190565b6100885b600080516020610ad883398151915254600160401b900460ff1661090a57604051631afcd79f60e31b815260040160405180910390fd5b565b62ffffff8116811461091d57600080fd5b50565b60006020828403121561093257600080fd5b813561093d8161090c565b9392505050565b80356001600160a01b038116811461095b57600080fd5b919050565b634e487b7160e01b600052604160045260246000fd5b60008060006060848603121561098b57600080fd5b61099484610944565b92506109a260208501610944565b9150604084013567ffffffffffffffff808211156109bf57600080fd5b818601915086601f8301126109d357600080fd5b8135818111156109e5576109e5610960565b604051601f8201601f19908116603f01168101908382118183101715610a0d57610a0d610960565b81604052828152896020848701011115610a2657600080fd5b8260208601602083013760006020848301015280955050505050509250925092565b600060208284031215610a5a57600080fd5b5035919050565b600060208284031215610a7357600080fd5b815161093d8161090c565b600060208284031215610a9057600080fd5b5051919050565b600060208284031215610aa957600080fd5b815167ffffffffffffffff8116811461093d57600080fd5b634e487b7160e01b600052603260045260246000fdfef0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a004f61291a8ac3d020d0a7d919a76b8592aa88385744dee3f8b4f3873b969ed900a2646970667358221220eee7a6a4c6a512f9719d058e4726dfb0335a572b4b5539c9b19c3174e26e5dc464736f6c63430008140033",
249
226
  "linkReferences": {
250
227
  "contracts/types/Blocknumber.sol": {
251
228
  "BlocknumberLib": [
252
229
  {
253
230
  "length": 20,
254
- "start": 969
255
- },
256
- {
257
- "length": 20,
258
- "start": 1893
231
+ "start": 1069
259
232
  }
260
233
  ]
261
234
  },
@@ -263,11 +236,11 @@
263
236
  "VersionLib": [
264
237
  {
265
238
  "length": 20,
266
- "start": 807
239
+ "start": 892
267
240
  },
268
241
  {
269
242
  "length": 20,
270
- "start": 2033
243
+ "start": 1172
271
244
  }
272
245
  ]
273
246
  }
@@ -277,7 +250,7 @@
277
250
  "BlocknumberLib": [
278
251
  {
279
252
  "length": 20,
280
- "start": 658
253
+ "start": 846
281
254
  }
282
255
  ]
283
256
  },
@@ -285,7 +258,11 @@
285
258
  "VersionLib": [
286
259
  {
287
260
  "length": 20,
288
- "start": 798
261
+ "start": 669
262
+ },
263
+ {
264
+ "length": 20,
265
+ "start": 949
289
266
  }
290
267
  ]
291
268
  }
package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/ddc9b0b487d1eff0b437a694ef8bc6d1.json"
3
+ "buildInfo": "../../../build-info/b012f4ed156d977fd771c60cd60f52df.json"
4
4
  }