@etherisc/gif-next 0.0.2-bd7444a → 0.0.2-c4efd5e
Sign up to get free protection for your applications and to get access to all the features.
- package/README.md +25 -0
- package/artifacts/contracts/components/Component.sol/Component.dbg.json +1 -1
- package/artifacts/contracts/components/Component.sol/InstanceLinked.dbg.json +1 -1
- package/artifacts/contracts/components/Component.sol/InstanceLinked.json +2 -2
- package/artifacts/contracts/components/IPool.sol/IPoolComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IProduct.sol/IProductComponent.dbg.json +1 -1
- package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
- package/artifacts/contracts/components/Pool.sol/Pool.json +2 -2
- package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/components/Product.sol/Product.json +2 -2
- package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +1 -1
- package/artifacts/contracts/experiment/errors/Require.sol/Require.json +2 -2
- package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +1 -1
- package/artifacts/contracts/experiment/errors/Revert.sol/Revert.json +2 -2
- package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/A.sol/A.json +2 -2
- package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +1 -1
- package/artifacts/contracts/experiment/inheritance/A.sol/AShared.json +2 -2
- 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/types/TypeA.sol/TypeALib.dbg.json +1 -1
- package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.json +2 -2
- package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +1 -1
- package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.json +2 -2
- package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +2 -2
- package/artifacts/contracts/instance/access/Access.sol/AccessModule.dbg.json +1 -1
- package/artifacts/contracts/instance/access/IAccess.sol/IAccess.dbg.json +1 -1
- package/artifacts/contracts/instance/access/IAccess.sol/IAccessCheckRole.dbg.json +1 -1
- package/artifacts/contracts/instance/access/IAccess.sol/IAccessComponentTypeRoles.dbg.json +1 -1
- package/artifacts/contracts/instance/access/IAccess.sol/IAccessModule.dbg.json +1 -1
- package/artifacts/contracts/instance/component/ComponentModule.sol/ComponentModule.dbg.json +1 -1
- package/artifacts/contracts/instance/component/ComponentModule.sol/ComponentOwnerService.dbg.json +1 -1
- package/artifacts/contracts/instance/component/ComponentModule.sol/ComponentOwnerService.json +2 -2
- package/artifacts/contracts/instance/component/IComponent.sol/IComponent.dbg.json +1 -1
- package/artifacts/contracts/instance/component/IComponent.sol/IComponentContract.dbg.json +1 -1
- package/artifacts/contracts/instance/component/IComponent.sol/IComponentModule.dbg.json +1 -1
- package/artifacts/contracts/instance/component/IComponent.sol/IComponentOwnerService.dbg.json +1 -1
- package/artifacts/contracts/instance/component/IComponent.sol/IInstanceLinked.dbg.json +1 -1
- package/artifacts/contracts/instance/policy/IPolicy.sol/IPolicy.dbg.json +1 -1
- package/artifacts/contracts/instance/policy/IPolicy.sol/IPolicyModule.dbg.json +1 -1
- package/artifacts/contracts/instance/policy/PolicyModule.sol/PolicyModule.dbg.json +1 -1
- package/artifacts/contracts/instance/pool/IPoolModule.sol/IPool.dbg.json +1 -1
- package/artifacts/contracts/instance/pool/IPoolModule.sol/IPoolModule.dbg.json +1 -1
- package/artifacts/contracts/instance/pool/PoolModule.sol/PoolModule.dbg.json +1 -1
- package/artifacts/contracts/instance/product/IProductService.sol/IProductModule.dbg.json +1 -1
- package/artifacts/contracts/instance/product/IProductService.sol/IProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/product/ProductService.sol/ProductModule.dbg.json +1 -1
- package/artifacts/contracts/instance/product/ProductService.sol/ProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/product/ProductService.sol/ProductService.json +2 -2
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +2 -2
- package/artifacts/contracts/registry/IChainNft.sol/IChainNft.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IOwnable.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegisterable.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegistryLinked.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registerable.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registry.json +2 -2
- package/artifacts/contracts/registry/Registry.sol/RegistryLinked.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/RegistryLinked.json +2 -2
- package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
- package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.json +2 -2
- package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/ChainId.sol/ChainIdLib.json +2 -2
- package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/NftId.sol/NftIdLib.json +2 -2
- package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
- package/artifacts/contracts/types/Timestamp.sol/TimestampLib.json +2 -2
- package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.dbg.json +1 -1
- package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.json +15 -2
- package/contracts/components/Component.sol +16 -18
- package/contracts/components/IPool.sol +3 -3
- package/contracts/components/IProduct.sol +3 -6
- package/contracts/components/Pool.sol +6 -13
- package/contracts/components/Product.sol +10 -21
- package/contracts/experiment/errors/Require.sol +10 -5
- package/contracts/experiment/errors/Revert.sol +13 -8
- package/contracts/experiment/inheritance/A.sol +8 -11
- package/contracts/experiment/inheritance/B.sol +10 -5
- package/contracts/experiment/inheritance/C.sol +11 -5
- package/contracts/experiment/inheritance/IA.sol +2 -7
- package/contracts/experiment/inheritance/IB.sol +3 -2
- package/contracts/experiment/inheritance/IC.sol +4 -3
- package/contracts/experiment/types/TypeA.sol +14 -9
- package/contracts/experiment/types/TypeB.sol +14 -9
- package/contracts/instance/IInstance.sol +1 -3
- package/contracts/instance/Instance.sol +13 -13
- package/contracts/instance/access/Access.sol +63 -116
- package/contracts/instance/access/IAccess.sol +28 -48
- package/contracts/instance/component/ComponentModule.sol +63 -98
- package/contracts/instance/component/IComponent.sol +30 -52
- package/contracts/instance/policy/IPolicy.sol +9 -24
- package/contracts/instance/policy/PolicyModule.sol +19 -35
- package/contracts/instance/pool/IPoolModule.sol +7 -19
- package/contracts/instance/pool/PoolModule.sol +22 -35
- package/contracts/instance/product/IProductService.sol +5 -15
- package/contracts/instance/product/ProductService.sol +43 -39
- package/contracts/registry/ChainNft.sol +23 -61
- package/contracts/registry/IChainNft.sol +10 -7
- package/contracts/registry/IRegistry.sol +46 -36
- package/contracts/registry/Registry.sol +80 -53
- package/contracts/types/Blocknumber.sol +76 -18
- package/contracts/types/ChainId.sol +18 -10
- package/contracts/types/NftId.sol +29 -13
- package/contracts/types/Timestamp.sol +63 -16
- package/contracts/types/UFixed.sol +62 -64
- package/package.json +7 -3
@@ -85,8 +85,8 @@
|
|
85
85
|
"type": "function"
|
86
86
|
}
|
87
87
|
],
|
88
|
-
"bytecode": "
|
89
|
-
"deployedBytecode": "
|
88
|
+
"bytecode": "0x6102e2610053600b82828239805160001a607314610046577f4e487b7100000000000000000000000000000000000000000000000000000000600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100565760003560e01c806308dc895e1461005b57806330b8415f1461008b57806352694ee8146100bb578063c4cade9d146100eb575b600080fd5b610075600480360381019061007091906101df565b61011b565b604051610082919061021b565b60405180910390f35b6100a560048036038101906100a091906101df565b610125565b6040516100b29190610251565b60405180910390f35b6100d560048036038101906100d091906101df565b61013f565b6040516100e29190610251565b60405180910390f35b6101056004803603810190610100919061026c565b610159565b6040516101129190610251565b60405180910390f35b6000819050919050565b600080826bffffffffffffffffffffffff16119050919050565b600080826bffffffffffffffffffffffff16149050919050565b6000610165838361016d565b905092915050565b6000816bffffffffffffffffffffffff16836bffffffffffffffffffffffff1614905092915050565b600080fd5b60006bffffffffffffffffffffffff82169050919050565b6101bc8161019b565b81146101c757600080fd5b50565b6000813590506101d9816101b3565b92915050565b6000602082840312156101f5576101f4610196565b5b6000610203848285016101ca565b91505092915050565b6102158161019b565b82525050565b6000602082019050610230600083018461020c565b92915050565b60008115159050919050565b61024b81610236565b82525050565b60006020820190506102666000830184610242565b92915050565b6000806040838503121561028357610282610196565b5b6000610291858286016101ca565b92505060206102a2858286016101ca565b915050925092905056fea2646970667358221220a437bad3f1d82348f7c8e98b54f91e66edf88468fdebf82dafd2a3e50ec34ef364736f6c63430008140033",
|
89
|
+
"deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100565760003560e01c806308dc895e1461005b57806330b8415f1461008b57806352694ee8146100bb578063c4cade9d146100eb575b600080fd5b610075600480360381019061007091906101df565b61011b565b604051610082919061021b565b60405180910390f35b6100a560048036038101906100a091906101df565b610125565b6040516100b29190610251565b60405180910390f35b6100d560048036038101906100d091906101df565b61013f565b6040516100e29190610251565b60405180910390f35b6101056004803603810190610100919061026c565b610159565b6040516101129190610251565b60405180910390f35b6000819050919050565b600080826bffffffffffffffffffffffff16119050919050565b600080826bffffffffffffffffffffffff16149050919050565b6000610165838361016d565b905092915050565b6000816bffffffffffffffffffffffff16836bffffffffffffffffffffffff1614905092915050565b600080fd5b60006bffffffffffffffffffffffff82169050919050565b6101bc8161019b565b81146101c757600080fd5b50565b6000813590506101d9816101b3565b92915050565b6000602082840312156101f5576101f4610196565b5b6000610203848285016101ca565b91505092915050565b6102158161019b565b82525050565b6000602082019050610230600083018461020c565b92915050565b60008115159050919050565b61024b81610236565b82525050565b60006020820190506102666000830184610242565b92915050565b6000806040838503121561028357610282610196565b5b6000610291858286016101ca565b92505060206102a2858286016101ca565b915050925092905056fea2646970667358221220a437bad3f1d82348f7c8e98b54f91e66edf88468fdebf82dafd2a3e50ec34ef364736f6c63430008140033",
|
90
90
|
"linkReferences": {},
|
91
91
|
"deployedLinkReferences": {}
|
92
92
|
}
|
@@ -167,8 +167,8 @@
|
|
167
167
|
"type": "function"
|
168
168
|
}
|
169
169
|
],
|
170
|
-
"bytecode": "
|
171
|
-
"deployedBytecode": "
|
170
|
+
"bytecode": "0x610459610053600b82828239805160001a607314610046577f4e487b7100000000000000000000000000000000000000000000000000000000600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100875760003560e01c8063add9ce9911610065578063add9ce991461011c578063c24922ce1461014c578063da09d4841461017c578063ddf3d631146101ac57610087565b806383ffcdef1461008c57806394335b1a146100bc5780639df87639146100ec575b600080fd5b6100a660048036038101906100a1919061034c565b6101dc565b6040516100b391906103a7565b60405180910390f35b6100d660048036038101906100d1919061034c565b6101f0565b6040516100e391906103a7565b60405180910390f35b6101066004803603810190610101919061034c565b610204565b60405161011391906103a7565b60405180910390f35b6101366004803603810190610131919061034c565b610218565b60405161014391906103a7565b60405180910390f35b6101666004803603810190610161919061034c565b61022c565b60405161017391906103a7565b60405180910390f35b610196600480360381019061019191906103c2565b610240565b6040516101a39190610408565b60405180910390f35b6101c660048036038101906101c1919061034c565b610251565b6040516101d391906103a7565b60405180910390f35b60006101e88383610265565b905092915050565b60006101fc8383610280565b905092915050565b6000610210838361029c565b905092915050565b600061022483836102b7565b905092915050565b600061023883836102d2565b905092915050565b60008164ffffffffff169050919050565b600061025d83836102ee565b905092915050565b60008164ffffffffff168364ffffffffff1611905092915050565b60008164ffffffffff168364ffffffffff161115905092915050565b60008164ffffffffff168364ffffffffff1614905092915050565b60008164ffffffffff168364ffffffffff1610905092915050565b60008164ffffffffff168364ffffffffff161015905092915050565b60008164ffffffffff168364ffffffffff161415905092915050565b600080fd5b600064ffffffffff82169050919050565b6103298161030f565b811461033457600080fd5b50565b60008135905061034681610320565b92915050565b600080604083850312156103635761036261030a565b5b600061037185828601610337565b925050602061038285828601610337565b9150509250929050565b60008115159050919050565b6103a18161038c565b82525050565b60006020820190506103bc6000830184610398565b92915050565b6000602082840312156103d8576103d761030a565b5b60006103e684828501610337565b91505092915050565b6000819050919050565b610402816103ef565b82525050565b600060208201905061041d60008301846103f9565b9291505056fea2646970667358221220f71e51985a3774045fc8cea3189544bc2ae0f12baaddecb905b398bf808d952964736f6c63430008140033",
|
171
|
+
"deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100875760003560e01c8063add9ce9911610065578063add9ce991461011c578063c24922ce1461014c578063da09d4841461017c578063ddf3d631146101ac57610087565b806383ffcdef1461008c57806394335b1a146100bc5780639df87639146100ec575b600080fd5b6100a660048036038101906100a1919061034c565b6101dc565b6040516100b391906103a7565b60405180910390f35b6100d660048036038101906100d1919061034c565b6101f0565b6040516100e391906103a7565b60405180910390f35b6101066004803603810190610101919061034c565b610204565b60405161011391906103a7565b60405180910390f35b6101366004803603810190610131919061034c565b610218565b60405161014391906103a7565b60405180910390f35b6101666004803603810190610161919061034c565b61022c565b60405161017391906103a7565b60405180910390f35b610196600480360381019061019191906103c2565b610240565b6040516101a39190610408565b60405180910390f35b6101c660048036038101906101c1919061034c565b610251565b6040516101d391906103a7565b60405180910390f35b60006101e88383610265565b905092915050565b60006101fc8383610280565b905092915050565b6000610210838361029c565b905092915050565b600061022483836102b7565b905092915050565b600061023883836102d2565b905092915050565b60008164ffffffffff169050919050565b600061025d83836102ee565b905092915050565b60008164ffffffffff168364ffffffffff1611905092915050565b60008164ffffffffff168364ffffffffff161115905092915050565b60008164ffffffffff168364ffffffffff1614905092915050565b60008164ffffffffff168364ffffffffff1610905092915050565b60008164ffffffffff168364ffffffffff161015905092915050565b60008164ffffffffff168364ffffffffff161415905092915050565b600080fd5b600064ffffffffff82169050919050565b6103298161030f565b811461033457600080fd5b50565b60008135905061034681610320565b92915050565b600080604083850312156103635761036261030a565b5b600061037185828601610337565b925050602061038285828601610337565b9150509250929050565b60008115159050919050565b6103a18161038c565b82525050565b60006020820190506103bc6000830184610398565b92915050565b6000602082840312156103d8576103d761030a565b5b60006103e684828501610337565b91505092915050565b6000819050919050565b610402816103ef565b82525050565b600060208201905061041d60008301846103f9565b9291505056fea2646970667358221220f71e51985a3774045fc8cea3189544bc2ae0f12baaddecb905b398bf808d952964736f6c63430008140033",
|
172
172
|
"linkReferences": {},
|
173
173
|
"deployedLinkReferences": {}
|
174
174
|
}
|
@@ -431,10 +431,23 @@
|
|
431
431
|
],
|
432
432
|
"stateMutability": "pure",
|
433
433
|
"type": "function"
|
434
|
+
},
|
435
|
+
{
|
436
|
+
"inputs": [],
|
437
|
+
"name": "zero",
|
438
|
+
"outputs": [
|
439
|
+
{
|
440
|
+
"internalType": "UFixed",
|
441
|
+
"name": "",
|
442
|
+
"type": "uint256"
|
443
|
+
}
|
444
|
+
],
|
445
|
+
"stateMutability": "pure",
|
446
|
+
"type": "function"
|
434
447
|
}
|
435
448
|
],
|
436
|
-
"bytecode": "0x61147f610053600b82828239805160001a607314610046577f4e487b7100000000000000000000000000000000000000000000000000000000600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106101415760003560e01c8063a391c15b116100c2578063d05b045211610086578063d05b0452146103e0578063dd45daa114610410578063ea6515c414610440578063eb646d7114610470578063f30ed5981461048e578063f70dd33e146104ac57610141565b8063a391c15b146102f0578063b477332914610320578063b67d77c514610350578063c8a4ac9c14610380578063cc8b7b73146103b057610141565b806332148d731161010957806332148d7314610200578063753b14a514610230578063771602f7146102605780637a858b971461029057806392ae8ce0146102c057610141565b8063059f8b1614610146578063118fc88c146101645780631a12cd471461019457806321e5749b146101b2578063313ce567146101e2575b600080fd5b61014e6104dc565b60405161015b9190610b3f565b60405180910390f35b61017e60048036038101906101799190610b8b565b6104f0565b60405161018b9190610be6565b60405180910390f35b61019c610504565b6040516101a99190610c1d565b60405180910390f35b6101cc60048036038101906101c79190610b8b565b610509565b6040516101d99190610be6565b60405180910390f35b6101ea61051d565b6040516101f79190610b3f565b60405180910390f35b61021a60048036038101906102159190610b8b565b610529565b6040516102279190610be6565b60405180910390f35b61024a60048036038101906102459190610c38565b61053d565b6040516102579190610be6565b60405180910390f35b61027a60048036038101906102759190610b8b565b61054f565b6040516102879190610ca0565b60405180910390f35b6102aa60048036038101906102a59190610c38565b610563565b6040516102b79190610be6565b60405180910390f35b6102da60048036038101906102d59190610ce7565b610575565b6040516102e79190610ca0565b60405180910390f35b61030a60048036038101906103059190610b8b565b61059a565b6040516103179190610ca0565b60405180910390f35b61033a60048036038101906103359190610b8b565b6105ae565b6040516103479190610be6565b60405180910390f35b61036a60048036038101906103659190610b8b565b6105c2565b6040516103779190610ca0565b60405180910390f35b61039a60048036038101906103959190610b8b565b6105d6565b6040516103a79190610ca0565b60405180910390f35b6103ca60048036038101906103c59190610b8b565b6105ea565b6040516103d79190610ca0565b60405180910390f35b6103fa60048036038101906103f59190610c38565b6105fe565b6040516104079190610b3f565b60405180910390f35b61042a60048036038101906104259190610d40565b610612565b6040516104379190610ca0565b60405180910390f35b61045a60048036038101906104559190610b8b565b6106f4565b6040516104679190610be6565b60405180910390f35b610478610708565b6040516104859190610b3f565b60405180910390f35b610496610728565b6040516104a39190610df7565b60405180910390f35b6104c660048036038101906104c19190610e37565b61072d565b6040516104d39190610b3f565b60405180910390f35b601260000b600a6104ed9190610fd9565b81565b60006104fc838361081e565b905092915050565b601281565b6000610515838361082b565b905092915050565b6000601260ff16905090565b60006105358383610838565b905092915050565b600061054882610845565b9050919050565b600061055b8383610851565b905092915050565b600061056e82610867565b9050919050565b6000601260000b600a6105889190610fd9565b826105939190611024565b9050919050565b60006105a68383610873565b905092915050565b60006105ba83836108d2565b905092915050565b60006105ce83836108e0565b905092915050565b60006105e2838361093f565b905092915050565b60006105f6838361095c565b905092915050565b600061060b82600261072d565b9050919050565b6000808260126106229190611066565b60000b1215610666576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161065d9061111c565b60405180910390fd5b60126002610674919061113c565b60000b8260126106849190611066565b60000b13156106c8576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016106bf906111c5565b60405180910390fd5b8160126106d59190611066565b600a6106e191906111f2565b836106ec9190611024565b905092915050565b60006107008383610991565b905092915050565b6002601260000b600a61071b9190610fd9565b610725919061126c565b81565b600281565b600060028081111561074257610741610d80565b5b82600281111561075557610754610d80565b5b036107a65761079f6002601260000b600a6107709190610fd9565b61077a919061126c565b84610785919061129d565b6001601260000b600a6107989190610fd9565b600061099f565b9050610818565b600060028111156107ba576107b9610d80565b5b8260028111156107cd576107cc610d80565b5b036107f7576107f0836001601260000b600a6107e99190610fd9565b600061099f565b9050610818565b610815836001601260000b600a61080e9190610fd9565b600161099f565b90505b92915050565b6000818310905092915050565b6000818311905092915050565b6000818314905092915050565b60008082149050919050565b6000818361085f919061129d565b905092915050565b60008082119050919050565b60008082116108b7576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016108ae9061131d565b60405180910390fd5b6108ca83670de0b6b3a764000084610a15565b905092915050565b600081831015905092915050565b60006108ec83836108d2565b61092b576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161092290611389565b60405180910390fd5b818361093791906113a9565b905092915050565b60006109548383670de0b6b3a7640000610a15565b905092915050565b6000610968838361082b565b1561097e5761097783836108e0565b905061098b565b61098882846108e0565b90505b92915050565b600081831115905092915050565b6000806109ad868686610a15565b9050600160028111156109c3576109c2610d80565b5b8360028111156109d6576109d5610d80565b5b1480156109f45750600084806109ef576109ee61123d565b5b868809115b15610a0957600181610a06919061129d565b90505b80915050949350505050565b6000806000801985870985870292508281108382030391505060008103610a5057838281610a4657610a4561123d565b5b0492505050610b1f565b808411610a92576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610a8990611429565b60405180910390fd5b60008486880990508281118203915080830392506000600186190186169050808604955080840493506001818260000304019050808302841793506000600287600302189050808702600203810290508087026002038102905080870260020381029050808702600203810290508087026002038102905080870260020381029050808502955050505050505b9392505050565b6000819050919050565b610b3981610b26565b82525050565b6000602082019050610b546000830184610b30565b92915050565b600080fd5b610b6881610b26565b8114610b7357600080fd5b50565b600081359050610b8581610b5f565b92915050565b60008060408385031215610ba257610ba1610b5a565b5b6000610bb085828601610b76565b9250506020610bc185828601610b76565b9150509250929050565b60008115159050919050565b610be081610bcb565b82525050565b6000602082019050610bfb6000830184610bd7565b92915050565b60008160000b9050919050565b610c1781610c01565b82525050565b6000602082019050610c326000830184610c0e565b92915050565b600060208284031215610c4e57610c4d610b5a565b5b6000610c5c84828501610b76565b91505092915050565b6000819050919050565b6000610c8a610c85610c8084610b26565b610c65565b610b26565b9050919050565b610c9a81610c6f565b82525050565b6000602082019050610cb56000830184610c91565b92915050565b610cc481610b26565b8114610ccf57600080fd5b50565b600081359050610ce181610cbb565b92915050565b600060208284031215610cfd57610cfc610b5a565b5b6000610d0b84828501610cd2565b91505092915050565b610d1d81610c01565b8114610d2857600080fd5b50565b600081359050610d3a81610d14565b92915050565b60008060408385031215610d5757610d56610b5a565b5b6000610d6585828601610cd2565b9250506020610d7685828601610d2b565b9150509250929050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602160045260246000fd5b60038110610dc057610dbf610d80565b5b50565b6000819050610dd182610daf565b919050565b6000610de182610dc3565b9050919050565b610df181610dd6565b82525050565b6000602082019050610e0c6000830184610de8565b92915050565b60038110610e1f57600080fd5b50565b600081359050610e3181610e12565b92915050565b60008060408385031215610e4e57610e4d610b5a565b5b6000610e5c85828601610b76565b9250506020610e6d85828601610e22565b9150509250929050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60008160011c9050919050565b6000808291508390505b6001851115610efd57808604811115610ed957610ed8610e77565b5b6001851615610ee85780820291505b8081029050610ef685610ea6565b9450610ebd565b94509492505050565b600082610f165760019050610fd2565b81610f245760009050610fd2565b8160018114610f3a5760028114610f4457610f73565b6001915050610fd2565b60ff841115610f5657610f55610e77565b5b8360020a915084821115610f6d57610f6c610e77565b5b50610fd2565b5060208310610133831016604e8410600b8410161715610fa85782820a905083811115610fa357610fa2610e77565b5b610fd2565b610fb58484846001610eb3565b92509050818404811115610fcc57610fcb610e77565b5b81810290505b9392505050565b6000610fe482610b26565b9150610fef83610b26565b925061101c7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8484610f06565b905092915050565b600061102f82610b26565b915061103a83610b26565b925082820261104881610b26565b9150828204841483151761105f5761105e610e77565b5b5092915050565b600061107182610c01565b915061107c83610c01565b925082820190507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff808112607f821317156110b9576110b8610e77565b5b92915050565b600082825260208201905092915050565b7f4552524f523a464d2d3031303a4558504f4e454e545f544f4f5f534d414c4c00600082015250565b6000611106601f836110bf565b9150611111826110d0565b602082019050919050565b60006020820190508181036000830152611135816110f9565b9050919050565b600061114782610c01565b915061115283610c01565b925082820261116081610c01565b915080821461117257611171610e77565b5b5092915050565b7f4552524f523a464d2d3031313a4558504f4e454e545f544f4f5f4c4152474500600082015250565b60006111af601f836110bf565b91506111ba82611179565b602082019050919050565b600060208201905081810360008301526111de816111a2565b9050919050565b600060ff82169050919050565b60006111fd82610b26565b9150611208836111e5565b92506112357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8484610f06565b905092915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b600061127782610b26565b915061128283610b26565b9250826112925761129161123d565b5b828204905092915050565b60006112a882610b26565b91506112b383610b26565b92508282019050808211156112cb576112ca610e77565b5b92915050565b7f4552524f523a55464d2d3032303a44495649534f525f5a45524f000000000000600082015250565b6000611307601a836110bf565b9150611312826112d1565b602082019050919050565b60006020820190508181036000830152611336816112fa565b9050919050565b7f4552524f523a55464d2d3031303a4e454741544956455f524553554c54000000600082015250565b6000611373601d836110bf565b915061137e8261133d565b602082019050919050565b600060208201905081810360008301526113a281611366565b9050919050565b60006113b482610b26565b91506113bf83610b26565b92508282039050818111156113d7576113d6610e77565b5b92915050565b7f4d6174683a206d756c446976206f766572666c6f770000000000000000000000600082015250565b60006114136015836110bf565b915061141e826113dd565b602082019050919050565b6000602082019050818103600083015261144281611406565b905091905056fea2646970667358221220a79031ff9896c283cf59d6d16d72edaffbec2a580e23470a5ecc007dabdbca1864736f6c63430008140033",
|
437
|
-
"deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106101415760003560e01c8063a391c15b116100c2578063d05b045211610086578063d05b0452146103e0578063dd45daa114610410578063ea6515c414610440578063eb646d7114610470578063f30ed5981461048e578063f70dd33e146104ac57610141565b8063a391c15b146102f0578063b477332914610320578063b67d77c514610350578063c8a4ac9c14610380578063cc8b7b73146103b057610141565b806332148d731161010957806332148d7314610200578063753b14a514610230578063771602f7146102605780637a858b971461029057806392ae8ce0146102c057610141565b8063059f8b1614610146578063118fc88c146101645780631a12cd471461019457806321e5749b146101b2578063313ce567146101e2575b600080fd5b61014e6104dc565b60405161015b9190610b3f565b60405180910390f35b61017e60048036038101906101799190610b8b565b6104f0565b60405161018b9190610be6565b60405180910390f35b61019c610504565b6040516101a99190610c1d565b60405180910390f35b6101cc60048036038101906101c79190610b8b565b610509565b6040516101d99190610be6565b60405180910390f35b6101ea61051d565b6040516101f79190610b3f565b60405180910390f35b61021a60048036038101906102159190610b8b565b610529565b6040516102279190610be6565b60405180910390f35b61024a60048036038101906102459190610c38565b61053d565b6040516102579190610be6565b60405180910390f35b61027a60048036038101906102759190610b8b565b61054f565b6040516102879190610ca0565b60405180910390f35b6102aa60048036038101906102a59190610c38565b610563565b6040516102b79190610be6565b60405180910390f35b6102da60048036038101906102d59190610ce7565b610575565b6040516102e79190610ca0565b60405180910390f35b61030a60048036038101906103059190610b8b565b61059a565b6040516103179190610ca0565b60405180910390f35b61033a60048036038101906103359190610b8b565b6105ae565b6040516103479190610be6565b60405180910390f35b61036a60048036038101906103659190610b8b565b6105c2565b6040516103779190610ca0565b60405180910390f35b61039a60048036038101906103959190610b8b565b6105d6565b6040516103a79190610ca0565b60405180910390f35b6103ca60048036038101906103c59190610b8b565b6105ea565b6040516103d79190610ca0565b60405180910390f35b6103fa60048036038101906103f59190610c38565b6105fe565b6040516104079190610b3f565b60405180910390f35b61042a60048036038101906104259190610d40565b610612565b6040516104379190610ca0565b60405180910390f35b61045a60048036038101906104559190610b8b565b6106f4565b6040516104679190610be6565b60405180910390f35b610478610708565b6040516104859190610b3f565b60405180910390f35b610496610728565b6040516104a39190610df7565b60405180910390f35b6104c660048036038101906104c19190610e37565b61072d565b6040516104d39190610b3f565b60405180910390f35b601260000b600a6104ed9190610fd9565b81565b60006104fc838361081e565b905092915050565b601281565b6000610515838361082b565b905092915050565b6000601260ff16905090565b60006105358383610838565b905092915050565b600061054882610845565b9050919050565b600061055b8383610851565b905092915050565b600061056e82610867565b9050919050565b6000601260000b600a6105889190610fd9565b826105939190611024565b9050919050565b60006105a68383610873565b905092915050565b60006105ba83836108d2565b905092915050565b60006105ce83836108e0565b905092915050565b60006105e2838361093f565b905092915050565b60006105f6838361095c565b905092915050565b600061060b82600261072d565b9050919050565b6000808260126106229190611066565b60000b1215610666576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161065d9061111c565b60405180910390fd5b60126002610674919061113c565b60000b8260126106849190611066565b60000b13156106c8576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016106bf906111c5565b60405180910390fd5b8160126106d59190611066565b600a6106e191906111f2565b836106ec9190611024565b905092915050565b60006107008383610991565b905092915050565b6002601260000b600a61071b9190610fd9565b610725919061126c565b81565b600281565b600060028081111561074257610741610d80565b5b82600281111561075557610754610d80565b5b036107a65761079f6002601260000b600a6107709190610fd9565b61077a919061126c565b84610785919061129d565b6001601260000b600a6107989190610fd9565b600061099f565b9050610818565b600060028111156107ba576107b9610d80565b5b8260028111156107cd576107cc610d80565b5b036107f7576107f0836001601260000b600a6107e99190610fd9565b600061099f565b9050610818565b610815836001601260000b600a61080e9190610fd9565b600161099f565b90505b92915050565b6000818310905092915050565b6000818311905092915050565b6000818314905092915050565b60008082149050919050565b6000818361085f919061129d565b905092915050565b60008082119050919050565b60008082116108b7576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016108ae9061131d565b60405180910390fd5b6108ca83670de0b6b3a764000084610a15565b905092915050565b600081831015905092915050565b60006108ec83836108d2565b61092b576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161092290611389565b60405180910390fd5b818361093791906113a9565b905092915050565b60006109548383670de0b6b3a7640000610a15565b905092915050565b6000610968838361082b565b1561097e5761097783836108e0565b905061098b565b61098882846108e0565b90505b92915050565b600081831115905092915050565b6000806109ad868686610a15565b9050600160028111156109c3576109c2610d80565b5b8360028111156109d6576109d5610d80565b5b1480156109f45750600084806109ef576109ee61123d565b5b868809115b15610a0957600181610a06919061129d565b90505b80915050949350505050565b6000806000801985870985870292508281108382030391505060008103610a5057838281610a4657610a4561123d565b5b0492505050610b1f565b808411610a92576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610a8990611429565b60405180910390fd5b60008486880990508281118203915080830392506000600186190186169050808604955080840493506001818260000304019050808302841793506000600287600302189050808702600203810290508087026002038102905080870260020381029050808702600203810290508087026002038102905080870260020381029050808502955050505050505b9392505050565b6000819050919050565b610b3981610b26565b82525050565b6000602082019050610b546000830184610b30565b92915050565b600080fd5b610b6881610b26565b8114610b7357600080fd5b50565b600081359050610b8581610b5f565b92915050565b60008060408385031215610ba257610ba1610b5a565b5b6000610bb085828601610b76565b9250506020610bc185828601610b76565b9150509250929050565b60008115159050919050565b610be081610bcb565b82525050565b6000602082019050610bfb6000830184610bd7565b92915050565b60008160000b9050919050565b610c1781610c01565b82525050565b6000602082019050610c326000830184610c0e565b92915050565b600060208284031215610c4e57610c4d610b5a565b5b6000610c5c84828501610b76565b91505092915050565b6000819050919050565b6000610c8a610c85610c8084610b26565b610c65565b610b26565b9050919050565b610c9a81610c6f565b82525050565b6000602082019050610cb56000830184610c91565b92915050565b610cc481610b26565b8114610ccf57600080fd5b50565b600081359050610ce181610cbb565b92915050565b600060208284031215610cfd57610cfc610b5a565b5b6000610d0b84828501610cd2565b91505092915050565b610d1d81610c01565b8114610d2857600080fd5b50565b600081359050610d3a81610d14565b92915050565b60008060408385031215610d5757610d56610b5a565b5b6000610d6585828601610cd2565b9250506020610d7685828601610d2b565b9150509250929050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602160045260246000fd5b60038110610dc057610dbf610d80565b5b50565b6000819050610dd182610daf565b919050565b6000610de182610dc3565b9050919050565b610df181610dd6565b82525050565b6000602082019050610e0c6000830184610de8565b92915050565b60038110610e1f57600080fd5b50565b600081359050610e3181610e12565b92915050565b60008060408385031215610e4e57610e4d610b5a565b5b6000610e5c85828601610b76565b9250506020610e6d85828601610e22565b9150509250929050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60008160011c9050919050565b6000808291508390505b6001851115610efd57808604811115610ed957610ed8610e77565b5b6001851615610ee85780820291505b8081029050610ef685610ea6565b9450610ebd565b94509492505050565b600082610f165760019050610fd2565b81610f245760009050610fd2565b8160018114610f3a5760028114610f4457610f73565b6001915050610fd2565b60ff841115610f5657610f55610e77565b5b8360020a915084821115610f6d57610f6c610e77565b5b50610fd2565b5060208310610133831016604e8410600b8410161715610fa85782820a905083811115610fa357610fa2610e77565b5b610fd2565b610fb58484846001610eb3565b92509050818404811115610fcc57610fcb610e77565b5b81810290505b9392505050565b6000610fe482610b26565b9150610fef83610b26565b925061101c7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8484610f06565b905092915050565b600061102f82610b26565b915061103a83610b26565b925082820261104881610b26565b9150828204841483151761105f5761105e610e77565b5b5092915050565b600061107182610c01565b915061107c83610c01565b925082820190507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff808112607f821317156110b9576110b8610e77565b5b92915050565b600082825260208201905092915050565b7f4552524f523a464d2d3031303a4558504f4e454e545f544f4f5f534d414c4c00600082015250565b6000611106601f836110bf565b9150611111826110d0565b602082019050919050565b60006020820190508181036000830152611135816110f9565b9050919050565b600061114782610c01565b915061115283610c01565b925082820261116081610c01565b915080821461117257611171610e77565b5b5092915050565b7f4552524f523a464d2d3031313a4558504f4e454e545f544f4f5f4c4152474500600082015250565b60006111af601f836110bf565b91506111ba82611179565b602082019050919050565b600060208201905081810360008301526111de816111a2565b9050919050565b600060ff82169050919050565b60006111fd82610b26565b9150611208836111e5565b92506112357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8484610f06565b905092915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b600061127782610b26565b915061128283610b26565b9250826112925761129161123d565b5b828204905092915050565b60006112a882610b26565b91506112b383610b26565b92508282019050808211156112cb576112ca610e77565b5b92915050565b7f4552524f523a55464d2d3032303a44495649534f525f5a45524f000000000000600082015250565b6000611307601a836110bf565b9150611312826112d1565b602082019050919050565b60006020820190508181036000830152611336816112fa565b9050919050565b7f4552524f523a55464d2d3031303a4e454741544956455f524553554c54000000600082015250565b6000611373601d836110bf565b915061137e8261133d565b602082019050919050565b600060208201905081810360008301526113a281611366565b9050919050565b60006113b482610b26565b91506113bf83610b26565b92508282039050818111156113d7576113d6610e77565b5b92915050565b7f4d6174683a206d756c446976206f766572666c6f770000000000000000000000600082015250565b60006114136015836110bf565b915061141e826113dd565b602082019050919050565b6000602082019050818103600083015261144281611406565b905091905056fea2646970667358221220a79031ff9896c283cf59d6d16d72edaffbec2a580e23470a5ecc007dabdbca1864736f6c63430008140033",
|
449
|
+
"bytecode": "0x611461610053600b82828239805160001a607314610046577f4e487b7100000000000000000000000000000000000000000000000000000000600052600060045260246000fd5b30600052607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061014c5760003560e01c8063b4773329116100c2578063d05b045211610086578063d05b045214610409578063dd45daa114610439578063ea6515c414610469578063eb646d7114610499578063f30ed598146104b7578063f70dd33e146104d55761014c565b8063b47733291461032b578063b67d77c51461035b578063bc1b392d1461038b578063c8a4ac9c146103a9578063cc8b7b73146103d95761014c565b806332148d731161011457806332148d731461020b578063753b14a51461023b578063771602f71461026b5780637a858b971461029b57806392ae8ce0146102cb578063a391c15b146102fb5761014c565b8063059f8b1614610151578063118fc88c1461016f5780631a12cd471461019f57806321e5749b146101bd578063313ce567146101ed575b600080fd5b610159610505565b6040516101669190610b5e565b60405180910390f35b61018960048036038101906101849190610baa565b610519565b6040516101969190610c05565b60405180910390f35b6101a761052d565b6040516101b49190610c3c565b60405180910390f35b6101d760048036038101906101d29190610baa565b610532565b6040516101e49190610c05565b60405180910390f35b6101f5610546565b6040516102029190610b5e565b60405180910390f35b61022560048036038101906102209190610baa565b610552565b6040516102329190610c05565b60405180910390f35b61025560048036038101906102509190610c57565b610566565b6040516102629190610c05565b60405180910390f35b61028560048036038101906102809190610baa565b610578565b6040516102929190610cbf565b60405180910390f35b6102b560048036038101906102b09190610c57565b61058c565b6040516102c29190610c05565b60405180910390f35b6102e560048036038101906102e09190610d06565b61059e565b6040516102f29190610cbf565b60405180910390f35b61031560048036038101906103109190610baa565b6105c3565b6040516103229190610cbf565b60405180910390f35b61034560048036038101906103409190610baa565b6105d7565b6040516103529190610c05565b60405180910390f35b61037560048036038101906103709190610baa565b6105eb565b6040516103829190610cbf565b60405180910390f35b6103936105ff565b6040516103a09190610cbf565b60405180910390f35b6103c360048036038101906103be9190610baa565b610604565b6040516103d09190610cbf565b60405180910390f35b6103f360048036038101906103ee9190610baa565b610618565b6040516104009190610cbf565b60405180910390f35b610423600480360381019061041e9190610c57565b61062c565b6040516104309190610b5e565b60405180910390f35b610453600480360381019061044e9190610d5f565b610640565b6040516104609190610cbf565b60405180910390f35b610483600480360381019061047e9190610baa565b610713565b6040516104909190610c05565b60405180910390f35b6104a1610727565b6040516104ae9190610b5e565b60405180910390f35b6104bf610747565b6040516104cc9190610e16565b60405180910390f35b6104ef60048036038101906104ea9190610e56565b61074c565b6040516104fc9190610b5e565b60405180910390f35b601260000b600a6105169190610ff8565b81565b6000610525838361083d565b905092915050565b601281565b600061053e838361084a565b905092915050565b6000601260ff16905090565b600061055e8383610857565b905092915050565b600061057182610864565b9050919050565b60006105848383610870565b905092915050565b600061059782610886565b9050919050565b6000601260000b600a6105b19190610ff8565b826105bc9190611043565b9050919050565b60006105cf8383610892565b905092915050565b60006105e383836108f1565b905092915050565b60006105f783836108ff565b905092915050565b600090565b6000610610838361095e565b905092915050565b6000610624838361097b565b905092915050565b600061063982600261074c565b9050919050565b6000808260126106509190611085565b60000b1215610694576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161068b9061113b565b60405180910390fd5b60408260126106a39190611085565b60000b13156106e7576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016106de906111a7565b60405180910390fd5b8160126106f49190611085565b600a61070091906111d4565b8361070b9190611043565b905092915050565b600061071f83836109b0565b905092915050565b6002601260000b600a61073a9190610ff8565b610744919061124e565b81565b600281565b600060028081111561076157610760610d9f565b5b82600281111561077457610773610d9f565b5b036107c5576107be6002601260000b600a61078f9190610ff8565b610799919061124e565b846107a4919061127f565b6001601260000b600a6107b79190610ff8565b60006109be565b9050610837565b600060028111156107d9576107d8610d9f565b5b8260028111156107ec576107eb610d9f565b5b036108165761080f836001601260000b600a6108089190610ff8565b60006109be565b9050610837565b610834836001601260000b600a61082d9190610ff8565b60016109be565b90505b92915050565b6000818310905092915050565b6000818311905092915050565b6000818314905092915050565b60008082149050919050565b6000818361087e919061127f565b905092915050565b60008082119050919050565b60008082116108d6576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016108cd906112ff565b60405180910390fd5b6108e983670de0b6b3a764000084610a34565b905092915050565b600081831015905092915050565b600061090b83836108f1565b61094a576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016109419061136b565b60405180910390fd5b8183610956919061138b565b905092915050565b60006109738383670de0b6b3a7640000610a34565b905092915050565b6000610987838361084a565b1561099d5761099683836108ff565b90506109aa565b6109a782846108ff565b90505b92915050565b600081831115905092915050565b6000806109cc868686610a34565b9050600160028111156109e2576109e1610d9f565b5b8360028111156109f5576109f4610d9f565b5b148015610a13575060008480610a0e57610a0d61121f565b5b868809115b15610a2857600181610a25919061127f565b90505b80915050949350505050565b6000806000801985870985870292508281108382030391505060008103610a6f57838281610a6557610a6461121f565b5b0492505050610b3e565b808411610ab1576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610aa89061140b565b60405180910390fd5b60008486880990508281118203915080830392506000600186190186169050808604955080840493506001818260000304019050808302841793506000600287600302189050808702600203810290508087026002038102905080870260020381029050808702600203810290508087026002038102905080870260020381029050808502955050505050505b9392505050565b6000819050919050565b610b5881610b45565b82525050565b6000602082019050610b736000830184610b4f565b92915050565b600080fd5b610b8781610b45565b8114610b9257600080fd5b50565b600081359050610ba481610b7e565b92915050565b60008060408385031215610bc157610bc0610b79565b5b6000610bcf85828601610b95565b9250506020610be085828601610b95565b9150509250929050565b60008115159050919050565b610bff81610bea565b82525050565b6000602082019050610c1a6000830184610bf6565b92915050565b60008160000b9050919050565b610c3681610c20565b82525050565b6000602082019050610c516000830184610c2d565b92915050565b600060208284031215610c6d57610c6c610b79565b5b6000610c7b84828501610b95565b91505092915050565b6000819050919050565b6000610ca9610ca4610c9f84610b45565b610c84565b610b45565b9050919050565b610cb981610c8e565b82525050565b6000602082019050610cd46000830184610cb0565b92915050565b610ce381610b45565b8114610cee57600080fd5b50565b600081359050610d0081610cda565b92915050565b600060208284031215610d1c57610d1b610b79565b5b6000610d2a84828501610cf1565b91505092915050565b610d3c81610c20565b8114610d4757600080fd5b50565b600081359050610d5981610d33565b92915050565b60008060408385031215610d7657610d75610b79565b5b6000610d8485828601610cf1565b9250506020610d9585828601610d4a565b9150509250929050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602160045260246000fd5b60038110610ddf57610dde610d9f565b5b50565b6000819050610df082610dce565b919050565b6000610e0082610de2565b9050919050565b610e1081610df5565b82525050565b6000602082019050610e2b6000830184610e07565b92915050565b60038110610e3e57600080fd5b50565b600081359050610e5081610e31565b92915050565b60008060408385031215610e6d57610e6c610b79565b5b6000610e7b85828601610b95565b9250506020610e8c85828601610e41565b9150509250929050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60008160011c9050919050565b6000808291508390505b6001851115610f1c57808604811115610ef857610ef7610e96565b5b6001851615610f075780820291505b8081029050610f1585610ec5565b9450610edc565b94509492505050565b600082610f355760019050610ff1565b81610f435760009050610ff1565b8160018114610f595760028114610f6357610f92565b6001915050610ff1565b60ff841115610f7557610f74610e96565b5b8360020a915084821115610f8c57610f8b610e96565b5b50610ff1565b5060208310610133831016604e8410600b8410161715610fc75782820a905083811115610fc257610fc1610e96565b5b610ff1565b610fd48484846001610ed2565b92509050818404811115610feb57610fea610e96565b5b81810290505b9392505050565b600061100382610b45565b915061100e83610b45565b925061103b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8484610f25565b905092915050565b600061104e82610b45565b915061105983610b45565b925082820261106781610b45565b9150828204841483151761107e5761107d610e96565b5b5092915050565b600061109082610c20565b915061109b83610c20565b925082820190507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff808112607f821317156110d8576110d7610e96565b5b92915050565b600082825260208201905092915050565b7f4552524f523a464d2d3031303a4558504f4e454e545f544f4f5f534d414c4c00600082015250565b6000611125601f836110de565b9150611130826110ef565b602082019050919050565b6000602082019050818103600083015261115481611118565b9050919050565b7f4552524f523a464d2d3031313a4558504f4e454e545f544f4f5f4c4152474500600082015250565b6000611191601f836110de565b915061119c8261115b565b602082019050919050565b600060208201905081810360008301526111c081611184565b9050919050565b600060ff82169050919050565b60006111df82610b45565b91506111ea836111c7565b92506112177fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8484610f25565b905092915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b600061125982610b45565b915061126483610b45565b9250826112745761127361121f565b5b828204905092915050565b600061128a82610b45565b915061129583610b45565b92508282019050808211156112ad576112ac610e96565b5b92915050565b7f4552524f523a55464d2d3032303a44495649534f525f5a45524f000000000000600082015250565b60006112e9601a836110de565b91506112f4826112b3565b602082019050919050565b60006020820190508181036000830152611318816112dc565b9050919050565b7f4552524f523a55464d2d3031303a4e454741544956455f524553554c54000000600082015250565b6000611355601d836110de565b91506113608261131f565b602082019050919050565b6000602082019050818103600083015261138481611348565b9050919050565b600061139682610b45565b91506113a183610b45565b92508282039050818111156113b9576113b8610e96565b5b92915050565b7f4d6174683a206d756c446976206f766572666c6f770000000000000000000000600082015250565b60006113f56015836110de565b9150611400826113bf565b602082019050919050565b60006020820190508181036000830152611424816113e8565b905091905056fea26469706673582212204ff3a1300bb92808b3af3b7ca3fa50e6740fb7fce11f1ba4e2a44ebf1bd1252c64736f6c63430008140033",
|
450
|
+
"deployedBytecode": "0x730000000000000000000000000000000000000000301460806040526004361061014c5760003560e01c8063b4773329116100c2578063d05b045211610086578063d05b045214610409578063dd45daa114610439578063ea6515c414610469578063eb646d7114610499578063f30ed598146104b7578063f70dd33e146104d55761014c565b8063b47733291461032b578063b67d77c51461035b578063bc1b392d1461038b578063c8a4ac9c146103a9578063cc8b7b73146103d95761014c565b806332148d731161011457806332148d731461020b578063753b14a51461023b578063771602f71461026b5780637a858b971461029b57806392ae8ce0146102cb578063a391c15b146102fb5761014c565b8063059f8b1614610151578063118fc88c1461016f5780631a12cd471461019f57806321e5749b146101bd578063313ce567146101ed575b600080fd5b610159610505565b6040516101669190610b5e565b60405180910390f35b61018960048036038101906101849190610baa565b610519565b6040516101969190610c05565b60405180910390f35b6101a761052d565b6040516101b49190610c3c565b60405180910390f35b6101d760048036038101906101d29190610baa565b610532565b6040516101e49190610c05565b60405180910390f35b6101f5610546565b6040516102029190610b5e565b60405180910390f35b61022560048036038101906102209190610baa565b610552565b6040516102329190610c05565b60405180910390f35b61025560048036038101906102509190610c57565b610566565b6040516102629190610c05565b60405180910390f35b61028560048036038101906102809190610baa565b610578565b6040516102929190610cbf565b60405180910390f35b6102b560048036038101906102b09190610c57565b61058c565b6040516102c29190610c05565b60405180910390f35b6102e560048036038101906102e09190610d06565b61059e565b6040516102f29190610cbf565b60405180910390f35b61031560048036038101906103109190610baa565b6105c3565b6040516103229190610cbf565b60405180910390f35b61034560048036038101906103409190610baa565b6105d7565b6040516103529190610c05565b60405180910390f35b61037560048036038101906103709190610baa565b6105eb565b6040516103829190610cbf565b60405180910390f35b6103936105ff565b6040516103a09190610cbf565b60405180910390f35b6103c360048036038101906103be9190610baa565b610604565b6040516103d09190610cbf565b60405180910390f35b6103f360048036038101906103ee9190610baa565b610618565b6040516104009190610cbf565b60405180910390f35b610423600480360381019061041e9190610c57565b61062c565b6040516104309190610b5e565b60405180910390f35b610453600480360381019061044e9190610d5f565b610640565b6040516104609190610cbf565b60405180910390f35b610483600480360381019061047e9190610baa565b610713565b6040516104909190610c05565b60405180910390f35b6104a1610727565b6040516104ae9190610b5e565b60405180910390f35b6104bf610747565b6040516104cc9190610e16565b60405180910390f35b6104ef60048036038101906104ea9190610e56565b61074c565b6040516104fc9190610b5e565b60405180910390f35b601260000b600a6105169190610ff8565b81565b6000610525838361083d565b905092915050565b601281565b600061053e838361084a565b905092915050565b6000601260ff16905090565b600061055e8383610857565b905092915050565b600061057182610864565b9050919050565b60006105848383610870565b905092915050565b600061059782610886565b9050919050565b6000601260000b600a6105b19190610ff8565b826105bc9190611043565b9050919050565b60006105cf8383610892565b905092915050565b60006105e383836108f1565b905092915050565b60006105f783836108ff565b905092915050565b600090565b6000610610838361095e565b905092915050565b6000610624838361097b565b905092915050565b600061063982600261074c565b9050919050565b6000808260126106509190611085565b60000b1215610694576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161068b9061113b565b60405180910390fd5b60408260126106a39190611085565b60000b13156106e7576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016106de906111a7565b60405180910390fd5b8160126106f49190611085565b600a61070091906111d4565b8361070b9190611043565b905092915050565b600061071f83836109b0565b905092915050565b6002601260000b600a61073a9190610ff8565b610744919061124e565b81565b600281565b600060028081111561076157610760610d9f565b5b82600281111561077457610773610d9f565b5b036107c5576107be6002601260000b600a61078f9190610ff8565b610799919061124e565b846107a4919061127f565b6001601260000b600a6107b79190610ff8565b60006109be565b9050610837565b600060028111156107d9576107d8610d9f565b5b8260028111156107ec576107eb610d9f565b5b036108165761080f836001601260000b600a6108089190610ff8565b60006109be565b9050610837565b610834836001601260000b600a61082d9190610ff8565b60016109be565b90505b92915050565b6000818310905092915050565b6000818311905092915050565b6000818314905092915050565b60008082149050919050565b6000818361087e919061127f565b905092915050565b60008082119050919050565b60008082116108d6576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016108cd906112ff565b60405180910390fd5b6108e983670de0b6b3a764000084610a34565b905092915050565b600081831015905092915050565b600061090b83836108f1565b61094a576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016109419061136b565b60405180910390fd5b8183610956919061138b565b905092915050565b60006109738383670de0b6b3a7640000610a34565b905092915050565b6000610987838361084a565b1561099d5761099683836108ff565b90506109aa565b6109a782846108ff565b90505b92915050565b600081831115905092915050565b6000806109cc868686610a34565b9050600160028111156109e2576109e1610d9f565b5b8360028111156109f5576109f4610d9f565b5b148015610a13575060008480610a0e57610a0d61121f565b5b868809115b15610a2857600181610a25919061127f565b90505b80915050949350505050565b6000806000801985870985870292508281108382030391505060008103610a6f57838281610a6557610a6461121f565b5b0492505050610b3e565b808411610ab1576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610aa89061140b565b60405180910390fd5b60008486880990508281118203915080830392506000600186190186169050808604955080840493506001818260000304019050808302841793506000600287600302189050808702600203810290508087026002038102905080870260020381029050808702600203810290508087026002038102905080870260020381029050808502955050505050505b9392505050565b6000819050919050565b610b5881610b45565b82525050565b6000602082019050610b736000830184610b4f565b92915050565b600080fd5b610b8781610b45565b8114610b9257600080fd5b50565b600081359050610ba481610b7e565b92915050565b60008060408385031215610bc157610bc0610b79565b5b6000610bcf85828601610b95565b9250506020610be085828601610b95565b9150509250929050565b60008115159050919050565b610bff81610bea565b82525050565b6000602082019050610c1a6000830184610bf6565b92915050565b60008160000b9050919050565b610c3681610c20565b82525050565b6000602082019050610c516000830184610c2d565b92915050565b600060208284031215610c6d57610c6c610b79565b5b6000610c7b84828501610b95565b91505092915050565b6000819050919050565b6000610ca9610ca4610c9f84610b45565b610c84565b610b45565b9050919050565b610cb981610c8e565b82525050565b6000602082019050610cd46000830184610cb0565b92915050565b610ce381610b45565b8114610cee57600080fd5b50565b600081359050610d0081610cda565b92915050565b600060208284031215610d1c57610d1b610b79565b5b6000610d2a84828501610cf1565b91505092915050565b610d3c81610c20565b8114610d4757600080fd5b50565b600081359050610d5981610d33565b92915050565b60008060408385031215610d7657610d75610b79565b5b6000610d8485828601610cf1565b9250506020610d9585828601610d4a565b9150509250929050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602160045260246000fd5b60038110610ddf57610dde610d9f565b5b50565b6000819050610df082610dce565b919050565b6000610e0082610de2565b9050919050565b610e1081610df5565b82525050565b6000602082019050610e2b6000830184610e07565b92915050565b60038110610e3e57600080fd5b50565b600081359050610e5081610e31565b92915050565b60008060408385031215610e6d57610e6c610b79565b5b6000610e7b85828601610b95565b9250506020610e8c85828601610e41565b9150509250929050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60008160011c9050919050565b6000808291508390505b6001851115610f1c57808604811115610ef857610ef7610e96565b5b6001851615610f075780820291505b8081029050610f1585610ec5565b9450610edc565b94509492505050565b600082610f355760019050610ff1565b81610f435760009050610ff1565b8160018114610f595760028114610f6357610f92565b6001915050610ff1565b60ff841115610f7557610f74610e96565b5b8360020a915084821115610f8c57610f8b610e96565b5b50610ff1565b5060208310610133831016604e8410600b8410161715610fc75782820a905083811115610fc257610fc1610e96565b5b610ff1565b610fd48484846001610ed2565b92509050818404811115610feb57610fea610e96565b5b81810290505b9392505050565b600061100382610b45565b915061100e83610b45565b925061103b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8484610f25565b905092915050565b600061104e82610b45565b915061105983610b45565b925082820261106781610b45565b9150828204841483151761107e5761107d610e96565b5b5092915050565b600061109082610c20565b915061109b83610c20565b925082820190507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff808112607f821317156110d8576110d7610e96565b5b92915050565b600082825260208201905092915050565b7f4552524f523a464d2d3031303a4558504f4e454e545f544f4f5f534d414c4c00600082015250565b6000611125601f836110de565b9150611130826110ef565b602082019050919050565b6000602082019050818103600083015261115481611118565b9050919050565b7f4552524f523a464d2d3031313a4558504f4e454e545f544f4f5f4c4152474500600082015250565b6000611191601f836110de565b915061119c8261115b565b602082019050919050565b600060208201905081810360008301526111c081611184565b9050919050565b600060ff82169050919050565b60006111df82610b45565b91506111ea836111c7565b92506112177fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8484610f25565b905092915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b600061125982610b45565b915061126483610b45565b9250826112745761127361121f565b5b828204905092915050565b600061128a82610b45565b915061129583610b45565b92508282019050808211156112ad576112ac610e96565b5b92915050565b7f4552524f523a55464d2d3032303a44495649534f525f5a45524f000000000000600082015250565b60006112e9601a836110de565b91506112f4826112b3565b602082019050919050565b60006020820190508181036000830152611318816112dc565b9050919050565b7f4552524f523a55464d2d3031303a4e454741544956455f524553554c54000000600082015250565b6000611355601d836110de565b91506113608261131f565b602082019050919050565b6000602082019050818103600083015261138481611348565b9050919050565b600061139682610b45565b91506113a183610b45565b92508282039050818111156113b9576113b8610e96565b5b92915050565b7f4d6174683a206d756c446976206f766572666c6f770000000000000000000000600082015250565b60006113f56015836110de565b9150611400826113bf565b602082019050919050565b60006020820190508181036000830152611424816113e8565b905091905056fea26469706673582212204ff3a1300bb92808b3af3b7ca3fa50e6740fb7fce11f1ba4e2a44ebf1bd1252c64736f6c63430008140033",
|
438
451
|
"linkReferences": {},
|
439
452
|
"deployedLinkReferences": {}
|
440
453
|
}
|
@@ -8,9 +8,7 @@ import {IInstance} from "../instance/IInstance.sol";
|
|
8
8
|
import {IInstanceLinked, IComponent, IComponentContract, IComponentModule, IComponentOwnerService} from "../instance/component/IComponent.sol";
|
9
9
|
import {NftId} from "../types/NftId.sol";
|
10
10
|
|
11
|
-
contract InstanceLinked is
|
12
|
-
IInstanceLinked
|
13
|
-
{
|
11
|
+
contract InstanceLinked is IInstanceLinked {
|
14
12
|
IInstance internal _instance;
|
15
13
|
|
16
14
|
constructor(address instance) {
|
@@ -22,41 +20,41 @@ contract InstanceLinked is
|
|
22
20
|
// _instance = IInstance(instance);
|
23
21
|
// }
|
24
22
|
|
25
|
-
function getInstance() public view override returns(IInstance instance) {
|
23
|
+
function getInstance() public view override returns (IInstance instance) {
|
26
24
|
return _instance;
|
27
25
|
}
|
28
26
|
}
|
29
27
|
|
30
|
-
|
31
28
|
abstract contract Component is
|
32
29
|
Registerable,
|
33
30
|
InstanceLinked,
|
34
31
|
IComponentContract
|
35
32
|
{
|
36
|
-
|
37
33
|
address private _deployer;
|
38
34
|
|
39
|
-
constructor(
|
40
|
-
|
41
|
-
|
42
|
-
{
|
35
|
+
constructor(
|
36
|
+
address registry,
|
37
|
+
address instance
|
38
|
+
) Registerable(registry) InstanceLinked(instance) {}
|
43
39
|
|
44
40
|
// from registerable
|
45
|
-
function register()
|
46
|
-
public
|
47
|
-
override
|
48
|
-
returns(NftId componentId)
|
49
|
-
{
|
41
|
+
function register() public override returns (NftId componentId) {
|
50
42
|
require(msg.sender == getInitialOwner(), "");
|
51
|
-
require(
|
52
|
-
|
43
|
+
require(
|
44
|
+
address(_registry) != address(0),
|
45
|
+
"ERROR:PRD-001:REGISTRY_ZERO"
|
46
|
+
);
|
47
|
+
require(
|
48
|
+
_registry.isRegistered(address(_instance)),
|
49
|
+
"ERROR:PRD-002:INSTANCE_NOT_REGISTERED"
|
50
|
+
);
|
53
51
|
|
54
52
|
IComponentOwnerService cos = _instance.getComponentOwnerService();
|
55
53
|
componentId = cos.register(this);
|
56
54
|
}
|
57
55
|
|
58
56
|
// from registerable
|
59
|
-
function getParentNftId() public view override returns(NftId) {
|
57
|
+
function getParentNftId() public view override returns (NftId) {
|
60
58
|
return getInstance().getNftId();
|
61
59
|
}
|
62
60
|
}
|
@@ -4,9 +4,6 @@ pragma solidity ^0.8.19;
|
|
4
4
|
import {IComponentContract} from "../instance/component/IComponent.sol";
|
5
5
|
import {NftId} from "../types/NftId.sol";
|
6
6
|
|
7
|
-
interface IProductComponent is
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
function getPoolNftId() external view returns(NftId poolNftId);
|
12
|
-
}
|
7
|
+
interface IProductComponent is IComponentContract {
|
8
|
+
function getPoolNftId() external view returns (NftId poolNftId);
|
9
|
+
}
|
@@ -4,26 +4,19 @@ pragma solidity ^0.8.19;
|
|
4
4
|
import {IPoolComponent} from "./IPool.sol";
|
5
5
|
import {Component} from "./Component.sol";
|
6
6
|
|
7
|
-
|
8
|
-
contract Pool is
|
9
|
-
Component,
|
10
|
-
IPoolComponent
|
11
|
-
{
|
12
|
-
|
7
|
+
contract Pool is Component, IPoolComponent {
|
13
8
|
constructor(
|
14
|
-
address registry,
|
9
|
+
address registry,
|
15
10
|
address instance
|
16
|
-
)
|
17
|
-
Component(registry, instance)
|
18
|
-
{ }
|
11
|
+
) Component(registry, instance) {}
|
19
12
|
|
20
13
|
// from registerable
|
21
|
-
function getType() public view override returns(uint256) {
|
14
|
+
function getType() public view override returns (uint256) {
|
22
15
|
return _registry.POOL();
|
23
16
|
}
|
24
17
|
|
25
18
|
// from registerable
|
26
|
-
function getData() external view override returns(bytes memory data) {
|
19
|
+
function getData() external view override returns (bytes memory data) {
|
27
20
|
return bytes(abi.encode(getInstance().getNftId()));
|
28
21
|
}
|
29
|
-
}
|
22
|
+
}
|
@@ -6,21 +6,15 @@ import {Component} from "./Component.sol";
|
|
6
6
|
import {IProductComponent} from "./IProduct.sol";
|
7
7
|
import {NftId} from "../types/NftId.sol";
|
8
8
|
|
9
|
-
|
10
|
-
contract Product is
|
11
|
-
Component,
|
12
|
-
IProductComponent
|
13
|
-
{
|
9
|
+
contract Product is Component, IProductComponent {
|
14
10
|
IProductService private _productService;
|
15
11
|
address private _pool;
|
16
12
|
|
17
13
|
constructor(
|
18
|
-
address registry,
|
19
|
-
address instance,
|
14
|
+
address registry,
|
15
|
+
address instance,
|
20
16
|
address pool
|
21
|
-
)
|
22
|
-
Component(registry, instance)
|
23
|
-
{
|
17
|
+
) Component(registry, instance) {
|
24
18
|
_productService = _instance.getProductService();
|
25
19
|
_pool = pool;
|
26
20
|
}
|
@@ -31,10 +25,7 @@ contract Product is
|
|
31
25
|
uint256 premiumAmount,
|
32
26
|
uint256 lifetime,
|
33
27
|
NftId bundleNftId
|
34
|
-
)
|
35
|
-
internal
|
36
|
-
returns(NftId nftId)
|
37
|
-
{
|
28
|
+
) internal returns (NftId nftId) {
|
38
29
|
nftId = _productService.createApplication(
|
39
30
|
applicationOwner,
|
40
31
|
sumInsuredAmount,
|
@@ -44,23 +35,21 @@ contract Product is
|
|
44
35
|
);
|
45
36
|
}
|
46
37
|
|
47
|
-
function _underwrite(NftId nftId)
|
48
|
-
internal
|
49
|
-
{
|
38
|
+
function _underwrite(NftId nftId) internal {
|
50
39
|
_productService.underwrite(nftId);
|
51
40
|
}
|
52
41
|
|
53
|
-
function getPoolNftId() external view override returns(NftId poolNftId) {
|
42
|
+
function getPoolNftId() external view override returns (NftId poolNftId) {
|
54
43
|
return _registry.getNftId(_pool);
|
55
44
|
}
|
56
45
|
|
57
46
|
// from registerable
|
58
|
-
function getType() public view override returns(uint256) {
|
47
|
+
function getType() public view override returns (uint256) {
|
59
48
|
return _registry.PRODUCT();
|
60
49
|
}
|
61
50
|
|
62
51
|
// from registerable
|
63
|
-
function getData() external view override returns(bytes memory data) {
|
52
|
+
function getData() external view override returns (bytes memory data) {
|
64
53
|
return bytes(abi.encode(getInstance().getNftId()));
|
65
54
|
}
|
66
|
-
}
|
55
|
+
}
|
@@ -2,7 +2,6 @@
|
|
2
2
|
pragma solidity ^0.8.19;
|
3
3
|
|
4
4
|
contract Require {
|
5
|
-
|
6
5
|
error AsmallerThanB_S();
|
7
6
|
error AsmallerThanB_M(uint a);
|
8
7
|
error AsmallerThanB_L(uint a, uint b);
|
@@ -13,21 +12,27 @@ contract Require {
|
|
13
12
|
_b = 42;
|
14
13
|
}
|
15
14
|
|
16
|
-
function isAlargerThanBRequire_S(
|
15
|
+
function isAlargerThanBRequire_S(
|
16
|
+
uint a
|
17
|
+
) external view returns (bool isLarger) {
|
17
18
|
require(a > _b, "ERROR:ABC-001");
|
18
19
|
|
19
20
|
return true;
|
20
21
|
}
|
21
22
|
|
22
|
-
function isAlargerThanBRequire_M(
|
23
|
+
function isAlargerThanBRequire_M(
|
24
|
+
uint a
|
25
|
+
) external view returns (bool isLarger) {
|
23
26
|
require(a > _b, "ERROR:ABC-002:A_IS_SMALLER");
|
24
27
|
|
25
28
|
return true;
|
26
29
|
}
|
27
30
|
|
28
|
-
function isAlargerThanBRequire_L(
|
31
|
+
function isAlargerThanBRequire_L(
|
32
|
+
uint a
|
33
|
+
) external view returns (bool isLarger) {
|
29
34
|
require(a > _b, "ERROR:ABC-003:A_IS_SMALLER_THAN_B");
|
30
35
|
|
31
36
|
return true;
|
32
37
|
}
|
33
|
-
}
|
38
|
+
}
|
@@ -2,7 +2,6 @@
|
|
2
2
|
pragma solidity ^0.8.19;
|
3
3
|
|
4
4
|
contract Revert {
|
5
|
-
|
6
5
|
error AsmallerThanB_S();
|
7
6
|
error AsmallerThanB_M(uint a);
|
8
7
|
error AsmallerThanB_L(uint a, uint b);
|
@@ -13,27 +12,33 @@ contract Revert {
|
|
13
12
|
_b = 42;
|
14
13
|
}
|
15
14
|
|
16
|
-
function isAlargerThanBRevert_S(
|
17
|
-
|
15
|
+
function isAlargerThanBRevert_S(
|
16
|
+
uint a
|
17
|
+
) external view returns (bool isLarger) {
|
18
|
+
if (a <= _b) {
|
18
19
|
revert AsmallerThanB_S();
|
19
20
|
}
|
20
21
|
|
21
22
|
return true;
|
22
23
|
}
|
23
24
|
|
24
|
-
function isAlargerThanBRevert_M(
|
25
|
-
|
25
|
+
function isAlargerThanBRevert_M(
|
26
|
+
uint a
|
27
|
+
) external view returns (bool isLarger) {
|
28
|
+
if (a <= _b) {
|
26
29
|
revert AsmallerThanB_M(a);
|
27
30
|
}
|
28
31
|
|
29
32
|
return true;
|
30
33
|
}
|
31
34
|
|
32
|
-
function isAlargerThanBRevert_L(
|
33
|
-
|
35
|
+
function isAlargerThanBRevert_L(
|
36
|
+
uint a
|
37
|
+
) external view returns (bool isLarger) {
|
38
|
+
if (a <= _b) {
|
34
39
|
revert AsmallerThanB_L(a, _b);
|
35
40
|
}
|
36
41
|
|
37
42
|
return true;
|
38
43
|
}
|
39
|
-
}
|
44
|
+
}
|
@@ -35,22 +35,19 @@ a.setC(20);
|
|
35
35
|
*/
|
36
36
|
|
37
37
|
contract AShared is ISharedA {
|
38
|
-
|
39
38
|
uint256 private _x;
|
40
39
|
|
41
40
|
constructor() {
|
42
41
|
_x = 42;
|
43
42
|
}
|
44
43
|
|
45
|
-
function getA() external view override returns(uint256) {
|
46
|
-
|
47
|
-
}
|
48
|
-
|
49
|
-
contract A is
|
50
|
-
AShared,
|
51
|
-
B,
|
52
|
-
C,
|
53
|
-
IA
|
54
|
-
{
|
44
|
+
function getA() external view override returns (uint256) {
|
45
|
+
return _x;
|
46
|
+
}
|
55
47
|
|
48
|
+
function setA(uint256 newA) external override {
|
49
|
+
_x = newA;
|
50
|
+
}
|
56
51
|
}
|
52
|
+
|
53
|
+
contract A is AShared, B, C, IA {}
|
@@ -5,7 +5,6 @@ import {ISharedA} from "./IA.sol";
|
|
5
5
|
import {IB} from "./IB.sol";
|
6
6
|
|
7
7
|
abstract contract B is ISharedA, IB {
|
8
|
-
|
9
8
|
// names of private variables can be re-used in inheritance
|
10
9
|
uint256 private _x;
|
11
10
|
|
@@ -14,10 +13,16 @@ abstract contract B is ISharedA, IB {
|
|
14
13
|
}
|
15
14
|
|
16
15
|
// access own state
|
17
|
-
function getB() external view override returns(uint256) {
|
18
|
-
|
16
|
+
function getB() external view override returns (uint256) {
|
17
|
+
return _x;
|
18
|
+
}
|
19
19
|
|
20
|
-
|
21
|
-
|
20
|
+
function setB(uint256 newB) external override {
|
21
|
+
_x = newB;
|
22
|
+
}
|
22
23
|
|
24
|
+
// access state from parent contract A
|
25
|
+
function getAfromB() external view override returns (uint256) {
|
26
|
+
return this.getA();
|
27
|
+
}
|
23
28
|
}
|
@@ -6,7 +6,6 @@ import {IB} from "./IB.sol";
|
|
6
6
|
import {IC} from "./IC.sol";
|
7
7
|
|
8
8
|
abstract contract C is ISharedA, IC {
|
9
|
-
|
10
9
|
uint256 private _x;
|
11
10
|
|
12
11
|
constructor() {
|
@@ -14,14 +13,21 @@ abstract contract C is ISharedA, IC {
|
|
14
13
|
}
|
15
14
|
|
16
15
|
// access own state
|
17
|
-
function getC() external view override returns(uint256) {
|
18
|
-
|
16
|
+
function getC() external view override returns (uint256) {
|
17
|
+
return _x;
|
18
|
+
}
|
19
|
+
|
20
|
+
function setC(uint256 newC) external override {
|
21
|
+
_x = newC;
|
22
|
+
}
|
19
23
|
|
20
24
|
// access state from parent contract A
|
21
|
-
function getAfromC() external view override returns(uint256) {
|
25
|
+
function getAfromC() external view override returns (uint256) {
|
26
|
+
return this.getA();
|
27
|
+
}
|
22
28
|
|
23
29
|
// access state from other module B
|
24
|
-
function getBfromC() external view override returns(uint256) {
|
30
|
+
function getBfromC() external view override returns (uint256) {
|
25
31
|
IB b = IB(address(this));
|
26
32
|
return b.getB();
|
27
33
|
}
|
@@ -5,14 +5,9 @@ import {IB} from "./IB.sol";
|
|
5
5
|
import {IC} from "./IC.sol";
|
6
6
|
|
7
7
|
interface ISharedA {
|
8
|
+
function getA() external view returns (uint256);
|
8
9
|
|
9
|
-
function getA() external view returns(uint256);
|
10
10
|
function setA(uint256 newA) external;
|
11
11
|
}
|
12
12
|
|
13
|
-
interface IA is
|
14
|
-
ISharedA,
|
15
|
-
IB,
|
16
|
-
IC
|
17
|
-
{
|
18
|
-
}
|
13
|
+
interface IA is ISharedA, IB, IC {}
|
@@ -2,8 +2,9 @@
|
|
2
2
|
pragma solidity ^0.8.19;
|
3
3
|
|
4
4
|
interface IB {
|
5
|
+
function getAfromB() external view returns (uint256);
|
6
|
+
|
7
|
+
function getB() external view returns (uint256);
|
5
8
|
|
6
|
-
function getAfromB() external view returns(uint256);
|
7
|
-
function getB() external view returns(uint256);
|
8
9
|
function setB(uint256 newA) external;
|
9
10
|
}
|
@@ -2,10 +2,11 @@
|
|
2
2
|
pragma solidity ^0.8.19;
|
3
3
|
|
4
4
|
interface IC {
|
5
|
+
function getAfromC() external view returns (uint256);
|
5
6
|
|
6
|
-
function
|
7
|
-
|
7
|
+
function getBfromC() external view returns (uint256);
|
8
|
+
|
9
|
+
function getC() external view returns (uint256);
|
8
10
|
|
9
|
-
function getC() external view returns(uint256);
|
10
11
|
function setC(uint256 newA) external;
|
11
12
|
}
|
@@ -23,20 +23,25 @@ a.toInt() == x.toInt() // -> no error
|
|
23
23
|
type TypeA is uint248;
|
24
24
|
|
25
25
|
// type bindings
|
26
|
-
using {
|
27
|
-
eqTypeA as ==,
|
28
|
-
neTypeA as !=,
|
29
|
-
TypeALib.toInt
|
30
|
-
} for TypeA global;
|
26
|
+
using {eqTypeA as ==, neTypeA as !=, TypeALib.toInt} for TypeA global;
|
31
27
|
|
32
28
|
// general pure free functions
|
33
|
-
function toTypeA(uint256 typeA) pure returns(TypeA) {
|
29
|
+
function toTypeA(uint256 typeA) pure returns (TypeA) {
|
30
|
+
return TypeA.wrap(uint248(typeA));
|
31
|
+
}
|
34
32
|
|
35
33
|
// pure free functions for operators
|
36
|
-
function eqTypeA(TypeA a, TypeA b) pure returns(bool isSame) {
|
37
|
-
|
34
|
+
function eqTypeA(TypeA a, TypeA b) pure returns (bool isSame) {
|
35
|
+
return TypeA.unwrap(a) == TypeA.unwrap(b);
|
36
|
+
}
|
37
|
+
|
38
|
+
function neTypeA(TypeA a, TypeA b) pure returns (bool isDifferent) {
|
39
|
+
return TypeA.unwrap(a) != TypeA.unwrap(b);
|
40
|
+
}
|
38
41
|
|
39
42
|
// library functions that operate on user defined type
|
40
43
|
library TypeALib {
|
41
|
-
function toInt(TypeA typeA) internal pure returns(uint256) {
|
44
|
+
function toInt(TypeA typeA) internal pure returns (uint256) {
|
45
|
+
return uint256(TypeA.unwrap(typeA));
|
46
|
+
}
|
42
47
|
}
|